validio-cli 0.17.2__tar.gz → 0.18.1__tar.gz

{validio_cli-0.17.2 → validio_cli-0.18.1}/PKG-INFO

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

{validio_cli-0.17.2 → validio_cli-0.18.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.17.2"
+version = "0.18.1"
 description = "CLI tool to interact with the Validio platform"
 authors = ["Validio <support@validio.io>"]
 license = "Apache-2.0"

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/entities/channels.py

@@ -35,12 +35,12 @@ async def get(
     if identifier is not None and not identifier.startswith("CNL_"):
         channels = [
             await vc.get_channel_by_resource_name(
-                resource_name=identifier, resource_namespace=ns
+                resource_name=identifier, namespace_id=ns
             )
         ]
     else:
         channels = await vc.get_channels(  # type: ignore
-            filter=ResourceFilter(resource_namespace=ns)
+            filter=ResourceFilter(namespace_id=ns)
         )
 
     # TODO(UI-2311): Fully support list/get/get_by_resource_name
@@ -82,7 +82,7 @@ async def get_channel_id(
 
     resource = await vc.get_channel_by_resource_name(
         resource_name=identifier,
-        resource_namespace=get_namespace(namespace, cfg),
+        namespace_id=get_namespace(namespace, cfg),
     )
 
     if resource is None:

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/entities/credentials.py

@@ -34,12 +34,12 @@ async def get(
         credentials = [
             await vc.get_credential_by_resource_name(
                 resource_name=identifier,
-                resource_namespace=namespace,
+                namespace_id=namespace,
             )
         ]
     else:
         credentials = await vc.list_credentials(  # type: ignore
-            filter=ResourceFilter(resource_namespace=get_namespace(namespace, cfg))
+            filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg))
         )
 
     # TODO(UI-2311): Fully support list/get/get_by_resource_name
@@ -81,7 +81,7 @@ async def get_credential_id(
         (
             credential.id
             for credential in await vc.list_credentials(
-                filter=ResourceFilter(resource_namespace=get_namespace(namespace, cfg))
+                filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg))
             )
             if credential.resource_name == identifier
         ),

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/entities/incidents.py

@@ -2,11 +2,6 @@ from datetime import datetime, timedelta
 from typing import Any
 
 import typer
-from validio_sdk import ValidioError
-from validio_sdk.graphql_client.get_source_incidents import GetSourceIncidentsSource
-from validio_sdk.graphql_client.get_validator_incidents import (
-    GetValidatorIncidentsValidator,
-)
 from validio_sdk.graphql_client.input_types import TimeRangeInput
 
 from validio_cli import (
@@ -21,7 +16,7 @@ from validio_cli import (
     output_json,
     output_text,
 )
-from validio_cli.bin.entities import sources, validators
+from validio_cli.bin.entities import validators
 
 app = AsyncTyper(help="Incidents from validators")
 
@@ -36,8 +31,6 @@ You can list incidents in different ways:
 
 * Listing all incidents
 
-* Listing all source incidents for a specific source with --source
-
 * Listing all incidents for a specific validator with --validator
 
 * Listing all incidents for a specific segment with --segment
@@ -58,9 +51,8 @@ async def get(
         (datetime.utcnow() - timedelta(hours=1)),
         help="The incident ended after this timestamp",
     ),
-    validator: str = typer.Option(None, help="Validator to fetch incidents for"),
+    validator: str = typer.Option(..., help="Validator to fetch incidents for"),
     segment: str = typer.Option(None, help="Segment to fetch incidents for"),
-    source: str = typer.Option(None, help="Source to fetch incidents for"),
 ) -> None:
     vc, cfg = await get_client_and_config(config_dir)
 
@@ -69,36 +61,16 @@ async def get(
         if validator_id is None:
             return None
 
-    if source is not None:
-        source_id = await sources.get_source_id(vc, cfg, source, namespace)
-        if source_id is None:
-            return None
-
     # TODO(UI-2006): These should all support namespace
 
-    incidents: None | GetValidatorIncidentsValidator | GetSourceIncidentsSource = None
-
-    if validator:
-        incidents = await vc.get_validator_incidents(
-            id=validator_id,
-            range=TimeRangeInput(
-                start=ended_after,
-                end=ended_before,
-            ),
-            segment_id=segment,
-        )
-    elif source:
-        incidents = await vc.get_source_incidents(
-            id=source_id,
-            range=TimeRangeInput(
-                start=ended_after,
-                end=ended_before,
-            ),
-        )
-    else:
-        raise ValidioError(
-            "You need to specify one of --validator and/or --segment or --source"
-        )
+    incidents = await vc.get_validator_incidents(
+        id=validator_id,
+        range=TimeRangeInput(
+            start=ended_after,
+            end=ended_before,
+        ),
+        segment_id=segment,
+    )
 
     if not incidents:
         return output_text(None, {})
@@ -109,20 +81,23 @@ async def get(
     return output_text(
         incidents.incidents,
         fields={
-            "operator": OutputSettings(
-                attribute_name="metric",
-                reformat=calculate_operator,
+            "validator": OutputSettings(
+                pass_full_object=True,
+                reformat=lambda _: incidents.typename__,
             ),
             "bound": OutputSettings(
-                attribute_name="metric",
-                reformat=calculate_bound,
-            ),
-            "value": OutputSettings(
-                attribute_name="metric",
-                reformat=lambda x: x.value,
+                pass_full_object=True,
+                reformat=lambda x: (
+                    f"{format_number(x.lower_bound)} - "
+                    f"{format_number(x.upper_bound)}"
+                ),
             ),
+            "value": OutputSettings(reformat=format_number),
+            "deviation": OutputSettings(reformat=format_number),
+            "severity": None,
+            "status": None,
             "age": OutputSettings(
-                attribute_name="metric",
+                pass_full_object=True,
                 reformat=lambda x: _format_relative_time(x.end_time),
             ),
         },
@@ -151,5 +126,18 @@ def calculate_bound(item: Any) -> str:
     return bound
 
 
+def format_number(item: Any) -> str:
+    if item % 1 == 0:
+        return str(item)
+    if (item * 10) % 1 == 0:
+        return f"{item:.1f}"
+    if (item * 100) % 1 == 0:
+        return f"{item:.2f}"
+    if (item * 1000) % 1 == 0:
+        return f"{item:.3f}"
+
+    return f"{item:.3f}..."
+
+
 if __name__ == "__main__":
     typer.run(app())

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/entities/notification_rules.py

@@ -35,12 +35,12 @@ async def get(
         notification_rules = [
             await vc.get_notification_rule_by_resource_name(
                 resource_name=identifier,
-                resource_namespace=get_namespace(namespace, cfg),
+                namespace_id=get_namespace(namespace, cfg),
             )
         ]
     else:
         notification_rules = await vc.get_notification_rules(  # type: ignore
-            filter=ResourceFilter(resource_namespace=get_namespace(namespace, cfg))
+            filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg))
         )
 
     # TODO(UI-2311): Fully support list/get/get_by_resource_name
@@ -85,7 +85,7 @@ async def get_notification_rule_id(
 
     resource = await vc.get_notification_rule_by_resource_name(
         resource_name=identifier,
-        resource_namespace=get_namespace(namespace, cfg),
+        namespace_id=get_namespace(namespace, cfg),
     )
 
     if resource is None:

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/entities/segmentations.py

@@ -43,12 +43,12 @@ async def get(
         segmentations = [
             await vc.get_segmentation_by_resource_name(
                 resource_name=identifier,
-                resource_namespace=get_namespace(namespace, cfg),
+                namespace_id=get_namespace(namespace, cfg),
             )
         ]
     else:
         segmentations = await vc.list_segmentations(
-            filter=ResourceFilter(resource_namespace=get_namespace(namespace, cfg))
+            filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg))
         )
 
     segmentations = [
@@ -91,7 +91,7 @@ async def get_segmentation_id(
 
     resource = await vc.get_segmentation_by_resource_name(
         resource_name=identifier,
-        resource_namespace=get_namespace(namespace, cfg),
+        namespace_id=get_namespace(namespace, cfg),
     )
 
     if resource is None:

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/entities/sources.py

@@ -81,12 +81,12 @@ async def get(
         sources = [
             await vc.get_source_by_resource_name(
                 resource_name=identifier,
-                resource_namespace=get_namespace(namespace, cfg),
+                namespace_id=get_namespace(namespace, cfg),
             )
         ]
     else:
         sources = await vc.list_sources(
-            filter=ResourceFilter(resource_namespace=get_namespace(namespace, cfg))
+            filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg))
         )
 
     sources = [
@@ -231,7 +231,7 @@ async def _interactive(config_dir: str, filename: Path, namespace: str) -> None:
     vc, cfg = await get_client_and_config(config_dir)
 
     credentials = await vc.list_credentials(
-        filter=ResourceFilter(resource_namespace=get_namespace(namespace, cfg))
+        filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg))
     )
 
     if len(credentials) == 0:
@@ -1173,7 +1173,7 @@ async def get_source_id(
 
     resource = await vc.get_source_by_resource_name(
         resource_name=identifier,
-        resource_namespace=get_namespace(namespace, cfg),
+        namespace_id=get_namespace(namespace, cfg),
     )
 
     if resource is None:

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/entities/users.py

@@ -30,7 +30,7 @@ async def get(
         users = [
             await vc.get_user_by_resource_name(
                 resource_name=identifier,
-                resource_namespace=get_namespace(namespace, cfg),
+                namespace_id=get_namespace(namespace, cfg),
             )
         ]
     else:

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/entities/validators.py

@@ -49,25 +49,23 @@ async def get(
         validators.append(
             await vc.get_validator_by_resource_name(
                 resource_name=identifier,
-                resource_namespace=get_namespace(namespace, cfg),
+                namespace_id=get_namespace(namespace, cfg),
             )
         )
     elif source is None or not source.startswith("SRC_"):
         for s in await vc.list_sources(
-            filter=ResourceFilter(resource_namespace=get_namespace(namespace, cfg))
+            filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg))
         ):
             validators.extend(
                 await vc.list_validators(
                     id=s.id,
-                    filter=ResourceFilter(
-                        resource_namespace=get_namespace(namespace, cfg)
-                    ),
+                    filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg)),
                 ),
             )
     else:
         validators = await vc.list_validators(
             id=source,
-            filter=ResourceFilter(resource_namespace=get_namespace(namespace, cfg)),
+            filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg)),
         )
 
     validators = [
@@ -113,7 +111,7 @@ async def get_validator_id(
 
     resource = await vc.get_validator_by_resource_name(
         resource_name=identifier,
-        resource_namespace=get_namespace(namespace, cfg),
+        namespace_id=get_namespace(namespace, cfg),
     )
 
     if resource is None:

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/entities/windows.py

@@ -37,12 +37,12 @@ async def get(
         windows = [
             await vc.get_window_by_resource_name(
                 resource_name=identifier,
-                resource_namespace=get_namespace(namespace, cfg),
+                namespace_id=get_namespace(namespace, cfg),
             )
         ]
     else:
         windows = await vc.list_windows(  # type: ignore
-            filter=ResourceFilter(resource_namespace=get_namespace(namespace, cfg))
+            filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg))
         )
 
     windows = [
@@ -94,7 +94,7 @@ async def get_window_id(
 
     resource = await vc.get_window_by_resource_name(
         resource_name=identifier,
-        resource_namespace=get_namespace(namespace, cfg),
+        namespace_id=get_namespace(namespace, cfg),
     )
 
     if resource is None:

{validio_cli-0.17.2 → validio_cli-0.18.1}/validio_cli/bin/main.py

@@ -8,6 +8,13 @@ import validio_sdk.metadata
 from tabulate import tabulate
 from validio_sdk import ValidioError
 from validio_sdk.config import Config
+from validio_sdk.graphql_client.exceptions import (
+    GraphQLClientGraphQLError,
+    GraphQLClientGraphQLMultiError,
+    GraphQLClientHttpError,
+    GraphQLClientInvalidMessageFormat,
+    GraphQLClientInvalidResponseError,
+)
 
 import validio_cli.metadata
 from validio_cli.bin.entities import (
@@ -170,9 +177,25 @@ def main() -> None:
 
     # ValidioErrors are thrown by us and should not require the stack trace
     # to tell what went wrong.
-    except ValidioError as e:
+    # GraphQL errors doesn't contain any valuable information in the trace, we
+    # only want to print the error message.
+    except (
+        ValidioError,
+        GraphQLClientGraphQLError,
+        GraphQLClientGraphQLMultiError,
+        GraphQLClientHttpError,
+        GraphQLClientInvalidMessageFormat,
+        GraphQLClientInvalidResponseError,
+    ) as e:
         print(f"Something went wrong: {e}")
 
+    # For the other errors check if they're known children.
+    except Exception as e:
+        if issubclass(type(e), ValidioError):
+            print(f"Something went wrong: {e}")
+        else:
+            raise e
+
     sys.exit(exit_code)