doover-cli 0.4.2__tar.gz → 0.5.0__tar.gz

{doover_cli-0.4.2 → doover_cli-0.5.0}/PKG-INFO

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

{doover_cli-0.4.2 → doover_cli-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "doover-cli"
-version = "0.4.2"
+version = "0.5.0"
 description = "CLI for Doover"
 requires-python = ">=3.11"
 dependencies = [

{doover_cli-0.4.2 → doover_cli-0.5.0}/src/doover_cli/apps/apps.py

@@ -31,6 +31,7 @@ from ..utils.apps import (
     call_with_uv,
     get_docker_path,
     get_app_config,
+    preserve_file,
 )
 from ..utils.crud import (
     build_update_command,
@@ -961,35 +962,40 @@ def publish(
     # Resolve the app name early so subsequent get_app_config calls don't re-prompt.
     app_config = get_app_config(root_fp, app_name=app_name)
 
-    if export_config:
-        try:
-            ctx.invoke(export_config_command, ctx, app_fp=root_fp, validate_=True)
-        except jsonschema.exceptions.SchemaError as exc:
-            summary, remainder = str(exc).split("\n", 1)
-            rich.print(
-                f"[red]Failed to export application configuration: {summary}[/red]\n{remainder}\n"
-            )
-            typer.confirm("Do you want to continue?", abort=True)
-        else:
-            rich.print("[green]Exported application configuration.[/green]")
-            app_config = get_app_config(root_fp)
-
-    if export_ui and _should_export_ui(app_config):
-        try:
-            ctx.invoke(export_ui_command, ctx, app_fp=root_fp, validate_=True)
-        except Exception as exc:
-            rich.print(f"[red]Failed to export UI schema: {exc}[/red]\n")
-            typer.confirm("Do you want to continue?", abort=True)
-        else:
-            rich.print("[green]Exported UI schema.[/green]")
+    # Generate the schema from the Python into doover_config.json so the upload
+    # payload carries the current source, then restore the file -- publishing
+    # never leaves generated config_schema/ui_schema in the working tree. The
+    # Python is the source of truth; the JSON is regenerated on demand.
+    with preserve_file(root_fp / "doover_config.json"):
+        if export_config:
+            try:
+                ctx.invoke(export_config_command, ctx, app_fp=root_fp, validate_=True)
+            except jsonschema.exceptions.SchemaError as exc:
+                summary, remainder = str(exc).split("\n", 1)
+                rich.print(
+                    f"[red]Failed to export application configuration: {summary}[/red]\n{remainder}\n"
+                )
+                typer.confirm("Do you want to continue?", abort=True)
+            else:
+                rich.print("[green]Exported application configuration.[/green]")
+                app_config = get_app_config(root_fp)
 
-    app_config = get_app_config(root_fp)
-    resolved_staging = _resolve_staging(staging)
-    payload = _build_application_payload(
-        app_config,
-        staging=resolved_staging,
-        include_deployment_data=True,
-    )
+        if export_ui and _should_export_ui(app_config):
+            try:
+                ctx.invoke(export_ui_command, ctx, app_fp=root_fp, validate_=True)
+            except Exception as exc:
+                rich.print(f"[red]Failed to export UI schema: {exc}[/red]\n")
+                typer.confirm("Do you want to continue?", abort=True)
+            else:
+                rich.print("[green]Exported UI schema.[/green]")
+
+        app_config = get_app_config(root_fp)
+        resolved_staging = _resolve_staging(staging)
+        payload = _build_application_payload(
+            app_config,
+            staging=resolved_staging,
+            include_deployment_data=True,
+        )
 
     client, renderer = get_state()
 

{doover_cli-0.4.2 → doover_cli-0.5.0}/src/doover_cli/config_schema.py

@@ -7,7 +7,12 @@ import rich
 import typer
 import jsf
 
-from .utils.apps import get_app_directory, call_with_uv, get_app_config
+from .utils.apps import (
+    get_app_directory,
+    call_with_uv,
+    get_app_config,
+    preserve_file,
+)
 
 app = typer.Typer(no_args_is_help=True)
 
@@ -63,18 +68,28 @@ def validate(
     export_: Annotated[
         bool,
         typer.Option(
-            "--export",
-            help="Export the configuration before validating.",
+            "--export/--no-export",
+            help="Regenerate the schema from the Python before validating. "
+            "The export is transient -- doover_config.json is restored "
+            "afterwards, so validation never writes to the working tree.",
         ),
     ] = True,
 ):
     """Validate application config is a valid JSON schema."""
     root_fp = get_app_directory(app_fp)
+    config_file = root_fp / "doover_config.json"
 
     if export_ is True:
-        ctx.invoke(export, ctx, app_fp=root_fp, validate_=False)
+        # 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)
+            _validate_config_file(config_file)
+    else:
+        _validate_config_file(config_file)
 
-    config_file = root_fp / "doover_config.json"
+
+def _validate_config_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."

{doover_cli-0.4.2 → doover_cli-0.5.0}/src/doover_cli/ui_schema.py

@@ -6,7 +6,12 @@ from typing import Annotated
 import rich
 import typer
 
-from .utils.apps import get_app_directory, call_with_uv, get_app_config
+from .utils.apps import (
+    get_app_directory,
+    call_with_uv,
+    get_app_config,
+    preserve_file,
+)
 
 app = typer.Typer(no_args_is_help=True)
 
@@ -55,18 +60,28 @@ def validate(
     export_: Annotated[
         bool,
         typer.Option(
-            "--export",
-            help="Export the UI schema before validating.",
+            "--export/--no-export",
+            help="Regenerate the schema from the Python before validating. "
+            "The export is transient -- doover_config.json is restored "
+            "afterwards, so validation never writes to the working tree.",
         ),
     ] = True,
 ):
     """Validate application UI schema is valid JSON."""
     root_fp = get_app_directory(app_fp)
+    config_file = root_fp / "doover_config.json"
 
     if export_ is True:
-        ctx.invoke(export, ctx, app_fp=root_fp, validate_=False)
+        # 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)
+            _validate_ui_file(config_file)
+    else:
+        _validate_ui_file(config_file)
 
-    config_file = root_fp / "doover_config.json"
+
+def _validate_ui_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."

{doover_cli-0.4.2 → doover_cli-0.5.0}/src/doover_cli/utils/apps.py

@@ -2,6 +2,7 @@ import os
 import json
 import base64
 import shutil
+import contextlib
 from pathlib import Path
 from typing import Any
 
@@ -19,6 +20,27 @@ def get_id_or_key(data: dict[str, Any], key: str) -> Any:
         return data.get(key)
 
 
+@contextlib.contextmanager
+def preserve_file(path: Path):
+    """Snapshot a file (or its absence) and restore it on exit.
+
+    Lets a command generate schema into ``doover_config.json`` transiently --
+    to validate it or build an upload payload from it -- without leaving the
+    working tree modified. This keeps generated ``config_schema``/``ui_schema``
+    out of git: the Python is the source of truth, the JSON is regenerated on
+    demand. Restores on exceptions too, so a failed run never dirties the tree.
+    """
+    existed = path.exists()
+    original = path.read_text() if existed else None
+    try:
+        yield
+    finally:
+        if existed:
+            path.write_text(original)
+        elif path.exists():
+            path.unlink()
+
+
 class LocalApplication(ControlApplication):
     _model_name = None
 
@@ -366,14 +388,16 @@ def get_app_config(root_fp: Path, app_name: str | None = None) -> Any:
 
     result = []
     for k, v in data.items():
-        if isinstance(v, dict) and "config_schema" in v:
-            # config_schema bit of a prerequisite for an app config entry.
+        if isinstance(v, dict) and "type" in v:
+            # `type` (e.g. DEV/PRO) marks an app entry. Don't key off
+            # config_schema -- it's generated from the Python and may be
+            # absent from the committed file.
             result.append(LocalApplication.from_config(v, root_fp))
 
     if len(result) == 0:
         print(
             f"No application configuration found in the `doover_config.json` file at {root_fp}. "
-            f"Make sure the `type` is set to `application` in the configuration."
+            f"Make sure each application entry has a `type` set in the configuration."
         )
         raise typer.Exit(1)
 

{doover_cli-0.4.2 → doover_cli-0.5.0}/tests/test_utils_apps.py

@@ -63,10 +63,12 @@ def test_get_app_config_caches_explicit_app_name(monkeypatch, tmp_path):
             {
                 "vega_level_sensor": {
                     "name": "vega_level_sensor",
+                    "type": "DEV",
                     "config_schema": {"type": "object"},
                 },
                 "farm_water_dashboard": {
                     "name": "farm_water_dashboard",
+                    "type": "DEV",
                     "config_schema": {"type": "object"},
                 },
             }
@@ -85,17 +87,21 @@ def test_get_app_config_caches_explicit_app_name(monkeypatch, tmp_path):
     assert cached_config.name == "farm_water_dashboard"
 
 
-def test_get_app_config_rejects_unknown_explicit_app_name(monkeypatch, tmp_path, capsys):
+def test_get_app_config_rejects_unknown_explicit_app_name(
+    monkeypatch, tmp_path, capsys
+):
     config_path = tmp_path / "doover_config.json"
     config_path.write_text(
         json.dumps(
             {
                 "vega_level_sensor": {
                     "name": "vega_level_sensor",
+                    "type": "DEV",
                     "config_schema": {"type": "object"},
                 },
                 "farm_water_dashboard": {
                     "name": "farm_water_dashboard",
+                    "type": "DEV",
                     "config_schema": {"type": "object"},
                 },
             }
@@ -124,6 +130,7 @@ def test_get_app_config_rejects_unknown_explicit_app_name_with_single_app(
             {
                 "tracker-app": {
                     "name": "tracker-app",
+                    "type": "DEV",
                     "config_schema": {"type": "object"},
                 },
             }

{doover_cli-0.4.2 → doover_cli-0.5.0}/uv.lock

@@ -544,7 +544,7 @@ wheels = [
 
 [[package]]
 name = "doover-cli"
-version = "0.4.2"
+version = "0.5.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },
@@ -1325,15 +1325,15 @@ wheels = [
 
 [[package]]
 name = "pydoover"
-version = "1.7.0"
+version = "1.7.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiohttp" },
     { name = "httpx" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/a6/8e/b44585e9d89573ed2848acbc32a49735bc1117842f2276b269ed7c65c227/pydoover-1.7.0.tar.gz", hash = "sha256:fe23f440dd3d2054e40c7cdf8d027664726e9f91ef42993a6139b9ba757b4eb3", size = 537261, upload-time = "2026-06-27T08:39:42.61Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/bf/b6/446d8f51b55d402a9e92519a4f0ecad0571c3bc0c0ce5d8da98c456dd8a6/pydoover-1.7.1.tar.gz", hash = "sha256:2d98f99650078d105c49cd9ed8e6ba99ea1d6e04de39524beebf27871b102cb5", size = 537405, upload-time = "2026-06-27T10:44:37.13Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/80/17/c8650ef2c47e6874cd88b915cba27fcc5a8533c05ffeb015da4826c9cd22/pydoover-1.7.0-py3-none-any.whl", hash = "sha256:4bd4e46a8b2171fddc561aa1d0e9ae6a34e7380fa85e69787eb0d44411c174f1", size = 284886, upload-time = "2026-06-27T08:39:41.383Z" },
+    { url = "https://files.pythonhosted.org/packages/76/7f/c688ea03adf654238a86035bbd94f225de4d923c6ace7fcd1ed7a47991ee/pydoover-1.7.1-py3-none-any.whl", hash = "sha256:bda708ab027987769c04385e1127e5d7706110308b650362e85cbb1f9478d872", size = 284995, upload-time = "2026-06-27T10:44:35.919Z" },
 ]
 
 [[package]]