meshagent-agents 0.2.1__py3-none-any.whl → 0.3.0__py3-none-any.whl

meshagent/agents/agent.py

@@ -222,22 +222,16 @@ class SingleRoomAgent(Agent):
                 if requirement.name not in schemas_by_name:
                     installed = True
 
-                    schema_path = f".schemas/{requirement.name}.json"
+                    logger.info(f"Installing required schema {requirement.name}")
 
-                    if await self._room.storage.exists(path=schema_path):
-                        # Schema is already in the room
-                        pass
+                    if requirement.name.startswith("https://"):
+                        url = requirement.name
                     else:
-                        logger.info(f"Installing required tool {requirement.name}")
+                        url = f"{meshagent_base_url()}/schemas/{requirement.name}"
 
-                        if requirement.name.startswith("https://"):
-                            url = requirement.name
-                        else:
-                            url = f"{meshagent_base_url()}/schemas/{requirement.name}"
-
-                        await self._room.agents.make_call(
-                            url=url, name=requirement.name, arguments={}
-                        )
+                    await self._room.agents.make_call(
+                        url=url, name=requirement.name, arguments={}
+                    )
 
             else:
                 raise RoomException("unsupported requirement")

meshagent/agents/chat.py

@@ -11,7 +11,7 @@ from meshagent.api import (
 )
 from meshagent.tools import Toolkit, ToolContext
 from .adapter import LLMAdapter, ToolResponseAdapter
-from meshagent.openai.tools.responses_adapter import ImageGenerationTool
+from meshagent.openai.tools.responses_adapter import ImageGenerationTool, LocalShellTool
 import asyncio
 from typing import Optional
 import logging
@@ -24,12 +24,55 @@ from openai.types.responses import ResponseStreamEvent
 from asyncio import CancelledError
 
 from opentelemetry import trace
+import shlex
 
 tracer = trace.get_tracer("meshagent.chatbot")
 
 logger = logging.getLogger("chat")
 
 
+class ChatBotThreadLocalShellTool(LocalShellTool):
+    def __init__(self, *, thread_context: "ChatThreadContext"):
+        super().__init__()
+        self.thread_context = thread_context
+
+    async def execute_shell_command(
+        self,
+        context,
+        *,
+        command,
+        env,
+        type,
+        timeout_ms=None,
+        user=None,
+        working_directory=None,
+    ):
+        messages = None
+
+        for prop in self.thread_context.thread.root.get_children():
+            if prop.tag_name == "messages":
+                messages = prop
+
+        exec_element = messages.append_child(
+            tag_name="exec",
+            attributes={"command": shlex.join(command), "pwd": working_directory},
+        )
+
+        result = await super().execute_shell_command(
+            context,
+            command=command,
+            env=env,
+            type=type,
+            timeout_ms=timeout_ms,
+            user=user,
+            working_directory=working_directory,
+        )
+
+        exec_element.set_attribute("result", result)
+
+        return result
+
+
 class ChatBotThreadOpenAIImageGenerationTool(ImageGenerationTool):
     def __init__(
         self,
@@ -188,6 +231,7 @@ class ChatThreadContext:
         *,
         chat: AgentChatContext,
         thread: MeshDocument,
+        path: str,
         participants: Optional[list[RemoteParticipant]] = None,
     ):
         self.thread = thread
@@ -196,6 +240,7 @@ class ChatThreadContext:
 
         self.participants = participants
         self.chat = chat
+        self.path = path
 
 
 # todo: thread should stop when participant stops?
@@ -500,7 +545,10 @@ class ChatBot(SingleRoomAgent):
                                     doc_messages = prop
 
                                     for element in doc_messages.get_children():
