meshagent-cli 0.0.34__tar.gz → 0.0.35__tar.gz

{meshagent_cli-0.0.34 → meshagent_cli-0.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.0.34
+Version: 0.0.35
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -8,14 +8,14 @@ Project-URL: Website, https://www.meshagent.com
 Project-URL: Source, https://www.meshagent.com
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: typer~=0.15.3
-Requires-Dist: pydantic-yaml~=1.4.0
-Requires-Dist: meshagent-api~=0.0.34
-Requires-Dist: meshagent-agents~=0.0.34
-Requires-Dist: meshagent-tools~=0.0.34
-Requires-Dist: meshagent-mcp~=0.0.34
-Requires-Dist: supabase~=2.15.1
-Requires-Dist: fastmcp~=2.8.1
+Requires-Dist: typer~=0.15
+Requires-Dist: pydantic-yaml~=1.4
+Requires-Dist: meshagent-api~=0.0.35
+Requires-Dist: meshagent-agents~=0.0.35
+Requires-Dist: meshagent-tools~=0.0.35
+Requires-Dist: meshagent-mcp~=0.0.35
+Requires-Dist: supabase~=2.15
+Requires-Dist: fastmcp~=2.8
 
 ### Meshagent CLI
 

{meshagent_cli-0.0.34 → meshagent_cli-0.0.35}/meshagent/cli/auth_async.py

@@ -58,7 +58,7 @@ async def _wait_for_code() -> str:
         return web.Response(status=400)
 
     app.add_routes([web.get("/callback", callback)])
-    runner = web.AppRunner(app)
+    runner = web.AppRunner(app, access_log=None)
     await runner.setup()
     site = web.TCPSite(runner, "localhost", REDIRECT_PORT)
     await site.start()

{meshagent_cli-0.0.34 → meshagent_cli-0.0.35}/meshagent/cli/chatbot.py

@@ -45,8 +45,10 @@ async def make_call(
         
         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=jwt)
+            protocol=WebSocketClientProtocol(
+                url=websocket_room_url(room_name=room, base_url=meshagent_base_url()),
+                token=jwt
+            )
         ) as client:
             
             requirements = []

meshagent_cli-0.0.35/meshagent/cli/cli.py

