doover-cli 0.6.2__tar.gz → 0.6.4__tar.gz

{doover_cli-0.6.2 → doover_cli-0.6.4}/PKG-INFO

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

{doover_cli-0.6.2 → doover_cli-0.6.4}/src/doover_cli/__init__.py

@@ -1,7 +1,7 @@
 from doover_cli.renderer import Renderer
 from typing import Annotated, Optional
 
-__version__ = "0.6.2"
+__version__ = "0.6.4"
 
 import click
 import typer

{doover_cli-0.6.2 → doover_cli-0.6.4}/src/doover_cli/apps/apps.py

@@ -299,6 +299,21 @@ def _resolve_application_id(client, app_config, *, staging: bool) -> int | None:
     return None
 
 
+def _image_package_uri(app_config) -> str | None:
+    """The ECR image a processor deploys from, or None if it ships a package.zip.
+
+    A processor whose dependencies cannot fit Lambda's 250MB unzipped zip limit declares
+    `PackageType: "Image"` in `lambda_config` and names an image instead. Such an app has
+    no source archive at all, so the whole build-and-upload-a-zip path has to be skipped:
+    there is no ./build.sh to run, and the control plane rejects a processor_source
+    upload for it.
+    """
+    lambda_config = getattr(app_config, "lambda_config", None) or {}
+    if lambda_config.get("PackageType") != "Image":
+        return None
+    return (lambda_config.get("Code") or {}).get("ImageUri")
+
+
 def _publish_processor_package(
     client,
     app_id: int,
@@ -1172,20 +1187,32 @@ def publish(
             rich.print("[green]Widget uploaded.[/green]")
 
     if app_config.type in PACKAGE_APP_TYPES:
-        if build_package:
-            print("\nBuilding package.zip for upload...")
-            shell_run("./build.sh", cwd=root_fp)
-        else:
+        image_uri = _image_package_uri(app_config)
+        if image_uri:
+            # Nothing to build or upload: the deployable is already in ECR, and the
+            # release below is what points the function at it.
             print(
-                "\nSkipping package.zip build (--no-build-package); using existing package.zip."
+                f"\nProcessor deploys from a container image; skipping package.zip.\n"
+                f"  image: {image_uri}\n"
+                f"Push the image before releasing, or the release will deploy whatever "
+                f"that tag currently points at."
             )
-        print("Uploading package.zip to Doover...")
-        processor_response = _publish_processor_package(
-            client,
-            application_id,
-            root_fp,
-        )
-        print("Done!")
+            processor_response = None
+        else:
+            if build_package:
+                print("\nBuilding package.zip for upload...")
+                shell_run("sh ./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,
+                application_id,
+                root_fp,
+            )
+            print("Done!")
         renderer.render(processor_response or response)
         if release:
             ctx.invoke(
@@ -1303,6 +1330,9 @@ def discover(
         )
         raise typer.Exit(1)
 
+    for entry in found:
+        entry["dir"] = os.path.normpath(os.path.join(root, entry["dir"]))
+
     if as_json:
         # Compact and on one line so it can be captured straight into a step output.
         print(json.dumps(found, separators=(",", ":")))

{doover_cli-0.6.2 → doover_cli-0.6.4}/src/doover_cli/config_schema.py

@@ -8,6 +8,7 @@ import typer
 import jsf
 
 from .utils.apps import (
+    app_names_in_config,
     get_app_directory,
     call_with_uv,
     get_app_config,
@@ -94,10 +95,12 @@ def validate(
     config_file = root_fp / "doover_config.json"
 
     if export_ is True:
-        # Validate the schema the Python *currently* generates, without leaving
-        # doover_config.json modified (e.g. when run as a pre-commit hook).
+        targets = [app_name] if app_name else app_names_in_config(root_fp) or [None]
         with preserve_file(config_file):
-            ctx.invoke(export, ctx, app_fp=root_fp, validate_=False, app_name=app_name)
+            for target in targets:
+                ctx.invoke(
+                    export, ctx, app_fp=root_fp, validate_=False, app_name=target
+                )
             _validate_config_file(config_file)
     else:
         _validate_config_file(config_file)

{doover_cli-0.6.2 → doover_cli-0.6.4}/src/doover_cli/ui_schema.py

@@ -7,6 +7,7 @@ import rich
 import typer
 
 from .utils.apps import (
+    app_names_in_config,
     get_app_directory,
     call_with_uv,
     get_app_config,
@@ -86,10 +87,12 @@ def validate(
     config_file = root_fp / "doover_config.json"
 
     if export_ is True:
-        # Validate the schema the Python *currently* generates, without leaving
-        # doover_config.json modified (e.g. when run as a pre-commit hook).
+        targets = [app_name] if app_name else app_names_in_config(root_fp) or [None]
         with preserve_file(config_file):
-            ctx.invoke(export, ctx, app_fp=root_fp, validate_=False, app_name=app_name)
+            for target in targets:
+                ctx.invoke(
+                    export, ctx, app_fp=root_fp, validate_=False, app_name=target
+                )
             _validate_ui_file(config_file)
     else:
         _validate_ui_file(config_file)

{doover_cli-0.6.2 → doover_cli-0.6.4}/src/doover_cli/utils/apps.py

@@ -459,6 +459,29 @@ def get_docker_path() -> Path:
 _selected_app_name: dict[Path, str] = {}
 
 
+def app_names_in_config(root_fp: Path) -> list[str]:
+    """Every app name declared in this directory's doover_config.json.
+
+    Never prompts, unlike `get_app_config`. For commands that act on the whole
+    file rather than one app — schema validation checks every app's schema, so
+    prompting for one would be asking a question whose answer does not matter, and
+    aborts outright when stdin is not a terminal (pre-commit, CI).
+    """
+    config_path = root_fp / "doover_config.json"
+    if not config_path.exists():
+        return []
+
+    with open(config_path, "r") as file:
+        data = json.load(file)
+
+    # Same rule as get_app_config: `type` marks an app entry.
+    return [
+        v.get("name") or k
+        for k, v in data.items()
+        if isinstance(v, dict) and "type" in v
+    ]
+
+
 def get_app_config(root_fp: Path, app_name: str | None = None) -> Any:
     config_path = root_fp / "doover_config.json"
     if not config_path.exists():

{doover_cli-0.6.2 → doover_cli-0.6.4}/tests/test_apps.py

@@ -706,7 +706,7 @@ def test_app_publish_processor_type_without_ui_skips_ui_export(monkeypatch, tmp_
 
     assert result.exit_code == 0
     assert "export_ui_called" not in captured
-    assert captured["build_script"] == ("./build.sh", tmp_path)
+    assert captured["build_script"] == ("sh ./build.sh", tmp_path)
     assert captured["processor_source"] == ("303", {"file": package_fp})
     # publish uploads the package but no longer cuts a version (that's `release`)
     assert "processor_version" not in captured
@@ -981,7 +981,7 @@ def test_app_publish_processor_builds_package_without_release(monkeypatch, tmp_p
     result = runner.invoke(app, ["app", "publish", str(tmp_path), "--no-release"])
 
     assert result.exit_code == 0
-    assert captured["build_script"] == ("./build.sh", tmp_path)
+    assert captured["build_script"] == ("sh ./build.sh", tmp_path)
     assert captured["application_id"] == "303"
     assert captured["body"] == {"file": package_fp}
     # publish uploads the package; the version is cut by `doover app release`