meshagent-agents 0.5.8b5__tar.gz → 0.5.13__tar.gz

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/CHANGELOG.md

@@ -1,4 +1,7 @@
-## [0.5.8b5]
+## [0.5.13]
+- Stability
+
+## [0.5.12]
 - Stability
 
 ## [0.5.8]

{meshagent_agents-0.5.8b5/meshagent_agents.egg-info → meshagent_agents-0.5.13}/PKG-INFO

@@ -1,30 +1,30 @@
 Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.5.8b5
+Version: 0.5.13
 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.13
+Requires-Python: >=3.12
 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.8b5
-Requires-Dist: meshagent-tools~=0.5.8b5
-Requires-Dist: meshagent-openai~=0.5.8b5
+Requires-Dist: meshagent-api~=0.5.13
+Requires-Dist: meshagent-tools~=0.5.13
+Requires-Dist: meshagent-openai~=0.5.13
 Requires-Dist: pydantic~=2.11
 Requires-Dist: opentelemetry-distro~=0.54b1
 Provides-Extra: all
-Requires-Dist: meshagent-api[all]~=0.5.8b5; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.5.13; 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.8b5; extra == "sync"
+Requires-Dist: meshagent-api[sync]~=0.5.13; extra == "sync"
 Provides-Extra: mail
 Requires-Dist: aiosmtplib~=4.0.1; extra == "mail"
 Provides-Extra: rag

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/meshagent/agents/agent.py

@@ -12,6 +12,7 @@ from meshagent.api import (
     ToolkitDescription,
     Participant,
     RemoteParticipant,
+    meshagent_base_url,
     StorageEntry,
 )
 from meshagent.api.protocol import Protocol
@@ -193,8 +194,6 @@ 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:
@@ -208,14 +207,12 @@ class SingleRoomAgent(Agent):
                 if requirement.name not in toolkits_by_name:
                     installed = True
 
-                    logger.info(f"calling required tool into room {requirement.name}")
+                    logger.info(f"Installing required tool {requirement.name}")
 
-                    if requirement.name.startswith(
-                        "https://"
-                    ) or requirement.name.startswith("http://"):
+                    if requirement.name.startswith("https://"):
                         url = requirement.name
                     else:
