meshagent-agents 0.0.7__py3-none-any.whl → 0.0.8__py3-none-any.whl

meshagent/agents/__init__.py

@@ -3,4 +3,5 @@ from .development import connect_development_agent
 from .listener import Listener, ListenerContext
 from .hosting import RemoteTaskRunnerServer
 from .adapter import ToolResponseAdapter, LLMAdapter
-from .thread_schema import thread_schema
+from .thread_schema import thread_schema
+from .version import __version__

meshagent/agents/agent.py

@@ -4,16 +4,17 @@ from copy import deepcopy
 from typing import Optional
 
 from meshagent.api.room_server_client import RoomException, RequiredToolkit, Requirement, RequiredSchema
-from meshagent.api import WebSocketClientProtocol, ToolDescription, ToolkitDescription, Participant, RemoteParticipant, meshagent_base_url, StorageEntry
+from meshagent.api import WebSocketClientProtocol, ToolDescription, ToolkitDescription, Participant, RemoteParticipant, meshagent_base_url, StorageEntry, JsonResponse
 from meshagent.api.protocol import Protocol
-from meshagent.tools.toolkit import Toolkit, Tool, ToolContext
+from meshagent.tools.toolkit import Toolkit, Tool, ToolContext, toolkit_factory, register_toolkit_factory
 from meshagent.api.room_server_client import RoomClient, RoomException
 from jsonschema import validate
 from .context import AgentCallContext, AgentChatContext
 from meshagent.api.schema_util import no_arguments_schema
+from meshagent.api import MeshSchema
 import logging
 import asyncio
-from typing import Optional
+from typing import Optional, Dict, Callable, Coroutine
 
 logger = logging.getLogger("agent")
 logger.setLevel(logging.INFO)
@@ -144,7 +145,11 @@ class SingleRoomAgent(Agent):
             
             if isinstance(requirement, RequiredToolkit):
                 
-                if requirement.name == "meshagent.ui":
+                if toolkit_factory(requirement.name) != None:
+                    # no need to install something we can create from a factory
+                    continue
+
+                if requirement.name == "ui":
                     # TODO: maybe requirements can be marked as non installable?
                     continue
                 
@@ -182,20 +187,34 @@ class SingleRoomAgent(Agent):
         if installed:
             await asyncio.sleep(5)
 
-    async def get_required_tools(self, participant_id: str) -> list[Toolkit]:
+    async def get_required_toolkits(self, context: ToolContext) -> list[Toolkit]:
+
+
+        tool_target = context.caller
+        if context.on_behalf_of != None:
+            tool_target = context.on_behalf_of
 
         toolkits_by_name = dict[str, ToolkitDescription]()
 
         toolkits = list[Toolkit]()
 
-        visible_tools = await self._room.agents.list_toolkits(participant_id=participant_id)
+        visible_tools = await self._room.agents.list_toolkits(participant_id=tool_target.id)
 
         for toolkit_description in visible_tools:
             toolkits_by_name[toolkit_description.name] = toolkit_description
 
+
         for required_toolkit in self.requires:
             
             if isinstance(required_toolkit, RequiredToolkit):
+                
+                if toolkit_factory(required_toolkit.name) != None:
+                
+                    
+                    toolkit = await toolkit_factory(required_toolkit.name)(context, required_toolkit)
+                    toolkits.append(toolkit)
+                    continue
+
 
                 toolkit = toolkits_by_name.get(required_toolkit.name, None)
                 if toolkit == None:
@@ -208,14 +227,14 @@ class SingleRoomAgent(Agent):
 
                     for tool_description in toolkit.tools:
                         tool = RoomTool(
-                            on_behalf_of_id=participant_id,
+                            on_behalf_of_id=tool_target.id,
                             toolkit_name=toolkit.name,
                             name=tool_description.name,
                             description=tool_description.description,
                             input_schema=tool_description.input_schema,
                             title=tool_description.title,
                             thumbnail_url=tool_description.thumbnail_url,
-                            participant_id=participant_id,
+                            participant_id=tool_target.id,
                             defs = tool_description.defs
                         )
                         room_tools.append(tool)
@@ -232,14 +251,14 @@ class SingleRoomAgent(Agent):
                             raise RoomException(f"unable to locate required tool {required_tool}")
 
                         tool = RoomTool(
-                            on_behalf_of_id=participant_id,
+                            on_behalf_of_id=tool_target.id,
                             toolkit_name=toolkit.name,
                             name=tool_description.name,
                             description=tool_description.description,
                             input_schema=tool_description.input_schema,
                             title=tool_description.title,
                             thumbnail_url=tool_description.thumbnail_url,
-                            participant_id=participant_id,
+                            participant_id=tool_target.id,
                             defs = tool_description.defs
                         )
                         room_tools.append(tool)
