meshagent-agents 0.5.7__py3-none-any.whl → 0.5.8b1__py3-none-any.whl

meshagent/agents/agent.py

@@ -12,7 +12,6 @@ from meshagent.api import (
     ToolkitDescription,
     Participant,
     RemoteParticipant,
-    meshagent_base_url,
     StorageEntry,
 )
 from meshagent.api.protocol import Protocol
@@ -194,6 +193,8 @@ class SingleRoomAgent(Agent):
 
         installed = False
 
+        builtin_agents_url = "http://localhost:8080"
+
         for requirement in self.requires:
             if isinstance(requirement, RequiredToolkit):
                 if toolkit_factory(requirement.name) is not None:
@@ -207,12 +208,12 @@ class SingleRoomAgent(Agent):
                 if requirement.name not in toolkits_by_name:
                     installed = True
 
-                    logger.info(f"Installing required tool {requirement.name}")
+                    logger.info(f"calling required tool into room {requirement.name}")
 
                     if requirement.name.startswith("https://"):
                         url = requirement.name
                     else:
-                        url = f"{meshagent_base_url()}/toolkits/{requirement.name}"
+                        url = f"{builtin_agents_url}/toolkits/{requirement.name}"
 
                     await self._room.agents.make_call(
                         url=url, name=requirement.name, arguments={}
@@ -227,7 +228,7 @@ class SingleRoomAgent(Agent):
                     if requirement.name.startswith("https://"):
                         url = requirement.name
                     else:
-                        url = f"{meshagent_base_url()}/schemas/{requirement.name}"
+                        url = f"{builtin_agents_url}/schemas/{requirement.name}"
 
                     await self._room.agents.make_call(
                         url=url, name=requirement.name, arguments={}

meshagent/agents/chat.py

@@ -448,7 +448,7 @@ class ChatBot(SingleRoomAgent):
         if doc_messages is None:
             raise Exception("thread was not properly initialized")
 
-    async def prepare_llm_context(self, *, context: ChatThreadContext):
+    async def prepare_llm_context(self, *, thread_context: ChatThreadContext):
         """
         called prior to sending the request to the LLM in case the agent needs to modify the context prior to sending
         """
@@ -736,7 +736,7 @@ class ChatBot(SingleRoomAgent):
                                         )
 
                                     await self.prepare_llm_context(
-                                        context=thread_context
+                                        thread_context=thread_context
                                     )
 
                                     llm_messages = asyncio.Queue[ResponseStreamEvent]()

meshagent/agents/development.py

@@ -22,7 +22,7 @@ async def connect_development_agent(*, room_name: str, agent: SingleRoomAgent):
             signal.signal(signal.SIGABRT, clean_termination)
 
             await asyncio.wait(
-                [asyncio.ensure_future(room.protocol.wait_for_close()), term],
+                [asyncio.create_task(room.protocol.wait_for_close()), term],
                 return_when=asyncio.FIRST_COMPLETED,
             )
 

meshagent/agents/hosting.py

@@ -74,7 +74,7 @@ class RemoteTaskRunnerServer[T: TaskRunner](WebhookServer):
                 await agent.start(room=room)
 
                 done, pending = await asyncio.wait(
-                    [dismissed, asyncio.ensure_future(room.protocol.wait_for_close())],
+                    [dismissed, asyncio.create_task(room.protocol.wait_for_close())],
                     return_when=asyncio.FIRST_COMPLETED,
                 )
 
@@ -158,7 +158,7 @@ class RemoteAgentServer[T: SingleRoomAgent](WebhookServer):
                 await agent.start(room=room)
 
                 done, pending = await asyncio.wait(
-                    [dismissed, asyncio.ensure_future(room.protocol.wait_for_close())],
+                    [dismissed, asyncio.create_task(room.protocol.wait_for_close())],
                     return_when=asyncio.FIRST_COMPLETED,
                 )
 

meshagent/agents/llmrunner.py

@@ -0,0 +1,169 @@
+from typing import Optional
+
+from jsonschema import validate, ValidationError
+from meshagent.api.schema_util import prompt_schema, merge
+from meshagent.api import Requirement
+from meshagent.tools import Toolkit
+from meshagent.agents import TaskRunner
+from meshagent.agents.agent import AgentCallContext
+from meshagent.agents.adapter import LLMAdapter, ToolResponseAdapter
+from meshagent.api.messaging import TextResponse
+
+
+class LLMTaskRunner(TaskRunner):
+    """
+    A Task Runner that uses an LLM execution loop until the task is complete.
+    """
+
+    def __init__(
+        self,
+        *,
+        name: str,
+        llm_adapter: LLMAdapter,
+        title: Optional[str] = None,
+        description: Optional[str] = None,
+        tool_adapter: Optional[ToolResponseAdapter] = None,
+        toolkits: Optional[list[Toolkit]] = None,
+        requires: Optional[list[Requirement]] = None,
+        supports_tools: bool = True,
+        input_prompt: bool = True,
+        input_schema: Optional[dict] = None,
+        output_schema: Optional[dict] = None,
+        rules: Optional[list[str]] = None,
+        labels: Optional[list[str]] = None,
+    ):
+        if input_schema is None:
+            if input_prompt:
+                input_schema = prompt_schema(
+                    description="use a prompt to generate content"
+                )
+            else:
+                input_schema = {
+                    "type": "object",
+                    "additionalProperties": False,
+                    "required": [],
+                    "properties": {},
+                }
+
+        static_toolkits = list(toolkits or [])
+
+        super().__init__(
+            name=name,
+            title=title,
+            description=description,
+            input_schema=input_schema,
+            output_schema=output_schema,
+            requires=requires,
+            supports_tools=supports_tools,
+            labels=labels,
+            toolkits=static_toolkits,
+        )
+
+        self._extra_rules = rules or []
+        self._llm_adapter = llm_adapter
+        self._tool_adapter = tool_adapter
+        self.toolkits = static_toolkits
+
+    async def init_chat_context(self):
+        chat = self._llm_adapter.create_chat_context()
+        if self._extra_rules:
+            chat.append_rules(self._extra_rules)
+        return chat
+
+    async def ask(self, *, context: AgentCallContext, arguments: dict):
+        prompt = arguments.get("prompt")
+        if prompt is None:
+            raise ValueError("`prompt` is required")
+
+        context.chat.append_user_message(prompt)
+
+        combined_toolkits: list[Toolkit] = [*self.toolkits, *context.toolkits]
+
+        resp = await self._llm_adapter.next(
+            context=context.chat,
+            room=context.room,
+            toolkits=combined_toolkits,
+            tool_adapter=self._tool_adapter,
+            output_schema=self.output_schema,
+        )
+
+        # Validate the LLM output against the declared output schema if one was provided
+        if self.output_schema:
+            try:
+                validate(instance=resp, schema=self.output_schema)
+            except ValidationError as exc:
+                raise RuntimeError("LLM output failed schema validation") from exc
+        # If no output schema was provided return a TextResponse
+        else:
+            resp = TextResponse(text=resp)
+
+        return resp
+
+
+class DynamicLLMTaskRunner(LLMTaskRunner):
+    """
+    Same capabilities as LLMTaskRunner, but the caller supplies an arbitrary JSON-schema (`output_schema`) at runtime
+    """
+
+    def __init__(
+        self,
+        *,
+        name: str,
+        llm_adapter: LLMAdapter,
+        supports_tools: bool = True,
+        title: Optional[str] = None,
+        description: Optional[str] = None,
+        tool_adapter: Optional[ToolResponseAdapter] = None,
+        toolkits: Optional[list[Toolkit]] = None,
+        rules: Optional[list[str]] = None,
+    ):
+        input_schema = merge(
+            schema=prompt_schema(description="use a prompt to generate content"),
+            additional_properties={"output_schema": {"type": "object"}},
+        )
+        super().__init__(
+            name=name,
+            llm_adapter=llm_adapter,
+            supports_tools=supports_tools,
+            title=title,
+            description=description,
+            tool_adapter=tool_adapter,
+            toolkits=toolkits,
+            rules=rules,
+            input_prompt=True,
+            input_schema=input_schema,
+            output_schema=None,
+        )
+
+    async def ask(self, *, context: AgentCallContext, arguments: dict):
+        prompt = arguments.get("prompt")
+        if prompt is None:
+            raise ValueError("`prompt` is required")
+
+        # Parse and pass JSON output schema provided at runtime
+        output_schema_raw = arguments.get("output_schema")
+        if output_schema_raw is None:
+            raise ValueError("`output_schema` is required for DynamicLLMTaskRunner")
+
+        # Make sure provided schema is a dict
+        if not isinstance(output_schema_raw, dict):
+            raise TypeError("`output_schema` must be a dict (JSON-schema object)")
+
+        context.chat.append_user_message(prompt)
+
+        combined_toolkits: list[Toolkit] = [*self.toolkits, *context.toolkits]
+
+        resp = await self._llm_adapter.next(
+            context=context.chat,
+            room=context.room,
+            toolkits=combined_toolkits,
+            tool_adapter=self._tool_adapter,
+            output_schema=output_schema_raw,
+        )
+
+        try:
+            validate(instance=resp, schema=output_schema_raw)
+        except ValidationError as exc:
+            raise RuntimeError("LLM output failed caller schema validation") from exc
+
+        return resp

meshagent/agents/mail.py

@@ -284,10 +284,7 @@ class MailWorker(Worker):
 
     async def process_message(self, *, chat_context, room, message, toolkits):
         thread_context = MailThreadContext(chat=chat_context, room_address=message)
-        toolkits = [
-            *toolkits,
-            *await self.get_thread_toolkits(thread_context=thread_context),
-        ]
+        toolkits = (await self.get_thread_toolkits(thread_context=thread_context),)
 
         logger.info(f"processing message {message}")
         reply = await super().process_message(

meshagent/agents/utils.py

@@ -1,5 +1,4 @@
 from meshagent.api import RoomClient, Requirement, RoomException, Participant
-from meshagent.tools import validate_openai_schema
 import json
 from typing import Optional
 import asyncio
@@ -35,7 +34,6 @@ async def generate_json(
     if prompt is 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.schema_planner",

meshagent/agents/version.py

@@ -1 +1 @@
-__version__ = "0.5.7"
+__version__ = "0.5.8-beta.1"

{meshagent_agents-0.5.7.dist-info → meshagent_agents-0.5.8b1.dist-info}/METADATA

@@ -1,30 +1,30 @@
 Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.5.7
+Version: 0.5.8b1
 Summary: Agent Building Blocks for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
 Project-URL: Website, https://www.meshagent.com
 Project-URL: Source, https://www.meshagent.com
-Requires-Python: >=3.12
+Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 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.7
-Requires-Dist: meshagent-tools~=0.5.7
-Requires-Dist: meshagent-openai~=0.5.7
+Requires-Dist: meshagent-api~=0.5.8-beta.1
+Requires-Dist: meshagent-tools~=0.5.8-beta.1
+Requires-Dist: meshagent-openai~=0.5.8-beta.1
 Requires-Dist: pydantic~=2.11
 Requires-Dist: opentelemetry-distro~=0.54b1
 Provides-Extra: all
-Requires-Dist: meshagent-api[all]~=0.5.7; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.5.8-beta.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.5.7; extra == "sync"
+Requires-Dist: meshagent-api[sync]~=0.5.8-beta.1; extra == "sync"
 Provides-Extra: mail
 Requires-Dist: aiosmtplib~=4.0.1; extra == "mail"
 Provides-Extra: rag

{meshagent_agents-0.5.7.dist-info → meshagent_agents-0.5.8b1.dist-info}/RECORD

@@ -1,20 +1,21 @@
 meshagent/agents/__init__.py,sha256=d2cplyLH8xqDWqP_GoPQ8ApHzuv8Iiq4rz-vYBlGMTw,706
 meshagent/agents/adapter.py,sha256=dMuejpjl__bdZ-Qmt-k4e81g-i10vZup7WE1JCZ_Sy4,1392
-meshagent/agents/agent.py,sha256=w14hM63YXiH15VEF1T2eZCvggvrUkE00a1kQkaMRBM0,20354
-meshagent/agents/chat.py,sha256=K1uLlUylKiWhuSh_gqQ2GajIZ3Pf5fc309adg14Z0Rk,32870
+meshagent/agents/agent.py,sha256=30Ey107T7Gk494UdWu3G0vmX6S-9qEEPfhD6AcBTyDg,20387
+meshagent/agents/chat.py,sha256=MLcgh_3HVgHMNmZZNRAhIpqLdo9hPcnwtcI_mFJAGJE,32884
 meshagent/agents/context.py,sha256=6txCXA22aHQaikvIKED6YjPyasM_bPqGqCE4HGj04_E,4035
-meshagent/agents/development.py,sha256=AEBkkycNZDRLYIdmX2LkrVZv715ALswiwSR9CiV3HE4,894
-meshagent/agents/hosting.py,sha256=tCcswAweEhlMxGaBR_m2YvUkwZiaHbTBT64urRHfK7I,5446
+meshagent/agents/development.py,sha256=JdCbR72nkqFTe5TK1ejmu9BgLuCWYzJRq-C2Soa3BFo,892
+meshagent/agents/hosting.py,sha256=95jKCzaHknX_1hTD2yMlOrzBSqlqBCFsmZ9ms3zKUlk,5442
 meshagent/agents/indexer.py,sha256=xFEzAmwAxhKu9xHppnxFUFlzeRHMfVk6MatRyka0ZW8,19367
 meshagent/agents/listener.py,sha256=q5z216FMVW-a7FBs706u3IuB81VArfucxEHaHvPFHEo,5139
-meshagent/agents/mail.py,sha256=NQUbLuUzk0xFCb_ROvD8ZWW3VnkN7pKMGJcJzcB8p3Q,12348
+meshagent/agents/llmrunner.py,sha256=ovHWsAsDqDCjmXLqXvx5B9Zwh9DaZMzvWU2dIL90syw,5739
+meshagent/agents/mail.py,sha256=mdSPzpSbAoOeyP2XFTyhip4iWq8YIS8lBsQhhyKcaqU,12302
 meshagent/agents/planning.py,sha256=69HLEkOR_24mZ1mcUCQVX_DgPfX5TVA7EJYCHENH6M0,21980
 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=OGQ-H5c2fJgNOYHC3Pas8iqTi2RUSxP2bytf0SK-SYc,4208
-meshagent/agents/utils.py,sha256=6D9GXpYu9xx5XlfD3DiGFdyOwq46e5-sTYOF_FYep1o,1446
-meshagent/agents/version.py,sha256=KiyyYbyEe0O858kmiWcg1RdmqGUYtk_JqRmc3_Ev2Q8,22
+meshagent/agents/utils.py,sha256=2Z3r7cUpKDZig8MVCrBwZRBUambeX4esZovDWme9uVE,1353
+meshagent/agents/version.py,sha256=UuWI1khJCTSIH7nHgIpNJWoeqg5GBLawnAjdq1dfb8w,29
 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 +24,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.7.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
-meshagent_agents-0.5.7.dist-info/METADATA,sha256=hDOxKUU6XtCX82qVFZbjmtrERgZAvSrv-fW5zbdk9mE,3773
-meshagent_agents-0.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_agents-0.5.7.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_agents-0.5.7.dist-info/RECORD,,
+meshagent_agents-0.5.8b1.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
+meshagent_agents-0.5.8b1.dist-info/METADATA,sha256=FVNk59GJcWT8kj7cpU6cjgAmc5I0tmQcte1beB64tnA,3810
+meshagent_agents-0.5.8b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_agents-0.5.8b1.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_agents-0.5.8b1.dist-info/RECORD,,