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

meshagent/agents/agent.py

@@ -256,9 +256,14 @@ class SingleRoomAgent(Agent):
         
 class TaskRunner(SingleRoomAgent):
 
-    def __init__(self, *, name, title = None, description = None, requires = None, supports_tools : Optional[bool] = None, input_schema: dict, output_schema: dict, labels: Optional[list[str]] = None):
+    def __init__(self, *, name, title = None, description = None, requires = None, supports_tools : Optional[bool] = None, input_schema: dict, output_schema: dict, labels: Optional[list[str]] = None, toolkits: Optional[list[Toolkit]] = None):
         super().__init__(name=name, title=title, description=description, requires=requires, labels=labels)
 
+        if toolkits == None:
+            toolkits = []
+
+        self._toolkits = toolkits
+
         self._registration_id = None     
 
         if input_schema == None:
@@ -353,25 +358,30 @@ class TaskRunner(SingleRoomAgent):
         async def worker():
             # Decode and parse the message
             message = json.loads(data.decode('utf-8'))
-            logger.info("got message %s", message)
+            logger.info("agent got message %s", message)
             args = message["arguments"]
             task_id = message["task_id"] 
             context_json = message["context"]
             toolkits_json = message["toolkits"]
             
-
             #context_json = message["context"]
 
             try:
                 chat_context = await self.init_chat_context()
 
                 caller : Participant | None = None
-
+                on_behalf_of : Participant | None = None
+                on_behalf_of_id = message.get("on_behalf_of_id", None) 
+    
                 for participant in self._room.messaging.get_participants():
                     if message["caller_id"] == participant.id:
                         caller = participant
                         break
                 
+                    if on_behalf_of_id == participant.id:
+                        on_behalf_of = participant
+                        break
+
                 if caller == None:
                     caller = RemoteParticipant(
                         id=message["caller_id"],
@@ -379,15 +389,30 @@ class TaskRunner(SingleRoomAgent):
                         attributes={}
                     )
 
-
-                context = AgentCallContext(chat=chat_context, room=self.room, caller=caller)
-    
+                if on_behalf_of_id != None and on_behalf_of == None:
+                    on_behalf_of = RemoteParticipant(
+                        id=message["on_behalf_of_id"],
+                        role="user",
+                        attributes={}
+                    )
+               
+                tool_target = caller
+                if on_behalf_of != None:
+                    tool_target = on_behalf_of
+
+                toolkits = [
+                    *self._toolkits,
+                    *await self.get_required_tools(participant_id=tool_target.id)
+                ]
+
+                context = AgentCallContext(chat=chat_context, room=self.room, caller=caller, on_behalf_of=on_behalf_of, toolkits=toolkits)
+                 
                 for toolkit_json in toolkits_json:
                     tools = []
                     for tool_json in toolkit_json["tools"]:
                         tools.append(RoomTool(
-                            on_behalf_of_id=message["caller_id"],
-                            participant_id=message["caller_id"],
+                            on_behalf_of_id=on_behalf_of_id,
+                            participant_id=tool_target.id,
                             toolkit_name=toolkit_json["name"],
                             name=tool_json["name"],
                             title=tool_json["title"],
@@ -405,6 +430,8 @@ class TaskRunner(SingleRoomAgent):
                         tools=tools,
                     ))
 
