doover-cli 0.3.1__tar.gz → 0.3.3__tar.gz

{doover_cli-0.3.1 → doover_cli-0.3.3}/.gitignore

@@ -130,4 +130,5 @@ dmypy.json
 
 # User testing files
 tmp/
-local/
+local/
+.DS_Store

doover_cli-0.3.3/AGENT.md

@@ -0,0 +1,8 @@
+# Agent Guidance
+
+The doover-cli maintainers also have access to and control over pydoover.
+
+Do not work around pydoover bugs in doover-cli when the correct fix belongs in
+pydoover. If a doover-cli issue is caused by generated pydoover behavior,
+request or propose the pydoover change instead of patching doover-cli to bypass
+pydoover internals such as `_execute`.

{doover_cli-0.3.1 → doover_cli-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doover-cli
-Version: 0.3.1
+Version: 0.3.3
 Summary: CLI for Doover
 License-File: LICENSE
 Requires-Python: >=3.11
@@ -10,7 +10,7 @@ Requires-Dist: docker>=7.1.0
 Requires-Dist: jsf>=0.11.2
 Requires-Dist: paramiko>=3.5.1
 Requires-Dist: prompt-toolkit>=3.0.52
-Requires-Dist: pydoover==1.0.0a3
+Requires-Dist: pydoover>=1.5.1
 Requires-Dist: pytz>=2025.2
 Requires-Dist: questionary>=1.10.0
 Requires-Dist: requests>=2.32.3

{doover_cli-0.3.1 → doover_cli-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "doover-cli"
-version = "0.3.1"
+version = "0.3.3"
 description = "CLI for Doover"
 requires-python = ">=3.11"
 dependencies = [
@@ -10,7 +10,7 @@ dependencies = [
     "docker>=7.1.0",
     "jsf>=0.11.2",
     "paramiko>=3.5.1",
-    "pydoover==1.0.0a3",
+    "pydoover>=1.5.1",
     "pytz>=2025.2",
     "questionary>=1.10.0",
     "requests>=2.32.3",
@@ -35,9 +35,5 @@ dev = [
     "pytest>=8.3.5",
 ]
 
-[tool.uv.sources]
-pydoover = { git = "https://github.com/getdoover/pydoover" }
-
 [tool.ty.environment]
 python = "./.venv"
-

{doover_cli-0.3.1 → doover_cli-0.3.3}/src/doover_cli/__init__.py

@@ -7,6 +7,7 @@ import typer
 from pydoover.api.auth import ConfigManager
 
 from .apps.apps import app as apps_app
+from .apps.app_install import app as app_install_app
 from .config_schema import app as config_schema_app
 from .ui_schema import app as ui_schema_app
 from .simulator import app as simulators_app
@@ -14,11 +15,13 @@ from .agent import app as agents_app
 from .channel import app as channels_app
 from .doover_config import app as doover_config_app
 from .dda_logs import app as dda_logs_app
+from .apps.device import app as device_app
 from .apps.device_type import app as device_type_app
 from .grpc import app as grpc_app
 from .login import app as login_app
 from .report import app as reports_app
-from .tunnel import app as tunnels_app
+from .apps.tunnel import app as tunnels_app
+from .user import org_app, users_app
 from .utils import sentry as sentry_utils
 from .utils.state import state
 
@@ -26,6 +29,11 @@ app = typer.Typer(no_args_is_help=True)
 app.add_typer(
     apps_app, name="app", help="Manage applications and their configurations."
 )
+app.add_typer(
+    app_install_app,
+    name="app-install",
+    help="Manage application installations in Doover 2.0.",
+)
 app.add_typer(
     config_schema_app, name="config-schema", help="Manage application config schemas."
 )
@@ -42,12 +50,15 @@ app.add_typer(
 )
 app.add_typer(login_app)
 app.add_typer(reports_app, name="report", help="Generate and manage reports.")
-app.add_typer(tunnels_app, name="tunnel", help="Manage SSH tunnels for remote access.")
+app.add_typer(tunnels_app, name="tunnel", help="Manage tunnels for remote access.")
 app.add_typer(grpc_app, name="grpc", help="Interact with running gRPC servers.")
 app.add_typer(dda_logs_app, name="dda-logs", help="Convert DDA message logs to JSON.")
+app.add_typer(device_app, name="device", help="Manipulate devices in Doover 2.0")
 app.add_typer(
     device_type_app, name="device-type", help="Manipulate device types in Doover 2.0"
 )
+app.add_typer(org_app, name="org", help="Manage the current organisation.")
+app.add_typer(users_app, name="users", help="Manage users.")
 
 
 def version_callback(value: bool):

doover_cli-0.3.3/src/doover_cli/agent.py

@@ -0,0 +1,239 @@
+from __future__ import annotations
+
+from collections import defaultdict
+from typing import TYPE_CHECKING, Annotated, Any
+
+import typer
+from pydoover.models.control import Agent, Agents, Group
+from typer import Typer
+
+from .renderer import TreeNode
+from .renderer._base import normalize_render_data
+from .utils.api import ProfileAnnotation
+from .utils.state import state
+
+if TYPE_CHECKING:
+    from pydoover.api import ControlClient
+    from .renderer import RendererBase
+
+app = Typer(no_args_is_help=True)
+
+
+def get_state() -> tuple["ControlClient", "RendererBase"]:
+    session = state.session
+    return session.get_control_client(), state.renderer
+
+
+@app.command(name="list")
+def list_(
+    tree: Annotated[
+        bool,
+        typer.Option(
+            "--tree",
+            help="Show agents grouped into a tree instead of a table.",
+        ),
+    ] = False,
+    include_archived: Annotated[
+        bool,
+        typer.Option(
+            "--include-archived",
+            help="Include archived agents and groups.",
+        ),
+    ] = False,
+    _profile: ProfileAnnotation = None,
+):
+    """List available agents."""
+    _ = _profile
+    client, renderer = get_state()
+
+    with renderer.loading("Loading agents..."):
+        response = client.agents.retrieve(include_archived=include_archived)
+
+    if tree:
+        renderer.tree(build_agents_tree(response))
+        return
+
+    renderer.render_list(response.agents)
+
+
+def build_agents_tree(response: Agents) -> TreeNode:
+    group_entries = _flatten_groups(response.groups or [])
+    groups = [group for group, _parent_id in group_entries]
+    agents = list(response.agents or [])
+    root = TreeNode(response)
+    groups_by_id = {
+        group_id: group
+        for group in groups
+        if (group_id := _resource_id(group)) is not None
+    }
+    group_ids = set(groups_by_id)
+    group_ids_by_name = {
+        str(group_name): group_id
+        for group_id, group in groups_by_id.items()
+        if (group_name := _field_value(group, "name"))
+    }
+    groups_by_parent_id: dict[int | None, list[Group]] = defaultdict(list)
+    agents_by_group_id, agents_by_unknown_group = _group_agents(
+        agents,
+        group_ids=group_ids,
+        group_ids_by_name=group_ids_by_name,
+    )
+
+    for group, inferred_parent_id in group_entries:
+        parent_id = _resource_id(_field_value(group, "parent"))
+        if parent_id is None:
+            parent_id = inferred_parent_id
+        if parent_id not in group_ids:
+            parent_id = None
+        groups_by_parent_id[parent_id].append(group)
+
+    for siblings in groups_by_parent_id.values():
+        siblings.sort(key=_group_sort_key)
+    for grouped_agents in agents_by_group_id.values():
+        grouped_agents.sort(key=_agent_sort_key)
+    for grouped_agents in agents_by_unknown_group.values():
+        grouped_agents.sort(key=_agent_sort_key)
+
+    root.children.extend(
+        _build_group_branch(group, groups_by_parent_id, agents_by_group_id)
+        for group in groups_by_parent_id[None]
+    )
+
+    for group_name in sorted(name for name in agents_by_unknown_group if name):
+        root.children.append(
+            TreeNode(
+                Group(name=group_name),
+                children=[
+                    TreeNode(agent)
+                    for agent in agents_by_unknown_group[group_name]
+                ],
+            )
+        )
+
+    if "" in agents_by_unknown_group:
+        root.children.append(
+            TreeNode(
+                Group(name="Ungrouped"),
+                children=[
+                    TreeNode(agent) for agent in agents_by_unknown_group[""]
+                ],
+            )
+        )
+
+    if not root.children and agents:
+        root.children.extend(
+            TreeNode(agent) for agent in sorted(agents, key=_agent_sort_key)
+        )
+
+    return root
+
+
+def _flatten_groups(groups: list[Group]) -> list[tuple[Group, int | None]]:
+    flattened: list[tuple[Group, int | None]] = []
+
+    def visit(group: Group, parent_id: int | None, path: set[int]) -> None:
+        group_id = _resource_id(group)
+        flattened.append((group, parent_id))
+
+        if group_id is not None:
+            if group_id in path:
+                return
+            path = {*path, group_id}
+
+        for child in _field_value(group, "children", []) or []:
+            visit(child, group_id, path)
+
+    for group in groups:
+        visit(group, None, set())
+
+    return flattened
+
+
+def _build_group_branch(
+    group: Group,
+    groups_by_parent_id: dict[int | None, list[Group]],
+    agents_by_group_id: dict[int, list[Agent]],
+) -> TreeNode:
+    group_id = _resource_id(group)
+    children = [
+        _build_group_branch(child, groups_by_parent_id, agents_by_group_id)
+        for child in groups_by_parent_id.get(group_id, [])
+    ]
+    if group_id is not None:
+        children.extend(
+            TreeNode(agent) for agent in agents_by_group_id.get(group_id, [])
+        )
+    return TreeNode(group, children=children)
+
+
+def _group_agents(
+    agents: list[Agent],
+    *,
+    group_ids: set[int],
+    group_ids_by_name: dict[str, int],
+) -> tuple[dict[int, list[Agent]], dict[str, list[Agent]]]:
+    by_id: dict[int, list[Agent]] = defaultdict(list)
+    by_unknown_label: dict[str, list[Agent]] = defaultdict(list)
+
+    for agent in agents:
+        group_value = _field_value(agent, "group")
+        group_id = _resource_id(group_value)
+        if group_id in group_ids:
+            by_id[group_id].append(agent)
+            continue
+
+        group_label = str(group_value or "")
+        if (named_group_id := group_ids_by_name.get(group_label)) is not None:
+            by_id[named_group_id].append(agent)
+            continue
+
+        by_unknown_label[group_label].append(agent)
+
+    return by_id, by_unknown_label
+
+
+def _field_value(item: Any, key: str, default: Any = None) -> Any:
+    if isinstance(item, dict):
+        return item.get(key, default)
+
+    value = getattr(item, key, default)
+    if value is not None:
+        return value
+
+    normalized = normalize_render_data(item)
+    if isinstance(normalized, dict):
+        return normalized.get(key, default)
+    return default
+
+
+def _resource_id(value: Any) -> int | None:
+    if value is None:
+        return None
+    if isinstance(value, dict):
+        return _coerce_int(value.get("id"))
+    return _coerce_int(getattr(value, "id", value))
+
+
+def _coerce_int(value: Any) -> int | None:
+    if value is None:
+        return None
+    try:
+        return int(value)
+    except (TypeError, ValueError):
+        return None
+
+
+def _group_label(group: Group) -> str:
+    return str(_field_value(group, "name") or _field_value(group, "id") or "Unnamed")
+
+
+def _group_sort_key(group: Group) -> tuple[str, int]:
+    return (_group_label(group).casefold(), _resource_id(group) or 0)
+
+
+def _agent_sort_key(agent: Agent) -> tuple[str, str, int]:
+    return (
+        str(_field_value(agent, "display_name", "") or "").casefold(),
+        str(_field_value(agent, "name", "") or "").casefold(),
+        _resource_id(agent) or 0,
+    )