Clean up changes in user_message

Author: NeonDaniel

chat_server/sio/handlers/user_message.py

@@ -49,7 +49,6 @@ async def user_message(sid, data):
     """
     LOG.debug(f"Received user message data: {data}")
     try:
-        data.setdefault("sid", "")  # TODO: This is patching clients that exclude `sid`
         message = UserMessage(**data)
         is_bot = message.is_bot == "1"
         is_proctor = message.username.startswith("proctor")
@@ -132,7 +131,7 @@ async def user_message(sid, data):
                 new_prompt_data = message.to_new_prompt_message()
                 new_prompt_data.context = prompt_data.get("context", {})
                 LOG.info(f"Emitting new_prompt_message: {new_prompt_data.model_dump()}")
-                # TODO: Consider backwards-compat. patching of `user_id` handling
+                # HACK: backwards-compat. patching of `userID` handling
                 await sio.emit(
                     "new_prompt_message",
                     data={**new_prompt_data.model_dump(), "userID": message.user_uid},
@@ -148,9 +147,7 @@ async def user_message(sid, data):
                 )
 
         message.bound_service = cid_data.get("bound_service", "")
-        # keys_diff = set(data.keys()).difference(set(message.model_dump().keys()))
-        # LOG.info(f"Removed keys={keys_diff}")
-        # TODO: Consider backwards-compat. patching of `user_id` handling
+        # HACK: backwards-compat. patching of `userID` handling
         await sio.emit(
             "new_message",
             data={**message.model_dump(), "userID": message.user_uid},

requirements/requirements.txt

@@ -5,7 +5,8 @@ fastapi==0.115.6
 httpx==0.28.1  # required by FastAPI
 klatchat-utils~=0.0,>=0.0.1a2
 kubernetes==29.0.0
-neon-data-models~=0.0,>=0.0.2a13
+#neon-data-models~=0.0,>=0.0.2a13
+neon-data-models@git+https://github.com/neongeckocom/neon-data-models@FIX_UserMessageSid
 neon-sftp~=0.1
 neon_utils[sentry]~=1.12
 pydantic~=2.7