+
+          
                 response = await self.ask(context=context, arguments=args)
                 
                 await protocol.send(type="agent.ask_response", data=json.dumps({ 

meshagent/agents/chat.py

@@ -10,7 +10,7 @@ from meshagent.tools import MultiToolkit
 import urllib
 import uuid
 import datetime
-
+import json
 from openai.types.responses import ResponseStreamEvent
 
 logging.basicConfig()
@@ -176,7 +176,9 @@ class ChatBot(SingleRoomAgent):
         doc_messages = None
         current_file = None
         llm_messages = Chan[ResponseStreamEvent]()
-        
+        thread_context = None
+    
+
         def done_processing_llm_events(task: asyncio.Task):
             try:
                 task.result()
@@ -191,7 +193,10 @@ class ChatBot(SingleRoomAgent):
 
             async for evt in llm_messages:
                 
-                #await self.room.messaging.send_message(to=chat_with_participant, type="llm.event", message=evt)
+                for participant in self._room.messaging.get_participants():
+                    logger.info(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 = ""
@@ -291,7 +296,7 @@ class ChatBot(SingleRoomAgent):
 
                         for participant in get_thread_participants(room=self._room, thread=thread):
                             # TODO: async gather
-                            await self._room.messaging.send_message(to=participant, type="thinking", message={"thinking":True, "path": path})
+                            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", data={ "context" : chat_context.id, "participant_id" : self.room.local_participant.id, "participant_name" : self.room.local_participant.get_attribute("name"), "message" : { "content" : {  "role" : "user", "text" : received.message["text"] } } })
@@ -320,19 +325,21 @@ class ChatBot(SingleRoomAgent):
             
 
                 try:
-                
-                    toolkits = [
-                        *self._toolkits,
-                        *await self.get_required_tools(participant_id=chat_with_participant.id)
-                    ]
-
-                    thread_context = ChatThreadContext(
-                        chat=chat_context,
-                        thread=thread,
-                        toolkits=toolkits,
-                    )
+                    
+                    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)
+                        await self.init_thread_context(thread_context=thread_context)
 
                     def handle_event(evt):
                         llm_messages.send_nowait(evt)
@@ -341,7 +348,7 @@ class ChatBot(SingleRoomAgent):
                         response = await self._llm_adapter.next(
                             context=chat_context,
                             room=self._room,
-                            toolkits=toolkits,
+                            toolkits=thread_context.toolkits,
                             tool_adapter=self._tool_adapter,
                             event_handler=handle_event
                         )
@@ -353,7 +360,7 @@ class ChatBot(SingleRoomAgent):
                 finally:
                     for participant in get_thread_participants(room=self._room, thread=thread):
                         # TODO: async gather
-                        await self._room.messaging.send_message(to=participant, type="thinking", message={"thinking":False, "path" : path})
+                        self._room.messaging.send_message_nowait(to=participant, type="thinking", message={"thinking":False, "path" : path})
 
                    
         finally:
@@ -386,11 +393,16 @@ class ChatBot(SingleRoomAgent):
     async def start(self, *, room):
 
         await super().start(room=room)
+
+        logger.info("Starting chatbot")
         
         await self.room.local_participant.set_attribute("empty_state_title", self._empty_state_title)
 
         def on_message(message: RoomMessage):
 
+            logger.info(f"received message {message.type}")
+              
+
             messages = self._get_message_channel(participant_id=message.from_participant_id)
             if message.type == "chat" or message.type == "opened":
                 messages.send_nowait(message)
@@ -444,5 +456,7 @@ class ChatBot(SingleRoomAgent):
 
             room.messaging.on("participant_added", on_participant_added)
 
+
+        logger.info("Enabling chatbot messaging")
         await room.messaging.enable()
 

meshagent/agents/context.py

@@ -81,13 +81,14 @@ class AgentChatContext:
         return AgentChatContext(messages=json["messages"], system_role=json.get("system_role", None))
 
 class AgentCallContext:
-    def __init__(self, *, chat: AgentChatContext, room: RoomClient, toolkits: Optional[list[Toolkit]] = None, caller: Optional[Participant] = None):
+    def __init__(self, *, chat: AgentChatContext, room: RoomClient, toolkits: Optional[list[Toolkit]] = None, caller: Optional[Participant] = None, on_behalf_of: Optional[Participant] = None):
         self._room = room
         if toolkits == None:
             toolkits = list[Toolkit]()
         self._toolkits = toolkits
         self._chat = chat
         self._caller = caller
+        self._on_behalf_of = on_behalf_of
 
     @property
     def toolkits(self):
@@ -101,6 +102,10 @@ class AgentCallContext:
     def caller(self):
         return self._caller
 
+    @property
+    def on_behalf_of(self):
+        return self._on_behalf_of
+    
     @property
     def room(self):
         return self._room

meshagent/agents/indexer.py

@@ -370,10 +370,10 @@ class StorageIndexer(SingleRoomAgent):
                 logger.error("error while indexing", exc_info=e)
 
 
-    def _on_file_deleted(self, path: str):
+    def _on_file_deleted(self, path: str, participant_id: str):
         self._chan.send_nowait(FileIndexEvent(path=path, deleted=True))
         
-    def _on_file_updated(self, path: str):
+    def _on_file_updated(self, path: str, participant_id: str):
         self._chan.send_nowait(FileIndexEvent(path=path, deleted=False))
 
         

meshagent/agents/planning.py

@@ -279,7 +279,8 @@ class PlanningResponder(TaskRunner):
             output_schema=output_schema,
             requires=requires,
             supports_tools=supports_tools,
-            labels=labels
+            labels=labels,
+            toolkits=toolkits
         )
         
         self._max_iterations = max_iterations
@@ -294,11 +295,6 @@ class PlanningResponder(TaskRunner):
         self._llm_adapter = llm_adapter
         self._tool_adapter = tool_adapter 
 
-        if toolkits == None:
-            toolkits = []
-        
-        self.toolkits = toolkits
-
         self._use_terminate_tool = use_terminate_tool
 
     async def init_chat_context(self):
@@ -389,14 +385,8 @@ class PlanningResponder(TaskRunner):
             
             try:
                 logger.info("COMPLETION STARTING: Step %s", i)
-                
-                toolkits = [
-                    *self.toolkits,
-                    *context.toolkits
-                ]
-
-                responses = await self._llm_adapter.next(context=context.chat, room=room, toolkits=toolkits, tool_adapter=self._tool_adapter, output_schema=rs)
-
+                    
+                responses = await self._llm_adapter.next(context=context.chat, room=room, toolkits=context.toolkits, tool_adapter=self._tool_adapter, output_schema=rs)
 
                 logger.info("COMPLETION RESPONSE %s", responses)
             

meshagent/agents/utils.py

@@ -0,0 +1,39 @@
+from meshagent.api import RoomClient, Requirement, RoomException, Participant
+from meshagent.tools import validate_openai_schema, Toolkit
+import json
+from typing import Optional
+import asyncio
+
+async def generate_json(*, on_behalf_of: Optional[Participant] = None, room: RoomClient, prompt: Optional[str] = None, output_schema: dict, requires: Optional[list[Requirement]] = None) -> dict:
+    
+    # make sure agent is in the room before proceeding
+    agent = None
+    for i in range(10):
+        agents = await room.agents.list_agents()
+        for a in agents:
+            if a.name == "meshagent.planning_responder":
+                agent = a
+                break
+        
+        if agent != None:
+            break
+
+        await asyncio.sleep(1)
+
+    if agent == None:
+        raise RoomException("unable to locate required agent (meshagent.planning_responder)")
+        
+    
+    if prompt == None:
+        prompt = f"ask me a series of questions to completely fill out the data structure described by this JSON schema ${json.dumps(output_schema)}. If you need to ask multiple questions, try to include all of them in a single form."
+
+    validate_openai_schema(output_schema)
+    return await room.agents.ask(
+        on_behalf_of=on_behalf_of,
+        agent="meshagent.planning_responder",
+        requires = requires,
+        arguments = {
+            "prompt": prompt,
+            "output_schema": output_schema,
+        },
+    )

meshagent/agents/version.py

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

meshagent/agents/worker.py

@@ -103,20 +103,19 @@ class Worker(TaskRunner):
                 try:
                     while True:
 
-                        toolkits = [
-                            *self._toolkits,
-                            *context.toolkits,
-                            *await self.get_required_tools(participant_id=self.room.local_participant.id)
-                        ]
+                        tool_target = context.caller
+                        if context.on_behalf_of != None:
+                            tool_target = context.on_behalf_of
+
                         response = await self._llm_adapter.next(
                             context=chat_context,
                             room=self._room,
-                            toolkits=toolkits,
+                            toolkits=context.toolkits,
                             tool_adapter=self._tool_adapter,
                             output_schema=step_schema,
                         )
 
-                        if response["finished"] or len(toolkits) == 0:
+                        if response["finished"] or len(context.toolkits) == 0:
                             break
                         else:
                             chat_context.append_user_message(message="proceed to the next step if you are ready")

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.0.5
+Version: 0.0.7
 Summary: Agent Building Blocks for Meshagent
 Home-page: 
 License: Apache License 2.0
@@ -13,9 +13,9 @@ 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.5
-Requires-Dist: meshagent-tools>=0.0.5
-Requires-Dist: meshagent-openai>=0.0.5
+Requires-Dist: meshagent-api>=0.0.7
+Requires-Dist: meshagent-tools>=0.0.7
+Requires-Dist: meshagent-openai>=0.0.7
 Requires-Dist: pydantic>=2.10.4
 Requires-Dist: pydantic-ai>=0.0.23
 Requires-Dist: chonkie>=0.5.1
@@ -23,6 +23,7 @@ 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

meshagent_agents-0.0.7.dist-info/RECORD

@@ -0,0 +1,23 @@
+meshagent/agents/__init__.py,sha256=uLDRp7W4wG0M2JHmyWBA4oYwYUsqGPD3VVHmcAddGAs,343
+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/development.py,sha256=04VYL1Q_BWUTQeVuiVOpyjcs8bzUIX1eQ4VyTtjc5s0,926
+meshagent/agents/hosting.py,sha256=e2wMGbWFt0WO3CJaTQehwbucftgUNVTgRsrBWiYDgcU,4973
+meshagent/agents/indexer.py,sha256=RnnRhxPs8QkpChTp4qQNQs9qzP1gkmlo-7mmL4Cqs64,19441
+meshagent/agents/listener.py,sha256=kKFaWPmvmk1aCAlI55AAU3-QnOWCSZbf621xZz10rbs,5388
+meshagent/agents/planning.py,sha256=GLP97e_u7NmG1HjsucPpZndqiFPYVTEAYDdu1dQu5Go,22958
+meshagent/agents/prompt.py,sha256=sidiyLLC6Lr9KO3cUTKttd2oROlcizle_4iKoaNrfhA,1864
+meshagent/agents/pydantic.py,sha256=BXALTyj8O9vV-eY5ejiJoYIY4zVl9AKetsqGUxixbiY,6091
+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/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.5.dist-info → meshagent_agents-0.0.7.dist-info}/WHEEL

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

meshagent_agents-0.0.5.dist-info/RECORD

@@ -1,22 +0,0 @@
-meshagent/agents/__init__.py,sha256=uLDRp7W4wG0M2JHmyWBA4oYwYUsqGPD3VVHmcAddGAs,343
-meshagent/agents/adapter.py,sha256=i2ck7a6B8ByXRZgtOH7chc7VT2cpk3uBAdEd93Ts7jI,1278
-meshagent/agents/agent.py,sha256=t9AwoKjF_bgPrJdN9dr73J-CkQy_oAQWyHKB1Q4RPOU,15734
-meshagent/agents/chat.py,sha256=5Uhy8rxsGDssLGbLkNvNPWTH4T2R8Irc9qAC3w2YP_I,17413
-meshagent/agents/context.py,sha256=1j38JGb0Nc0CZ0UMC_VkKjMraHZdsqBStTGNrP2nanM,3191
-meshagent/agents/development.py,sha256=04VYL1Q_BWUTQeVuiVOpyjcs8bzUIX1eQ4VyTtjc5s0,926
-meshagent/agents/hosting.py,sha256=e2wMGbWFt0WO3CJaTQehwbucftgUNVTgRsrBWiYDgcU,4973
-meshagent/agents/indexer.py,sha256=t7FbUxTSHSS-2pLrYSiCuv7P28y00XA8iJtEsuQjTZA,19399
-meshagent/agents/listener.py,sha256=kKFaWPmvmk1aCAlI55AAU3-QnOWCSZbf621xZz10rbs,5388
-meshagent/agents/planning.py,sha256=DTanAzanhjZ4bU6kWDFTBkw3oVcdtSj3XTKYwntoN0A,23136
-meshagent/agents/prompt.py,sha256=sidiyLLC6Lr9KO3cUTKttd2oROlcizle_4iKoaNrfhA,1864
-meshagent/agents/pydantic.py,sha256=BXALTyj8O9vV-eY5ejiJoYIY4zVl9AKetsqGUxixbiY,6091
-meshagent/agents/single_shot_writer.py,sha256=CJ7KgekR6JUSbYZ8OdYmhBPPjEWDYNtbIjR4g1wkWAA,3405
-meshagent/agents/thread_schema.py,sha256=mmm1p7A6Eux98xsNXwGSNq_DjkMn3hsyaWsplc6akCM,2575
-meshagent/agents/version.py,sha256=v0zqRembIW__d7HVDd71J2eoXGtALnzdY8JdBVk-BPY,21
-meshagent/agents/worker.py,sha256=vZ6tnOyjno8N551c5HsXR8Mw3ZPmYRa4o1MZ3i7hEG4,4374
-meshagent/agents/writer.py,sha256=Ff8RVxdpFNKmo6zxaGkuFMz8MIKumdM0FIXX_6lbZ6Q,2738
-meshagent_agents-0.0.5.dist-info/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
-meshagent_agents-0.0.5.dist-info/METADATA,sha256=nSnJIv-rOhIRwum8fEIWnhMESU3D3-6HQVhSglPzKxA,896
-meshagent_agents-0.0.5.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-meshagent_agents-0.0.5.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_agents-0.0.5.dist-info/RECORD,,