@@ -0,0 +1,189 @@
+import typer
+import asyncio
+from typing import Optional
+
+from meshagent.cli import auth
+from meshagent.cli import api_keys
+from meshagent.cli import projects
+from meshagent.cli import sessions
+from meshagent.cli import participant_token
+from meshagent.cli import agent
+from meshagent.cli import messaging
+from meshagent.cli import storage
+from meshagent.cli import developer
+from meshagent.cli import webhook
+from meshagent.cli import services
+from meshagent.cli import cli_secrets
+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 tty
+
+app = typer.Typer()
+app.add_typer(call.app, name="call")
+app.add_typer(auth.app, name="auth")
+app.add_typer(projects.app, name="project")
+app.add_typer(api_keys.app, name="api-key")
+app.add_typer(sessions.app, name="session")
+app.add_typer(participant_token.app, name="participant-token")
+app.add_typer(agent.app, name="agents")
+app.add_typer(messaging.app, name="messaging")
+app.add_typer(storage.app, name="storage")
+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(cli_mcp.app, name="mcp")
+app.add_typer(chatbot.app, name="chatbot")
+app.add_typer(voicebot.app, name="voicebot")
+app.add_typer(tty.app, name="tty")
+
+def _run_async(coro):
+    asyncio.run(coro)
+
+
+import os, sys
+from pathlib import Path
+import typer
+from meshagent.cli.helper import get_client, set_active_project, get_active_project, resolve_project_id, resolve_api_key
+
+
+def detect_shell() -> str:
+    """
+    Best-effort detection of the *current* interactive shell.
+
+    Order of preference
+    1. Explicit --shell argument (handled by Typer)
+    2. Per-shell env vars set by the running shell
+       • BASH_VERSION / ZSH_VERSION / FISH_VERSION
+    3. $SHELL on POSIX (user’s login shell – still correct >90 % of the time)
+    4. Parent process on Windows (COMSPEC → cmd / powershell)
+    5. Safe default: 'bash'
+    """
+    # Per-shell version variables (works even if login shell ≠ current shell)
+    for var, name in (
+        ("ZSH_VERSION", "zsh"),
+        ("BASH_VERSION", "bash"),
+        ("FISH_VERSION", "fish"),
+    ):
+        if var in os.environ:
+            return name
+
+    # POSIX fallback: login shell path
+    sh = os.environ.get("SHELL")
+    if sh:
+        return Path(sh).name.lower()
+
+    # Windows heuristics
+    if sys.platform == "win32":
+        comspec = Path(os.environ.get("COMSPEC", "")).name.lower()
+        if "powershell" in comspec:
+            return "powershell"
+        if "cmd" in comspec:
+            return "cmd"
+        return "powershell"  # sensible default on modern Windows
+
+    # Last-ditch default
+    return "bash"
+
+
+def _bash_like(name: str, value: str, unset: bool) -> str:
+    return f'unset {name}' if unset else f'export {name}="{value}"'
+
+
+def _fish(name: str, value: str, unset: bool) -> str:
+    return f'set -e {name}' if unset else f'set -gx {name} "{value}"'
+
+
+def _powershell(name: str, value: str, unset: bool) -> str:
+    return f'Remove-Item Env:{name}' if unset else f'$Env:{name}="{value}"'
+
+
+def _cmd(name: str, value: str, unset: bool) -> str:
+    return f'set {name}=' if unset else f'set {name}={value}'
+
+
+SHELL_RENDERERS = {
+    "bash": _bash_like,
+    "zsh": _bash_like,
+    "fish": _fish,
+    "powershell": _powershell,
+    "cmd": _cmd,
+}
+
+
+@app.command(
+    "env",
+    help="Generate commands to set meshagent environment variables.",
+)
+def env(
+    shell: Optional[str] = typer.Option(None,
+        "--shell",
+        case_sensitive=False,
+        help="bash | zsh | fish | powershell | cmd",
+    ),
+    unset: bool = typer.Option(
+        False, "--unset", help="Output commands to unset the variables."
+    ),
+):
+    """Print shell-specific exports/unsets for Docker environment variables."""
+    
+    async def command():
+        nonlocal shell, unset
+        shell = (shell or detect_shell()).lower()
+        if shell not in SHELL_RENDERERS:
+            typer.echo(f"Unsupported shell '{shell}'.", err=True)
+            raise typer.Exit(code=1)
+
+        client = await get_client()
+        try:
+            project_id = await resolve_project_id(project_id=None)
+            api_key_id = await resolve_api_key(project_id=project_id, api_key_id=None)
+
+            token = (await client.decrypt_project_api_key(project_id=project_id, id=api_key_id))["token"]
+        finally:
+            await client.close()
+
+        vars = {
+            "MESHAGENT_PROJECT_ID" : project_id,
+            "MESHAGENT_API_KEY" : api_key_id,
+            "MESHAGENT_SECRET" : token
+        }
+        if shell not in SHELL_RENDERERS:
+            typer.echo(f"Unsupported shell '{shell}'.", err=True)
+            raise typer.Exit(code=1)
+
+        render = SHELL_RENDERERS[shell]
+
+        for name, value in vars.items():
+            typer.echo(render(name, value, unset))
+
+        if not unset and shell in ("bash", "zsh"):
+            typer.echo(
+                '\n# Run this command to configure your current shell:\n'
+                f'# eval "$(meshagent env)"'
+            )
+    
+    _run_async(command())
+
+@app.command("setup")
+def setup_command():
+    """Perform initial login and project/api key activation."""
+
+    async def runner():
+        await auth.login()
+        print("Activate a project...")
+        project_id = await projects.activate(None, interactive=True)
+        if project_id is None:
+            print("You have choosen to not activate a project. Exiting.")
+        if project_id is not None:
+            print("Activate an api-key...")
+            api_key_id = await api_keys.activate(None, interactive=True)
+            if api_key_id is None:
+                print("You have choosen to not activate an api-key. Exiting.")
+
+    _run_async(runner())
+
+if __name__ == "__main__":
+    app()

{meshagent_cli-0.0.34 → meshagent_cli-0.0.35}/meshagent/cli/tty.py

@@ -2,6 +2,7 @@ import pathlib
 import sys
 import tty
 import termios
+from meshagent.api.helpers import websocket_room_url
 from typing import Annotated, Optional
 
 import asyncio
@@ -46,10 +47,9 @@ async def tty_command(
         )
 
         token.add_role_grant(role="user")
-
         token.add_room_grant(room)
 
-        ws_url = f"{os.getenv("MESHAGENT_API_URL").replace("http","ws",1)}/rooms/{room}/tty?token={token.to_jwt(token=key)}"
+        ws_url = websocket_room_url(room_name=room)+"/tty?token={token.to_jwt(token=key)}"
 
         print(f"[bold green]Connecting to[/bold green] {room}")
 

meshagent_cli-0.0.35/meshagent/cli/version.py

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