-                                        if isinstance(element, Element):
+                                        if (
+                                            isinstance(element, Element)
+                                            and element.tag_name == "message"
+                                        ):
                                             msg = element["text"]
                                             if (
                                                 element["author_name"]
@@ -608,12 +656,17 @@ class ChatBot(SingleRoomAgent):
                         try:
                             if thread_context is None:
                                 thread_context = ChatThreadContext(
+                                    path=path,
                                     chat=chat_context,
                                     thread=thread,
                                     participants=get_thread_participants(
                                         room=self.room, thread=thread
                                     ),
                                 )
+                            else:
+                                thread_context.participants = get_thread_participants(
+                                    room=self.room, thread=thread
+                                )
 
                             def handle_event(evt):
                                 llm_messages.send_nowait(evt)

meshagent/agents/thread_schema.py

@@ -35,7 +35,7 @@ thread_schema = MeshSchema(
             properties=[
                 ChildProperty(
                     name="items",
-                    child_tag_names=["message"],
+                    child_tag_names=["message", "exec"],
                     description="the messages in this thread",
                 )
             ],
@@ -66,6 +66,27 @@ thread_schema = MeshSchema(
                 ),
             ],
         ),
+        ElementType(
+            tag_name="exec",
+            description="a command execution",
+            properties=[
+                ValueProperty(
+                    name="command",
+                    description="a command that was executed",
+                    type="string",
+                ),
+                ValueProperty(
+                    name="result",
+                    description="the result of the command",
+                    type="string",
+                ),
+                ValueProperty(
+                    name="pwd",
+                    description="the working directory the command was executed in",
+                    type="string",
+                ),
+            ],
+        ),
         ElementType(
             tag_name="message",
             description="a message sent in the conversation",

meshagent/agents/version.py

@@ -1 +1 @@
-__version__ = "0.2.1"
+__version__ = "0.3.0"

meshagent/agents/worker.py

@@ -95,31 +95,42 @@ class Worker(SingleRoomAgent):
             *self._toolkits,
         ]
 
+        backoff = 0
         while not self._done:
-            message = await room.queues.receive(
-                name=self._queue, create=True, wait=True
-            )
-            if message is not None:
-                logger.info(f"received message on worker queue {message}")
-                try:
-                    chat_context = await self.init_chat_context()
-
-                    chat_context.append_rules(
-                        rules=[
-                            *self._rules,
-                        ]
-                    )
-
-                    await self.append_message_context(
-                        room=room, message=message, chat_context=chat_context
-                    )
-
-                    await self.process_message(
-                        chat_context=chat_context,
-                        room=room,
-                        message=message,
-                        toolkits=toolkits,
-                    )
-
-                except Exception as e:
-                    logger.error(f"Failed to process a message {message}", exc_info=e)
+            try:
+                message = await room.queues.receive(
+                    name=self._queue, create=True, wait=True
+                )
+                backoff = 0
+                if message is not None:
+                    logger.info(f"received message on worker queue {message}")
+                    try:
+                        chat_context = await self.init_chat_context()
+
+                        chat_context.append_rules(
+                            rules=[
+                                *self._rules,
+                            ]
+                        )
+
+                        await self.append_message_context(
+                            room=room, message=message, chat_context=chat_context
+                        )
+
+                        await self.process_message(
+                            chat_context=chat_context,
+                            room=room,
+                            message=message,
+                            toolkits=toolkits,
+                        )
+
+                    except Exception as e:
+                        logger.error(f"Failed to process: {e}\n{message}", exc_info=e)
+
+            except Exception as e:
+                logger.error(
+                    f"Worker error while receiving: {e}, will retry", exc_info=e
+                )
+
+                asyncio.sleep(0.1 * pow(2, backoff))
+                backoff = backoff + 1

