validio-cli 0.15.0__tar.gz → 0.16.0__tar.gz

{validio_cli-0.15.0 → validio_cli-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: validio-cli
-Version: 0.15.0
+Version: 0.16.0
 Summary: CLI tool to interact with the Validio platform
 Home-page: https://validio.io/
 License: Apache-2.0

{validio_cli-0.15.0 → validio_cli-0.16.0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "validio-cli"
 # This version does not represent the released version or any tag. For each
 # release we automatically bump this before building and publishing so this
 # should be kept at 0.0.1dev1
-version = "0.15.0"
+version = "0.16.0"
 description = "CLI tool to interact with the Validio platform"
 authors = ["Validio <support@validio.io>"]
 license = "Apache-2.0"

{validio_cli-0.15.0 → validio_cli-0.16.0}/validio_cli/bin/entities/code.py

@@ -426,16 +426,25 @@ def _show_update_resource_diff(
     diff_output: DiffOutput,
 ) -> None:
     for r in resources.values():
-        class_key = r.manifest.resource.__class__.__name__
+        class_key = r.manifest.__class__.__name__
 
-        print(f"{class_key} '{r.manifest.resource.name}' will be updated")
+        print(f"{class_key} '{r.manifest.name}' will be updated")
 
         rewrites = _diff_field_rewrites(show_schema)
+
         a_value = code_plan._create_resource_diff_object(
-            r.manifest.resource, show_secrets=show_secrets, rewrites=rewrites
+            r.manifest,
+            show_secrets=show_secrets,
+            rewrites=rewrites,
+            secrets_changed=r.secrets_changed,
+            is_manifest=True,
         )
         b_value = code_plan._create_resource_diff_object(
-            r.server.resource, show_secrets=show_secrets, rewrites=rewrites
+            r.server,
+            show_secrets=show_secrets,
+            rewrites=rewrites,
+            secrets_changed=r.secrets_changed,
+            is_manifest=False,
         )
 
         _show_diff(b_value, a_value, color, diff_output, class_key)

validio_cli-0.16.0/validio_cli/bin/entities/dbt.py

@@ -0,0 +1,120 @@
+import typing
+from pathlib import Path
+from typing import Any, Optional, Tuple
+
+import typer
+from validio_sdk import ValidioError, dbt, util
+
+from validio_cli import AsyncTyper, ConfigDir, Namespace, get_client_and_config
+from validio_cli.bin.entities import credentials
+
+app = AsyncTyper(help="dbt related commands")
+
+"""
+Well-known file name for the manifest artifact.
+
+https://docs.getdbt.com/reference/artifacts/dbt-artifacts
+"""
+MANIFEST_FILE_NAME = "manifest.json"
+
+"""
+Well-known file name for the run-results artifact.
+
+https://docs.getdbt.com/reference/artifacts/dbt-artifacts
+"""
+RUN_RESULTS_FILE_NAME = "run_results.json"
+
+
+def _resolve_file_paths(
+    explicit_manifest_path: Optional[Path],
+    explicit_run_result_path: Optional[Path],
+    target_path: Optional[Path],
+) -> Tuple[Path, Optional[Path]]:
+    if explicit_manifest_path or explicit_run_result_path:
+        print(
+            "Deprecation notice ⚠️: The --manifest and --run-results flags "
+            "have been deprecated and will be removed in a future version. "
+            "Please use the --target-path argument instead."
+        )
+        if not explicit_manifest_path:
+            raise ValidioError(
+                "--manifest is required when combined with the --run-results argument"
+            )
+
+        return explicit_manifest_path, explicit_run_result_path
+
+    if not target_path:
+        raise ValidioError("Missing --target-path argument")
+
+    manifest_path = target_path / MANIFEST_FILE_NAME
+    run_results_path = target_path / RUN_RESULTS_FILE_NAME
+    if not manifest_path.is_file():
+        raise ValidioError(f"manifest file not found at {manifest_path}")
+
+    if not run_results_path.is_file():
+        print(
+            "Warning: run_results file not found at {run_results_path}. "
+            "Uploading only manifest file"
+        )
+        return manifest_path, None
+
+    return manifest_path, run_results_path
+
+
+@app.async_command(help="Upload dbt artifact")
+async def upload(
+    config_dir: str = ConfigDir,
+    namespace: str = Namespace(),
+    credential_id: str = typer.Option(..., help="Credential name or ID"),
+    manifest: Optional[Path] = typer.Option(
+        help="Path to the manifest file. "
+        "(deprecated in favor of the --target-path flag)",
+        default=None,
+    ),
+    job_name: str = typer.Option(
+        ..., help="The job that the dbt execution belongs to, e.g. `staging-pipeline`"
+    ),
+    run_results: Optional[Path] = typer.Option(
+        help="Path to the run results file. "
+        "(deprecated in favor of the --target-path flag)",
+        default=None,
+    ),
+    target_path: Optional[Path] = typer.Option(
+        help="Path to the dbt artifacts target directory. "
+        "(supersedes the --manifest flag)",
+        default=None,
+    ),
+) -> None:
+    vc, cfg = await get_client_and_config(config_dir)
+
+    resolved_credential_id = await credentials.get_credential_id(
+        vc, cfg, credential_id, namespace
+    )
+    if resolved_credential_id is None:
+        raise ValidioError(f"Credential '{credential_id}' not found")
+
+    manifest, run_results = _resolve_file_paths(manifest, run_results, target_path)
+
+    run_results_content = None
+    try:
+        manifest_content = typing.cast(dict[str, Any], util.read_json_file(manifest))
+        if run_results is not None:
+            run_results_content = typing.cast(
+                dict[str, Any],
+                util.read_json_file(run_results),
+            )
+    except Exception as e:
+        raise ValidioError(f"Failed to process artifacts file: {e}")
+
+    await dbt.upload_artifacts(
+        client=vc,
+        credential_id=resolved_credential_id,
+        job_name=job_name,
+        manifest=manifest_content,
+        run_results=run_results_content,
+    )
+    return print("dbt artifact uploaded successfully")
+
+
+if __name__ == "__main__":
+    typer.run(app())

validio_cli-0.15.0/validio_cli/bin/entities/dbt.py

@@ -1,59 +0,0 @@
-import json
-import typing
-from pathlib import Path
-from typing import Any
-
-import typer
-from validio_sdk import ValidioError, dbt, util
-from validio_sdk.graphql_client.input_types import DbtArtifactUploadInput
-
-from validio_cli import AsyncTyper, ConfigDir, Namespace, get_client_and_config
-from validio_cli.bin.entities import credentials
-
-app = AsyncTyper(help="dbt related commands")
-
-
-@app.async_command(help="Upload dbt artifact")
-async def upload(
-    config_dir: str = ConfigDir,
-    namespace: str = Namespace(),
-    credential_id: str = typer.Option(..., help="Credential name or ID"),
-    manifest: Path = typer.Option(..., help="Path to the manifest file"),
-    job_name: str = typer.Option(
-        ..., help="The job that the dbt execution belongs to, e.g. `staging-pipeline`"
-    ),
-    run_results: Path = typer.Option(help="Path to the run results file", default=None),
-) -> None:
-    vc, cfg = await get_client_and_config(config_dir)
-
-    resolved_credential_id = await credentials.get_credential_id(
-        vc, cfg, credential_id, namespace
-    )
-    if resolved_credential_id is None:
-        raise ValidioError(f"Credential '{credential_id}' not found")
-
-    try:
-        manifest_content = util.read_json_file(manifest)
-        trimmed_manifest = dbt.trim_manifest_json(
-            typing.cast(dict[str, Any], manifest_content)
-        )
-    except Exception as e:
-        raise ValidioError(f"Failed to process manifest file: {e}")
-
-    run_results_content = None
-    if run_results is not None:
-        run_results_content = json.dumps(util.read_json_file(run_results))
-
-    await vc.dbt_artifact_upload(
-        input=DbtArtifactUploadInput(
-            credential_id=resolved_credential_id,
-            manifest=json.dumps(trimmed_manifest),
-            run_results=run_results_content,
-            job_name=job_name,
-        )
-    )
-    return print("dbt artifact uploaded successfully")
-
-
-if __name__ == "__main__":
-    typer.run(app())