@@ -366,6 +385,8 @@ class TaskRunner(SingleRoomAgent):
             
             #context_json = message["context"]
 
+            chat_context = None
+
             try:
                 chat_context = await self.init_chat_context()
 
@@ -400,9 +421,10 @@ class TaskRunner(SingleRoomAgent):
                 if on_behalf_of != None:
                     tool_target = on_behalf_of
 
+                
                 toolkits = [
                     *self._toolkits,
-                    *await self.get_required_tools(participant_id=tool_target.id)
+                    *await self.get_required_toolkits(context=ToolContext(room=self.room, caller=caller, on_behalf_of=on_behalf_of, caller_context={ "chat": chat_context.to_json() }))
                 ]
 
                 context = AgentCallContext(chat=chat_context, room=self.room, caller=caller, on_behalf_of=on_behalf_of, toolkits=toolkits)
@@ -436,15 +458,28 @@ class TaskRunner(SingleRoomAgent):
                 
                 await protocol.send(type="agent.ask_response", data=json.dumps({ 
                     "task_id" : task_id,
-                    "response" : response,
+                    "answer" : response,
+                    "caller_context" : {
+                        "chat" : chat_context.to_json()
+                    }
                 }))
 
             except Exception as e:
                 logger.error("Task runner failed to complete task", exc_info=e)
-                await protocol.send(type="agent.ask_response", data=json.dumps({
-                    "task_id" : task_id,
-                    "error" : str(e),
-                }))
+                if chat_context != None:
+                        
+                    await protocol.send(type="agent.ask_response", data=json.dumps({
+                        "task_id" : task_id,
+                        "error" : str(e),
+                        "caller_context" : {
+                            "chat" : chat_context.to_json()
+                        }
+                    }))
+                else:
+                    await protocol.send(type="agent.ask_response", data=json.dumps({
+                        "task_id" : task_id,
+                        "error" : str(e),
+                    }))
 
         def on_done(task: asyncio.Task):
             task.result()
@@ -452,11 +487,39 @@ class TaskRunner(SingleRoomAgent):
         task = asyncio.create_task(worker())
         task.add_done_callback(on_done)    
 
+
 class RunTaskTool(Tool):
-    def __init__(self, *, agent_name: str, input_schema: dict, rules = None, thumbnail_url = None):
-        super().__init__(name=agent_name, input_schema=input_schema, rules=rules, thumbnail_url=thumbnail_url)
+    def __init__(self, *, name: str, agent_name: str, input_schema: dict, rules = None, thumbnail_url = None, title: Optional[str] = None, description: Optional[str]  = None):
+        super().__init__(name=name, input_schema=input_schema, rules=rules, thumbnail_url=thumbnail_url, title=title, description=description)
 
         self._agent_name = agent_name
 
     async def execute(self, context: ToolContext, **kwargs):
-        return await context.room.agents.ask(agent=self._agent_name, arguments=kwargs)
+        return await context.room.agents.ask(agent=self._agent_name, arguments=kwargs)
+    
+
+async def make_run_task_tool(context: ToolContext, toolkit: RequiredToolkit):
+
+    agents = await context.room.agents.list_agents()
+    tools = []
+    for agent_name in toolkit.tools:
+        agent = next((x for x in agents if x.name == agent_name), None)
+
+        if agent == None:
+            raise RoomException(f"agent was not found in the room {agent_name}")
+        
+        tools.append(
+            RunTaskTool(
+                agent_name=agent_name,
+                name=f"run_{agent_name}",
+                input_schema=agent.input_schema,
+                title=agent.title,
+                description=agent.description
+            ))
+
+    return Toolkit(
+        name="agents",
+        tools=tools
+    )
+
+register_toolkit_factory("agents", make_run_task_tool)

meshagent/agents/chat.py

@@ -1,7 +1,7 @@
 from .agent import SingleRoomAgent, AgentChatContext, AgentCallContext
 from meshagent.api.chan import Chan
 from meshagent.api import RoomMessage, RoomException, RoomClient, RemoteParticipant, RequiredSchema, Requirement, Element, MeshDocument
-from meshagent.tools import Toolkit
+from meshagent.tools import Toolkit, ToolContext
 from .adapter import LLMAdapter, ToolResponseAdapter
 import asyncio
 from typing import Optional
