meshagent-cli 0.3.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

meshagent/cli/chatbot.py

@@ -22,7 +22,9 @@ from meshagent.agents.chat import (
 )
 
 from typing import List
+from pathlib import Path
 
+from meshagent.openai.tools.responses_adapter import WebSearchTool
 from meshagent.api import RequiredToolkit, RequiredSchema
 
 app = async_typer.AsyncTyper()
@@ -38,6 +40,8 @@ def build_chatbot(
     image_generation: Optional[str] = None,
     local_shell: bool,
     computer_use: bool,
+    web_search: bool,
+    rules_file: Optional[str] = None,
 ):
     requirements = []
 
@@ -49,6 +53,13 @@ def build_chatbot(
     for t in schema:
         requirements.append(RequiredSchema(name=t))
 
+    if rules_file is not None:
+        try:
+            with open(Path(rules_file).resolve(), "r") as f:
+                rule.extend(f.read().splitlines())
+        except FileNotFoundError:
+            print(f"[yellow]rules file not found at {rules_file}[/yellow]")
+
     BaseClass = ChatBot
     if computer_use:
         BaseClass = ComputerAgent
@@ -95,6 +106,9 @@ def build_chatbot(
                     )
                 )
 
+            if web_search:
+                thread_toolkit.tools.append(WebSearchTool())
+
             toolkits.append(thread_toolkit)
             return toolkits
 
