feature/gra-1023-server-not-respecting-provided-chat_id

grai-server/app/grAI/consumers.py

@@ -15,6 +15,8 @@
 from grAI.websocket_payloads import ChatErrorMessages, ChatEvent
 from users.models import User
 from workspaces.models import Membership
+import logging
+from uuid import UUID
 
 
 class ChatConsumer(WebsocketConsumer):
@@ -23,8 +25,8 @@ class ChatConsumer(WebsocketConsumer):
     """
 
     def __init__(self, *args, **kwargs):
-        self.conversations: dict[str, BaseConversation] = {}
-        self.active_chats: set = set()
+        self.conversations: dict[UUID, BaseConversation] = {}
+        self.active_chats: set[UUID] = set()
         super().__init__(*args, **kwargs)
 
     @cached_property
@@ -58,7 +60,6 @@ def disconnect(self, close_code):
     def receive(self, text_data):
         data: dict = json.loads(text_data)
         socket_message_type = data.get("type", None)
-
         match socket_message_type:
             case "chat.message":
                 self.chat_message(data)

grai-server/app/grAI/websocket_payloads.py

@@ -1,7 +1,7 @@
 import uuid
 from enum import Enum
-from typing import Literal
-
+from typing import Literal, Annotated
+from uuid import UUID
 from pydantic import BaseModel, ValidationError, validator
 
 
@@ -18,8 +18,8 @@ class ChatErrorMessages(Enum):
 class ChatEvent(BaseModel):
     type: Literal["chat.message"] = "chat.message"
     message: str
-    chat_id: str
+    chat_id: UUID
 
     @validator("chat_id")
     def chat_id_is_uuid(cls, v):
-        return v if v == "" else str(uuid.uuid4())
+        return uuid.uuid4() if v == "" else v

grai-server/app/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "the_guide"
-version = "0.1.48"
+version = "0.1.49"
 description = ""
 authors = ["Ian Eaves <ian@grai.io>", "Edward Louth <edward@grai.io>"]
 license = "Elastic-2.0"

grai-server/app/the_guide/__init__.py

@@ -2,5 +2,5 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app
 
-__version__ = "0.1.48"
+__version__ = "0.1.49"
 __all__ = ("celery_app",)