{meshagent_agents-0.2.1.dist-info → meshagent_agents-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.2.1
+Version: 0.3.0
 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.2.1
-Requires-Dist: meshagent-tools~=0.2.1
-Requires-Dist: meshagent-openai~=0.2.1
+Requires-Dist: meshagent-api~=0.3.0
+Requires-Dist: meshagent-tools~=0.3.0
+Requires-Dist: meshagent-openai~=0.3.0
 Requires-Dist: pydantic~=2.11
 Requires-Dist: opentelemetry-distro~=0.54b1
 Provides-Extra: all
-Requires-Dist: meshagent-api[all]~=0.2.1; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.3.0; 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.2.1; extra == "sync"
+Requires-Dist: meshagent-api[sync]~=0.3.0; extra == "sync"
 Provides-Extra: mail
 Requires-Dist: aiosmtplib~=4.0.1; extra == "mail"
 Provides-Extra: rag

{meshagent_agents-0.2.1.dist-info → meshagent_agents-0.3.0.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=bBEMlI2E0P97gkP93J68o9XvIxtTB_bEiFXSrRH3iyk,20623
-meshagent/agents/chat.py,sha256=5yxzs1KkWigv1H5LXWjSqO5eX90LYSYlN8eruJOxI_Q,29011
+meshagent/agents/agent.py,sha256=OaWjjccOsU_n-Pr6WdA90LePGQflHQlL-X5lJ72s3pc,20337
+meshagent/agents/chat.py,sha256=HocrfVSV6kJaNUG5umKhi22AKwyq0ySCfVM--7ytjtE,30595
 meshagent/agents/context.py,sha256=6txCXA22aHQaikvIKED6YjPyasM_bPqGqCE4HGj04_E,4035
 meshagent/agents/development.py,sha256=AEBkkycNZDRLYIdmX2LkrVZv715ALswiwSR9CiV3HE4,894
 meshagent/agents/hosting.py,sha256=tCcswAweEhlMxGaBR_m2YvUkwZiaHbTBT64urRHfK7I,5446
@@ -12,10 +12,10 @@ meshagent/agents/planning.py,sha256=69HLEkOR_24mZ1mcUCQVX_DgPfX5TVA7EJYCHENH6M0,
 meshagent/agents/prompt.py,sha256=OSSqbzaugyQtuvYxTY5UcZQWyeV73e3GUJz_iC5xZkA,1883
 meshagent/agents/pydantic.py,sha256=RrdOESZg-n_FyxbfkOBwRPVxV39IOjxK2unsyAGn9as,6278
 meshagent/agents/single_shot_writer.py,sha256=miWVMo4NX8Hib0yHwDmiwuk8GraJwg1JzljsgFyTl4Y,3237
-meshagent/agents/thread_schema.py,sha256=c6KuLhcBxjxcz8M5NQzmmlyJLqv8RB7W491uWOu6Z34,3485
+meshagent/agents/thread_schema.py,sha256=OGQ-H5c2fJgNOYHC3Pas8iqTi2RUSxP2bytf0SK-SYc,4208
 meshagent/agents/utils.py,sha256=6D9GXpYu9xx5XlfD3DiGFdyOwq46e5-sTYOF_FYep1o,1446
-meshagent/agents/version.py,sha256=HfjVOrpTnmZ-xVFCYSVmX50EXaBQeJteUHG-PD6iQs8,22
-meshagent/agents/worker.py,sha256=6-SDWm-4aqlx9G8321g1lS0caZUybBpJRhrg5jxqTy8,3500
+meshagent/agents/version.py,sha256=VrXpHDu3erkzwl_WXrqINBm9xWkcyUy53IQOj042dOs,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
 meshagent/agents/schemas/document.py,sha256=H-aolubkRHdTAH-rLI2SJ8y3JKwXvpNsR3ZCqghwAWI,1515
@@ -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.2.1.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
-meshagent_agents-0.2.1.dist-info/METADATA,sha256=PC-rIb3FIcHnjYuB2BENas60n4t3iX3EvEzLDM-YSx4,3731
-meshagent_agents-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_agents-0.2.1.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_agents-0.2.1.dist-info/RECORD,,
+meshagent_agents-0.3.0.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
+meshagent_agents-0.3.0.dist-info/METADATA,sha256=nXgORIGmwE3_q96I34Y2i4d8HKs7RRvOf_F6OY4lHP0,3731
+meshagent_agents-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_agents-0.3.0.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_agents-0.3.0.dist-info/RECORD,,