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/database/schema.py

@@ -30,26 +30,6 @@ def migrate_bug_tables_to_issue_tables() -> None:
         logger.info("Dropped table %s after migration", source_name)
 
 
-def _add_message_unique_index() -> None:
-    if "messages" not in db.tables:
-        return
-    with db:
-        db.query(
-            """
-            DELETE FROM messages WHERE id NOT IN (
-                SELECT MIN(id) FROM messages GROUP BY sender_uid, receiver_uid, content
-            )
-            """
-        )
-    _index(
-        db,
-        "messages",
-        "idx_messages_unique_sender_receiver_content",
-        ["sender_uid", "receiver_uid", "content"],
-        unique=True,
-    )
-
-
 def init_db():
     tables = db.tables
     _index(db, "users", "idx_users_username", ["username"])
@@ -151,7 +131,6 @@ def init_db():
         "idx_messages_conversation_rev",
         ["receiver_uid", "sender_uid"],
     )
-    _add_message_unique_index()
     _index(db, "notifications", "idx_notifications_user", ["user_uid"])
     _index(db, "notifications", "idx_notifications_user_read", ["user_uid", "read"])
     _index(db, "push_registration", "idx_push_registration_user", ["user_uid"])

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)

devplacepy/services/correction.py

@@ -88,7 +88,7 @@ def gateway_complete(
             {"role": "system", "content": system},
             {"role": "user", "content": text},
         ],
-        "temperature": 0.0,
+        "temperature": 0.1,
     }
     headers = {
         "Content-Type": "application/json",

devplacepy/services/messaging/persist.py

@@ -1,9 +1,6 @@
 # retoor <retoor@molodetz.nl>
 
-import hashlib
 import logging
-import time
-from collections import OrderedDict
 from datetime import datetime, timezone
 from typing import Any, Optional
 
@@ -18,16 +15,12 @@ from devplacepy.utils import (
     track_action,
 )
 from devplacepy.services.audit import record as audit
-from sqlalchemy.exc import IntegrityError
-
 from devplacepy.services.correction import schedule_correction
 from devplacepy.services.ai_modifier import schedule_modification
 
 logger = logging.getLogger("messaging.persist")
 
 MAX_CONTENT_LENGTH = 2000
-DEDUP_WINDOW_SECONDS = 3
-_content_cache: dict[str, tuple[float, str]] = OrderedDict()
 
 
 def _slim_attachment(attachment: dict[str, Any]) -> dict[str, Any]:
@@ -88,60 +81,19 @@ def persist_message(
 
     sender_uid = sender["uid"]
     sender_username = sender.get("username", "")
-
-    content_hash = hashlib.sha256(
-        f"{sender_uid}:{receiver_uid}:{content}".encode()
-    ).hexdigest()[:16]
-    now = time.time()
-    last_seen, cached_uid = _content_cache.get(content_hash, (0.0, None))
-    if now - last_seen < DEDUP_WINDOW_SECONDS and cached_uid is not None:
-        logger.debug(
-            "Dedup hit for message hash %s (original uid %s)", content_hash, cached_uid
-        )
-        cached = get_table("messages").find_one(uid=cached_uid)
-        if cached:
-            return {
-                "uid": cached["uid"],
-                "sender_uid": cached["sender_uid"],
-                "receiver_uid": cached["receiver_uid"],
-                "content": cached["content"],
-                "read": cached.get("read", False),
-                "created_at": cached["created_at"],
-            }
-
     messages_table = get_table("messages")
     msg_uid = generate_uid()
     created_at = datetime.now(timezone.utc).isoformat()
-
-    try:
-        messages_table.insert(
-            {
-                "uid": msg_uid,
-                "sender_uid": sender_uid,
-                "receiver_uid": receiver_uid,
-                "content": content,
-                "read": False,
-                "created_at": created_at,
-            }
-        )
-    except IntegrityError:
-        existing = messages_table.find_one(
-            sender_uid=sender_uid, receiver_uid=receiver_uid, content=content
-        )
-        if not existing:
-            raise
-        logger.debug(
-            "Dedup via unique constraint for message (uid %s)", existing["uid"]
-        )
-        _content_cache[content_hash] = (time.time(), existing["uid"])
-        return {
-            "uid": existing["uid"],
-            "sender_uid": existing["sender_uid"],
-            "receiver_uid": existing["receiver_uid"],
-            "content": existing["content"],
-            "read": existing.get("read", False),
-            "created_at": existing["created_at"],
+    messages_table.insert(
+        {
+            "uid": msg_uid,
+            "sender_uid": sender_uid,
+            "receiver_uid": receiver_uid,
+            "content": content,
+            "read": False,
+            "created_at": created_at,
         }
+    )
 
     link_attachments(attachment_uids, "message", msg_uid)
     schedule_correction(sender, "messages", msg_uid, request)
@@ -162,8 +114,6 @@ def persist_message(
     )
     track_action(sender_uid, "message")
 
-    _content_cache[content_hash] = (time.time(), msg_uid)
-
     logger.info(
         "Message %s sent from %s to %s via %s",
         msg_uid,

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

tests/api/messages/send.py

@@ -166,23 +166,3 @@ def test_send_attachment_only_empty_content_succeeds(seeded_db):
     refresh_snapshot()
     row = get_table("messages").find_one(uid=msg["uid"])
     assert row["content"] == ""
-
-
-def test_duplicate_message_returns_same_uid(seeded_db):
-    s, _ = _member()
-    receiver = _db_user("bob_test")["uid"]
-    content = _unique("dupmsg")
-
-    first = s.post(
-        f"{BASE_URL}/messages/send",
-        headers=JSON_audit_log,
-        data={"content": content, "receiver_uid": receiver},
-    ).json()["data"]
-
-    second = s.post(
-        f"{BASE_URL}/messages/send",
-        headers=JSON_audit_log,
-        data={"content": content, "receiver_uid": receiver},
-    ).json()["data"]
-
-    assert first["uid"] == second["uid"], "duplicate messages should return the same uid"