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

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

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

{ojin_client-0.1.7.dev0 → ojin_client-0.1.7.dev2}/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 = True
 
     async def connect(self) -> None:
         """Establish WebSocket connection and authenticate with the service."""
@@ -261,11 +262,19 @@ class OjinPersonaClient(IOjinPersonaClient):
                     payload=message.to_proxy_message()
             )
 
-            if self._message_queue.empty():
-                self._message_queue = asyncio.Queue()
-
             await self._ws.send(cancel_input.model_dump_json())
 
+            logger.info(f"Message sent {message.interaction_id}")
+
+            while not self._message_queue.empty():
+                try:
+                    self._message_queue.get_nowait()
+                except asyncio.QueueEmpty:
+                    break
+
+
+            self._cancelled = False
+
             return
 
         if isinstance(message, StartInteractionMessage):
@@ -281,6 +290,7 @@ class OjinPersonaClient(IOjinPersonaClient):
 
         if isinstance(message, OjinPersonaInteractionInputMessage):
             logger.info("InteractionMessage")            
+            logger.info(f"Message sent {message.interaction_id}")
             if not message.audio_int16_bytes:
                 raise ValueError("Audio cannot be empty")
 
@@ -321,7 +331,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 +341,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.dev2}/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.dev2
 Summary: Ojin platform services
 Author: Journee
 License: Apache-2.0

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

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