doover-cli 0.5.2__tar.gz → 0.5.4__tar.gz

{doover_cli-0.5.2 → doover_cli-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doover-cli
-Version: 0.5.2
+Version: 0.5.4
 Summary: CLI for Doover
 License-File: LICENSE
 Requires-Python: >=3.11

{doover_cli-0.5.2 → doover_cli-0.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "doover-cli"
-version = "0.5.2"
+dynamic = ["version"]
 description = "CLI for Doover"
 requires-python = ">=3.11"
 dependencies = [
@@ -26,6 +26,9 @@ dependencies = [
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.hatch.version]
+path = "src/doover_cli/__init__.py"
+
 [project.scripts]
 doover = "doover_cli:main"
 

{doover_cli-0.5.2 → doover_cli-0.5.4}/src/doover_cli/__init__.py

@@ -1,6 +1,8 @@
 from doover_cli.renderer import Renderer
 from typing import Annotated, Optional
 
+__version__ = "0.5.4"
+
 import click
 import typer
 

{doover_cli-0.5.2 → doover_cli-0.5.4}/src/doover_cli/apps/apps.py

@@ -938,6 +938,14 @@ def publish(
             help="Upload the widget when publishing. Disable with --no-put-widget.",
         ),
     ] = True,
+    build_package: Annotated[
+        bool,
+        typer.Option(
+            help="Build package.zip (./build.sh) before uploading a processor. "
+            "Use --no-build-package to upload an existing package.zip -- e.g. "
+            "when publishing several apps that share a single build.",
+        ),
+    ] = True,
     app_name: Annotated[
         str | None,
         typer.Option(
@@ -999,6 +1007,16 @@ def publish(
 
     client, renderer = get_state()
 
+    # The publish endpoints are organisation-scoped: without the
+    # X-Doover-Organisation header the control plane rejects the request with
+    # 401 "X-Doover-Organisation header missing" for any non-staff account.
+    # Pin the client to the app's organisation (staging-aware, resolved into the
+    # payload above) so every publish sub-call - create/partial, widget upload,
+    # processor source + version release - carries the header.
+    publish_org_id = payload.get("organisation_id")
+    if publish_org_id is not None:
+        client.organisation_id = int(publish_org_id)
+
     rich.print(
         f"Updating application on doover site ({_control_base_url() or 'unknown base URL'})...\n"
     )
@@ -1062,8 +1080,13 @@ def publish(
             rich.print("[green]Widget uploaded.[/green]")
 
     if app_config.type in ("PRO", "REP", "INT"):
-        print("\nBuilding package.zip for upload...")
-        shell_run("./build.sh", cwd=root_fp)
+        if build_package:
+            print("\nBuilding package.zip for upload...")
+            shell_run("./build.sh", cwd=root_fp)
+        else:
+            print(
+                "\nSkipping package.zip build (--no-build-package); using existing package.zip."
+            )
         print("Uploading package.zip to Doover...")
         processor_response = _publish_processor_package(
             client,

{doover_cli-0.5.2 → doover_cli-0.5.4}/src/doover_cli/config_schema.py

@@ -38,18 +38,25 @@ def export(
             file_okay=True,
         ),
     ] = None,
+    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 configuration to the doover config json file."""
     if config_fp is None:
         root_fp = get_app_directory(app_fp)
-        app_config = get_app_config(root_fp)
+        app_config = get_app_config(root_fp, app_name=app_name)
         call_with_uv(
             app_config.export_config_command or "export-config",
             in_shell=True,
             cwd=app_fp,
         )
     else:
-        config = get_app_config(app_fp)
+        config = get_app_config(app_fp, app_name=app_name)
         call_with_uv(config.src_directory / "app_config.py", in_shell=True)
 
     print("Exporting application configuration...")
@@ -74,6 +81,13 @@ def validate(
             "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 application config is a valid JSON schema."""
     root_fp = get_app_directory(app_fp)
@@ -83,7 +97,7 @@ def validate(
         # Validate the schema the Python *currently* generates, without leaving
         # doover_config.json modified (e.g. when run as a pre-commit hook).
         with preserve_file(config_file):
-            ctx.invoke(export, ctx, app_fp=root_fp, validate_=False)
+            ctx.invoke(export, ctx, app_fp=root_fp, validate_=False, app_name=app_name)
             _validate_config_file(config_file)
     else:
         _validate_config_file(config_file)

{doover_cli-0.5.2 → doover_cli-0.5.4}/src/doover_cli/ui_schema.py

@@ -29,10 +29,17 @@ def export(
             help="Validate the UI 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 UI schema to the doover config json file."""
     root_fp = get_app_directory(app_fp)
-    app_config = get_app_config(root_fp)
+    app_config = get_app_config(root_fp, app_name=app_name)
     export_command = app_config.export_ui_command or "export-ui"
     if export_command == "NO_EXPORT":
         print("App requested no ui export. Skipping...")
@@ -66,6 +73,13 @@ def validate(
             "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 application UI schema is valid JSON."""
     root_fp = get_app_directory(app_fp)
@@ -75,7 +89,7 @@ def validate(
         # Validate the schema the Python *currently* generates, without leaving
         # doover_config.json modified (e.g. when run as a pre-commit hook).
         with preserve_file(config_file):
-            ctx.invoke(export, ctx, app_fp=root_fp, validate_=False)
+            ctx.invoke(export, ctx, app_fp=root_fp, validate_=False, app_name=app_name)
             _validate_ui_file(config_file)
     else:
         _validate_ui_file(config_file)

{doover_cli-0.5.2 → doover_cli-0.5.4}/tests/test_apps.py

@@ -491,6 +491,51 @@ def test_app_publish_updates_existing_application(monkeypatch, tmp_path):
     assert renderer.render_calls == [{"id": 101, "published": True}]
 
 
+def test_app_publish_pins_client_to_app_organisation(monkeypatch, tmp_path):
+    # Regression: publish must set the org context on the client so the
+    # X-Doover-Organisation header is sent. Without it the control plane
+    # returns 401 "X-Doover-Organisation header missing" for non-staff accounts.
+    captured = {}
+    renderer = FakeRenderer()
+    app_config = FakeAppConfig(app_id=101)
+
+    class FakeApplicationsClient:
+        @staticmethod
+        def partial(application_id, body):
+            captured["partial"] = (application_id, body)
+            return {"id": int(application_id), "published": True}
+
+    class FakeControlClient:
+        organisation_id = None
+        applications = FakeApplicationsClient()
+
+    client = FakeControlClient()
+
+    monkeypatch.setattr(
+        "doover_cli.apps.apps.get_app_directory", lambda root=None: tmp_path
+    )
+    monkeypatch.setattr(
+        "doover_cli.apps.apps.get_app_config", lambda root_fp, app_name=None: app_config
+    )
+    monkeypatch.setattr(
+        "doover_cli.apps.apps.get_state", lambda: (client, renderer)
+    )
+    monkeypatch.setattr(
+        "doover_cli.apps.apps.export_config_command",
+        lambda ctx, app_fp, validate_: None,
+    )
+    monkeypatch.setattr(
+        "doover_cli.apps.apps.export_ui_command",
+        lambda ctx, app_fp, validate_: None,
+    )
+
+    result = runner.invoke(app, ["app", "publish", str(tmp_path)])
+
+    assert result.exit_code == 0
+    assert client.organisation_id == 17
+    assert captured["partial"][0] == "101"
+
+
 def test_app_publish_creates_then_updates_when_missing(monkeypatch, tmp_path):
     captured = {}
     renderer = FakeRenderer()

{doover_cli-0.5.2 → doover_cli-0.5.4}/uv.lock

@@ -544,7 +544,6 @@ wheels = [
 
 [[package]]
 name = "doover-cli"
-version = "0.5.2"
 source = { editable = "." }
 dependencies = [
     { name = "click" },