meshagent-agents 0.5.1__py3-none-any.whl → 0.5.3__py3-none-any.whl

meshagent/agents/adapter.py

@@ -44,7 +44,7 @@ class LLMAdapter(Generic[T]):
         *,
         context: AgentChatContext,
         room: RoomClient,
-        toolkits: Toolkit,
+        toolkits: list[Toolkit],
         tool_adapter: Optional[ToolResponseAdapter] = None,
         output_schema: Optional[dict] = None,
         event_handler: Optional[Callable[[T], None]] = None,

meshagent/agents/agent.py

@@ -335,7 +335,7 @@ class TaskRunner(SingleRoomAgent):
         requires=None,
         supports_tools: Optional[bool] = None,
         input_schema: dict,
-        output_schema: dict,
+        output_schema: Optional[dict] = None,
         labels: Optional[list[str]] = None,
         toolkits: Optional[list[Toolkit]] = None,
     ):

meshagent/agents/chat.py

@@ -420,58 +420,87 @@ class ChatBot(SingleRoomAgent):
         def done_processing_llm_events(task: asyncio.Task):
             try:
                 task.result()
-            except CancelledError:
-                pass
             except Exception as e:
                 logger.error("error sending delta", exc_info=e)
 
         async def process_llm_events():
-            partial = ""
-            content_element = None
             context_message = None
+            updates = asyncio.Queue()
 
-            async for evt in llm_messages:
-                for participant in self._room.messaging.get_participants():
-                    logger.debug(
-                        f"sending event {evt.type} to {participant.get_attribute('name')}"
-                    )
+            # throttle updates so we don't send too many syncs over the wire at once
+            async def update_thread():
+                try:
+                    changes = {}
+                    while True:
+                        try:
+                            element, partial = updates.get_nowait()
+                            changes[element] = partial
 
-                    # self.room.messaging.send_message_nowait(to=participant, type="llm.event", message=json.loads(evt.to_json()))
-
-                if evt.type == "response.content_part.added":
-                    partial = ""
-                    content_element = doc_messages.append_child(
-                        tag_name="message",
-                        attributes={
-                            "text": "",
-                            "created_at": datetime.datetime.now(datetime.timezone.utc)
-                            .isoformat()
-                            .replace("+00:00", "Z"),
-                            "author_name": self.room.local_participant.get_attribute(
-                                "name"
-                            ),
-                        },
-                    )
+                        except asyncio.QueueEmpty:
+                            for e, p in changes.items():
+                                e["text"] = p
 
-                    context_message = {"role": "assistant", "content": ""}
-                    chat_context.messages.append(context_message)
+                            changes.clear()
 
-                elif evt.type == "response.output_text.delta":
-                    partial += evt.delta
-                    content_element["text"] = partial
-                    context_message["content"] = partial
+                            e, p = await updates.get()
+                            changes[e] = p
 
-                elif evt.type == "response.output_text.done":
-                    content_element = None
+                            await asyncio.sleep(0.1)
 
-                    with tracer.start_as_current_span("chatbot.thread.message") as span:
-                        span.set_attribute(
-                            "from_participant_name",
-                            self.room.local_participant.get_attribute("name"),
+                except asyncio.QueueShutDown:
+                    pass
+
+            update_thread_task = asyncio.create_task(update_thread())
+            try:
+                async for evt in llm_messages:
+                    for participant in self._room.messaging.get_participants():
+                        logger.debug(
+                            f"sending event {evt.type} to {participant.get_attribute('name')}"
+                        )
+
+                        # self.room.messaging.send_message_nowait(to=participant, type="llm.event", message=json.loads(evt.to_json()))
+
+                    if evt.type == "response.content_part.added":
+                        partial = ""
+                        content_element = doc_messages.append_child(
+                            tag_name="message",
+                            attributes={
+                                "text": "",
+                                "created_at": datetime.datetime.now(
+                                    datetime.timezone.utc
+                                )
+                                .isoformat()
+                                .replace("+00:00", "Z"),
+                                "author_name": self.room.local_participant.get_attribute(
+                                    "name"
+                                ),
+                            },
                         )
-                        span.set_attribute("role", "assistant")
-                        span.set_attributes(thread_attributes)
-                        span.set_attributes({"text": evt.text})
+
+                        context_message = {"role": "assistant", "content": ""}
+                        chat_context.messages.append(context_message)
+
+                    elif evt.type == "response.output_text.delta":
+                        partial += evt.delta
+                        updates.put_nowait((content_element, partial))
+                        context_message["content"] = partial
+
+                    elif evt.type == "response.output_text.done":
+                        content_element = None
+
+                        with tracer.start_as_current_span(
+                            "chatbot.thread.message"
+                        ) as span:
+                            span.set_attribute(
+                                "from_participant_name",
+                                self.room.local_participant.get_attribute("name"),
+                            )
+                            span.set_attribute("role", "assistant")
+                            span.set_attributes(thread_attributes)
+                            span.set_attributes({"text": evt.text})
+            finally:
+                updates.shutdown()
+                await update_thread_task
 
         llm_task = asyncio.create_task(process_llm_events())
         llm_task.add_done_callback(done_processing_llm_events)
@@ -590,16 +619,6 @@ class ChatBot(SingleRoomAgent):
                             )
                             break
 
