validio-cli 0.25.2__tar.gz → 0.26.1__tar.gz

{validio_cli-0.25.2 → validio_cli-0.26.1}/PKG-INFO

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

{validio_cli-0.25.2 → validio_cli-0.26.1}/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.25.2"
+version = "0.26.1"
 description = "CLI tool to interact with the Validio platform"
 authors = ["Validio <support@validio.io>"]
 license = "Apache-2.0"
@@ -24,7 +24,7 @@ pydantic = "2.4.2"
 validio-sdk = "*"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.1.11"
+ruff = "^0.9.6"
 mypy = "^1.2.0"
 licensecheck = "^2023.1.1"
 pytest = "^7.4.3"
@@ -41,6 +41,7 @@ validio = "validio_cli.bin.main:main"
 [tool.ruff]
 fix = true
 
+[tool.ruff.lint]
 select = [
     "ARG", # flake8-unused-argument
     "C4",  # flake8-comprehension
@@ -66,7 +67,7 @@ ignore = [
     "PLR0913", # `too-many-arguments` - Not relevant with only 6
 ]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 # No need for documentation in these files
 "__init__.py" = ["D"]
 "*/bin/*.py" = ["D"]

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/__init__.py

@@ -198,6 +198,17 @@ def output_text(items: Any, fields: dict[str, OutputSettings | None]) -> None:
     sys.stdout.flush()
 
 
+def output_ok_or_error(result: Any) -> None:
+    status = "OK" if not result.get("errors") else "ERROR"
+
+    return output_text(
+        {"status": status},
+        fields={
+            "status": OutputSettings(pass_full_object=True, reformat=lambda _: status),
+        },
+    )
+
+
 # ruff: noqa: PLR2004, PLR0911
 def _format_relative_time(d: datetime) -> str:
     diff = datetime.now(timezone.utc) - d
@@ -214,11 +225,11 @@ def _format_relative_time(d: datetime) -> str:
     if seconds < 120:
         return "1m"
     if seconds < 3600:
-        return f"{int(seconds/60)}m"
+        return f"{int(seconds / 60)}m"
     if seconds < 7200:
         return "1h"
 
-    return f"{int(seconds/3600)}h"
+    return f"{int(seconds / 3600)}h"
 
 
 def _single_resource_if_specified(items: list[Any], identifier: str | None) -> Any:

validio_cli-0.26.1/validio_cli/bin/entities/channels.py

@@ -0,0 +1,124 @@
+import typer
+from camel_converter import to_snake
+from validio_sdk.exception import ValidioError
+
+from validio_cli import (
+    APIClient,
+    AsyncTyper,
+    ConfigDir,
+    Identifier,
+    Identifiers,
+    Namespace,
+    OutputFormat,
+    OutputFormatOption,
+    OutputSettings,
+    ValidioConfig,
+    _single_resource_if_specified,
+    get_client,
+    output_json,
+    output_ok_or_error,
+    output_text,
+)
+from validio_cli.namespace import get_namespace
+
+app = AsyncTyper(help="Channels used for notifications")
+
+
+@app.async_command(help="Get channels")
+async def get(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    namespace: str = Namespace(),
+    identifier: str = Identifier,
+) -> None:
+    client, cfg = get_client(config_dir)
+
+    channels = await client.get_channels(
+        channel_id=identifier,
+        namespace_id=get_namespace(namespace, cfg),
+    )
+
+    # TODO(UI-2311): Fully support list/get/get_by_resource_name
+    if isinstance(channels, list):
+        channels = _single_resource_if_specified(channels, identifier)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(channels, identifier)
+
+    return output_text(
+        channels,
+        fields={
+            "name": OutputSettings(attribute_name="resourceName"),
+            "type": OutputSettings(
+                attribute_name="__typename",
+                reformat=lambda x: to_snake(x.removesuffix("Channel")).upper(),
+            ),
+            "age": OutputSettings.string_as_datetime("createdAt"),
+        },
+    )
+
+
+@app.async_command(help="Delete channel")
+async def delete(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    namespace: str = Namespace(),
+    identifiers: list[str] = Identifiers,
+) -> None:
+    if not identifiers:
+        raise ValidioError("no identifiers are provided")
+
+    vc, cfg = get_client(config_dir)
+
+    channel_ids = [
+        channel_id
+        for channel_id in [
+            await get_channel_id(vc, cfg, identifier, namespace)
+            for identifier in identifiers
+        ]
+        if channel_id
+    ]
+
+    result = await vc.delete_channels(channel_ids)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(result)
+
+    return output_ok_or_error(result)
+
+
+async def get_channel_id(
+    vc: APIClient, cfg: ValidioConfig, identifier: str, namespace: str
+) -> str | None:
+    """
+    Ensure the identifier is a resource id.
+
+    If it doesn't have the expected prefix, do a resource lookup by name.
+    """
+    identifier_type = "channel"
+    prefix = "CNL_"
+
+    if not identifier:
+        print(f"Missing {identifier_type} id or name")
+        return None
+
+    if identifier.startswith(prefix):
+        return identifier
+
+    resource = await vc.get_channels(
+        channel_id=identifier,
+        namespace_id=get_namespace(namespace, cfg),
+    )
+
+    if resource is None:
+        print(f"No {identifier_type} with name or id {identifier} found")
+        return None
+
+    if not isinstance(resource, dict):
+        raise ValidioError("failed to get channel id")
+
+    return resource["id"]
+
+
+if __name__ == "__main__":
+    typer.run(app())

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/code.py

@@ -65,7 +65,7 @@ diff_option = typer.Option(
 )
 
 color_option = typer.Option(
-    not os.environ.get("NO_COLOR", False),
+    not os.environ.get("NO_COLOR", False) and sys.stdout.isatty(),
     help="Enable colored output",
 )
 
@@ -99,7 +99,7 @@ update_all_schemas_option = typer.Option(
 )
 
 show_progress_option = typer.Option(
-    True,
+    sys.stdout.isatty(),
     help=(
         f"{BETA_BANNER} "
         "If enabled, progress updates will be displayed during "
@@ -113,7 +113,7 @@ def target_option(resource_type: str) -> Any:
         [],
         help=(
             f"{BETA_BANNER} "
-            f'Only target selected {resource_type.replace("-", " ")}(s) and ignore '
+            f"Only target selected {resource_type.replace('-', ' ')}(s) and ignore "
             f"changes for others. E.g. `--{resource_type} resource-a"
         ),
     )
@@ -210,6 +210,14 @@ async def apply(
     validator: list[str] = target_option("validator"),
     window: list[str] = target_option("window"),
     progress: bool = show_progress_option,
+    dry_run_sql: bool = typer.Option(
+        False,
+        help=f"""
+            {BETA_BANNER} Dry run SQL queries before creating/updating SQL Filters
+            or Validators.
+            Note: this feature is unsupported on Azure based warehouses.
+        """,
+    ),
 ) -> None:
     dir_path = directory_or_default(directory)
     client, _ = get_client(config_dir)
@@ -259,6 +267,7 @@ async def apply(
         diff=diff,
         show_secrets=show_secrets,
         show_progress=progress,
+        dry_run_sql=dry_run_sql,
     )
 
     print(
@@ -406,7 +415,7 @@ async def _plan(
                 diff=plan_result.graph_diff,
                 show_schema=show_schema,
                 show_secrets=show_secrets,
-                escape=sys.stdout.isatty() and color,
+                escape=color,
                 diff_output=diff_output,
             )
 
@@ -533,9 +542,7 @@ def _show_update_resource_diff(
         cascade_update = ""
         if r.replacement_cascaded_update_parent:
             (cls, parent_name) = r.replacement_cascaded_update_parent
-            cascade_update = (
-                f" (due to replacement of " f"{cls.__name__}({parent_name!r}))"
-            )
+            cascade_update = f" (due to replacement of {cls.__name__}({parent_name!r}))"
 
         print(f"{class_key} '{r.manifest.name}' will be updated{cascade_update}")
 
@@ -545,14 +552,14 @@ def _show_update_resource_diff(
             r.manifest,
             show_secrets=show_secrets,
             rewrites=rewrites,
-            secrets_changed=r.secrets_changed,
+            secret_fields_changed=r.secret_fields_changed,
             is_manifest=True,
         )
         b_value = code_plan._create_resource_diff_object(
             r.server,
             show_secrets=show_secrets,
             rewrites=rewrites,
-            secrets_changed=r.secrets_changed,
+            secret_fields_changed=r.secret_fields_changed,
             is_manifest=False,
         )
 
@@ -584,14 +591,14 @@ def _show_replace_resource_diff(
                 update.manifest,
                 show_secrets=show_secrets,
                 rewrites=rewrites,
-                secrets_changed=update.secrets_changed,
+                secret_fields_changed=update.secret_fields_changed,
                 is_manifest=True,
             )
             b_value = code_plan._create_resource_diff_object(
                 update.server,
                 show_secrets=show_secrets,
                 rewrites=rewrites,
-                secrets_changed=update.secrets_changed,
+                secret_fields_changed=update.secret_fields_changed,
                 is_manifest=False,
             )
         else:
@@ -647,7 +654,7 @@ def _show_deprecations(deprecations: list[ResourceDeprecation]) -> None:
     print()
     print(f"\033[93m{title}\033[0m")  # Make the text yellow
     for i, message in enumerate(sorted(deprecations)):
-        print(f"\033[93m{i+1:>2}. {message}\033[0m")
+        print(f"\033[93m{i + 1:>2}. {message}\033[0m")
 
     print(footer, end="")
 

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/credentials.py

@@ -7,6 +7,7 @@ from validio_cli import (
     AsyncTyper,
     ConfigDir,
     Identifier,
+    Identifiers,
     Namespace,
     OutputFormat,
     OutputFormatOption,
@@ -14,6 +15,7 @@ from validio_cli import (
     _single_resource_if_specified,
     get_client,
     output_json,
+    output_ok_or_error,
     output_text,
 )
 from validio_cli.namespace import get_namespace
@@ -52,6 +54,50 @@ async def get(
     )
 
 
+@app.async_command(help="Delete credential")
+async def delete(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    namespace: str = Namespace(),
+    identifiers: list[str] = Identifiers,
+) -> None:
+    if not identifiers:
+        raise ValidioError("no identifiers are provided")
+
+    vc, cfg = get_client(config_dir)
+
+    credential_ids = [
+        credential_id
+        for credential_id in [
+            await get_credential_id(vc, cfg, identifier, namespace)
+            for identifier in identifiers
+        ]
+        if credential_id
+    ]
+
+    sources = await vc.get_sources(namespace_id=namespace)
+    if not isinstance(sources, list):
+        raise ValidioError("failed to get sources")
+
+    credentials_with_sources = {
+        s["credential"]["resourceName"]
+        for s in sources
+        if s["credential"]["id"] in credential_ids
+    }
+    if len(credentials_with_sources) > 0:
+        raise ValidioError(
+            "Following credentials are connected to sources:\n"
+            + "\n".join(credentials_with_sources)
+        )
+
+    result = await vc.delete_credentials(credential_ids)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(result)
+
+    return output_ok_or_error(result)
+
+
 async def get_credential_id(
     vc: APIClient, cfg: ValidioConfig, identifier: str, namespace: str
 ) -> str | None:

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/dbt.py

@@ -1,6 +1,6 @@
 import typing
 from pathlib import Path
-from typing import Any, Optional, Tuple
+from typing import Any, Optional
 
 import typer
 from validio_sdk import ValidioError, dbt, util
@@ -26,23 +26,8 @@ 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
-
+    target_path: Path,
+) -> tuple[Path, Optional[Path]]:
     if not target_path:
         raise ValidioError("Missing --target-path argument")
 
@@ -66,23 +51,11 @@ 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,
+    target_path: Path = typer.Option(
+        ..., help="Path to the dbt artifacts target directory. "
     ),
 ) -> None:
     client, cfg = get_client(config_dir)
@@ -93,7 +66,7 @@ async def upload(
     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)
+    manifest, run_results = _resolve_file_paths(target_path)
 
     run_results_content = None
     try:

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/filters.py

@@ -3,15 +3,19 @@ from validio_sdk.exception import ValidioError
 
 import validio_cli
 from validio_cli import (
+    APIClient,
     AsyncTyper,
     ConfigDir,
     Identifier,
+    Identifiers,
     Namespace,
     OutputFormat,
     OutputFormatOption,
     OutputSettings,
+    ValidioConfig,
     get_client,
     output_json,
+    output_ok_or_error,
     output_text,
 )
 from validio_cli.namespace import get_namespace
@@ -62,5 +66,67 @@ async def get(
     )
 
 
+@app.async_command(help="Delete filter")
+async def delete(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    namespace: str = Namespace(),
+    identifiers: list[str] = Identifiers,
+) -> None:
+    if not identifiers:
+        raise ValidioError("no identifiers are provided")
+
+    vc, cfg = get_client(config_dir)
+
+    filter_ids = [
+        filter_id
+        for filter_id in [
+            await get_filter_id(vc, cfg, identifier, namespace)
+            for identifier in identifiers
+        ]
+        if filter_id
+    ]
+
+    result = await vc.delete_filters(filter_ids)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(result)
+
+    return output_ok_or_error(result)
+
+
+async def get_filter_id(
+    vc: APIClient, cfg: ValidioConfig, identifier: str, namespace: str
+) -> str | None:
+    """
+    Ensure the identifier is a resource id.
+
+    If it doesn't have the expected prefix, do a resource lookup by name.
+    """
+    identifier_type = "filter"
+    prefix = "FTR_"
+
+    if not identifier:
+        print(f"Missing {identifier_type} id or name")
+        return None
+
+    if identifier.startswith(prefix):
+        return identifier
+
+    resource = await vc.get_filters(
+        filter_id=identifier,
+        namespace_id=get_namespace(namespace, cfg),
+    )
+
+    if resource is None:
+        print(f"No {identifier_type} with name or id {identifier} found")
+        return None
+
+    if not isinstance(resource, dict):
+        raise ValidioError("failed to get filter id")
+
+    return resource["id"]
+
+
 if __name__ == "__main__":
     typer.run(app())

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/incidents.py

@@ -80,8 +80,8 @@ async def get(
             "bound": OutputSettings(
                 pass_full_object=True,
                 reformat=lambda x: (
-                    f'{format_number(x["lowerBound"])} - '
-                    f'{format_number(x["upperBound"])}'
+                    f"{format_number(x['lowerBound'])} - "
+                    f"{format_number(x['upperBound'])}"
                 ),
             ),
             "value": OutputSettings(reformat=format_number),
@@ -96,10 +96,10 @@ async def get(
 def calculate_operator(item: Any) -> str:
     type_ = item["__typename"][len("ValidatorMetricWith") :]
     if type_ == "DynamicThreshold":
-        return f'{type_}/{item["decisionBoundsType"]}'
+        return f"{type_}/{item['decisionBoundsType']}"
 
     if type_ == "FixedThreshold":
-        return f'{type_}/{item["operator"]}'
+        return f"{type_}/{item['operator']}"
 
     return type_
 
@@ -107,10 +107,10 @@ def calculate_operator(item: Any) -> str:
 def calculate_bound(item: Any) -> str:
     type_ = item["__typename"][len("ValidatorMetricWith") :]
     if type_ == "DynamicThreshold":
-        bound = f'{item["lowerBound"]:.2f} - {item["upperBound"]:.2f}'
+        bound = f"{item['lowerBound']:.2f} - {item['upperBound']:.2f}"
     elif type_ == "DifferenceThreshold":
-        lower = f'{item["lowerBound"]:.2f}' if item["lowerBound"] is not None else "-"
-        upper = f'{item["upperBound"]:.2f}' if item["upperBound"] is not None else "-"
+        lower = f"{item['lowerBound']:.2f}" if item["lowerBound"] is not None else "-"
+        upper = f"{item['upperBound']:.2f}" if item["upperBound"] is not None else "-"
 
         bound = f"{lower} - {upper}"
     elif type_ == "FixedThreshold":

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/metrics.py

@@ -63,7 +63,7 @@ async def get(
                 reformat=calculate_bound,
             ),
             "value": None,
-            "is_incident": None,
+            "is_incident": OutputSettings(attribute_name="isIncident"),
             "age": OutputSettings.string_as_datetime(
                 attribute_name="endTime",
             ),

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/namespaces.py

@@ -34,7 +34,8 @@ async def get(
     return output_text(
         namespaces,
         fields={
-            "name": OutputSettings(attribute_name="id"),
+            "id": None,
+            "name": None,
         },
     )
 

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/notification_rules.py

@@ -8,6 +8,7 @@ from validio_cli import (
     AsyncTyper,
     ConfigDir,
     Identifier,
+    Identifiers,
     Namespace,
     OutputFormat,
     OutputFormatOption,
@@ -15,6 +16,7 @@ from validio_cli import (
     _single_resource_if_specified,
     get_client,
     output_json,
+    output_ok_or_error,
     output_text,
 )
 from validio_cli.namespace import get_namespace
@@ -61,6 +63,35 @@ async def get(
     )
 
 
+@app.async_command(help="Delete notification rule")
+async def delete(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    namespace: str = Namespace(),
+    identifiers: list[str] = Identifiers,
+) -> None:
+    if not identifiers:
+        raise ValidioError("no identifiers are provided")
+
+    vc, cfg = get_client(config_dir)
+
+    notification_rule_ids = [
+        notification_rule_id
+        for notification_rule_id in [
+            await get_notification_rule_id(vc, cfg, identifier, namespace)
+            for identifier in identifiers
+        ]
+        if notification_rule_id
+    ]
+
+    result = await vc.delete_notification_rules(notification_rule_ids)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(result)
+
+    return output_ok_or_error(result)
+
+
 async def get_notification_rule_id(
     vc: APIClient, cfg: ValidioConfig, identifier: str, namespace: str
 ) -> str | None:

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/segmentations.py

@@ -8,12 +8,14 @@ from validio_cli import (
     AsyncTyper,
     ConfigDir,
     Identifier,
+    Identifiers,
     Namespace,
     OutputFormat,
     OutputFormatOption,
     OutputSettings,
     get_client,
     output_json,
+    output_ok_or_error,
     output_text,
 )
 from validio_cli.namespace import get_namespace
@@ -65,6 +67,35 @@ async def get(
     )
 
 
+@app.async_command(help="Delete segmentation")
+async def delete(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    namespace: str = Namespace(),
+    identifiers: list[str] = Identifiers,
+) -> None:
+    if not identifiers:
+        raise ValidioError("no identifiers are provided")
+
+    vc, cfg = get_client(config_dir)
+
+    segmentation_ids = [
+        segmentation_id
+        for segmentation_id in [
+            await get_segmentation_id(vc, cfg, identifier, namespace)
+            for identifier in identifiers
+        ]
+        if segmentation_id
+    ]
+
+    result = await vc.delete_segmentations(segmentation_ids)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(result)
+
+    return output_ok_or_error(result)
+
+
 async def get_segmentation_id(
     vc: APIClient, cfg: ValidioConfig, identifier: str, namespace: str
 ) -> str | None:

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/segments.py

@@ -46,11 +46,11 @@ async def get(
     for segment in segments:
         field_and_value = []
         for f in segment["fields"]:
-            field_and_value.append(f'{f["field"]}={f["value"]}')
+            field_and_value.append(f"{f['field']}={f['value']}")
 
         additional = ""
         if len(field_and_value) > max_fields:
-            additional = f" and {len(field_and_value)-max_fields} more"
+            additional = f" and {len(field_and_value) - max_fields} more"
             field_and_value = field_and_value[:max_fields]
 
         resources.append(

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/sources.py

@@ -32,6 +32,7 @@ from validio_cli import (
     components,
     get_client,
     output_json,
+    output_ok_or_error,
     output_text,
 )
 from validio_cli.bin.entities import credentials
@@ -102,6 +103,35 @@ async def get(
     )
 
 
+@app.async_command(help="Delete source")
+async def delete(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    namespace: str = Namespace(),
+    identifiers: list[str] = Identifiers,
+) -> None:
+    if not identifiers:
+        raise ValidioError("no identifiers are provided")
+
+    vc, cfg = get_client(config_dir)
+
+    source_ids = [
+        source_id
+        for source_id in [
+            await get_source_id(vc, cfg, identifier, namespace)
+            for identifier in identifiers
+        ]
+        if source_id
+    ]
+
+    result = await vc.delete_sources(source_ids)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(result)
+
+    return output_ok_or_error(result)
+
+
 @app.async_command(help="Start sources")
 async def start(
     config_dir: str = ConfigDir,
@@ -208,6 +238,8 @@ def main(
     return None
 
 
+# Not much to do with this complexity
+# ruff: noqa: PLR0915,PLR0912
 async def _interactive(config_dir: str, filename: Path, namespace: str) -> None:
     vc, cfg = get_client(config_dir)
 
@@ -247,7 +279,6 @@ async def _interactive(config_dir: str, filename: Path, namespace: str) -> None:
             ("bigquery", "Google BigQuery"),
             ("gcs", "Google Cloud Storage"),
             ("pubsub", "Google Pub/Sub"),
-            ("pubsub_lite", "Google Pub/Sub Lite"),
         ],
         "PostgreSqlCredential": [("postgresql", "PostgreSQL")],
         "RedshiftCredential": [("redshift", "Amazon Redshift")],
@@ -411,16 +442,6 @@ async def _interactive(config_dir: str, filename: Path, namespace: str) -> None:
                     ("Message schema", [], ""),
                 ]
             )
-            await _infer_schema_pubsub_lite(
-                vc,
-                filename,
-                credential_id,
-                info.get("project", ""),
-                info.get("subscription_id", ""),
-                info.get("location", ""),
-                info.get("message_format", ""),
-                info.get("message_schema", ""),
-            )
         case "kafka":
             info = await _multip_prompt(
                 [
@@ -657,36 +678,6 @@ async def pubsub(
     )
 
 
-@infer_schema_app.async_command(help="Infer GCP Pub/Sub Lite schema")
-async def pubsub_lite(
-    config_dir: str = ConfigDir,
-    filename: Path = schema_filename_option("pubsub-lite"),
-    credential_id: str = typer.Option(..., help="Credential name or ID"),
-    project: str = typer.Option(..., help="GCP project"),
-    subscription_id: str = typer.Option(..., help="GCP Pub/Sub subscription ID"),
-    location: str = typer.Option(..., help="GCP Pub/Sub Lite location"),
-    message_format: str = typer.Option(default=None, help="Message format"),
-    message_schema: str = typer.Option(default=None, help="Message schema"),
-    namespace: str = Namespace(),
-) -> None:
-    vc, cfg = get_client(config_dir)
-
-    resolved_credential_id = await _resolve_credential(
-        vc, cfg, credential_id, namespace
-    )
-
-    await _infer_schema_pubsub_lite(
-        vc,
-        filename,
-        resolved_credential_id,
-        project,
-        subscription_id,
-        location,
-        message_format,
-        message_schema,
-    )
-
-
 @infer_schema_app.async_command(help="Infer Kafka schema")
 async def kafka(
     config_dir: str = ConfigDir,
@@ -934,30 +925,6 @@ async def _infer_schema_pubsub(
     _write_schema(filename, schema)
 
 
-async def _infer_schema_pubsub_lite(
-    vc: APIClient,
-    filename: Path,
-    credential_id: str,
-    project: str,
-    subscription_id: str,
-    location: str,
-    message_format: str | None = None,
-    message_schema: str | None = None,
-) -> None:
-    message_format_input = _get_message_format_input(message_format, message_schema)
-    schema = await vc.infer_schema(
-        class_name="GcpPubSubLite",
-        variable_values={
-            "credentialId": credential_id,
-            "project": project,
-            "subscriptionId": subscription_id,
-            "location": location,
-            "messageFormat": message_format_input,
-        },
-    )
-    _write_schema(filename, schema)
-
-
 async def _infer_schema_kafka(
     vc: APIClient,
     filename: Path,
@@ -1199,13 +1166,10 @@ def _resource_filter(
     if credential_id is not None and source["credential"]["id"] != credential_id:
         return False
 
-    if (
+    return (
         credential_name is not None
-        and source["credential"]["resourceName"] != credential_name
-    ):
-        return False
-
-    return True
+        and source["credential"]["resourceName"] == credential_name
+    )
 
 
 async def _resolve_credential(

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/validators.py

@@ -8,12 +8,14 @@ from validio_cli import (
     AsyncTyper,
     ConfigDir,
     Identifier,
+    Identifiers,
     Namespace,
     OutputFormat,
     OutputFormatOption,
     OutputSettings,
     get_client,
     output_json,
+    output_ok_or_error,
     output_text,
 )
 from validio_cli.bin.entities.sources import get_source_id
@@ -76,6 +78,35 @@ async def get(
     )
 
 
+@app.async_command(help="Delete validator")
+async def delete(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    namespace: str = Namespace(),
+    identifiers: list[str] = Identifiers,
+) -> None:
+    if not identifiers:
+        raise ValidioError("no identifiers are provided")
+
+    vc, cfg = get_client(config_dir)
+
+    validator_ids = [
+        validator_id
+        for validator_id in [
+            await get_validator_id(vc, cfg, identifier, namespace)
+            for identifier in identifiers
+        ]
+        if validator_id
+    ]
+
+    result = await vc.delete_validators(validator_ids)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(result)
+
+    return output_ok_or_error(result)
+
+
 async def get_validator_id(
     vc: APIClient, cfg: ValidioConfig, identifier: str, namespace: str
 ) -> str | None:

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/entities/windows.py

@@ -1,20 +1,22 @@
 import typer
 from camel_converter import to_snake
+from validio_sdk._api.api import APIClient
 from validio_sdk.config import ValidioConfig
 from validio_sdk.exception import ValidioError
-from validio_sdk.validio_client import ValidioAPIClient
 
 import validio_cli
 from validio_cli import (
     AsyncTyper,
     ConfigDir,
     Identifier,
+    Identifiers,
     Namespace,
     OutputFormat,
     OutputFormatOption,
     OutputSettings,
     get_client,
     output_json,
+    output_ok_or_error,
     output_text,
 )
 from validio_cli.namespace import get_namespace
@@ -69,8 +71,37 @@ async def get(
     )
 
 
+@app.async_command(help="Delete window")
+async def delete(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    namespace: str = Namespace(),
+    identifiers: list[str] = Identifiers,
+) -> None:
+    if not identifiers:
+        raise ValidioError("no identifiers are provided")
+
+    vc, cfg = get_client(config_dir)
+
+    window_ids = [
+        window_id
+        for window_id in [
+            await get_window_id(vc, cfg, identifier, namespace)
+            for identifier in identifiers
+        ]
+        if window_id
+    ]
+
+    result = await vc.delete_windows(window_ids)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(result)
+
+    return output_ok_or_error(result)
+
+
 async def get_window_id(
-    vc: ValidioAPIClient, cfg: ValidioConfig, identifier: str, namespace: str
+    vc: APIClient, cfg: ValidioConfig, identifier: str, namespace: str
 ) -> str | None:
     """
     Ensure the identifier is a resource id.
@@ -87,8 +118,8 @@ async def get_window_id(
     if identifier.startswith(prefix):
         return identifier
 
-    resource = await vc.get_window_by_resource_name(
-        resource_name=identifier,
+    resource = await vc.get_windows(
+        window_id=identifier,
         namespace_id=get_namespace(namespace, cfg),
     )
 
@@ -96,7 +127,10 @@ async def get_window_id(
         print(f"No {identifier_type} with name or id {identifier} found")
         return None
 
-    return resource.id
+    if not isinstance(resource, dict):
+        raise ValidioError(f"failed to get {identifier_type} id")
+
+    return resource["id"]
 
 
 if __name__ == "__main__":

{validio_cli-0.25.2 → validio_cli-0.26.1}/validio_cli/bin/main.py

@@ -49,7 +49,9 @@ app.add_typer(metrics.app, no_args_is_help=True, name="metrics")
 app.add_typer(namespaces.app, no_args_is_help=True, name="namespaces")
 app.add_typer(resources.app, no_args_is_help=True, name="resources")
 app.add_typer(notification_rules.app, no_args_is_help=True, name="notification-rules")
-app.add_typer(recommendations.app, no_args_is_help=True, name="recommendations")
+app.add_typer(
+    recommendations.app, no_args_is_help=True, name="recommendations", deprecated=True
+)
 app.add_typer(segmentations.app, no_args_is_help=True, name="segmentations")
 app.add_typer(segments.app, no_args_is_help=True, name="segments")
 app.add_typer(sources.app, no_args_is_help=True, name="sources")

validio_cli-0.25.2/validio_cli/bin/entities/channels.py

@@ -1,57 +0,0 @@
-import typer
-from camel_converter import to_snake
-
-from validio_cli import (
-    AsyncTyper,
-    ConfigDir,
-    Identifier,
-    Namespace,
-    OutputFormat,
-    OutputFormatOption,
-    OutputSettings,
-    _single_resource_if_specified,
-    get_client,
-    output_json,
-    output_text,
-)
-from validio_cli.namespace import get_namespace
-
-app = AsyncTyper(help="Channels used for notifications")
-
-
-@app.async_command(help="Get channels")
-async def get(
-    config_dir: str = ConfigDir,
-    output_format: OutputFormat = OutputFormatOption,
-    namespace: str = Namespace(),
-    identifier: str = Identifier,
-) -> None:
-    client, cfg = get_client(config_dir)
-
-    channels = await client.get_channels(
-        channel_id=identifier,
-        namespace_id=get_namespace(namespace, cfg),
-    )
-
-    # TODO(UI-2311): Fully support list/get/get_by_resource_name
-    if isinstance(channels, list):
-        channels = _single_resource_if_specified(channels, identifier)
-
-    if output_format == OutputFormat.JSON:
-        return output_json(channels, identifier)
-
-    return output_text(
-        channels,
-        fields={
-            "name": OutputSettings(attribute_name="resourceName"),
-            "type": OutputSettings(
-                attribute_name="__typename",
-                reformat=lambda x: to_snake(x.removesuffix("Channel")).upper(),
-            ),
-            "age": OutputSettings.string_as_datetime("createdAt"),
-        },
-    )
-
-
-if __name__ == "__main__":
-    typer.run(app())