ticket #85 attempt 1
This commit is contained in:
parent
ad1736ebf1
commit
1d1efc0dfc
File diff suppressed because one or more lines are too long
@ -88,7 +88,7 @@ def gateway_complete(
|
|||||||
{"role": "system", "content": system},
|
{"role": "system", "content": system},
|
||||||
{"role": "user", "content": text},
|
{"role": "user", "content": text},
|
||||||
],
|
],
|
||||||
"temperature": 0.1,
|
"temperature": 0.0,
|
||||||
}
|
}
|
||||||
headers = {
|
headers = {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
|
|||||||
@ -1,6 +1,9 @@
|
|||||||
# retoor <retoor@molodetz.nl>
|
# retoor <retoor@molodetz.nl>
|
||||||
|
|
||||||
|
import hashlib
|
||||||
import logging
|
import logging
|
||||||
|
import time
|
||||||
|
from collections import OrderedDict
|
||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone
|
||||||
from typing import Any, Optional
|
from typing import Any, Optional
|
||||||
|
|
||||||
@ -21,6 +24,8 @@ from devplacepy.services.ai_modifier import schedule_modification
|
|||||||
logger = logging.getLogger("messaging.persist")
|
logger = logging.getLogger("messaging.persist")
|
||||||
|
|
||||||
MAX_CONTENT_LENGTH = 2000
|
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]:
|
def _slim_attachment(attachment: dict[str, Any]) -> dict[str, Any]:
|
||||||
@ -81,6 +86,27 @@ def persist_message(
|
|||||||
|
|
||||||
sender_uid = sender["uid"]
|
sender_uid = sender["uid"]
|
||||||
sender_username = sender.get("username", "")
|
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")
|
messages_table = get_table("messages")
|
||||||
msg_uid = generate_uid()
|
msg_uid = generate_uid()
|
||||||
created_at = datetime.now(timezone.utc).isoformat()
|
created_at = datetime.now(timezone.utc).isoformat()
|
||||||
@ -114,6 +140,8 @@ def persist_message(
|
|||||||
)
|
)
|
||||||
track_action(sender_uid, "message")
|
track_action(sender_uid, "message")
|
||||||
|
|
||||||
|
_content_cache[content_hash] = (time.time(), msg_uid)
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
"Message %s sent from %s to %s via %s",
|
"Message %s sent from %s to %s via %s",
|
||||||
msg_uid,
|
msg_uid,
|
||||||
|
|||||||
@ -166,3 +166,23 @@ def test_send_attachment_only_empty_content_succeeds(seeded_db):
|
|||||||
refresh_snapshot()
|
refresh_snapshot()
|
||||||
row = get_table("messages").find_one(uid=msg["uid"])
|
row = get_table("messages").find_one(uid=msg["uid"])
|
||||||
assert row["content"] == ""
|
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"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user