meshagent-cli 0.46.0__tar.gz → 0.46.2__tar.gz

{meshagent_cli-0.46.0 → meshagent_cli-0.46.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.46.0
+Version: 0.46.2
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -22,8 +22,8 @@ Requires-Dist: openpyxl~=3.1
 Requires-Dist: xlsxwriter~=3.2
 Requires-Dist: pathspec<2,>=1.0.3
 Requires-Dist: zstandard~=0.25.0
-Requires-Dist: meshagent-llm-proxy==0.46.0
-Requires-Dist: meshagent-codex==0.46.0
+Requires-Dist: meshagent-llm-proxy==0.46.2
+Requires-Dist: meshagent-codex==0.46.2
 Requires-Dist: rich~=14.3.0
 Requires-Dist: sounddevice~=0.5
 Requires-Dist: textual<9.0,>=8.2.3
@@ -32,23 +32,23 @@ Requires-Dist: prompt-toolkit~=3.0.52
 Requires-Dist: ascii-magic~=2.3
 Requires-Dist: pillow~=11.3.0
 Provides-Extra: all
-Requires-Dist: meshagent-agents[all]==0.46.0; extra == "all"
-Requires-Dist: meshagent-api[all]==0.46.0; extra == "all"
-Requires-Dist: meshagent-commoncrawl==0.46.0; extra == "all"
-Requires-Dist: meshagent-scrapy==0.46.0; extra == "all"
-Requires-Dist: meshagent-computers==0.46.0; extra == "all"
-Requires-Dist: meshagent-openai==0.46.0; extra == "all"
-Requires-Dist: meshagent-anthropic==0.46.0; extra == "all"
-Requires-Dist: meshagent-otel==0.46.0; extra == "all"
-Requires-Dist: meshagent-mcp==0.46.0; extra == "all"
-Requires-Dist: meshagent-tools==0.46.0; extra == "all"
+Requires-Dist: meshagent-agents[all]==0.46.2; extra == "all"
+Requires-Dist: meshagent-api[all]==0.46.2; extra == "all"
+Requires-Dist: meshagent-commoncrawl==0.46.2; extra == "all"
+Requires-Dist: meshagent-scrapy==0.46.2; extra == "all"
+Requires-Dist: meshagent-computers==0.46.2; extra == "all"
+Requires-Dist: meshagent-openai==0.46.2; extra == "all"
+Requires-Dist: meshagent-anthropic==0.46.2; extra == "all"
+Requires-Dist: meshagent-otel==0.46.2; extra == "all"
+Requires-Dist: meshagent-mcp==0.46.2; extra == "all"
+Requires-Dist: meshagent-tools==0.46.2; extra == "all"
 Requires-Dist: supabase-auth~=2.28.0; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0.52; extra == "all"
 Provides-Extra: mcp-service
-Requires-Dist: meshagent-agents[all]==0.46.0; extra == "mcp-service"
-Requires-Dist: meshagent-api==0.46.0; extra == "mcp-service"
-Requires-Dist: meshagent-mcp==0.46.0; extra == "mcp-service"
-Requires-Dist: meshagent-tools==0.46.0; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]==0.46.2; extra == "mcp-service"
+Requires-Dist: meshagent-api==0.46.2; extra == "mcp-service"
+Requires-Dist: meshagent-mcp==0.46.2; extra == "mcp-service"
+Requires-Dist: meshagent-tools==0.46.2; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 Dynamic: license-file
 

{meshagent_cli-0.46.0 → meshagent_cli-0.46.2}/meshagent/cli/agents.py

