ticket #114 attempt 1

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/models.py

@@ -439,8 +439,8 @@ class VoteForm(BaseModel):
     @field_validator("value")
     @classmethod
     def valid_value(cls, value):
-        if value not in (1, -1):
-            raise ValueError("value must be 1 or -1")
+        if value not in (1, -1, 0):
+            raise ValueError("value must be 1, -1, or 0")
         return value
 
 

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/devii/actions/catalog/engagement.py

@@ -22,7 +22,7 @@ ENGAGEMENT_ACTIONS: tuple[Action, ...] = (
             ),
             body(
                 "value",
-                "Vote value: 1 to upvote, -1 to downvote (re-send to remove).",
+                "Vote value: 1 to upvote, -1 to downvote, 0 to retract.",
                 required=True,
             ),
         ),

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/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"

tests/api/votes.py

@@ -135,3 +135,13 @@ def test_non_ajax_vote_redirects_to_referer(app_server):
     )
     assert r.status_code == 302
     assert r.headers["location"] == "/gists"
+
+
+def test_explicit_zero_retracts_vote(app_server):
+    s_a, a_name = _session_votes()
+    s_b, _ = _session_votes()
+    post_uid = _make_post_votes(_uid_votes(a_name))
+    s_b.post(f"{BASE_URL}/votes/post/{post_uid}", data={"value": "1"}, headers=AJAX_votes)
+    r = s_b.post(f"{BASE_URL}/votes/post/{post_uid}", data={"value": "0"}, headers=AJAX_votes)
+    assert r.json()["value"] == 0
+    assert r.json()["net"] == 0