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

{dhis2w_cli-0.7.0 → dhis2w_cli-0.10.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: dhis2w-cli
-Version: 0.7.0
+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.7.0,<0.8
+Requires-Dist: dhis2w-core>=0.10.0,<0.11
 Requires-Dist: typer>=0.24
 Requires-Dist: rich>=15
-Requires-Dist: dhis2w-browser>=0.7.0,<0.8 ; extra == 'browser'
+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-0.7.0 → dhis2w_cli-0.10.0}/pyproject.toml

@@ -1,18 +1,18 @@
 [project]
 name = "dhis2w-cli"
-version = "0.7.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.7.0,<0.8",
+  "dhis2w-core>=0.10.0,<0.11",
   "typer>=0.24",
   "rich>=15",
 ]
 
 [project.optional-dependencies]
-browser = ["dhis2w-browser>=0.7.0,<0.8"]
+browser = ["dhis2w-browser>=0.10.0,<0.11"]
 
 [project.scripts]
 dhis2 = "dhis2w_cli.main:main"

{dhis2w_cli-0.7.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