meshagent-cli 0.2.0__tar.gz → 0.3.0__tar.gz

{meshagent_cli-0.2.0 → meshagent_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.2.0
+Version: 0.3.0
 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.2.0
-Requires-Dist: meshagent-agents~=0.2.0
-Requires-Dist: meshagent-computers~=0.2.0
-Requires-Dist: meshagent-openai~=0.2.0
-Requires-Dist: meshagent-tools~=0.2.0
-Requires-Dist: meshagent-mcp~=0.2.0
+Requires-Dist: meshagent-api~=0.3.0
+Requires-Dist: meshagent-agents~=0.3.0
+Requires-Dist: meshagent-computers~=0.3.0
+Requires-Dist: meshagent-openai~=0.3.0
+Requires-Dist: meshagent-tools~=0.3.0
+Requires-Dist: meshagent-mcp~=0.3.0
 Requires-Dist: supabase~=2.15
 Requires-Dist: fastmcp~=2.8
 Requires-Dist: opentelemetry-distro~=0.54b1

{meshagent_cli-0.2.0 → meshagent_cli-0.3.0}/meshagent/cli/chatbot.py

@@ -14,10 +14,12 @@ from meshagent.cli.helper import (
 )
 from meshagent.agents.chat import ChatBot
 from meshagent.openai import OpenAIResponsesAdapter
-from meshagent.openai.tools.responses_adapter import LocalShellTool
 from meshagent.api.services import ServiceHost
 from meshagent.computers.agent import ComputerAgent
-from meshagent.agents.chat import ChatBotThreadOpenAIImageGenerationTool
+from meshagent.agents.chat import (
+    ChatBotThreadOpenAIImageGenerationTool,
+    ChatBotThreadLocalShellTool,
+)
 
 from typing import List
 
@@ -79,7 +81,9 @@ def build_chatbot(
             thread_toolkit = Toolkit(name="thread_toolkit", tools=[])
 
             if local_shell:
-                thread_toolkit.tools.append(LocalShellTool())
+                thread_toolkit.tools.append(
+                    ChatBotThreadLocalShellTool(thread_context=thread_context)
+                )
 
             if image_generation is not None:
                 print("adding openai image gen to thread", flush=True)
@@ -103,7 +107,6 @@ async def make_call(
     project_id: str = None,
     room: Annotated[Optional[str], typer.Option()] = None,
     api_key_id: Annotated[Optional[str], typer.Option()] = None,
-    name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "agent",
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     token_path: Annotated[Optional[str], typer.Option()] = None,
@@ -142,7 +145,7 @@ async def make_call(
             project_id=project_id,
             api_key_id=api_key_id,
             token_path=token_path,
-            name=name,
+            name=agent_name,
             role=role,
             room=room,
         )

{meshagent_cli-0.2.0 → meshagent_cli-0.3.0}/meshagent/cli/cli.py

@@ -4,6 +4,7 @@ from typing import Optional
 
 from meshagent.cli import async_typer
 
+from meshagent.cli import queue
 from meshagent.cli import auth
 from meshagent.cli import api_keys
 from meshagent.cli import projects
@@ -54,6 +55,7 @@ app.add_typer(developer.app, name="developer")
 app.add_typer(webhook.app, name="webhook")
 app.add_typer(services.app, name="service")
 app.add_typer(cli_secrets.app, name="secret")
+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")

{meshagent_cli-0.2.0 → meshagent_cli-0.3.0}/meshagent/cli/exec.py

@@ -37,6 +37,7 @@ def register(app: typer.Typer):
         api_key_id: Annotated[Optional[str], typer.Option()] = None,
         command: Annotated[list[str], typer.Argument(...)] = None,
         tty: bool = False,
+        room_storage_path: str = "/data",
     ):
         """Open an interactive websocket‑based TTY."""
         client = await get_client()
@@ -73,6 +74,11 @@ def register(app: typer.Typer):
             if command and len(command) != 0:
                 ws_url += f"&command={quote(' '.join(command))}"
 
+            if room_storage_path:
+                room_storage_path += (
+                    f"&room_storage_path={quote(' '.join(room_storage_path))}"
+                )
+
             if tty:
                 if not sys.stdin.isatty():
                     print("[red]TTY requested but process is not a TTY[/red]")

meshagent_cli-0.3.0/meshagent/cli/queue.py

@@ -0,0 +1,119 @@
+import typer
+from rich import print
+from typing import Annotated, Optional
+import json as _json
+
+from meshagent.api.helpers import meshagent_base_url, websocket_room_url
+from meshagent.api import (
+    RoomClient,
+    ParticipantToken,
+    WebSocketClientProtocol,
+    RoomException,
+)
+from meshagent.cli.helper import resolve_project_id, resolve_api_key
+from meshagent.cli import async_typer
+from meshagent.cli.helper import get_client
+
+app = async_typer.AsyncTyper()
+
+
+@app.async_command("send")
+async def send(
+    *,
+    project_id: str = None,
+    room: Annotated[str, typer.Option()],
+    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
+    role: str = "user",
+    queue: Annotated[str, typer.Option(..., help="Queue name")],
+    json: Optional[str] = typer.Option(..., help="a JSON message to send to the queue"),
+    file: Annotated[
+        Optional[str],
+        typer.Option("--file", "-f", help="File path to a JSON file"),
+    ] = None,
+):
+    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)
+
+        key = (
+            await account_client.decrypt_project_api_key(
+                project_id=project_id, id=api_key_id
+            )
+        )["token"]
+
+        token = ParticipantToken(
+            name=name, project_id=project_id, api_key_id=api_key_id
+        )
+
+        token.add_role_grant(role=role)
+        token.add_room_grant(room)
+
+        print("[bold green]Connecting to room...[/bold green]")
+        async with RoomClient(
+            protocol=WebSocketClientProtocol(
+                url=websocket_room_url(room_name=room, base_url=meshagent_base_url()),
+                token=token.to_jwt(token=key),
+            )
+        ) as client:
+            if file is not None:
+                with open(file, "rb") as f:
+                    message = f.read()
+            else:
+                message = _json.loads(json)
+
+            await client.queues.send(name=queue, message=message)
+
+    except RoomException as e:
+        print(f"[red]{e}[/red]")
+    finally:
+        await account_client.close()
+
+
+@app.async_command("receive")
+async def receive(
+    *,
+    project_id: str = None,
+    room: Annotated[str, typer.Option()],
+    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
+    role: str = "user",
+    queue: Annotated[str, typer.Option(..., help="Queue name")],
+):
+    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)
+
+        key = (
+            await account_client.decrypt_project_api_key(
+                project_id=project_id, id=api_key_id
+            )
+        )["token"]
+
+        token = ParticipantToken(
+            name=name, project_id=project_id, api_key_id=api_key_id
+        )
+
+        token.add_role_grant(role=role)
+        token.add_room_grant(room)
+
+        async with RoomClient(
+            protocol=WebSocketClientProtocol(
+                url=websocket_room_url(room_name=room, base_url=meshagent_base_url()),
+                token=token.to_jwt(token=key),
+            )
+        ) as client:
+            response = await client.queues.receive(name=queue, wait=False)
+            if response is None:
+                print("[bold yellow]Queue did not contain any messages.[/bold yellow]")
+                raise typer.Exit(1)
+            else:
+                print(response)
+
+    except RoomException as e:
+        print(f"[red]{e}[/red]")
+        raise typer.Exit(1)
+    finally:
+        await account_client.close()