-                        for participant in get_thread_participants(
-                            room=self._room, thread=thread
-                        ):
-                            # TODO: async gather
-                            self._room.messaging.send_message_nowait(
-                                to=participant,
-                                type="thinking",
-                                message={"thinking": True, "path": path},
-                            )
-
                         if chat_with_participant.id == received.from_participant_id:
                             self.room.developer.log_nowait(
                                 type="llm.message",
@@ -628,13 +647,6 @@ class ChatBot(SingleRoomAgent):
 
                             chat_context.append_user_message(message=text)
 
-                        # if user is typing, wait for typing to stop
-                        while True:
-                            if chat_with_participant.id not in self._is_typing:
-                                break
-
-                            await asyncio.sleep(0.5)
-
                         if messages.empty():
                             break
 
@@ -654,6 +666,16 @@ class ChatBot(SingleRoomAgent):
                         span.set_attributes({"text": text})
 
                         try:
+                            for participant in get_thread_participants(
+                                room=self._room, thread=thread
+                            ):
+                                # TODO: async gather
+                                self._room.messaging.send_message_nowait(
+                                    to=participant,
+                                    type="thinking",
+                                    message={"thinking": True, "path": path},
+                                )
+
                             if thread_context is None:
                                 thread_context = ChatThreadContext(
                                     path=path,
@@ -690,6 +712,7 @@ class ChatBot(SingleRoomAgent):
                                         tool_adapter=self._tool_adapter,
                                         event_handler=handle_event,
                                     )
+
                                 except Exception as e:
                                     logger.error("An error was encountered", exc_info=e)
                                     await self._send_and_save_chat(
@@ -702,27 +725,34 @@ class ChatBot(SingleRoomAgent):
                                     )
 
                         finally:
-                            for participant in get_thread_participants(
-                                room=self._room, thread=thread
-                            ):
-                                # TODO: async gather
-                                self._room.messaging.send_message_nowait(
-                                    to=participant,
-                                    type="thinking",
-                                    message={"thinking": False, "path": path},
-                                )
+
+                            async def cleanup():
+                                for participant in get_thread_participants(
+                                    room=self._room, thread=thread
+                                ):
+                                    self._room.messaging.send_message_nowait(
+                                        to=participant,
+                                        type="thinking",
+                                        message={"thinking": False, "path": path},
+                                    )
+
+                            asyncio.shield(cleanup())
 
         finally:
-            llm_messages.close()
 
-            if self.room is not None:
-                logger.info("thread was ended {path}")
-                self.room.developer.log_nowait(
-                    type="chatbot.thread.ended", data={"path": path}
-                )
+            async def cleanup():
+                llm_messages.close()
+
+                if self.room is not None:
+                    logger.info(f"thread was ended {path}")
+                    self.room.developer.log_nowait(
+                        type="chatbot.thread.ended", data={"path": path}
+                    )
 
-                if thread is not None:
-                    await self.close_thread(path=path)
+                    if thread is not None:
+                        await self.close_thread(path=path)
+
+            asyncio.shield(cleanup())
 
     def _get_message_channel(self, key: str) -> Chan[RoomMessage]:
         if key not in self._message_channels:
@@ -765,6 +795,7 @@ class ChatBot(SingleRoomAgent):
                 if path not in self._thread_tasks or self._thread_tasks[path].done():
 
                     def thread_done(task: asyncio.Task):
+                        self._thread_tasks.pop(path)
                         self._message_channels.pop(path)
                         try:
                             task.result()
@@ -783,6 +814,11 @@ class ChatBot(SingleRoomAgent):
 
                     self._thread_tasks[path] = task
 
+            elif message.type == "cancel":
+                path = message.message["path"]
+                if path in self._thread_tasks:
+                    self._thread_tasks[path].cancel()
+
             elif message.type == "typing":
 
                 def callback(task: asyncio.Task):

meshagent/agents/version.py

@@ -1 +1 @@
-__version__ = "0.5.1"
+__version__ = "0.5.3"

{meshagent_agents-0.5.1.dist-info → meshagent_agents-0.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.5.1
+Version: 0.5.3
 Summary: Agent Building Blocks for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -12,19 +12,19 @@ License-File: LICENSE
 Requires-Dist: pyjwt~=2.10
 Requires-Dist: pytest~=8.4
 Requires-Dist: pytest-asyncio~=0.26
-Requires-Dist: meshagent-api~=0.5.1
-Requires-Dist: meshagent-tools~=0.5.1
-Requires-Dist: meshagent-openai~=0.5.1
+Requires-Dist: meshagent-api~=0.5.3
+Requires-Dist: meshagent-tools~=0.5.3
+Requires-Dist: meshagent-openai~=0.5.3
 Requires-Dist: pydantic~=2.11
 Requires-Dist: opentelemetry-distro~=0.54b1
 Provides-Extra: all
-Requires-Dist: meshagent-api[all]~=0.5.1; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.5.3; extra == "all"
 Requires-Dist: chonkie~=0.5.1; extra == "all"
 Requires-Dist: chonkie[semantic]~=0.5.1; extra == "all"
 Requires-Dist: chonkie[openai]~=0.5.1; extra == "all"
 Requires-Dist: aiosmtplib~=4.0.1; extra == "all"
 Provides-Extra: sync
-Requires-Dist: meshagent-api[sync]~=0.5.1; extra == "sync"
+Requires-Dist: meshagent-api[sync]~=0.5.3; extra == "sync"
 Provides-Extra: mail
 Requires-Dist: aiosmtplib~=4.0.1; extra == "mail"
 Provides-Extra: rag

{meshagent_agents-0.5.1.dist-info → meshagent_agents-0.5.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 meshagent/agents/__init__.py,sha256=d2cplyLH8xqDWqP_GoPQ8ApHzuv8Iiq4rz-vYBlGMTw,706
-meshagent/agents/adapter.py,sha256=CZgVzUTTY8dyPBYA7O_Kaawb40maxAbUUhBFk1YjbsI,1386
-meshagent/agents/agent.py,sha256=OaWjjccOsU_n-Pr6WdA90LePGQflHQlL-X5lJ72s3pc,20337
-meshagent/agents/chat.py,sha256=HocrfVSV6kJaNUG5umKhi22AKwyq0ySCfVM--7ytjtE,30595
+meshagent/agents/adapter.py,sha256=dMuejpjl__bdZ-Qmt-k4e81g-i10vZup7WE1JCZ_Sy4,1392
+meshagent/agents/agent.py,sha256=w14hM63YXiH15VEF1T2eZCvggvrUkE00a1kQkaMRBM0,20354
+meshagent/agents/chat.py,sha256=137LU0qkVxF53SQDV1gSHq2QeSFh4m17sGmXg_Ym77U,31964
 meshagent/agents/context.py,sha256=6txCXA22aHQaikvIKED6YjPyasM_bPqGqCE4HGj04_E,4035
 meshagent/agents/development.py,sha256=AEBkkycNZDRLYIdmX2LkrVZv715ALswiwSR9CiV3HE4,894
 meshagent/agents/hosting.py,sha256=tCcswAweEhlMxGaBR_m2YvUkwZiaHbTBT64urRHfK7I,5446
@@ -14,7 +14,7 @@ meshagent/agents/pydantic.py,sha256=RrdOESZg-n_FyxbfkOBwRPVxV39IOjxK2unsyAGn9as,
 meshagent/agents/single_shot_writer.py,sha256=miWVMo4NX8Hib0yHwDmiwuk8GraJwg1JzljsgFyTl4Y,3237
 meshagent/agents/thread_schema.py,sha256=OGQ-H5c2fJgNOYHC3Pas8iqTi2RUSxP2bytf0SK-SYc,4208
 meshagent/agents/utils.py,sha256=6D9GXpYu9xx5XlfD3DiGFdyOwq46e5-sTYOF_FYep1o,1446
-meshagent/agents/version.py,sha256=eZ1bOun1DDVV0YLOBW4wj2FP1ajReLjbIrGmzN7ASBw,22
+meshagent/agents/version.py,sha256=tgzuqHKcEdKBaP57F5oXxq4XlW2n9J4Fj8ZGu7nGOZg,22
 meshagent/agents/worker.py,sha256=SkrPhxIQ-Chyjg-eZGOlehkbrVYmsas8zmZnrTsAl3o,3910
 meshagent/agents/writer.py,sha256=dXglYgHwBrBJIaapMqBDyD3kmwSyi94tOdHH44itODc,2682
 meshagent/agents/schemas/__init__.py,sha256=_xAhrkxvFdfer3NolrynragGxcLElGR51LSribT3deU,299
@@ -23,8 +23,8 @@ meshagent/agents/schemas/gallery.py,sha256=65IsrH2wiFIR-DNo8est-nCOC72i1Aa5EmVNU
 meshagent/agents/schemas/presentation.py,sha256=aaMzkFQryurbHd1fbzTQPdN7v8QIhsjXuvbE8ZiuXNY,1589
 meshagent/agents/schemas/schema.py,sha256=8OXGCLVouoPg6eHBU9mgf1pTGTMvVZqiKNq15wkQJe0,5310
 meshagent/agents/schemas/super_editor_document.py,sha256=iRv4Q-DE_5kUdsAD5Rm4GwHek8L_7ZEpxIZ1x2dWjdg,1813
-meshagent_agents-0.5.1.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
-meshagent_agents-0.5.1.dist-info/METADATA,sha256=f-ytgdDrFU5ZaW4R3NzYgDYpv886BnLXoTiW5HMOC6A,3773
-meshagent_agents-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_agents-0.5.1.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_agents-0.5.1.dist-info/RECORD,,
+meshagent_agents-0.5.3.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
+meshagent_agents-0.5.3.dist-info/METADATA,sha256=_Fi7KmyntVN55jJ73d6eLDgs8a6QoljVVH-SCOVx9zE,3773
+meshagent_agents-0.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_agents-0.5.3.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_agents-0.5.3.dist-info/RECORD,,