dhis2w-cli 1.28.1__tar.gz → 1.30.0__tar.gz

{dhis2w_cli-1.28.1 → dhis2w_cli-1.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dhis2w-cli
-Version: 1.28.1
+Version: 1.30.0
 Summary: d2w command-line interface (Typer) — mounts plugins from dhis2w-core.
 Author: Morten Hansen
 Author-email: Morten Hansen <morten@winterop.com>
@@ -11,19 +11,20 @@ Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: dhis2w-core>=1.28.1,<2.0
+Requires-Dist: dhis2w-core>=1.30.0,<2.0
 Requires-Dist: typer>=0.27.1
 Requires-Dist: rich>=15
-Requires-Dist: dhis2w-fhir>=1.28.1,<2.0
-Requires-Dist: dhis2w-browser>=1.28.1,<2.0 ; extra == 'browser'
-Requires-Dist: dhis2w-security>=1.19.0,<2.0 ; extra == 'security'
-Requires-Dist: dhis2w-fhir-serve>=1.28.1,<2.0 ; extra == 'serve'
+Requires-Dist: dhis2w-browser>=1.29.0,<2.0 ; extra == 'browser'
+Requires-Dist: dhis2w-fhir>=1.29.0,<2.0 ; extra == 'fhir'
+Requires-Dist: dhis2w-security>=1.29.0,<2.0 ; extra == 'security'
+Requires-Dist: dhis2w-fhir-serve>=1.29.0,<2.0 ; extra == 'serve'
 Requires-Python: >=3.13
 Project-URL: Homepage, https://github.com/winterop-com/dhis2w
 Project-URL: Documentation, https://winterop-com.github.io/dhis2w/
 Project-URL: Repository, https://github.com/winterop-com/dhis2w
 Project-URL: Changelog, https://github.com/winterop-com/dhis2w/blob/main/CHANGELOG.md
 Provides-Extra: browser
+Provides-Extra: fhir
 Provides-Extra: security
 Provides-Extra: serve
 Description-Content-Type: text/markdown
@@ -45,10 +46,18 @@ uv tool install 'dhis2w-cli[security]'
 uv tool install 'dhis2w-cli[browser]'
 playwright install chromium    # one-time, after the install above
 
+# With FHIR Implementation Guide tooling (the dhis2w-fhir pack mounts `d2w fhir`);
+# add `serve` for the capture facade behind `d2w fhir serve`
+uv tool install 'dhis2w-cli[fhir]'
+uv tool install 'dhis2w-cli[fhir,serve]'
+
 # Update later
 uv tool upgrade dhis2w-cli
 ```
 
+Extras combine (`'dhis2w-cli[fhir,security]'`). A pack's command without the pack installed -
+`d2w fhir`, `d2w browser`, `d2w security` - prints the install command that adds it.
+
 Or run on demand without installing:
 
 ```bash
@@ -80,7 +89,7 @@ d2w browser      Playwright UI automation (only with [browser] extra).
 d2w data         DHIS2 data values (aggregate + tracker).
 d2w dev          Developer/operator tools.
 d2w doctor       Probe a DHIS2 instance for known gotchas + requirements.
-d2w fhir         FHIR IG generation (SUSHI/FSH) from DHIS2 metadata.
+d2w fhir         FHIR IG generation, serving and capture (only with [fhir] extra).
 d2w files        Manage DHIS2 documents + file resources.
 d2w maintenance  DHIS2 maintenance (tasks, cache, integrity, cleanup, refresh).
 d2w messaging    DHIS2 internal messaging.
@@ -99,4 +108,4 @@ d2w user-role    DHIS2 user-role administration.
 
 Full CLI reference: https://winterop-com.github.io/dhis2w/cli-reference/.
 
-`dhis2w-cli` is one member of the [`dhis2w`](https://github.com/winterop-com/dhis2w) workspace. The MCP server (`dhis2w-mcp`) exposes the same plugin surface as MCP tools.
+`dhis2w-cli` is one member of the [`dhis2w`](https://github.com/winterop-com/dhis2w) workspace. The MCP server ([`dhis2w-mcp`](https://github.com/winterop-com/dhis2w-mcp), a plugin pack in its own repository) exposes the same plugin surface as MCP tools.

{dhis2w_cli-1.28.1 → dhis2w_cli-1.30.0}/README.md

@@ -15,10 +15,18 @@ uv tool install 'dhis2w-cli[security]'
 uv tool install 'dhis2w-cli[browser]'
 playwright install chromium    # one-time, after the install above
 
+# With FHIR Implementation Guide tooling (the dhis2w-fhir pack mounts `d2w fhir`);
+# add `serve` for the capture facade behind `d2w fhir serve`
+uv tool install 'dhis2w-cli[fhir]'
+uv tool install 'dhis2w-cli[fhir,serve]'
+
 # Update later
 uv tool upgrade dhis2w-cli
 ```
 
+Extras combine (`'dhis2w-cli[fhir,security]'`). A pack's command without the pack installed -
+`d2w fhir`, `d2w browser`, `d2w security` - prints the install command that adds it.
+
 Or run on demand without installing:
 
 ```bash
@@ -50,7 +58,7 @@ d2w browser      Playwright UI automation (only with [browser] extra).
 d2w data         DHIS2 data values (aggregate + tracker).
 d2w dev          Developer/operator tools.
 d2w doctor       Probe a DHIS2 instance for known gotchas + requirements.
-d2w fhir         FHIR IG generation (SUSHI/FSH) from DHIS2 metadata.
+d2w fhir         FHIR IG generation, serving and capture (only with [fhir] extra).
 d2w files        Manage DHIS2 documents + file resources.
 d2w maintenance  DHIS2 maintenance (tasks, cache, integrity, cleanup, refresh).
 d2w messaging    DHIS2 internal messaging.
@@ -69,4 +77,4 @@ d2w user-role    DHIS2 user-role administration.
 
 Full CLI reference: https://winterop-com.github.io/dhis2w/cli-reference/.
 
-`dhis2w-cli` is one member of the [`dhis2w`](https://github.com/winterop-com/dhis2w) workspace. The MCP server (`dhis2w-mcp`) exposes the same plugin surface as MCP tools.
+`dhis2w-cli` is one member of the [`dhis2w`](https://github.com/winterop-com/dhis2w) workspace. The MCP server ([`dhis2w-mcp`](https://github.com/winterop-com/dhis2w-mcp), a plugin pack in its own repository) exposes the same plugin surface as MCP tools.

{dhis2w_cli-1.28.1 → dhis2w_cli-1.30.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dhis2w-cli"
-version = "1.28.1"
+version = "1.30.0"
 description = "d2w command-line interface (Typer) — mounts plugins from dhis2w-core."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -14,10 +14,9 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-    "dhis2w-core>=1.28.1,<2.0",
+    "dhis2w-core>=1.30.0,<2.0",
     "typer>=0.27.1",
     "rich>=15",
-    "dhis2w-fhir>=1.28.1,<2.0",
 ]
 
 [[project.authors]]
@@ -25,9 +24,10 @@ name = "Morten Hansen"
 email = "morten@winterop.com"
 
 [project.optional-dependencies]
-browser = ["dhis2w-browser>=1.28.1,<2.0"]
-serve = ["dhis2w-fhir-serve>=1.28.1,<2.0"]
-security = ["dhis2w-security>=1.19.0,<2.0"]
+browser = ["dhis2w-browser>=1.29.0,<2.0"]
+serve = ["dhis2w-fhir-serve>=1.29.0,<2.0"]
+security = ["dhis2w-security>=1.29.0,<2.0"]
+fhir = ["dhis2w-fhir>=1.29.0,<2.0"]
 
 [project.scripts]
 d2w = "dhis2w_cli.main:main"
@@ -41,9 +41,3 @@ Changelog = "https://github.com/winterop-com/dhis2w/blob/main/CHANGELOG.md"
 [build-system]
 requires = ["uv_build>=0.12.12,<0.13.0"]
 build-backend = "uv_build"
-
-[tool.uv.sources.dhis2w-fhir]
-workspace = true
-
-[tool.uv.sources.dhis2w-fhir-serve]
-workspace = true

{dhis2w_cli-1.28.1 → dhis2w_cli-1.30.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "dhis2w-cli"
-version = "1.28.1"
+version = "1.30.0"
 description = "d2w command-line interface (Typer) — mounts plugins from dhis2w-core."
 readme = "README.md"
 authors = [{ name = "Morten Hansen", email = "morten@winterop.com" }]
@@ -15,19 +15,23 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-  "dhis2w-core>=1.28.1,<2.0",
+  "dhis2w-core>=1.30.0,<2.0",
   "typer>=0.27.1",
   "rich>=15",
-  "dhis2w-fhir>=1.28.1,<2.0",
 ]
 
 [project.optional-dependencies]
-browser = ["dhis2w-browser>=1.28.1,<2.0"]
+browser = [
+    "dhis2w-browser>=1.29.0,<2.0",
+]
 serve = [
-    "dhis2w-fhir-serve>=1.28.1,<2.0",
+    "dhis2w-fhir-serve>=1.29.0,<2.0",
 ]
 security = [
-    "dhis2w-security>=1.19.0,<2.0",
+    "dhis2w-security>=1.29.0,<2.0",
+]
+fhir = [
+    "dhis2w-fhir>=1.29.0,<2.0",
 ]
 
 [project.scripts]
@@ -42,7 +46,3 @@ Changelog = "https://github.com/winterop-com/dhis2w/blob/main/CHANGELOG.md"
 [build-system]
 requires = ["uv_build>=0.12.12,<0.13.0"]
 build-backend = "uv_build"
-
-[tool.uv.sources]
-dhis2w-fhir = { workspace = true }
-dhis2w-fhir-serve = { workspace = true }

{dhis2w_cli-1.28.1 → dhis2w_cli-1.30.0}/src/dhis2w_cli/main.py

@@ -15,6 +15,8 @@ from dhis2w_core.plugin import DEFAULT_VERSION_KEY, load_plugin_host, resolve_st
 from dhis2w_core.rich_console import STDERR_CONSOLE
 from rich.logging import RichHandler
 
+from dhis2w_cli.packs import mount_install_hints
+
 
 def _extract_profile_from_argv(argv: list[str]) -> str | None:
     """Pre-scan argv for the profile Click will apply: the last root `--profile` / `-p` value.
@@ -196,7 +198,9 @@ def build_app() -> typer.Typer:
         # invocation must not leak into the next one.
         JSON_OUTPUT.set(json_)
 
-    load_plugin_host(resolve_startup_version()).mount_cli(app)
+    host = load_plugin_host(resolve_startup_version())
+    host.mount_cli(app)
+    mount_install_hints(app, host.names)
     return app
 
 

dhis2w_cli-1.30.0/src/dhis2w_cli/packs.py

@@ -0,0 +1,74 @@
+"""The optional plugin packs `d2w` knows by name, and the hint it prints when one is not installed."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+
+import typer
+from pydantic import BaseModel, ConfigDict
+
+
+class OptionalPack(BaseModel):
+    """A plugin pack that mounts a `d2w` command group when installed, and the extra that installs it."""
+
+    model_config = ConfigDict(frozen=True)
+
+    command: str
+    distribution: str
+    extra: str
+    summary: str
+
+
+OPTIONAL_PACKS: tuple[OptionalPack, ...] = (
+    OptionalPack(
+        command="fhir",
+        distribution="dhis2w-fhir",
+        extra="fhir",
+        summary="FHIR Implementation Guides from DHIS2 metadata, and the capture server",
+    ),
+    OptionalPack(
+        command="browser",
+        distribution="dhis2w-browser",
+        extra="browser",
+        summary="Playwright-driven DHIS2 UI automation",
+    ),
+    OptionalPack(
+        command="security",
+        distribution="dhis2w-security",
+        extra="security",
+        summary="a security audit of a DHIS2 instance",
+    ),
+)
+
+
+def install_hint(pack: OptionalPack) -> str:
+    """The message `d2w <command>` prints when the pack providing it is not installed."""
+    return (
+        f"`d2w {pack.command}` is not installed. It comes with the {pack.distribution} pack "
+        f"({pack.summary}):\n\n"
+        f'  uv tool install "dhis2w-cli[{pack.extra}]"\n\n'
+        f"or, in a project: uv add {pack.distribution}"
+    )
+
+
+def _hint_command(pack: OptionalPack) -> Callable[[typer.Context], None]:
+    """The command body standing in for `d2w <command>`: print the install hint and exit 1."""
+
+    def _hint(context: typer.Context) -> None:
+        typer.echo(install_hint(pack), err=True)
+        raise typer.Exit(1)
+
+    return _hint
+
+
+def mount_install_hints(app: typer.Typer, mounted: tuple[str, ...]) -> None:
+    """Mount a hidden `d2w <command>` for every known pack that is not installed, printing how to install it."""
+    for pack in OPTIONAL_PACKS:
+        if pack.command in mounted:
+            continue
+        app.command(
+            pack.command,
+            hidden=True,
+            add_help_option=False,
+            context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
+        )(_hint_command(pack))