ojin-client 0.1.7.dev0__tar.gz → 0.1.7.dev1__tar.gz

{ojin_client-0.1.7.dev0 → ojin_client-0.1.7.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ojin-client
-Version: 0.1.7.dev0
+Version: 0.1.7.dev1
 Summary: Ojin platform services
 Author: Journee
 License: Apache-2.0

{ojin_client-0.1.7.dev0 → ojin_client-0.1.7.dev1}/ojin/ojin_persona_client.py

@@ -86,6 +86,7 @@ class OjinPersonaClient(IOjinPersonaClient):
         self._running = False
         self._receive_task: Optional[asyncio.Task] = None
         self._inference_server_ready: bool = False
+        self._cancelled: bool = False
 
     async def connect(self) -> None:
         """Establish WebSocket connection and authenticate with the service."""
@@ -260,12 +261,16 @@ class OjinPersonaClient(IOjinPersonaClient):
             cancel_input = CancelInteractionMessage(
                     payload=message.to_proxy_message()
             )
-
-            if self._message_queue.empty():
-                self._message_queue = asyncio.Queue()
+            self._cancelled = True
+            while not self._message_queue.empty():
+                try:
+                    self._message_queue.get_nowait()
+                except asyncio.QueueEmpty:
+                    break
 
             await self._ws.send(cancel_input.model_dump_json())
 
+            self._cancelled = False
             return
 
         if isinstance(message, StartInteractionMessage):
@@ -314,6 +319,8 @@ class OjinPersonaClient(IOjinPersonaClient):
         await self.close()
         error = ErrorResponseMessage(
                 payload=ErrorResponse(
+                    interaction_id="",
+                    details={},
                     code="UNKNOWN",
                     message="The message is Unknown",
                     timestamp=int(time.monotonic() * 1000),
@@ -321,7 +328,7 @@ class OjinPersonaClient(IOjinPersonaClient):
         )
         raise Exception(error)
 
-    async def receive_message(self) -> BaseModel:
+    async def receive_message(self) -> BaseModel | None:
         """Receive the next message from the OJIN Persona service.
 
         Returns:
@@ -331,6 +338,8 @@ class OjinPersonaClient(IOjinPersonaClient):
             asyncio.QueueEmpty: If no messages are available
 
         """
+        if self._cancelled:
+            return None
         return await self._message_queue.get()
 
     def is_connected(self) -> bool:

{ojin_client-0.1.7.dev0 → ojin_client-0.1.7.dev1}/ojin/ojin_persona_messages.py

@@ -210,7 +210,7 @@ class IOjinPersonaClient(ABC):
         """
 
     @abstractmethod
-    async def receive_message(self) -> BaseModel:
+    async def receive_message(self) -> BaseModel | None:
         """Receive a message from the server.
 
         Returns:

{ojin_client-0.1.7.dev0 → ojin_client-0.1.7.dev1}/ojin_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ojin-client
-Version: 0.1.7.dev0
+Version: 0.1.7.dev1
 Summary: Ojin platform services
 Author: Journee
 License: Apache-2.0

{ojin_client-0.1.7.dev0 → ojin_client-0.1.7.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ojin-client"
-version = "0.1.7dev"
+version = "0.1.7dev1"
 description = "Ojin platform services"
 readme = "README.md"
 requires-python = ">=3.10"