@@ -111,6 +125,7 @@ async def make_call(
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     token_path: Annotated[Optional[str], typer.Option()] = None,
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
+    rules_file: Optional[str] = None,
     toolkit: Annotated[
         List[str],
         typer.Option("--toolkit", "-t", help="the name or url of a required toolkit"),
@@ -134,6 +149,9 @@ async def make_call(
     local_shell: Annotated[
         Optional[bool], typer.Option(..., help="Enable local shell tool calling")
     ] = False,
+    web_search: Annotated[
+        Optional[bool], typer.Option(..., help="Enable web search tool calling")
+    ] = False,
 ):
     account_client = await get_client()
     try:
@@ -174,6 +192,8 @@ async def make_call(
                 toolkit=toolkit,
                 schema=schema,
                 image_generation=image_generation,
+                web_search=web_search,
+                rules_file=rules_file,
             )
 
             bot = CustomChatbot()
@@ -198,6 +218,7 @@ async def service(
     room: Annotated[Optional[str], typer.Option()] = None,
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
+    rules_file: Optional[str] = None,
     toolkit: Annotated[
         List[str],
         typer.Option("--toolkit", "-t", help="the name or url of a required toolkit"),
@@ -221,6 +242,9 @@ async def service(
             ..., help="Enable computer use (requires computer-use-preview model)"
         ),
     ] = False,
+    web_search: Annotated[
+        Optional[bool], typer.Option(..., help="Enable web search tool calling")
+    ] = False,
     host: Annotated[Optional[str], typer.Option()] = None,
     port: Annotated[Optional[int], typer.Option()] = None,
     path: Annotated[str, typer.Option()] = "/agent",
@@ -240,7 +264,9 @@ async def service(
             rule=rule,
             toolkit=toolkit,
             schema=schema,
+            web_search=web_search,
             image_generation=image_generation,
+            rules_file=rules_file,
         ),
     )
 

meshagent/cli/cli.py

@@ -21,6 +21,7 @@ from meshagent.cli import call
 from meshagent.cli import cli_mcp
 from meshagent.cli import chatbot
 from meshagent.cli import voicebot
+from meshagent.cli import mailbot
 from meshagent.cli.exec import register as register_exec
 
 from meshagent.cli import otel
@@ -59,6 +60,7 @@ app.add_typer(queue.app, name="queue")
 app.add_typer(cli_mcp.app, name="mcp")
 app.add_typer(chatbot.app, name="chatbot")
 app.add_typer(voicebot.app, name="voicebot")
+app.add_typer(mailbot.app, name="mailbot")
 
 register_exec(app)
 

meshagent/cli/mailbot.py

@@ -0,0 +1,250 @@
+from meshagent.agents.mail import MailWorker
+
+import typer
+from meshagent.api import ParticipantToken
+from rich import print
+from typing import Annotated, Optional
+from meshagent.tools import Toolkit
+from meshagent.api import RoomClient, WebSocketClientProtocol
+from meshagent.api.helpers import meshagent_base_url, websocket_room_url
+from meshagent.cli import async_typer
+from meshagent.cli.helper import (
+    get_client,
+    resolve_project_id,
+    resolve_api_key,
+    resolve_token_jwt,
+    resolve_room,
+)
+from meshagent.openai import OpenAIResponsesAdapter
+from meshagent.openai.tools.responses_adapter import ImageGenerationTool, LocalShellTool
+from meshagent.api.services import ServiceHost
+
+from meshagent.agents.mail import room_address
+from typing import List
+from pathlib import Path
+
+from meshagent.api import RequiredToolkit, RequiredSchema
+from meshagent.openai.tools.responses_adapter import WebSearchTool
+
+app = async_typer.AsyncTyper()
+
+
+def build_mailbot(
+    *,
+    model: str,
+    agent_name: str,
+    rule: List[str],
+    toolkit: List[str],
+    schema: List[str],
+    image_generation: Optional[str] = None,
+    local_shell: bool,
+    computer_use: bool,
+    rules_file: Optional[str] = None,
+    web_search: Annotated[
+        Optional[bool], typer.Option(..., help="Enable web search tool calling")
+    ] = False,
+):
+    requirements = []
+
+    toolkits = []
+
+    for t in toolkit:
+        requirements.append(RequiredToolkit(name=t))
+
+    for t in schema:
+        requirements.append(RequiredSchema(name=t))
+
+    if rules_file is not None:
+        try:
+            with open(Path(rules_file).resolve(), "r") as f:
+                rule.extend(f.read().splitlines())
+        except FileNotFoundError:
+            print(f"[yellow]rules file not found at {rules_file}[/yellow]")
+
+    BaseClass = MailWorker
+    if computer_use:
+        raise ValueError("computer use is not yet supported for the mail agent")
+    else:
+        llm_adapter = OpenAIResponsesAdapter(model=model)
+
+    class CustomMailbot(BaseClass):
+        def __init__(self):
+            super().__init__(
+                llm_adapter=llm_adapter,
+                name=agent_name,
+                requires=requirements,
+                toolkits=toolkits,
+                rules=rule if len(rule) > 0 else None,
+            )
+
+        async def start(self, *, room: RoomClient):
+            parsed_token = ParticipantToken.from_jwt(
+                room.protocol.token, validate=False
+            )
+            print(
+                f"[bold green]Send an email interact with your mailbot: {room_address(project_id=parsed_token.project_id, room_name=room.room_name)}[/bold green]"
+            )
+            return await super().start(room=room)
+
+        async def get_thread_toolkits(self, *, thread_context):
+            toolkits = await super().get_thread_toolkits(thread_context=thread_context)
+
+            thread_toolkit = Toolkit(name="thread_toolkit", tools=[])
+
+            if local_shell:
+                thread_toolkit.tools.append(
+                    LocalShellTool(thread_context=thread_context)
+                )
+
+            if image_generation is not None:
+                print("adding openai image gen to thread", flush=True)
+                thread_toolkit.tools.append(
+                    ImageGenerationTool(
+                        model=image_generation,
+                        thread_context=thread_context,
+                        partial_images=3,
+                    )
+                )
+
+            if web_search:
+                thread_toolkit.tools.append(WebSearchTool())
+
+            toolkits.append(thread_toolkit)
+            return toolkits
+
+    return CustomMailbot
+
+
+@app.async_command("join")
+async def make_call(
+    *,
+    project_id: str = None,
+    room: Annotated[Optional[str], typer.Option()] = None,
+    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    role: str = "agent",
+    agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
+    token_path: Annotated[Optional[str], typer.Option()] = None,
+    rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
+    rules_file: Optional[str] = None,
+    toolkit: Annotated[
+        List[str],
+        typer.Option("--toolkit", "-t", help="the name or url of a required toolkit"),
+    ] = [],
+    schema: Annotated[
+        List[str],
+        typer.Option("--schema", "-s", help="the name or url of a required schema"),
+    ] = [],
+    model: Annotated[
+        str, typer.Option(..., help="Name of the LLM model to use for the chatbot")
+    ] = "gpt-4o",
+    local_shell: Annotated[
+        Optional[bool], typer.Option(..., help="Enable local shell tool calling")
+    ] = False,
+    web_search: Annotated[
+        Optional[bool], typer.Option(..., help="Enable web search tool calling")
+    ] = False,
+):
+    account_client = await get_client()
+    try:
+        project_id = await resolve_project_id(project_id=project_id)
+        api_key_id = await resolve_api_key(project_id, api_key_id)
+
+        room = resolve_room(room)
+        jwt = await resolve_token_jwt(
+            project_id=project_id,
+            api_key_id=api_key_id,
+            token_path=token_path,
+            name=agent_name,
+            role=role,
+            room=room,
+        )
+
+        print("[bold green]Connecting to room...[/bold green]", flush=True)
+        async with RoomClient(
+            protocol=WebSocketClientProtocol(
+                url=websocket_room_url(room_name=room, base_url=meshagent_base_url()),
+                token=jwt,
+            )
+        ) as client:
+            requirements = []
+
+            for t in toolkit:
+                requirements.append(RequiredToolkit(name=t))
+
+            for t in schema:
+                requirements.append(RequiredSchema(name=t))
+
+            CustomMailbot = build_mailbot(
+                computer_use=None,
+                model=model,
+                local_shell=local_shell,
+                agent_name=agent_name,
+                rule=rule,
+                toolkit=toolkit,
+                schema=schema,
+                image_generation=None,
+                web_search=web_search,
+                rules_file=rules_file,
+            )
+
+            bot = CustomMailbot()
+
+            await bot.start(room=client)
+            try:
+                print(
+                    flush=True,
+                )
+                await client.protocol.wait_for_close()
+            except KeyboardInterrupt:
+                await bot.stop()
+
+    finally:
+        await account_client.close()
+
+
+@app.async_command("service")
+async def service(
+    *,
+    room: Annotated[Optional[str], typer.Option()] = None,
+    agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
+    rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
+    rules_file: Optional[str] = None,
+    toolkit: Annotated[
+        List[str],
+        typer.Option("--toolkit", "-t", help="the name or url of a required toolkit"),
+    ] = [],
+    schema: Annotated[
+        List[str],
+        typer.Option("--schema", "-s", help="the name or url of a required schema"),
+    ] = [],
+    model: Annotated[
+        str, typer.Option(..., help="Name of the LLM model to use for the chatbot")
+    ] = "gpt-4o",
+    local_shell: Annotated[
+        Optional[bool], typer.Option(..., help="Enable local shell tool calling")
+    ] = False,
+    host: Annotated[Optional[str], typer.Option()] = None,
+    port: Annotated[Optional[int], typer.Option()] = None,
+    path: Annotated[str, typer.Option()] = "/agent",
+):
+    room = resolve_room(room)
+
+    print("[bold green]Connecting to room...[/bold green]", flush=True)
+
+    service = ServiceHost(host=host, port=port)
+    service.add_path(
+        path=path,
+        cls=build_mailbot(
+            computer_use=None,
+            model=model,
+            local_shell=local_shell,
+            agent_name=agent_name,
+            rule=rule,
+            toolkit=toolkit,
+            schema=schema,
+            image_generation=None,
+            rules_file=rules_file,
+        ),
+    )
+
+    await service.run()

meshagent/cli/projects.py

@@ -1,5 +1,6 @@
 import typer
 from rich import print
+from typing import Annotated
 from meshagent.cli import async_typer
 from meshagent.cli.helper import (
     get_client,
@@ -22,7 +23,16 @@ async def create(name: str):
 
 
 @app.async_command("list")
-async def list():
+async def list(
+    o: Annotated[
+        str,
+        typer.Option(
+            "--output",
+            "-o",
+            help="output format [json|table]",
+        ),
+    ] = "table",
+):
     client = await get_client()
     projects = await client.list_projects()
     active_project = await get_active_project()
@@ -30,7 +40,10 @@ async def list():
         if project["id"] == active_project:
             project["name"] = "*" + project["name"]
 
-    print_json_table(projects["projects"], "id", "name")
+    if o == "json":
+        print(projects)
+    else:
+        print_json_table(projects["projects"], "id", "name")
     await client.close()
 
 

meshagent/cli/version.py

@@ -1 +1 @@
-__version__ = "0.3.1"
+__version__ = "0.4.3"

meshagent/cli/voicebot.py

@@ -15,6 +15,7 @@ from typing import List
 
 from meshagent.api import RequiredToolkit, RequiredSchema
 from meshagent.api.services import ServiceHost
+from pathlib import Path
 
 try:
     from meshagent.livekit.agents.voice import VoiceBot
@@ -41,6 +42,7 @@ async def make_call(
     role: str = "agent",
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
+    rules_file: Optional[str] = None,
     toolkit: Annotated[
         List[str],
         typer.Option("--toolkit", "-t", help="the name or url of a required toolkit"),
@@ -68,6 +70,13 @@ async def make_call(
             room=room,
         )
 
+        if rules_file is not None:
+            try:
+                with open(Path(rules_file).resolve(), "r") as f:
+                    rule.extend(f.read().splitlines())
+            except FileNotFoundError:
+                print(f"[yellow]rules file not found at {rules_file}[/yellow]")
+
         print("[bold green]Connecting to room...[/bold green]", flush=True)
         async with RoomClient(
             protocol=WebSocketClientProtocol(
@@ -112,6 +121,7 @@ async def service(
     project_id: str = None,
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
+    rules_file: Optional[str] = None,
     toolkit: Annotated[
         List[str],
         typer.Option("--toolkit", "-t", help="the name or url of a required toolkit"),
@@ -134,6 +144,13 @@ async def service(
     for t in schema:
         requirements.append(RequiredSchema(name=t))
 
+    if rules_file is not None:
+        try:
+            with open(Path(rules_file).resolve(), "r") as f:
+                rule.extend(f.read().splitlines())
+        except FileNotFoundError:
+            print(f"[yellow]rules file not found at {rules_file}[/yellow]")
+
     service = ServiceHost(host=host, port=port)
 
     @service.path(path=path)

{meshagent_cli-0.3.1.dist-info → meshagent_cli-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.3.1
+Version: 0.4.3
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -10,12 +10,12 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: typer~=0.15
 Requires-Dist: pydantic-yaml~=1.4
-Requires-Dist: meshagent-api~=0.3.1
-Requires-Dist: meshagent-agents~=0.3.1
-Requires-Dist: meshagent-computers~=0.3.1
-Requires-Dist: meshagent-openai~=0.3.1
-Requires-Dist: meshagent-tools~=0.3.1
-Requires-Dist: meshagent-mcp~=0.3.1
+Requires-Dist: meshagent-api~=0.4.3
+Requires-Dist: meshagent-agents~=0.4.3
+Requires-Dist: meshagent-computers~=0.4.3
+Requires-Dist: meshagent-openai~=0.4.3
+Requires-Dist: meshagent-tools~=0.4.3
+Requires-Dist: meshagent-mcp~=0.4.3
 Requires-Dist: supabase~=2.15
 Requires-Dist: fastmcp~=2.8
 Requires-Dist: opentelemetry-distro~=0.54b1

{meshagent_cli-0.3.1.dist-info → meshagent_cli-0.4.3.dist-info}/RECORD

@@ -5,26 +5,27 @@ meshagent/cli/async_typer.py,sha256=GCeSefBDbpd-V4V8LrvHGUTBMth3HspVMfFa-HUZ0cg,
 meshagent/cli/auth.py,sha256=tPipbOtHnsrvJ-OUOE-lyfvvIhkTIGYlkgS81hLdyB8,783
 meshagent/cli/auth_async.py,sha256=mi2-u949M412PAMN-PCdHEiF9hGf0W3m1RAseZX07-w,4058
 meshagent/cli/call.py,sha256=aVRs-7QDZWxK8jYc71oACNIkHuoDe1KUyfl8EtUbj-0,5306
-meshagent/cli/chatbot.py,sha256=88EviswmakCEONA-ELAslYd1FAI8lCjIsvl6Bppzwwg,7910
-meshagent/cli/cli.py,sha256=DuTkcCLtMFlNdb69-SnFkIJFIFIcUJj4LAR4-jQvG8I,6447
+meshagent/cli/chatbot.py,sha256=eeQsO_94x34WyWER1H8LnutH6p4xnm3XL6SCeuoV1K0,8888
+meshagent/cli/cli.py,sha256=vxAIGcc_XF9X07PQYxgBK3vtHpWBUvILVEmZhCSbEns,6524
 meshagent/cli/cli_mcp.py,sha256=BTTAMn3u4i1uTDItFxmxMTsSAvFaWtdI3YdZngHz11g,10641
 meshagent/cli/cli_secrets.py,sha256=lkfR8tVjOA5KdynAhKCg5Z2EJkgrHFTX43pdB60YiU4,13767
 meshagent/cli/developer.py,sha256=JWz-qcduCbFopQ1DNGbwrknzFt59KBLIXx8DyD6PxZM,3081
 meshagent/cli/exec.py,sha256=H5_AOu5vic7ijFmRFotGj0WHf5t3jbEjZRCAp2-S3WQ,11551
 meshagent/cli/helper.py,sha256=gbd6Tvlp7CObPp3srWm-mbAe7tBD0iacg6PitGWJdtw,4874
+meshagent/cli/mailbot.py,sha256=y5kDGs-PDahxsfTdh8sUc0MRxxzNo653bTqVbQbOg5M,8145
 meshagent/cli/messaging.py,sha256=cr-oVAu_s8uEPUm3GELSq8yaVDnEWlt02D5V4KbA6wc,6437
 meshagent/cli/otel.py,sha256=1yoMGivskLV9f7M_LqCLKbttTTAPmFY5yhWXqFzvRN8,4066
 meshagent/cli/participant_token.py,sha256=N07hblRjj0zDKxl5CQXJjIMmft5s9mWgKZKz-VZyhKw,1400
-meshagent/cli/projects.py,sha256=WaO7M-D4ghy0nVpvwZ08ZEcybZ_e_cFe6rEoNxyAWkc,3306
+meshagent/cli/projects.py,sha256=yr2nPyUBepR4V52nInOyVsbsFMflHCiyoKq_JoFgMhc,3564
 meshagent/cli/queue.py,sha256=iCbFOFRvX5opeCL0YMk2d3l-4vDWIsi1joe0r2gQeMM,3820
 meshagent/cli/services.py,sha256=1afeMH41Kj0-1uAKB72buWnPFcgaqT4xFVO4FEpTPC0,19308
 meshagent/cli/sessions.py,sha256=MP7XhrtkUrealdpl8IKrTR3u9sjF15sG175-Y_m7nps,800
 meshagent/cli/storage.py,sha256=wtLKYFyfsErCePxCG962Xb--moCN-zj9uVCtRPhIpfA,35572
-meshagent/cli/version.py,sha256=r4xAFihOf72W9TD-lpMi6ntWSTKTP2SlzKP1ytkjRbI,22
-meshagent/cli/voicebot.py,sha256=Ykn9mUhcwl03ZCPDRua6moeNyrvToGPowQfjhPM0zqA,5032
+meshagent/cli/version.py,sha256=Nyg0pmk5ea9-SLCAFEIF96ByFx4-TJFtrqYPN-Zn6g4,22
+meshagent/cli/voicebot.py,sha256=eTPaw4yEIBgNclZxlH8aXv0GquKcUTpqBH9WUuKRwsg,5691
 meshagent/cli/webhook.py,sha256=r5zct-UBQYSq3BWmnZRrHVOEHVlkY0j8uDxGVn3Pbxo,2902
-meshagent_cli-0.3.1.dist-info/METADATA,sha256=jI_bsFT3Phi3SwMFZ6-CS4CCbk3AcOh7TitZoK1vnYk,1448
-meshagent_cli-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_cli-0.3.1.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
-meshagent_cli-0.3.1.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_cli-0.3.1.dist-info/RECORD,,
+meshagent_cli-0.4.3.dist-info/METADATA,sha256=5NFZ0_iXJbmtvKB-8g6xpBY8Oclv95b6eeaQDryBPMs,1448
+meshagent_cli-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_cli-0.4.3.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
+meshagent_cli-0.4.3.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_cli-0.4.3.dist-info/RECORD,,