meshagent_cli-0.3.0/meshagent/cli/version.py

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

{meshagent_cli-0.2.0 → meshagent_cli-0.3.0}/meshagent_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.2.0
+Version: 0.3.0
 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.2.0
-Requires-Dist: meshagent-agents~=0.2.0
-Requires-Dist: meshagent-computers~=0.2.0
-Requires-Dist: meshagent-openai~=0.2.0
-Requires-Dist: meshagent-tools~=0.2.0
-Requires-Dist: meshagent-mcp~=0.2.0
+Requires-Dist: meshagent-api~=0.3.0
+Requires-Dist: meshagent-agents~=0.3.0
+Requires-Dist: meshagent-computers~=0.3.0
+Requires-Dist: meshagent-openai~=0.3.0
+Requires-Dist: meshagent-tools~=0.3.0
+Requires-Dist: meshagent-mcp~=0.3.0
 Requires-Dist: supabase~=2.15
 Requires-Dist: fastmcp~=2.8
 Requires-Dist: opentelemetry-distro~=0.54b1

{meshagent_cli-0.2.0 → meshagent_cli-0.3.0}/meshagent_cli.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ meshagent/cli/messaging.py
 meshagent/cli/otel.py
 meshagent/cli/participant_token.py
 meshagent/cli/projects.py
+meshagent/cli/queue.py
 meshagent/cli/services.py
 meshagent/cli/sessions.py
 meshagent/cli/storage.py

{meshagent_cli-0.2.0 → meshagent_cli-0.3.0}/meshagent_cli.egg-info/requires.txt

@@ -1,11 +1,11 @@
 typer~=0.15
 pydantic-yaml~=1.4
-meshagent-api~=0.2.0
-meshagent-agents~=0.2.0
-meshagent-computers~=0.2.0
-meshagent-openai~=0.2.0
-meshagent-tools~=0.2.0
-meshagent-mcp~=0.2.0
+meshagent-api~=0.3.0
+meshagent-agents~=0.3.0
+meshagent-computers~=0.3.0
+meshagent-openai~=0.3.0
+meshagent-tools~=0.3.0
+meshagent-mcp~=0.3.0
 supabase~=2.15
 fastmcp~=2.8
 opentelemetry-distro~=0.54b1

{meshagent_cli-0.2.0 → meshagent_cli-0.3.0}/pyproject.toml

@@ -11,12 +11,12 @@ keywords = []
 dependencies = [
   "typer~=0.15",
   "pydantic-yaml~=1.4",
-  "meshagent-api~=0.2.0",
-  "meshagent-agents~=0.2.0",
-  "meshagent-computers~=0.2.0",
-  "meshagent-openai~=0.2.0",
-  "meshagent-tools~=0.2.0",
-  "meshagent-mcp~=0.2.0",
+  "meshagent-api~=0.3.0",
+  "meshagent-agents~=0.3.0",
+  "meshagent-computers~=0.3.0",
+  "meshagent-openai~=0.3.0",
+  "meshagent-tools~=0.3.0",
+  "meshagent-mcp~=0.3.0",
   "supabase~=2.15",
   "fastmcp~=2.8",
   "opentelemetry-distro~=0.54b1",

meshagent_cli-0.2.0/meshagent/cli/version.py

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