{meshagent_cli-0.0.34 → meshagent_cli-0.0.35}/meshagent_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.0.34
+Version: 0.0.35
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -8,14 +8,14 @@ Project-URL: Website, https://www.meshagent.com
 Project-URL: Source, https://www.meshagent.com
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: typer~=0.15.3
-Requires-Dist: pydantic-yaml~=1.4.0
-Requires-Dist: meshagent-api~=0.0.34
-Requires-Dist: meshagent-agents~=0.0.34
-Requires-Dist: meshagent-tools~=0.0.34
-Requires-Dist: meshagent-mcp~=0.0.34
-Requires-Dist: supabase~=2.15.1
-Requires-Dist: fastmcp~=2.8.1
+Requires-Dist: typer~=0.15
+Requires-Dist: pydantic-yaml~=1.4
+Requires-Dist: meshagent-api~=0.0.35
+Requires-Dist: meshagent-agents~=0.0.35
+Requires-Dist: meshagent-tools~=0.0.35
+Requires-Dist: meshagent-mcp~=0.0.35
+Requires-Dist: supabase~=2.15
+Requires-Dist: fastmcp~=2.8
 
 ### Meshagent CLI
 

meshagent_cli-0.0.35/meshagent_cli.egg-info/requires.txt

@@ -0,0 +1,8 @@
+typer~=0.15
+pydantic-yaml~=1.4
+meshagent-api~=0.0.35
+meshagent-agents~=0.0.35
+meshagent-tools~=0.0.35
+meshagent-mcp~=0.0.35
+supabase~=2.15
+fastmcp~=2.8

{meshagent_cli-0.0.34 → meshagent_cli-0.0.35}/pyproject.toml

@@ -9,14 +9,14 @@ requires-python = ">=3.12"
 license = "Apache-2.0"
 keywords = []
 dependencies = [
-  "typer~=0.15.3",
-  "pydantic-yaml~=1.4.0",
-  "meshagent-api~=0.0.34",
-  "meshagent-agents~=0.0.34",
-  "meshagent-tools~=0.0.34",
-  "meshagent-mcp~=0.0.34",
-  "supabase~=2.15.1",
-  "fastmcp~=2.8.1"
+  "typer~=0.15",
+  "pydantic-yaml~=1.4",
+  "meshagent-api~=0.0.35",
+  "meshagent-agents~=0.0.35",
+  "meshagent-tools~=0.0.35",
+  "meshagent-mcp~=0.0.35",
+  "supabase~=2.15",
+  "fastmcp~=2.8"
 ]
 dynamic = ["version", "readme"]
 

meshagent_cli-0.0.34/meshagent/cli/cli.py

@@ -1,63 +0,0 @@
-import typer
-import asyncio
-
-from meshagent.cli import auth
-from meshagent.cli import api_keys
-from meshagent.cli import projects
-from meshagent.cli import sessions
-from meshagent.cli import participant_token
-from meshagent.cli import agent
-from meshagent.cli import messaging
-from meshagent.cli import storage
-from meshagent.cli import developer
-from meshagent.cli import webhook
-from meshagent.cli import services
-from meshagent.cli import cli_secrets
-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 tty
-
-app = typer.Typer()
-app.add_typer(call.app, name="call")
-app.add_typer(auth.app, name="auth")
-app.add_typer(projects.app, name="project")
-app.add_typer(api_keys.app, name="api-key")
-app.add_typer(sessions.app, name="session")
-app.add_typer(participant_token.app, name="participant-token")
-app.add_typer(agent.app, name="agents")
-app.add_typer(messaging.app, name="messaging")
-app.add_typer(storage.app, name="storage")
-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(cli_mcp.app, name="mcp")
-app.add_typer(chatbot.app, name="chatbot")
-app.add_typer(voicebot.app, name="voicebot")
-app.add_typer(tty.app, name="tty")
-
-def _run_async(coro):
-    asyncio.run(coro)
-
-@app.command("setup")
-def setup_command():
-    """Perform initial login and project/api key activation."""
-
-    async def runner():
-        await auth.login()
-        print("Activate a project...")
-        project_id = await projects.activate(None, interactive=True)
-        if project_id is None:
-            print("You have choosen to not activate a project. Exiting.")
-        if project_id is not None:
-            print("Activate an api-key...")
-            api_key_id = await api_keys.activate(None, interactive=True)
-            if api_key_id is None:
-                print("You have choosen to not activate an api-key. Exiting.")
-
-    _run_async(runner())
-
-if __name__ == "__main__":
-    app()

meshagent_cli-0.0.34/meshagent/cli/version.py

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

meshagent_cli-0.0.34/meshagent_cli.egg-info/requires.txt

@@ -1,8 +0,0 @@
-typer~=0.15.3
-pydantic-yaml~=1.4.0
-meshagent-api~=0.0.34
-meshagent-agents~=0.0.34
-meshagent-tools~=0.0.34
-meshagent-mcp~=0.0.34
-supabase~=2.15.1
-fastmcp~=2.8.1