meshagent-cli 0.0.37__py3-none-any.whl → 0.0.38__py3-none-any.whl

meshagent/cli/services.py

@@ -6,13 +6,24 @@ from rich import print
 from typing import Annotated, List, Optional, Dict
 from aiohttp import ClientResponseError
 from datetime import datetime, timezone
-from pydantic_yaml import parse_yaml_raw_as, to_yaml_str
 from pydantic import PositiveInt
 import pydantic
 from typing import Literal
 from meshagent.cli import async_typer
-from meshagent.cli.helper import get_client, print_json_table, resolve_project_id, resolve_api_key
-from meshagent.api import ParticipantToken, RoomClient, WebSocketClientProtocol, websocket_protocol, websocket_room_url, meshagent_base_url
+from meshagent.cli.helper import (
+    get_client,
+    print_json_table,
+    resolve_project_id,
+    resolve_api_key,
+)
+from meshagent.api import (
+    ParticipantToken,
+    RoomClient,
+    WebSocketClientProtocol,
+    websocket_room_url,
+    meshagent_base_url,
+)
+
 # Pydantic basemodels
 from meshagent.api.accounts_client import Service, Port, Services
 
@@ -57,7 +68,9 @@ def _parse_port_spec(spec: str) -> PortSpec:
     kv: Dict[str, str] = {}
     for t in tokens:
         if "=" not in t:
-            raise typer.BadParameter(f"expected num=PORT_NUMBER type=meshagent.callable|mcp.sse liveness=OPTIONAL_PATH, got '{t}'")
+            raise typer.BadParameter(
+                f"expected num=PORT_NUMBER type=meshagent.callable|mcp.sse liveness=OPTIONAL_PATH, got '{t}'"
+            )
         k, v = t.split("=", 1)
         kv[k] = v
     try:
@@ -159,7 +172,12 @@ async def service_test(
     *,
     project_id: str = None,
     api_key_id: Annotated[Optional[str], typer.Option()] = None,
-    room: Annotated[str, typer.Option(help="A room name to test the service in (must not be currently running)")],
+    room: Annotated[
+        str,
+        typer.Option(
+            help="A room name to test the service in (must not be currently running)"
+        ),
+    ],
     name: Annotated[str, typer.Option(help="Friendly service name")],
     role: Annotated[str, typer.Option(help="Service role (agent|tool)")] = None,
     image: Annotated[str, typer.Option(help="Container image reference")],
@@ -191,11 +209,11 @@ async def service_test(
     ] = ...,
     timeout: Annotated[
         Optional[int],
-        typer.Option("--timeout", help="The maximum time that this room should run (default 1hr)"),
+        typer.Option(
+            "--timeout", help="The maximum time that this room should run (default 1hr)"
+        ),
     ] = None,
 ):
-    
-
     """Create a service attached to the project."""
     my_client = await get_client()
     try:
@@ -233,45 +251,45 @@ async def service_test(
 
         try:
             token = ParticipantToken(
-                name=name,
-                project_id=project_id,
-                api_key_id=api_key_id
+                name=name, project_id=project_id, api_key_id=api_key_id
             )
             token.add_role_grant("user")
             token.add_room_grant(room)
             token.extra_payload = {
-                "max_runtime_seconds" : timeout, # run for 1 hr max
-                "meshagent_dev_services" : [
-                    service_obj.model_dump(mode="json")
-                ]
+                "max_runtime_seconds": timeout,  # run for 1 hr max
+                "meshagent_dev_services": [service_obj.model_dump(mode="json")],
             }
-            
+
             print("[bold green]Connecting to room...[/bold green]")
 
-            key = (await my_client.decrypt_project_api_key(project_id=project_id, id=api_key_id))["token"]
+            key = (
+                await my_client.decrypt_project_api_key(
+                    project_id=project_id, id=api_key_id
+                )
+            )["token"]
 
             async with RoomClient(
                 protocol=WebSocketClientProtocol(
-                    url=websocket_room_url(room_name=room, base_url=meshagent_base_url()),
-                    token=token.to_jwt(token=key)
+                    url=websocket_room_url(
+                        room_name=room, base_url=meshagent_base_url()
+                    ),
+                    token=token.to_jwt(token=key),
                 )
             ) as client:
-                
-                print(f"[green]Your test room '{room}' has been started. It will time out after a few minutes if you do not join it.[/green]")
+                print(
+                    f"[green]Your test room '{client.room_name}' has been started. It will time out after a few minutes if you do not join it.[/green]"
+                )
 
-            
         except ClientResponseError as exc:
             if exc.status == 409:
                 print(f"[red]Room already in use: {room}[/red]")
                 raise typer.Exit(code=1)
             raise
 
-    
     finally:
         await my_client.close()
 
 
-
 @app.async_command("show")
 async def service_show(
     *,
@@ -291,7 +309,13 @@ async def service_show(
 
 
 @app.async_command("list")
-async def service_list(*, project_id: str = None, o: Annotated[str, typer.Option(help="output format [json|table]")]):
+async def service_list(
+    *,
+    project_id: str = None,
+    o: Annotated[
+        str, typer.Option("--output", "-o", help="output format [json|table]")
+    ] = "table",
+):
     """List all services for the project."""
     client = await get_client()
     try:
@@ -304,10 +328,7 @@ async def service_list(*, project_id: str = None, o: Annotated[str, typer.Option
             print(Services(services=services).model_dump_json(indent=2))
         else:
             print_json_table(
-                [svc.model_dump(mode="json") for svc in services],
-                "id",
-                "name",
-                "image"
+                [svc.model_dump(mode="json") for svc in services], "id", "name", "image"
             )
     finally:
         await client.close()

meshagent/cli/sessions.py

@@ -1,12 +1,15 @@
 from meshagent.cli import async_typer
-from meshagent.cli.helper import get_client, print_json_table, set_active_project, resolve_project_id
+from meshagent.cli.helper import get_client, print_json_table, resolve_project_id
 
 app = async_typer.AsyncTyper()
 
+
 @app.async_command("list")
 async def list(*, project_id: str = None):
     client = await get_client()
-    sessions = await client.list_recent_sessions(project_id=await resolve_project_id(project_id=project_id))
+    sessions = await client.list_recent_sessions(
+        project_id=await resolve_project_id(project_id=project_id)
+    )
     print_json_table(sessions["sessions"])
     await client.close()
 
@@ -14,6 +17,9 @@ async def list(*, project_id: str = None):
 @app.async_command("show")
 async def show(*, project_id: str = None, session_id: str):
     client = await get_client()
-    events = await client.list_session_events(project_id=await resolve_project_id(project_id=project_id), session_id=session_id)
+    events = await client.list_session_events(
+        project_id=await resolve_project_id(project_id=project_id),
+        session_id=session_id,
+    )
     print_json_table(events["events"], "type", "data")
     await client.close()