dhis2w-cli 0.12.0__tar.gz → 0.13.0__tar.gz

{dhis2w_cli-0.12.0 → dhis2w_cli-0.13.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: dhis2w-cli
-Version: 0.12.0
+Version: 0.13.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.12.0,<0.13
+Requires-Dist: dhis2w-core>=0.13.0,<0.14
 Requires-Dist: typer>=0.24
 Requires-Dist: rich>=15
-Requires-Dist: dhis2w-browser>=0.12.0,<0.13 ; extra == 'browser'
+Requires-Dist: dhis2w-browser>=0.13.0,<0.14 ; extra == 'browser'
 Requires-Python: >=3.13
 Provides-Extra: browser
 Description-Content-Type: text/markdown

{dhis2w_cli-0.12.0 → dhis2w_cli-0.13.0}/pyproject.toml

@@ -1,18 +1,18 @@
 [project]
 name = "dhis2w-cli"
-version = "0.12.0"
+version = "0.13.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.12.0,<0.13",
+  "dhis2w-core>=0.13.0,<0.14",
   "typer>=0.24",
   "rich>=15",
 ]
 
 [project.optional-dependencies]
-browser = ["dhis2w-browser>=0.12.0,<0.13"]
+browser = ["dhis2w-browser>=0.13.0,<0.14"]
 
 [project.scripts]
 dhis2 = "dhis2w_cli.main:main"

{dhis2w_cli-0.12.0 → dhis2w_cli-0.13.0}/src/dhis2w_cli/main.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import logging
 import os
+import sys
 from importlib.metadata import PackageNotFoundError, version
 from typing import Annotated
 
@@ -15,6 +16,35 @@ from dhis2w_core.rich_console import STDERR_CONSOLE
 from rich.logging import RichHandler
 
 
+def _extract_profile_from_argv(argv: list[str]) -> str | None:
+    """Pre-scan argv for `--profile NAME` / `--profile=NAME` / `-p NAME`.
+
+    Plugin discovery needs to happen *after* `--profile` is applied — the
+    `version` field on the resolved profile picks which `v{41,42,43}`
+    plugin tree gets mounted. The Typer root callback sets the env var,
+    but plugins are mounted before any argv is parsed. This pre-scan
+    runs before `build_app()` so the env is in place when
+    `resolve_startup_version()` fires.
+
+    Returns `None` when no `--profile` flag is present. Stops at `--`
+    (positional separator) so a profile-shaped string passed after `--`
+    is not mistaken for the option value.
+    """
+    i = 0
+    while i < len(argv):
+        arg = argv[i]
+        if arg == "--":
+            return None
+        if arg in {"--profile", "-p"}:
+            if i + 1 < len(argv):
+                return argv[i + 1]
+            return None
+        if arg.startswith("--profile="):
+            return arg.removeprefix("--profile=")
+        i += 1
+    return None
+
+
 def _version_banner() -> str:
     """Multi-line banner shown for `dhis2 --version` — package version + active plugin tree.
 
@@ -140,12 +170,31 @@ def build_app() -> typer.Typer:
     return app
 
 
-app = build_app()
-
-
 def main() -> None:
-    """Console-script entrypoint — wraps the Typer app with clean error rendering."""
-    run_app(app)
+    """Console-script entrypoint — wraps the Typer app with clean error rendering.
+
+    Resolves `--profile` from argv *before* mounting plugins so the
+    correct `v{41,42,43}` plugin tree gets discovered. Without this
+    pre-pass, `dhis2 --profile v43p ...` would freeze the plugin tree
+    at whatever the default profile pinned (typically v42), hiding
+    v43-only commands and making `--version`'s banner disagree with
+    the actual mounted command tree.
+    """
+    profile = _extract_profile_from_argv(sys.argv[1:])
+    if profile:
+        os.environ["DHIS2_PROFILE"] = profile
+    fresh_app = build_app()
+    run_app(fresh_app)
+
+
+# Module-level Typer app instance for `typer dhis2w_cli.main utils docs ...`
+# introspection used by `make docs-cli` to regenerate `docs/cli-reference.md`.
+# Not consumed by the console-script entry point — `main()` above builds its
+# own fresh app *after* applying `--profile` from argv, which is what the user
+# expects at runtime. This module-level instance is only walked at docs-build
+# time, where no user CLI args are in play and the canonical (default-profile)
+# command tree is the correct thing to dump.
+app = build_app()
 
 
 if __name__ == "__main__":