@@ -40,9 +40,8 @@ def get_thread_participants(*, room: RoomClient, thread: MeshDocument) -> list[R
 
 
 class ChatThreadContext:
-    def __init__(self, *, chat: AgentChatContext, thread: MeshDocument, toolkits: list[Toolkit], participants: Optional[list[RemoteParticipant]] = None):
+    def __init__(self, *, chat: AgentChatContext, thread: MeshDocument, participants: Optional[list[RemoteParticipant]] = None):
         self.thread = thread
-        self.toolkits = toolkits
         if participants == None:
             participants = []
 
@@ -125,13 +124,14 @@ class ChatBot(SingleRoomAgent):
     async def get_thread_participants(self, *, thread: MeshDocument):
         return get_thread_participants(room=self._room, thread=thread)
     
-    async def init_thread_context(self, *, thread_context: ChatThreadContext) -> list[Toolkit]:
+    async def get_thread_toolkits(self, *, thread_context: ChatThreadContext, participant: RemoteParticipant) -> list[Toolkit]:
 
+        toolkits = await self.get_required_toolkits(context=ToolContext(room=self.room, caller=participant, caller_context={ "chat": thread_context.chat.to_json() }))
         toaster = None
         
-        for toolkit in thread_context.toolkits:
+        for toolkit in toolkits:
 
-            if toolkit.name == "meshagent.ui":
+            if toolkit.name == "ui":
 
                 for tool in toolkit.tools:
 
@@ -147,10 +147,13 @@ class ChatBot(SingleRoomAgent):
                 
                 return MultiToolkit(required=[ toaster ], base_toolkit=toolkit )
 
-            toolkits = list(map(multi_tool, thread_context.toolkits))
+            toolkits = list(map(multi_tool, toolkits))
         
-            thread_context.toolkits = toolkits
-
+        
+        return [
+            *self._toolkits,
+            *toolkits
+        ]
     
     async def init_chat_context(self) -> AgentChatContext:
         context =  self._llm_adapter.create_chat_context()
@@ -325,21 +328,16 @@ class ChatBot(SingleRoomAgent):
             
 
                 try:
+
+
                     
                     if thread_context == None:
-                        toolkits = [
-                            *self._toolkits,
-                            *await self.get_required_tools(participant_id=chat_with_participant.id)
-                        ]
-
+                      
                         thread_context = ChatThreadContext(
                             chat=chat_context,
                             thread=thread,
-                            toolkits=toolkits,
                             participants=get_thread_participants(room=self.room, thread=thread)
-                        )
-
-                        await self.init_thread_context(thread_context=thread_context)
+                        )                        
 
                     def handle_event(evt):
                         llm_messages.send_nowait(evt)
@@ -348,7 +346,7 @@ class ChatBot(SingleRoomAgent):
                         response = await self._llm_adapter.next(
                             context=chat_context,
                             room=self._room,
-                            toolkits=thread_context.toolkits,
+                            toolkits=await self.get_thread_toolkits(thread_context=thread_context, participant=participant),
                             tool_adapter=self._tool_adapter,
                             event_handler=handle_event
                         )

meshagent/agents/context.py

@@ -8,7 +8,7 @@ from meshagent.api.participant import Participant
 import uuid
 
 class AgentChatContext:
-    def __init__(self, *, messages: Optional[list[dict]] = None, system_role: Optional[str] = None):
+    def __init__(self, *, messages: Optional[list[dict]] = None, system_role: Optional[str] = None, previous_messages: Optional[list[dict]] = None, previous_response_id: Optional[str] = None):
         self.id = str(uuid.uuid4())
         if messages == None:
             messages = list[dict]()
@@ -17,8 +17,11 @@ class AgentChatContext:
             system_role = "system"
         self._system_role = system_role
 
-        self._previous_response_id = None
-        self._previous_messages = list[dict]()
+        if previous_messages == None:            
+            previous_messages = list[dict]()
+
+        self._previous_response_id = previous_response_id
+        self._previous_messages = previous_messages
     
     @property
     def messages(self):
@@ -36,7 +39,7 @@ class AgentChatContext:
     def previous_response_id(self):
         return self._previous_response_id
     
-    def create_response(self, id: str):
+    def track_response(self, id: str):
         self._previous_response_id = id
         self._previous_messages.extend(self.messages)
         self.messages.clear()
