doover-cli 0.6.6__tar.gz → 0.6.7__tar.gz

{doover_cli-0.6.6 → doover_cli-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: doover-cli
-Version: 0.6.6
+Version: 0.6.7
 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.12.0
+Requires-Dist: pydoover>=1.17.1
 Requires-Dist: pytz>=2025.2
 Requires-Dist: questionary>=1.10.0
 Requires-Dist: requests>=2.32.3

{doover_cli-0.6.6 → doover_cli-0.6.7}/pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "docker>=7.1.0",
     "jsf>=0.11.2",
     "paramiko>=3.5.1",
-    "pydoover>=1.12.0",
+    "pydoover>=1.17.1",
     "pytz>=2025.2",
     "questionary>=1.10.0",
     "requests>=2.32.3",

{doover_cli-0.6.6 → doover_cli-0.6.7}/src/doover_cli/__init__.py

@@ -1,7 +1,7 @@
 from doover_cli.renderer import Renderer
 from typing import Annotated, Optional
 
-__version__ = "0.6.6"
+__version__ = "0.6.7"
 
 import click
 import typer
@@ -11,6 +11,7 @@ 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 .notification_schema import app as notification_schema_app
 from .ui_schema import app as ui_schema_app
 from .simulator import app as simulators_app
 from .agent import app as agents_app
@@ -40,6 +41,11 @@ app.add_typer(
     config_schema_app, name="config-schema", help="Manage application config schemas."
 )
 app.add_typer(ui_schema_app, name="ui-schema", help="Manage application UI schemas.")
+app.add_typer(
+    notification_schema_app,
+    name="notification-schema",
+    help="Manage application notification schemas.",
+)
 app.add_typer(
     simulators_app, name="simulator", help="Manage simulators and their configurations."
 )

{doover_cli-0.6.6 → doover_cli-0.6.7}/src/doover_cli/apps/apps.py

@@ -26,6 +26,7 @@ import questionary
 
 
 from ..config_schema import export as export_config_command
+from ..notification_schema import export as export_notification_command
 from ..ui_schema import export as export_ui_command
 from ..utils.api import ProfileAnnotation
 from ..registry import is_doover_registry, login_for_push, publish_github_output
@@ -397,6 +398,16 @@ def _build_application_payload(
     return payload
 
 
+def _should_export_notifications(app_config) -> bool:
+    """Whether to try the notification exporter for this app.
+
+    Opt-out rather than opt-in so an app that adds notifications starts
+    publishing them without also having to remember a flag, but explicitly
+    skippable with ``"export_notification_command": "NO_EXPORT"``.
+    """
+    return getattr(app_config, "export_notification_command", None) != "NO_EXPORT"
+
+
 def _should_export_ui(app_config) -> bool:
     return app_config.type not in ("REP", "INT") and getattr(
         app_config, "generate_ui", True
@@ -1154,6 +1165,12 @@ def publish(
             help="Export the application UI schema before publishing.",
         ),
     ] = True,
+    export_notifications: Annotated[
+        bool,
+        typer.Option(
+            help="Export the application notification schema before publishing.",
+        ),
+    ] = True,
     build_widget: Annotated[
         bool,
         typer.Option(
@@ -1255,6 +1272,21 @@ def publish(
             else:
                 rich.print("[green]Exported UI schema.[/green]")
 
+        # Most apps declare no notifications, and the exporter is only present
+        # on those that do, so a missing one is not worth a prompt -- unlike the
+        # config and UI exports, which every app of their type has.
+        if export_notifications and _should_export_notifications(app_config):
+            try:
+                ctx.invoke(
+                    export_notification_command, ctx, app_fp=root_fp, validate_=True
+                )
+            except Exception as exc:
+                rich.print(
+                    f"[yellow]Skipping notification schema export: {exc}[/yellow]"
+                )
+            else:
+                rich.print("[green]Exported notification schema.[/green]")
+
         app_config = get_app_config(root_fp)
         resolved_staging = _resolve_staging(staging)
         payload = _build_application_payload(

{doover_cli-0.6.6 → doover_cli-0.6.7}/src/doover_cli/apps/migrate.py

@@ -58,7 +58,7 @@ REGISTRY_PROFILE_IDS = {
 
 # Generated from the app's Python/Rust at publish time. A committed copy is a
 # stale duplicate that nothing reads.
-GENERATED_FIELDS = ("config_schema", "ui_schema")
+GENERATED_FIELDS = ("config_schema", "ui_schema", "notification_schema")
 
 # Container registry credentials are minted by the control plane against the
 # app's publish permission now, so a registry profile no longer selects

doover_cli-0.6.7/src/doover_cli/notification_schema.py

@@ -0,0 +1,153 @@
+import json
+
+from pathlib import Path
+from typing import Annotated
+
+import rich
+import typer
+
+from .utils.apps import (
+    app_names_in_config,
+    get_app_directory,
+    get_app_config,
+    preserve_file,
+    run_schema_export,
+)
+
+app = typer.Typer(no_args_is_help=True)
+
+
+@app.command()
+def export(
+    ctx: typer.Context,
+    app_fp: Annotated[
+        Path, typer.Argument(help="Path to the application directory.")
+    ] = Path(),
+    validate_: Annotated[
+        bool,
+        typer.Option(
+            "--validate",
+            help="Validate the notification schema before exporting.",
+        ),
+    ] = True,
+    app_name: Annotated[
+        str | None,
+        typer.Option(
+            help="Application name in doover_config.json. Required to pick one "
+            "non-interactively when the repo defines multiple apps.",
+        ),
+    ] = None,
+):
+    """Export the application notification schema to the doover config json file."""
+    root_fp = get_app_directory(app_fp)
+    app_config = get_app_config(root_fp, app_name=app_name)
+    export_command = app_config.export_notification_command or "export-notifications"
+    if export_command == "NO_EXPORT":
+        print("App requested no notification export. Skipping...")
+        return
+
+    run_schema_export(
+        root_fp,
+        app_config.export_notification_command,
+        "export-notifications",
+        app_name=app_config.name,
+        cwd=app_fp,
+    )
+
+    print("Exporting notification schema...")
+
+    if validate_ is True:
+        print("Validating notification schema...")
+        ctx.invoke(validate, ctx, app_fp=app_fp, export_=False)
+
+
+@app.command()
+def validate(
+    ctx: typer.Context,
+    app_fp: Annotated[
+        Path, typer.Argument(help="Path to the application directory.")
+    ] = Path(),
+    export_: Annotated[
+        bool,
+        typer.Option(
+            "--export/--no-export",
+            help="Regenerate the schema from the source before validating. "
+            "The export is transient -- doover_config.json is restored "
+            "afterwards, so validation never writes to the working tree.",
+        ),
+    ] = True,
+    app_name: Annotated[
+        str | None,
+        typer.Option(
+            help="Application name in doover_config.json. Required to pick one "
+            "non-interactively when the repo defines multiple apps.",
+        ),
+    ] = None,
+):
+    """Validate the application notification schema."""
+    root_fp = get_app_directory(app_fp)
+    config_file = root_fp / "doover_config.json"
+
+    if export_ is True:
+        targets = [app_name] if app_name else app_names_in_config(root_fp) or [None]
+        with preserve_file(config_file):
+            for target in targets:
+                ctx.invoke(
+                    export, ctx, app_fp=root_fp, validate_=False, app_name=target
+                )
+            _validate_notification_file(config_file)
+    else:
+        _validate_notification_file(config_file)
+
+
+#: Every event a topic is built from has to survive being a topic segment, and
+#: the policy decides which half of the hierarchy it lands in. Both are checked
+#: here because a bad one is only otherwise discovered when a device in the
+#: field tries to send the notification.
+_VALID_POLICIES = ("default", "opt-in")
+
+
+def _validate_notification_file(config_file: Path):
+    if not config_file.exists():
+        raise FileNotFoundError(
+            "doover_config.json not found. Please ensure there is a "
+            "doover_config.json file in the application directory."
+        )
+    data = json.loads(config_file.read_text())
+
+    for k, v in data.items():
+        if not isinstance(v, dict):
+            continue
+
+        schema = v.get("notification_schema")
+        # An explicit null says the same thing as no key: this app declares no
+        # notifications. Most apps do not, and an exporter that writes null is
+        # how they say so.
+        if schema is None:
+            continue
+
+        if not isinstance(schema, dict):
+            rich.print(
+                f"[red]Notification schema for {k} is not a JSON object "
+                f"(got {type(schema).__name__}).[/red]"
+            )
+            raise typer.Exit(1)
+
+        for event, entry in schema.items():
+            if not isinstance(entry, dict):
+                rich.print(
+                    f"[red]Notification {event!r} for {k} is not a JSON object.[/red]"
+                )
+                raise typer.Exit(1)
+            policy = entry.get("policy")
+            if policy is not None and policy not in _VALID_POLICIES:
+                rich.print(
+                    f"[red]Notification {event!r} for {k} has policy {policy!r}; "
+                    f"expected one of {', '.join(_VALID_POLICIES)}.[/red]"
+                )
+                raise typer.Exit(1)
+
+        rich.print(
+            f"[green]Notification schema for {k} is valid "
+            f"({len(schema)} notification{'' if len(schema) == 1 else 's'}).[/green]"
+        )

{doover_cli-0.6.6 → doover_cli-0.6.7}/src/doover_cli/utils/apps.py

@@ -111,6 +111,7 @@ class LocalApplication(ControlApplication):
         allow_many: bool | None = None,
         config_schema: Any | None = None,
         ui_schema: Any | None = None,
+        notification_schema: Any | None = None,
         depends_on: list[str] | None = None,
         organisation: dict[str, Any] | str | int | None = None,
         approx_installs: int | None = None,
@@ -127,6 +128,7 @@ class LocalApplication(ControlApplication):
         build_widget_command: str | None = None,
         export_config_command: str | None = None,
         export_ui_command: str | None = None,
+        export_notification_command: str | None = None,
         generate_ui: bool = True,
         run_command: str | None = None,
         staging_config: dict[str, Any] | None = None,
@@ -145,6 +147,7 @@ class LocalApplication(ControlApplication):
             allow_many=allow_many,
             config_schema=config_schema,
             ui_schema=ui_schema,
+            notification_schema=notification_schema,
             depends_on=depends_on,
             organisation=organisation,
             approx_installs=approx_installs,
@@ -181,6 +184,7 @@ class LocalApplication(ControlApplication):
         self.build_args = build_args
         self.export_config_command = export_config_command
         self.export_ui_command = export_ui_command
+        self.export_notification_command = export_notification_command
         self.generate_ui = generate_ui
         self.run_command = run_command
         self.staging_config = staging_config or {}
@@ -306,10 +310,12 @@ class LocalApplication(ControlApplication):
             build_widget_command=data.get("build_widget_command"),
             export_config_command=data.get("export_config_command"),
             export_ui_command=data.get("export_ui_command"),
+            export_notification_command=data.get("export_notification_command"),
             generate_ui=data.get("generate_ui", True),
             run_command=data.get("run_command"),
             config_schema=data.get("config_schema"),
             ui_schema=data.get("ui_schema"),
+            notification_schema=data.get("notification_schema"),
             staging_config=data.get("staging_config", {}),
             icon_url=data.get("icon_url"),
             banner_url=data.get("banner_url"),
@@ -401,6 +407,7 @@ class LocalApplication(ControlApplication):
                 "lambda_config": self.lambda_config,
                 "config_schema": self.config_schema,
                 "ui_schema": self.ui_schema,
+                "notification_schema": self.notification_schema,
                 "icon_url": self.icon_url,
                 "banner_url": self.banner_url,
             }
@@ -417,6 +424,7 @@ class LocalApplication(ControlApplication):
             data["build_widget_command"] = self.build_widget_command
             data["export_config_command"] = self.export_config_command
             data["export_ui_command"] = self.export_ui_command
+            data["export_notification_command"] = self.export_notification_command
             data["generate_ui"] = self.generate_ui
             data["run_command"] = self.run_command
 

{doover_cli-0.6.6 → doover_cli-0.6.7}/uv.lock

@@ -591,7 +591,7 @@ requires-dist = [
     { name = "jsf", specifier = ">=0.11.2" },
     { name = "paramiko", specifier = ">=3.5.1" },
     { name = "prompt-toolkit", specifier = ">=3.0.52" },
-    { name = "pydoover", specifier = ">=1.12.0" },
+    { name = "pydoover", specifier = ">=1.17.1" },
     { name = "pytz", specifier = ">=2025.2" },
     { name = "questionary", specifier = ">=1.10.0" },
     { name = "requests", specifier = ">=2.32.3" },
@@ -1337,15 +1337,15 @@ wheels = [
 
 [[package]]
 name = "pydoover"
-version = "1.12.0"
+version = "1.17.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiohttp" },
     { name = "httpx" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/20/6a/6250ccb49522966c7024f7cfdda6268941ca8eeeaa32c7ecb3e983e5fd1a/pydoover-1.12.0.tar.gz", hash = "sha256:ef3c4f89ad81ed46f457a0fc72052e1da609246977745f7530bd9ae653dc1771", size = 563024, upload-time = "2026-07-31T02:23:39.204Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d9/99/56164d2368604d81dedde8f969f777f2cfa75b6325cd7235c4a64413714d/pydoover-1.17.1.tar.gz", hash = "sha256:11ae6055a5af53aeb137c5a14fe38942596f7549cd9bdf20db571433f135503d", size = 608525, upload-time = "2026-09-09T03:17:32.98Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/44/c4/d70ae64e37d5ff8d68d9a833ec8771ffc30946174e453286b537ee418add/pydoover-1.12.0-py3-none-any.whl", hash = "sha256:d0b82371c7ad11b247aa278b3198ea7ea2bec4dc3b6886221ab33867acc6928f", size = 299364, upload-time = "2026-07-31T02:23:37.73Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/8f/f17d1242881565ed5d93604dab48977891421f3d1a1fe189f6150af31ae8/pydoover-1.17.1-py3-none-any.whl", hash = "sha256:dc9e6a67007d161193372d884b691809c7c835409f8c50d6dacbec5dee0ce27a", size = 329229, upload-time = "2026-09-09T03:17:31.696Z" },
 ]
 
 [[package]]