-                        url = f"{builtin_agents_url}/toolkits/{requirement.name}"
+                        url = f"{meshagent_base_url()}/toolkits/{requirement.name}"
 
                     await self._room.agents.make_call(
                         url=url, name=requirement.name, arguments={}
@@ -227,12 +224,10 @@ class SingleRoomAgent(Agent):
 
                     logger.info(f"Installing required schema {requirement.name}")
 
-                    if requirement.name.startswith(
-                        "https://"
-                    ) or requirement.name.startswith("http://"):
+                    if requirement.name.startswith("https://"):
                         url = requirement.name
                     else:
-                        url = f"{builtin_agents_url}/schemas/{requirement.name}"
+                        url = f"{meshagent_base_url()}/schemas/{requirement.name}"
 
                     await self._room.agents.make_call(
                         url=url, name=requirement.name, arguments={}

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/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, *, thread_context: ChatThreadContext):
+    async def prepare_llm_context(self, *, 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(
-                                        thread_context=thread_context
+                                        context=thread_context
                                     )
 
                                     llm_messages = asyncio.Queue[ResponseStreamEvent]()

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/meshagent/agents/development.py

@@ -2,10 +2,8 @@ from .agent import SingleRoomAgent
 from meshagent.api import websocket_protocol, RoomClient
 import asyncio
 import signal
-from warnings import deprecated
 
 
-@deprecated("use ServiceHost and the cli to connect agents to the room")
 async def connect_development_agent(*, room_name: str, agent: SingleRoomAgent):
     async with RoomClient(
         protocol=websocket_protocol(
@@ -24,7 +22,7 @@ async def connect_development_agent(*, room_name: str, agent: SingleRoomAgent):
             signal.signal(signal.SIGABRT, clean_termination)
 
             await asyncio.wait(
-                [asyncio.create_task(room.protocol.wait_for_close()), term],
+                [asyncio.ensure_future(room.protocol.wait_for_close()), term],
                 return_when=asyncio.FIRST_COMPLETED,
             )
 

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/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.create_task(room.protocol.wait_for_close())],
+                    [dismissed, asyncio.ensure_future(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.create_task(room.protocol.wait_for_close())],
+                    [dismissed, asyncio.ensure_future(room.protocol.wait_for_close())],
                     return_when=asyncio.FIRST_COMPLETED,
                 )
 

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/meshagent/agents/mail.py

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

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/meshagent/agents/utils.py

@@ -1,4 +1,5 @@
 from meshagent.api import RoomClient, Requirement, RoomException, Participant
+from meshagent.tools import validate_openai_schema
 import json
 from typing import Optional
 import asyncio
@@ -34,6 +35,7 @@ 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-0.5.13/meshagent/agents/version.py

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

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13/meshagent_agents.egg-info}/PKG-INFO

@@ -1,30 +1,30 @@
 Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.5.8b5
+Version: 0.5.13
 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.13
+Requires-Python: >=3.12
 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.8b5
-Requires-Dist: meshagent-tools~=0.5.8b5
-Requires-Dist: meshagent-openai~=0.5.8b5
+Requires-Dist: meshagent-api~=0.5.13
+Requires-Dist: meshagent-tools~=0.5.13
+Requires-Dist: meshagent-openai~=0.5.13
 Requires-Dist: pydantic~=2.11
 Requires-Dist: opentelemetry-distro~=0.54b1
 Provides-Extra: all
-Requires-Dist: meshagent-api[all]~=0.5.8b5; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.5.13; 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.8b5; extra == "sync"
+Requires-Dist: meshagent-api[sync]~=0.5.13; extra == "sync"
 Provides-Extra: mail
 Requires-Dist: aiosmtplib~=4.0.1; extra == "mail"
 Provides-Extra: rag

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/meshagent_agents.egg-info/SOURCES.txt

@@ -12,7 +12,6 @@ meshagent/agents/development.py
 meshagent/agents/hosting.py
 meshagent/agents/indexer.py
 meshagent/agents/listener.py
-meshagent/agents/llmrunner.py
 meshagent/agents/mail.py
 meshagent/agents/planning.py
 meshagent/agents/prompt.py

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/meshagent_agents.egg-info/requires.txt

@@ -1,14 +1,14 @@
 pyjwt~=2.10
 pytest~=8.4
 pytest-asyncio~=0.26
-meshagent-api~=0.5.8b5
-meshagent-tools~=0.5.8b5
-meshagent-openai~=0.5.8b5
+meshagent-api~=0.5.13
+meshagent-tools~=0.5.13
+meshagent-openai~=0.5.13
 pydantic~=2.11
 opentelemetry-distro~=0.54b1
 
 [all]
-meshagent-api[all]~=0.5.8b5
+meshagent-api[all]~=0.5.13
 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.5.8b5
+meshagent-api[sync]~=0.5.13

{meshagent_agents-0.5.8b5 → meshagent_agents-0.5.13}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 name = "meshagent-agents"
 dynamic = ["version", "readme"]
 description = "Agent Building Blocks for Meshagent"
-requires-python = ">=3.13"
+requires-python = ">=3.12"
 license = "Apache-2.0"
 classifiers = []
 keywords = []
@@ -17,16 +17,16 @@ dependencies = [
   "pyjwt~=2.10",
   "pytest~=8.4",
   "pytest-asyncio~=0.26",
-  "meshagent-api~=0.5.8b5",
-  "meshagent-tools~=0.5.8b5",
-  "meshagent-openai~=0.5.8b5",
+  "meshagent-api~=0.5.13",
+  "meshagent-tools~=0.5.13",
+  "meshagent-openai~=0.5.13",
   "pydantic~=2.11",
   "opentelemetry-distro~=0.54b1"
 ]
 
 [project.optional-dependencies]
 all = [
-    "meshagent-api[all]~=0.5.8b5",
+    "meshagent-api[all]~=0.5.13",
     "chonkie~=0.5.1",
     "chonkie[semantic]~=0.5.1",
     "chonkie[openai]~=0.5.1",
@@ -34,7 +34,7 @@ all = [
 ]
 
 sync = [
-    "meshagent-api[sync]~=0.5.8b5",
+    "meshagent-api[sync]~=0.5.13",
 ]
 
 mail = [

meshagent_agents-0.5.8b5/meshagent/agents/llmrunner.py

@@ -1,169 +0,0 @@
-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-0.5.8b5/meshagent/agents/version.py

@@ -1 +0,0 @@
-__version__ = "0.5.8b5"