dhis2w-cli 0.6.0__tar.gz → 0.10.0__tar.gz

dhis2w_cli-0.10.0/PKG-INFO

@@ -0,0 +1,82 @@
+Metadata-Version: 2.3
+Name: dhis2w-cli
+Version: 0.10.0
+Summary: dhis2 command-line interface (Typer) — mounts plugins from dhis2w-core.
+Author: Morten Hansen
+Author-email: Morten Hansen <morten@winterop.com>
+Requires-Dist: dhis2w-core>=0.10.0,<0.11
+Requires-Dist: typer>=0.24
+Requires-Dist: rich>=15
+Requires-Dist: dhis2w-browser>=0.10.0,<0.11 ; extra == 'browser'
+Requires-Python: >=3.13
+Provides-Extra: browser
+Description-Content-Type: text/markdown
+
+# dhis2w-cli
+
+Typer console script `dhis2` for working with DHIS2 instances from the shell. Discovers plugins from `dhis2w-core` — sixteen top-level domains covering metadata, data, analytics, tracker, users, routes, files, messaging, apps, doctor, and developer tools.
+
+## Install
+
+```bash
+# Drops `dhis2` on $PATH
+uv tool install dhis2w-cli
+
+# With Playwright UI automation (browser screenshots, OIDC login, PAT minting)
+uv tool install 'dhis2w-cli[browser]'
+playwright install chromium    # one-time, after the install above
+
+# Update later
+uv tool upgrade dhis2w-cli
+```
+
+Or run on demand without installing:
+
+```bash
+uvx --from dhis2w-cli dhis2 --help
+```
+
+## Configure
+
+The CLI reads a profile from `.dhis2/profiles.toml` (project) or `~/.config/dhis2/profiles.toml` (user). One-shot bootstrap:
+
+```bash
+dhis2 profile bootstrap mywork
+```
+
+Or set env vars and skip the profile system entirely:
+
+```bash
+export DHIS2_URL=https://dhis2.example.org
+export DHIS2_PAT=d2p_...
+dhis2 system info
+```
+
+## Surface
+
+```
+dhis2 analytics    DHIS2 analytics queries.
+dhis2 apps         DHIS2 apps — /api/apps + /api/appHub.
+dhis2 browser      Playwright UI automation (only with [browser] extra).
+dhis2 data         DHIS2 data values (aggregate + tracker).
+dhis2 dev          Developer/operator tools.
+dhis2 doctor       Probe a DHIS2 instance for known gotchas + requirements.
+dhis2 files        Manage DHIS2 documents + file resources.
+dhis2 maintenance  DHIS2 maintenance (tasks, cache, integrity, cleanup, refresh).
+dhis2 messaging    DHIS2 internal messaging.
+dhis2 metadata     DHIS2 metadata inspection.
+dhis2 profile      Manage DHIS2 profiles.
+dhis2 route        DHIS2 integration routes.
+dhis2 system       DHIS2 system info.
+dhis2 user         DHIS2 user administration.
+dhis2 user-group   DHIS2 user-group administration.
+dhis2 user-role    DHIS2 user-role administration.
+```
+
+`dhis2 --help` for the full tree; `dhis2 <group> --help` for each.
+
+## Documentation
+
+Full CLI reference: https://winterop-com.github.io/dhis2w-utils/cli-reference/.
+
+`dhis2w-cli` is one member of the [`dhis2w-utils`](https://github.com/winterop-com/dhis2w-utils) workspace. The MCP server (`dhis2w-mcp`) exposes the same plugin surface as MCP tools.

dhis2w_cli-0.10.0/README.md

@@ -0,0 +1,68 @@
+# dhis2w-cli
+
+Typer console script `dhis2` for working with DHIS2 instances from the shell. Discovers plugins from `dhis2w-core` — sixteen top-level domains covering metadata, data, analytics, tracker, users, routes, files, messaging, apps, doctor, and developer tools.
+
+## Install
+
+```bash
+# Drops `dhis2` on $PATH
+uv tool install dhis2w-cli
+
+# With Playwright UI automation (browser screenshots, OIDC login, PAT minting)
+uv tool install 'dhis2w-cli[browser]'
+playwright install chromium    # one-time, after the install above
+
+# Update later
+uv tool upgrade dhis2w-cli
+```
+
+Or run on demand without installing:
+
+```bash
+uvx --from dhis2w-cli dhis2 --help
+```
+
+## Configure
+
+The CLI reads a profile from `.dhis2/profiles.toml` (project) or `~/.config/dhis2/profiles.toml` (user). One-shot bootstrap:
+
+```bash
+dhis2 profile bootstrap mywork
+```
+
+Or set env vars and skip the profile system entirely:
+
+```bash
+export DHIS2_URL=https://dhis2.example.org
+export DHIS2_PAT=d2p_...
+dhis2 system info
+```
+
+## Surface
+
+```
+dhis2 analytics    DHIS2 analytics queries.
+dhis2 apps         DHIS2 apps — /api/apps + /api/appHub.
+dhis2 browser      Playwright UI automation (only with [browser] extra).
+dhis2 data         DHIS2 data values (aggregate + tracker).
+dhis2 dev          Developer/operator tools.
+dhis2 doctor       Probe a DHIS2 instance for known gotchas + requirements.
+dhis2 files        Manage DHIS2 documents + file resources.
+dhis2 maintenance  DHIS2 maintenance (tasks, cache, integrity, cleanup, refresh).
+dhis2 messaging    DHIS2 internal messaging.
+dhis2 metadata     DHIS2 metadata inspection.
+dhis2 profile      Manage DHIS2 profiles.
+dhis2 route        DHIS2 integration routes.
+dhis2 system       DHIS2 system info.
+dhis2 user         DHIS2 user administration.
+dhis2 user-group   DHIS2 user-group administration.
+dhis2 user-role    DHIS2 user-role administration.
+```
+
+`dhis2 --help` for the full tree; `dhis2 <group> --help` for each.
+
+## Documentation
+
+Full CLI reference: https://winterop-com.github.io/dhis2w-utils/cli-reference/.
+
+`dhis2w-cli` is one member of the [`dhis2w-utils`](https://github.com/winterop-com/dhis2w-utils) workspace. The MCP server (`dhis2w-mcp`) exposes the same plugin surface as MCP tools.

{dhis2w_cli-0.6.0 → dhis2w_cli-0.10.0}/pyproject.toml

@@ -1,18 +1,18 @@
 [project]
 name = "dhis2w-cli"
-version = "0.6.0"
+version = "0.10.0"
 description = "dhis2 command-line interface (Typer) — mounts plugins from dhis2w-core."
 readme = "README.md"
 authors = [{ name = "Morten Hansen", email = "morten@winterop.com" }]
 requires-python = ">=3.13"
 dependencies = [
-  "dhis2w-core>=0.6.0,<0.7",
+  "dhis2w-core>=0.10.0,<0.11",
   "typer>=0.24",
   "rich>=15",
 ]
 
 [project.optional-dependencies]
-browser = ["dhis2w-browser>=0.6.0,<0.7"]
+browser = ["dhis2w-browser>=0.10.0,<0.11"]
 
 [project.scripts]
 dhis2 = "dhis2w_cli.main:main"

{dhis2w_cli-0.6.0 → dhis2w_cli-0.10.0}/src/dhis2w_cli/main.py

@@ -4,16 +4,52 @@ from __future__ import annotations
 
 import logging
 import os
+from importlib.metadata import PackageNotFoundError, version
 from typing import Annotated
 
 import typer
 from dhis2w_core.cli_errors import run_app
 from dhis2w_core.cli_output import JSON_OUTPUT
-from dhis2w_core.plugin import discover_plugins
+from dhis2w_core.plugin import DEFAULT_VERSION_KEY, discover_plugins, resolve_startup_version
 from dhis2w_core.rich_console import STDERR_CONSOLE
 from rich.logging import RichHandler
 
 
+def _version_banner() -> str:
+    """Multi-line banner shown for `dhis2 --version` — package version + active plugin tree.
+
+    Surfaces which plugin tree (`v41` / `v42` / `v43`) the CLI booted with
+    and where that came from in the resolution chain (`profile.version` →
+    `DHIS2_VERSION` env → default). Helps debug "which DHIS2 major is
+    this CLI talking to" without reading the profile by hand.
+    """
+    try:
+        pkg_version = version("dhis2w-cli")
+    except PackageNotFoundError:
+        pkg_version = "unknown"
+    active = resolve_startup_version()
+    env_version = os.environ.get("DHIS2_VERSION", "").strip()
+    if (
+        env_version in {"41", "42", "43"}
+        and f"v{env_version}" == active
+        or env_version in {"v41", "v42", "v43"}
+        and env_version == active
+    ):
+        source = f"DHIS2_VERSION={env_version!r} env"
+    elif active == DEFAULT_VERSION_KEY:
+        source = "default (no profile.version, no DHIS2_VERSION env)"
+    else:
+        source = "profile.version"
+    return f"dhis2 {pkg_version}  (plugin tree: {active} — {source})"
+
+
+def _version_callback(value: bool) -> None:
+    """Eager `--version` callback — print the banner and exit."""
+    if value:
+        typer.echo(_version_banner())
+        raise typer.Exit(0)
+
+
 def _enable_debug_logging() -> None:
     """Turn on dhis2w-client HTTP traces + dhis2w-core debug logs on stderr.
 
@@ -78,6 +114,16 @@ def build_app() -> typer.Typer:
                 help="Emit raw JSON to stdout instead of Rich tables (uniform across all commands).",
             ),
         ] = False,
+        _version: Annotated[
+            bool,
+            typer.Option(
+                "--version",
+                "-V",
+                help="Print the CLI version + active plugin tree and exit.",
+                callback=_version_callback,
+                is_eager=True,
+            ),
+        ] = False,
     ) -> None:
         """Set the active DHIS2 profile + optional debug logging + output mode for this invocation."""
         if profile:
@@ -89,7 +135,7 @@ def build_app() -> typer.Typer:
         # invocation must not leak into the next one.
         JSON_OUTPUT.set(json_)
 
-    for plugin in discover_plugins():
+    for plugin in discover_plugins(resolve_startup_version()):
         plugin.register_cli(app)
     return app
 

dhis2w_cli-0.6.0/PKG-INFO

@@ -1,14 +0,0 @@
-Metadata-Version: 2.3
-Name: dhis2w-cli
-Version: 0.6.0
-Summary: dhis2 command-line interface (Typer) — mounts plugins from dhis2w-core.
-Author: Morten Hansen
-Author-email: Morten Hansen <morten@winterop.com>
-Requires-Dist: dhis2w-core>=0.6.0,<0.7
-Requires-Dist: typer>=0.24
-Requires-Dist: rich>=15
-Requires-Dist: dhis2w-browser>=0.6.0,<0.7 ; extra == 'browser'
-Requires-Python: >=3.13
-Provides-Extra: browser
-Description-Content-Type: text/markdown
-