meshagent-cli 0.7.0__py3-none-any.whl → 0.21.0__py3-none-any.whl

meshagent/cli/services.py

@@ -40,22 +40,21 @@ from pydantic_yaml import parse_yaml_raw_as
 
 from meshagent.cli.call import _make_call
 
+
 app = async_typer.AsyncTyper(help="Manage services for your project")
 
 
 @app.async_command("create")
 async def service_create(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     file: Annotated[
         str,
         typer.Option("--file", "-f", help="File path to a service definition"),
     ],
     room: Annotated[
         Optional[str],
-        typer.Option(
-            "--room", "-r", help="The name of a room to create the service for"
-        ),
+        typer.Option("--room", help="The name of a room to create the service for"),
     ] = None,
 ):
     """Create a service attached to the project."""
@@ -94,7 +93,7 @@ async def service_create(
 @app.async_command("update")
 async def service_update(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     id: Optional[str] = None,
     file: Annotated[
         str,
@@ -108,9 +107,7 @@ async def service_update(
     ] = False,
     room: Annotated[
         Optional[str],
-        typer.Option(
-            "--room", "-r", help="The name of a room to update the service for"
-        ),
+        typer.Option("--room", help="The name of a room to update the service for"),
     ] = None,
 ):
     """Create a service attached to the project."""
@@ -179,7 +176,7 @@ async def service_update(
 @app.async_command("run")
 async def service_run(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     command: str,
     port: Annotated[
         int,
@@ -238,11 +235,26 @@ async def service_run(
             run_tasks = []
 
             async def run_service(port: int):
-                code, output = await _run_process(
-                    cmd=shlex.split("python3 " + command),
-                    log=True,
-                    env={**os.environ, "MESHAGENT_PORT": str(port)},
-                )
+                if command.endswith(".py"):
+                    code, output = await _run_process(
+                        cmd=shlex.split("python3 " + command),
+                        log=True,
+                        env={**os.environ, "MESHAGENT_PORT": str(port)},
+                    )
+
+                elif command.endswith(".dart"):
+                    code, output = await _run_process(
+                        cmd=shlex.split("dart run " + command),
+                        log=True,
+                        env={**os.environ, "MESHAGENT_PORT": str(port)},
+                    )
+
+                else:
+                    code, output = await _run_process(
+                        cmd=shlex.split(command),
+                        log=True,
+                        env={**os.environ, "MESHAGENT_PORT": str(port)},
+                    )
 
                 if code != 0:
                     print(f"[red]{output}[/red]")
@@ -274,6 +286,7 @@ async def service_run(
                             print("[red]unable to read service spec[/red]")
                             raise typer.Exit(-1)
 
+            print(f"getting spec {port}", flush=True)
             spec = await get_spec(port)
 
             sys.stdout.write("\n")
@@ -319,7 +332,7 @@ async def service_run(
 @app.async_command("show")
 async def service_show(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     service_id: Annotated[str, typer.Argument(help="ID of the service to show")],
 ):
     """Show a services for the project."""
@@ -337,13 +350,11 @@ async def service_show(
 @app.async_command("list")
 async def service_list(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     o: OutputFormatOption = "table",
     room: Annotated[
         Optional[str],
-        typer.Option(
-            "--room", "-r", help="The name of a room to list the services for"
-        ),
+        typer.Option("--room", help="The name of a room to list the services for"),
     ] = None,
 ):
     """List all services for the project."""
@@ -385,13 +396,11 @@ async def service_list(
 @app.async_command("delete")
 async def service_delete(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     service_id: Annotated[str, typer.Argument(help="ID of the service to delete")],
     room: Annotated[
         Optional[str],
-        typer.Option(
-            "--room", "-r", help="The name of a room to delete the service for"
-        ),
+        typer.Option("--room", help="The name of a room to delete the service for"),
     ] = None,
 ):
     """Delete a service."""

meshagent/cli/sessions.py

@@ -2,11 +2,11 @@ from meshagent.cli import async_typer
 from meshagent.cli.helper import get_client, print_json_table, resolve_project_id
 from meshagent.cli.common_options import ProjectIdOption
 
-app = async_typer.AsyncTyper()
+app = async_typer.AsyncTyper(help="Inspect recent sessions and events")
 
 
-@app.async_command("list")
-async def list(*, project_id: ProjectIdOption = None):
+@app.async_command("list", help="List recent sessions")
+async def list(*, project_id: ProjectIdOption):
     client = await get_client()
     sessions = await client.list_recent_sessions(
         project_id=await resolve_project_id(project_id=project_id)
@@ -15,8 +15,8 @@ async def list(*, project_id: ProjectIdOption = None):
     await client.close()
 
 
-@app.async_command("show")
-async def show(*, project_id: ProjectIdOption = None, session_id: str):
+@app.async_command("show", help="Show events for a session")
+async def show(*, project_id: ProjectIdOption, session_id: str):
     client = await get_client()
     events = await client.list_session_events(
         project_id=await resolve_project_id(project_id=project_id),

meshagent/cli/storage.py

@@ -55,7 +55,7 @@ def split_glob_subpath(subpath: str):
 @app.async_command("exists")
 async def storage_exists_command(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     room: RoomOption,
     path: str,
 ):
@@ -89,7 +89,7 @@ async def storage_exists_command(
 @app.async_command("cp")
 async def storage_cp_command(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     room: RoomOption,
     source_path: str,
     dest_path: str,
@@ -322,7 +322,7 @@ async def storage_cp_command(
 @app.async_command("show")
 async def storage_show_command(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     room: RoomOption,
     path: str,
     encoding: Annotated[
@@ -395,7 +395,7 @@ async def storage_show_command(
 @app.async_command("rm")
 async def storage_rm_command(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     room: RoomOption,
     path: str,
     recursive: Annotated[
@@ -599,7 +599,7 @@ async def storage_rm_command(
 @app.async_command("ls")
 async def storage_ls_command(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     room: RoomOption,
     path: Annotated[
         str, typer.Argument(..., help="Path to list (local or room://...)")