@@ -609,9 +609,7 @@ async def agent_list_command(
         project_id = await resolve_project_id(project_id=project_id)
         agents = await account_client.list_agents(
             project_id=project_id,
-            limit=limit if limit is not None else count,
-            offset=offset,
-            order_by=order_by,
+            page_size=limit if limit is not None else count,
             filter=filter,
         )
         output = [

{meshagent_cli-0.46.0 → meshagent_cli-0.46.2}/meshagent/cli/agents_test.py

@@ -64,17 +64,13 @@ class _FakeAgentClient:
         self,
         *,
         project_id: str,
-        limit: int,
-        offset: int,
-        order_by: str,
+        page_size: int,
         filter: str | None = None,
     ) -> list[ManagedAgent]:
         self.list_agents_calls.append(
             {
                 "project_id": project_id,
-                "limit": limit,
-                "offset": offset,
-                "order_by": order_by,
+                "page_size": page_size,
                 "filter": filter,
             }
         )
@@ -269,6 +265,13 @@ async def test_agent_list_command_outputs_current_agent_shape(
 
     await agents.agent_list_command(project_id="project-1")
 
+    assert client.list_agents_calls == [
+        {
+            "project_id": "resolved-project",
+            "page_size": 100,
+            "filter": None,
+        }
+    ]
     assert printed == [
         (
             [

{meshagent_cli-0.46.0 → meshagent_cli-0.46.2}/meshagent/cli/projects.py

@@ -1,4 +1,3 @@
-import builtins
 import sys
 from dataclasses import dataclass
 from typing import Annotated
@@ -6,7 +5,7 @@ from typing import Annotated
 import typer
 from rich import print
 
-from meshagent.api.client import Meshagent, NotFoundError
+from meshagent.api.client import Meshagent, NotFoundError, ProjectInfo, ProjectsPage
 from meshagent.cli import async_typer
 from meshagent.cli.helper import (
     get_client,
@@ -27,35 +26,17 @@ class ListedProject:
 
 
 def _parse_listed_projects(
-    response: object,
+    response: ProjectsPage,
     *,
     active_project_id: str | None,
 ) -> list[ListedProject]:
-    if not isinstance(response, dict):
-        return []
-
-    project_rows = response.get("projects")
-    if not isinstance(project_rows, builtins.list):
-        return []
-
     selectable_projects: list[ListedProject] = []
-    for row in project_rows:
-        if not isinstance(row, dict):
-            continue
-
-        project_id = row.get("id")
-        if not isinstance(project_id, str):
-            continue
-        resolved_project_id = project_id.strip()
+    for row in response.projects:
+        resolved_project_id = row.id.strip()
         if resolved_project_id == "":
             continue
 
-        project_name = row.get("name")
-        resolved_project_name = (
-            project_name.strip()
-            if isinstance(project_name, str) and project_name.strip() != ""
-            else resolved_project_id
-        )
+        resolved_project_name = row.name.strip() or resolved_project_id
 
         selectable_projects.append(
             ListedProject(
@@ -85,25 +66,18 @@ async def _create_project_id(
     project_name: str,
 ) -> str:
     created = await client.create_project(project_name)
-    if not isinstance(created, dict):
-        raise RuntimeError("Project creation did not return a valid id.")
-
-    created_project_id = created.get("id")
-    if not isinstance(created_project_id, str):
-        raise RuntimeError("Project creation did not return a valid id.")
-
-    resolved_project_id = created_project_id.strip()
+    resolved_project_id = created.id.strip()
     if resolved_project_id == "":
         raise RuntimeError("Project creation did not return a valid id.")
 
     return resolved_project_id
 
 
-def _project_id_from_payload(project: dict[str, object]) -> str:
-    project_id = project.get("id")
-    if not isinstance(project_id, str) or project_id.strip() == "":
+def _project_id_from_payload(project: ProjectInfo) -> str:
+    project_id = project.id.strip()
+    if project_id == "":
         raise RuntimeError("Project lookup did not return a valid id.")
-    return project_id.strip()
+    return project_id
 
 
 async def _resolve_project_id_or_key(client: Meshagent, selector: str) -> str:
@@ -186,7 +160,7 @@ async def create(name: str):
     client = await get_client()
     try:
         result = await client.create_project(name)
-        print(f"[green]Project created:[/] {result['id']}")
+        print(f"[green]Project created:[/] {result.id}")
     finally:
         await client.close()
 
@@ -198,14 +172,18 @@ async def list(
     client = await get_client()
     projects = await client.list_projects()
     active_project = await get_active_project()
-    for project in projects["projects"]:
+    output = [
+        project.model_dump(mode="json", exclude_none=True)
+        for project in projects.projects
+    ]
+    for project in output:
         if project["id"] == active_project:
-            project["name"] = "*" + project["name"]
+            project["name"] = "*" + str(project["name"])
 
     if o == "json":
-        print(projects)
+        print({"projects": output})
     else:
-        print_json_table(projects["projects"], "id", "name", "project_key")
+        print_json_table(output, "id", "name", "project_key")
     await client.close()
 
 
@@ -219,9 +197,14 @@ async def get(
         project_id = await _resolve_project_id_or_key(client, project)
         project_info = await client.get_project(project_id)
         if o == "json":
-            print(project_info)
+            print(project_info.model_dump(mode="json", exclude_none=True))
         else:
-            print_json_table([project_info], "id", "name", "project_key")
+            print_json_table(
+                [project_info.model_dump(mode="json", exclude_none=True)],
+                "id",
+                "name",
+                "project_key",
+            )
     finally:
         await client.close()
 

{meshagent_cli-0.46.0 → meshagent_cli-0.46.2}/meshagent/cli/projects_test.py

@@ -3,6 +3,7 @@ from types import SimpleNamespace
 import pytest
 
 from meshagent.api.client import NotFoundError
+from meshagent.api.client import ProjectInfo, ProjectsPage
 from meshagent.cli import projects
 
 
@@ -18,22 +19,26 @@ class _FakeClient:
         self.created_project_names: list[str] = []
         self.closed = False
 
-    async def list_projects(self) -> dict[str, list[dict[str, str]]]:
-        return {"projects": self._project_rows}
+    async def list_projects(self) -> ProjectsPage:
+        return ProjectsPage(
+            projects=[
+                ProjectInfo.model_validate(project) for project in self._project_rows
+            ]
+        )
 
-    async def get_project(self, project_id: str) -> dict[str, str]:
+    async def get_project(self, project_id: str) -> ProjectInfo:
         for project in self._project_rows:
             if project["id"] == project_id:
-                return project
+                return ProjectInfo.model_validate(project)
         raise NotFoundError("not found")
 
-    async def get_project_by_key(self, project_key: str) -> dict[str, str]:
+    async def get_project_by_key(self, project_key: str) -> ProjectInfo:
         for project in self._project_rows:
             if project.get("project_key") == project_key:
-                return project
+                return ProjectInfo.model_validate(project)
         raise NotFoundError("not found")
 
-    async def create_project(self, name: str) -> dict[str, str]:
+    async def create_project(self, name: str) -> ProjectInfo:
         self.created_project_names.append(name)
         created_row = {
             "id": self._created_project_id,
@@ -41,7 +46,7 @@ class _FakeClient:
             "project_key": name.lower().replace(" ", "-"),
         }
         self._project_rows.append(created_row)
-        return created_row
+        return ProjectInfo.model_validate(created_row)
 
     async def close(self) -> None:
         self.closed = True

{meshagent_cli-0.46.0 → meshagent_cli-0.46.2}/meshagent/cli/room.py

@@ -51,11 +51,9 @@ app.add_lazy_command(
     help="Manage dataset tables in a room",
 )
 app.add_lazy_command(
-    name="database",
-    module="meshagent.cli.dataset",
-    help="Manage dataset tables in a room",
-    hidden=True,
-    deprecated=True,
+    name="sqlite",
+    module="meshagent.cli.sqlite",
+    help="Manage SQLite databases and tables in a room",
 )
 app.add_lazy_command(
     name="memory",

{meshagent_cli-0.46.0 → meshagent_cli-0.46.2}/meshagent/cli/routes.py

@@ -74,6 +74,30 @@ def _warn_if_non_meshagent_app_domain(domain: str) -> None:
     )
 
 
+async def _list_routes_view(
+    client,
+    *,
+    project_id: str,
+    count: int,
+    offset: int,
+    filter: str | None,
+):
+    routes = []
+    continuation_token: str | None = None
+    while len(routes) < offset + count:
+        page = await client.list_routes_page(
+            project_id=project_id,
+            page_size=min(max(offset + count - len(routes), 1), 100),
+            continuation_token=continuation_token,
+            filter=filter,
+        )
+        routes.extend(page.routes)
+        continuation_token = page.continuation_token
+        if continuation_token is None:
+            break
+    return routes[offset : offset + count]
+
+
 @app.async_command("create")
 async def route_create(
     *,
@@ -317,7 +341,8 @@ async def route_list(
                 filter=filter,
             )
         else:
-            routes = await client.list_routes(
+            routes = await _list_routes_view(
+                client,
                 project_id=project_id,
                 count=count,
                 offset=offset,

meshagent_cli-0.46.2/meshagent/cli/routes_test.py

@@ -0,0 +1,119 @@
+import pytest
+
+from meshagent.api.client import Route, RoutesPage
+from meshagent.cli import routes
+
+
+class _FakeRoutesClient:
+    def __init__(self) -> None:
+        self.closed = False
+        self.list_routes_page_calls: list[dict[str, object]] = []
+        self.list_routes_calls: list[dict[str, object]] = []
+        self.pages = [
+            RoutesPage(
+                routes=[
+                    Route.model_validate(
+                        {
+                            "domain": "a.meshagent.app",
+                            "room_name": "room-a",
+                            "port": "8080",
+                        }
+                    ),
+                    Route.model_validate(
+                        {
+                            "domain": "b.meshagent.app",
+                            "room_name": "room-b",
+                            "port": "8081",
+                        }
+                    ),
+                ],
+                continuation_token="next",
+            ),
+            RoutesPage(
+                routes=[
+                    Route.model_validate(
+                        {
+                            "domain": "c.meshagent.app",
+                            "room_name": "room-c",
+                            "port": "8082",
+                        }
+                    )
+                ],
+                continuation_token=None,
+            ),
+        ]
+
+    async def list_routes_page(
+        self,
+        *,
+        project_id: str,
+        page_size: int,
+        continuation_token: str | None = None,
+        filter: str | None = None,
+    ) -> RoutesPage:
+        self.list_routes_page_calls.append(
+            {
+                "project_id": project_id,
+                "page_size": page_size,
+                "continuation_token": continuation_token,
+                "filter": filter,
+            }
+        )
+        return self.pages.pop(0)
+
+    async def list_routes(self, **kwargs):
+        self.list_routes_calls.append(kwargs)
+        raise AssertionError("route_list should use list_routes_page for pagination")
+
+    async def close(self) -> None:
+        self.closed = True
+
+
+@pytest.mark.asyncio
+async def test_route_list_without_room_uses_paged_routes_client(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    client = _FakeRoutesClient()
+    printed: list[object] = []
+
+    async def fake_get_client() -> _FakeRoutesClient:
+        return client
+
+    async def fake_resolve_project_id(project_id: str | None = None) -> str:
+        assert project_id == "project-1"
+        return "resolved-project"
+
+    monkeypatch.setattr(routes, "get_client", fake_get_client)
+    monkeypatch.setattr(routes, "resolve_project_id", fake_resolve_project_id)
+    monkeypatch.setattr(routes, "resolve_room", lambda room=None: room)
+    monkeypatch.setattr(routes, "print", printed.append)
+
+    await routes.route_list(
+        project_id="project-1",
+        count=2,
+        offset=1,
+        filter="mesh",
+        o="json",
+    )
+
+    assert client.list_routes_calls == []
+    assert client.list_routes_page_calls == [
+        {
+            "project_id": "resolved-project",
+            "page_size": 3,
+            "continuation_token": None,
+            "filter": "mesh",
+        },
+        {
+            "project_id": "resolved-project",
+            "page_size": 1,
+            "continuation_token": "next",
+            "filter": "mesh",
+        },
+    ]
+    assert client.closed
+    assert len(printed) == 1
+    assert [route["domain"] for route in printed[0]["routes"]] == [
+        "b.meshagent.app",
+        "c.meshagent.app",
+    ]