meshagent-agents 0.2.1__tar.gz → 0.3.1__tar.gz

{meshagent_agents-0.2.1 → meshagent_agents-0.3.1}/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.3.1]
+- Stability
+
+## [0.3.0]
+- Stability
+
 ## [0.2.1]
 - Stability
 

{meshagent_agents-0.2.1/meshagent_agents.egg-info → meshagent_agents-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.2.1
+Version: 0.3.1
 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.1
+Requires-Dist: meshagent-tools~=0.3.1
+Requires-Dist: meshagent-openai~=0.3.1
 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.1; 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.1; extra == "sync"
 Provides-Extra: mail
 Requires-Dist: aiosmtplib~=4.0.1; extra == "mail"
 Provides-Extra: rag

{meshagent_agents-0.2.1 → meshagent_agents-0.3.1}/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-0.2.1 → meshagent_agents-0.3.1}/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-0.2.1 → meshagent_agents-0.3.1}/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-0.3.1/meshagent/agents/version.py

@@ -0,0 +1 @@
+__version__ = "0.3.1"

{meshagent_agents-0.2.1 → meshagent_agents-0.3.1}/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 → meshagent_agents-0.3.1/meshagent_agents.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.2.1
+Version: 0.3.1
 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.1
+Requires-Dist: meshagent-tools~=0.3.1
+Requires-Dist: meshagent-openai~=0.3.1
 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.1; 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.1; extra == "sync"
 Provides-Extra: mail
 Requires-Dist: aiosmtplib~=4.0.1; extra == "mail"
 Provides-Extra: rag

{meshagent_agents-0.2.1 → meshagent_agents-0.3.1}/meshagent_agents.egg-info/requires.txt

@@ -1,14 +1,14 @@
 pyjwt~=2.10
 pytest~=8.4
 pytest-asyncio~=0.26
-meshagent-api~=0.2.1
-meshagent-tools~=0.2.1
-meshagent-openai~=0.2.1
+meshagent-api~=0.3.1
+meshagent-tools~=0.3.1
+meshagent-openai~=0.3.1
 pydantic~=2.11
 opentelemetry-distro~=0.54b1
 
 [all]
-meshagent-api[all]~=0.2.1
+meshagent-api[all]~=0.3.1
 chonkie~=0.5.1
 chonkie[semantic]~=0.5.1
 chonkie[openai]~=0.5.1
@@ -23,4 +23,4 @@ chonkie[semantic]~=0.5.1
 chonkie[openai]~=0.5.1
 
 [sync]
-meshagent-api[sync]~=0.2.1
+meshagent-api[sync]~=0.3.1

{meshagent_agents-0.2.1 → meshagent_agents-0.3.1}/pyproject.toml

@@ -17,16 +17,16 @@ dependencies = [
   "pyjwt~=2.10",
   "pytest~=8.4",
   "pytest-asyncio~=0.26",
-  "meshagent-api~=0.2.1",
-  "meshagent-tools~=0.2.1",
-  "meshagent-openai~=0.2.1",
+  "meshagent-api~=0.3.1",
+  "meshagent-tools~=0.3.1",
+  "meshagent-openai~=0.3.1",
   "pydantic~=2.11",
   "opentelemetry-distro~=0.54b1"
 ]
 
 [project.optional-dependencies]
 all = [
-    "meshagent-api[all]~=0.2.1",
+    "meshagent-api[all]~=0.3.1",
     "chonkie~=0.5.1",
     "chonkie[semantic]~=0.5.1",
     "chonkie[openai]~=0.5.1",
@@ -34,7 +34,7 @@ all = [
 ]
 
 sync = [
-    "meshagent-api[sync]~=0.2.1",
+    "meshagent-api[sync]~=0.3.1",
 ]
 
 mail = [

meshagent_agents-0.2.1/meshagent/agents/version.py

@@ -1 +0,0 @@
-__version__ = "0.2.1"