ticket #116 attempt 1

devplacepy/avatar.py

@@ -15,19 +15,27 @@ def avatar_seed(user) -> str:
     return user.get("avatar_seed") or user.get("username") or ""
 
 
-def generate_avatar_svg(seed: str) -> str:
+def _svg_with_size(svg: str, size: int) -> str:
+    size_attr = f' width="{size}" height="{size}"'
+    if svg.startswith("<svg"):
+        tag_end = svg.index(">")
+        return svg[:tag_end] + size_attr + svg[tag_end:]
+    return svg
+
+
+def generate_avatar_svg(seed: str, size: int = 128) -> str:
     try:
         from multiavatar.multiavatar import multiavatar
 
         svg = multiavatar(seed, None, None)
         if svg and svg.strip().startswith("<svg"):
-            return svg
+            return _svg_with_size(svg, size)
     except Exception as e:
         logger.exception(e)
         logger.warning(f"Avatar generation failed for {seed}: {e}")
     initial = seed[:1].upper() if seed else "?"
     return (
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">'
+        f'<svg xmlns="http://www.w3.org/2000/svg" width="{size}" height="{size}" viewBox="0 0 100 100">'
         f'<rect width="100" height="100" rx="50" fill="#ff6b35"/>'
         f'<text x="50" y="65" text-anchor="middle" fill="white" font-size="40" font-weight="700" font-family="sans-serif">{initial}</text></svg>'
     )

devplacepy/routers/avatar.py

@@ -17,14 +17,16 @@ _CACHE_CONTROL = f"public, max-age={SECONDS_PER_DAY}, immutable"
 
 @router.get("/{style}/{seed}")
 async def avatar_proxy(request: Request, style: str, seed: str, size: int = 128):
-    etag = '"' + hashlib.md5(f"{seed}:{size}".encode("utf-8")).hexdigest() + '"'
+    size = max(16, min(512, size))
+    cache_key = f"{seed}:{size}"
+    etag = '"' + hashlib.md5(cache_key.encode("utf-8")).hexdigest() + '"'
     headers = {"ETag": etag, "Cache-Control": _CACHE_CONTROL}
 
     if request.headers.get("if-none-match") == etag:
         return Response(status_code=304, headers=headers)
 
-    svg = _cache.get(seed)
+    svg = _cache.get(cache_key)
     if svg is None:
-        svg = generate_avatar_svg(seed)
-        _cache.set(seed, svg)
+        svg = generate_avatar_svg(seed, size)
+        _cache.set(cache_key, svg)
     return Response(content=svg, media_type="image/svg+xml", headers=headers)

tests/api/avatar.py

@@ -1,7 +1,6 @@
 # retoor <retoor@molodetz.nl>
 
 import requests
-from devplacepy.avatar import avatar_url, generate_avatar_svg
 from tests.conftest import BASE_URL
 
 
@@ -10,3 +9,32 @@ def test_avatar_endpoint_serves_svg(app_server):
     assert r.status_code == 200
     assert "svg" in r.headers.get("content-type", "").lower()
     assert "<svg" in r.text
+
+
+def test_avatar_respects_size(app_server):
+    r = requests.get(f"{BASE_URL}/avatar/multiavatar/alice_test?size=32")
+    assert r.status_code == 200
+    assert 'width="32"' in r.text
+    assert 'height="32"' in r.text
+
+
+def test_avatar_different_sizes_different_response(app_server):
+    r32 = requests.get(f"{BASE_URL}/avatar/multiavatar/bob_test?size=32")
+    r128 = requests.get(f"{BASE_URL}/avatar/multiavatar/bob_test?size=128")
+    assert r32.status_code == 200
+    assert r128.status_code == 200
+    etag32 = r32.headers.get("etag", "")
+    etag128 = r128.headers.get("etag", "")
+    assert etag32 != etag128, "same seed with different sizes must produce different ETags"
+
+
+def test_avatar_size_clamped_low(app_server):
+    r = requests.get(f"{BASE_URL}/avatar/multiavatar/clamp_low?size=1")
+    assert r.status_code == 200
+    assert 'width="16"' in r.text
+
+
+def test_avatar_size_clamped_high(app_server):
+    r = requests.get(f"{BASE_URL}/avatar/multiavatar/clamp_high?size=9999")
+    assert r.status_code == 200
+    assert 'width="512"' in r.text