@@ -73,12 +76,14 @@ class AgentChatContext:
     def to_json(self) -> dict:
         return {
             "messages" : self.messages,
-            "system_role" : self.system_role
+            "system_role" : self.system_role,
+            "previous_messages" : self.previous_messages,
+            "previous_response_id" : self.previous_response_id
         }
     
     @staticmethod
     def from_json(json: dict):
-        return AgentChatContext(messages=json["messages"], system_role=json.get("system_role", None))
+        return AgentChatContext(messages=json["messages"], system_role=json.get("system_role", None), previous_messages=json.get("previous_messages", None), previous_response_id=json.get("previous_response_id", None))
 
 class AgentCallContext:
     def __init__(self, *, chat: AgentChatContext, room: RoomClient, toolkits: Optional[list[Toolkit]] = None, caller: Optional[Participant] = None, on_behalf_of: Optional[Participant] = None):

meshagent/agents/indexer.py

@@ -18,9 +18,6 @@ import os
 
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
-
-
-
 def _async_debounce(wait):
     def decorator(func):
         task = None

meshagent/agents/version.py

@@ -1 +1 @@
-__version__ = "0.0.7"
+__version__ = "0.0.8"

meshagent/agents/worker.py

@@ -17,29 +17,19 @@ logger.setLevel(logging.INFO)
 # todo: thread should stop when participant stops?
 
 class Worker(TaskRunner):
-    def __init__(self, *, name, title = None, description = None, requires = None, llm_adapter: LLMAdapter, tool_adapter:  Optional[ToolResponseAdapter] = None, toolkits: Optional[list[Toolkit]] = None, rules : Optional[list[str]] = None, supports_tools: bool = True):
+    def __init__(self, *, queue: str, prompt: str,  name, title = None, description = None, requires = None, llm_adapter: LLMAdapter, tool_adapter:  Optional[ToolResponseAdapter] = None, toolkits: Optional[list[Toolkit]] = None, rules : Optional[list[str]] = None, supports_tools: bool = True):
         super().__init__(
             name=name,
             title=title,
             description=description,
             requires=requires,
-            input_schema={
-                "type" : "object",
-                "additionalProperties" : False,
-                "required" : [ "prompt", "queue" ],
-                "properties" : {
-                    "prompt" : {
-                        "type" : "string"
-                    },
-                    "queue" : {
-                        "type" : "string"
-                    }
-                }
-            },
             output_schema=None,
             supports_tools=supports_tools
         )
 
+        self._queue = queue
+        self._prompt = prompt
+
         if toolkits == None:
             toolkits = []
 
@@ -59,8 +49,8 @@ class Worker(TaskRunner):
 
     async def ask(self, *, context: AgentCallContext, arguments: dict):
         
-        queue = arguments["queue"]
-        prompt = arguments["prompt"]
+        queue = self._queue
+        prompt = self._prompt
 
         step_schema = {
             "type" : "object",

{meshagent_agents-0.0.7.dist-info → meshagent_agents-0.0.8.dist-info}/METADATA

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.0.7
+Version: 0.0.8
 Summary: Agent Building Blocks for Meshagent
-Home-page: 
-License: Apache License 2.0
+License-Expression: Apache-2.0
 Project-URL: Documentation, https://meshagent.com
 Project-URL: Website, https://meshagent.com
 Project-URL: Source, https://github.com/meshagent
@@ -13,18 +12,12 @@ License-File: LICENSE
 Requires-Dist: pyjwt>=2.0.0
 Requires-Dist: pytest>=8.3.4
 Requires-Dist: pytest-asyncio>=0.24.0
-Requires-Dist: meshagent-api>=0.0.7
-Requires-Dist: meshagent-tools>=0.0.7
-Requires-Dist: meshagent-openai>=0.0.7
+Requires-Dist: meshagent-api>=0.0.8
+Requires-Dist: meshagent-tools>=0.0.8
+Requires-Dist: meshagent-openai>=0.0.8
 Requires-Dist: pydantic>=2.10.4
 Requires-Dist: pydantic-ai>=0.0.23
 Requires-Dist: chonkie>=0.5.1
 Requires-Dist: chonkie[semantic]>=0.5.1
 Requires-Dist: chonkie[openai]>=0.5.1
-Dynamic: description-content-type
-Dynamic: license
 Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary

{meshagent_agents-0.0.7.dist-info → meshagent_agents-0.0.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
-meshagent/agents/__init__.py,sha256=uLDRp7W4wG0M2JHmyWBA4oYwYUsqGPD3VVHmcAddGAs,343
+meshagent/agents/__init__.py,sha256=S83622vDM9hWErcgfwZg8lJT2ncu00OEgnxoIbY3VcM,376
 meshagent/agents/adapter.py,sha256=i2ck7a6B8ByXRZgtOH7chc7VT2cpk3uBAdEd93Ts7jI,1278
-meshagent/agents/agent.py,sha256=3TO8buY5yGFmtZPlf1aUiVxa-O8sLoKwpREpSUVNlso,16788
-meshagent/agents/chat.py,sha256=f21i_Qna0fYv0GXmyaWqpzy43hwtIeEjxo22Id5UFL0,18016
-meshagent/agents/context.py,sha256=4aKEWoQHg60uuzMJ-9T3RFxVncXZ5lrOPRYKvtuuShA,3358
+meshagent/agents/agent.py,sha256=yQWgzv2k9tHsGwTPbU3AkE58q0_nURYLd2wMjI4o6og,19089
+meshagent/agents/chat.py,sha256=7BfNM976_VXm5s5OgKu2bxZdrstqifrs9mpGax5OPDY,17938
+meshagent/agents/context.py,sha256=6eFK7wizjzZmZyhbqwazlT_E_e_Cpb17Qa3tBk2BJzw,3804
 meshagent/agents/development.py,sha256=04VYL1Q_BWUTQeVuiVOpyjcs8bzUIX1eQ4VyTtjc5s0,926
 meshagent/agents/hosting.py,sha256=e2wMGbWFt0WO3CJaTQehwbucftgUNVTgRsrBWiYDgcU,4973
-meshagent/agents/indexer.py,sha256=RnnRhxPs8QkpChTp4qQNQs9qzP1gkmlo-7mmL4Cqs64,19441
+meshagent/agents/indexer.py,sha256=P25QsxNh8B26wZSVs9t5wWS7xd3FF7ocXXq4PQvscus,19438
 meshagent/agents/listener.py,sha256=kKFaWPmvmk1aCAlI55AAU3-QnOWCSZbf621xZz10rbs,5388
 meshagent/agents/planning.py,sha256=GLP97e_u7NmG1HjsucPpZndqiFPYVTEAYDdu1dQu5Go,22958
 meshagent/agents/prompt.py,sha256=sidiyLLC6Lr9KO3cUTKttd2oROlcizle_4iKoaNrfhA,1864
@@ -13,11 +13,11 @@ meshagent/agents/pydantic.py,sha256=BXALTyj8O9vV-eY5ejiJoYIY4zVl9AKetsqGUxixbiY,
 meshagent/agents/single_shot_writer.py,sha256=CJ7KgekR6JUSbYZ8OdYmhBPPjEWDYNtbIjR4g1wkWAA,3405
 meshagent/agents/thread_schema.py,sha256=mmm1p7A6Eux98xsNXwGSNq_DjkMn3hsyaWsplc6akCM,2575
 meshagent/agents/utils.py,sha256=Vjl1CR_K7VbTl0RRBnswfxxndhl8oJMDdOxPlOsC9Fk,1443
-meshagent/agents/version.py,sha256=D0UVD6fSKhTEm2bcEShuydq4MtAQfmIq3CLzUVZH53I,21
-meshagent/agents/worker.py,sha256=tKN-s0bqRCsF8DowtN5Y3TdDkayzwwGYGQcDwBxAiKM,4303
+meshagent/agents/version.py,sha256=ICOxGt7ta-t2F9uXLMXVo-4VDYGM0IEvKPStCf0y8Rk,21
+meshagent/agents/worker.py,sha256=Te3uK5y31cvtVajf9gFuMT0a-PKkMXBSWEEv01MnKcI,3952
 meshagent/agents/writer.py,sha256=Ff8RVxdpFNKmo6zxaGkuFMz8MIKumdM0FIXX_6lbZ6Q,2738
-meshagent_agents-0.0.7.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
-meshagent_agents-0.0.7.dist-info/METADATA,sha256=UGqoAtFA2KYioi1Uo55VWGqhD4_xDZubGEOgzAfByrQ,918
-meshagent_agents-0.0.7.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-meshagent_agents-0.0.7.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_agents-0.0.7.dist-info/RECORD,,
+meshagent_agents-0.0.8.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
+meshagent_agents-0.0.8.dist-info/METADATA,sha256=pybRNpDhSWT0AUxsR81L5774DvYTi87GA-eSKwGmlFM,772
+meshagent_agents-0.0.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+meshagent_agents-0.0.8.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_agents-0.0.8.dist-info/RECORD,,

{meshagent_agents-0.0.7.dist-info → meshagent_agents-0.0.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any