cortexapps-cli 1.6.0__tar.gz → 1.9.0__tar.gz

{cortexapps_cli-1.6.0 → cortexapps_cli-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cortexapps-cli
-Version: 1.6.0
+Version: 1.9.0
 Summary: Command Line Interface for cortexapps
 License: MIT
 License-File: LICENSE
@@ -18,7 +18,7 @@ Requires-Dist: click (<8.2)
 Requires-Dist: pyyaml (>=6.0.1,<7)
 Requires-Dist: requests (>=2.32.4,<3.0.0)
 Requires-Dist: typer (>=0.12.5,<0.13.0)
-Requires-Dist: urllib3 (>=2.2.2)
+Requires-Dist: urllib3 (>=2.6.0)
 Project-URL: Bug Tracker, https://github.com/cortexapps/cli/issues
 Project-URL: Changes,  https://github.com/cortexapps/cli/blob/main/HISTORY.md
 Project-URL: Documentation,  https://github.com/cortexapps/cli/blob/main/README.rst

{cortexapps_cli-1.6.0 → cortexapps_cli-1.9.0}/cortexapps_cli/cli.py

@@ -87,7 +87,7 @@ def global_callback(
     url: str = typer.Option(None, "--url", "-u", help="Base URL for the API", envvar="CORTEX_BASE_URL"),
     config_file: str = typer.Option(os.path.join(os.path.expanduser('~'), '.cortex', 'config'), "--config", "-c", help="Config file path", envvar="CORTEX_CONFIG"),
     tenant: str = typer.Option("default", "--tenant", "-t", help="Tenant alias", envvar="CORTEX_TENANT_ALIAS"),
-    log_level: Annotated[str, typer.Option("--log-level", "-l", help="Set the logging level")] = "INFO",
+    log_level: Annotated[str, typer.Option("--log-level", "-l", help="Set the logging level")] = "WARNING",
     rate_limit: int = typer.Option(None, "--rate-limit", "-r", help="API rate limit in requests per minute (default: 1000)", envvar="CORTEX_RATE_LIMIT")
 ):
     if not ctx.obj:

{cortexapps_cli-1.6.0 → cortexapps_cli-1.9.0}/cortexapps_cli/commands/backup.py

@@ -472,6 +472,8 @@ def _import_entity_relationships(ctx, directory):
     return ("entity-relationships", len(results) - failed_count, [(fp, et, em) for rt, fp, et, em in results if et])
 
 def _import_catalog(ctx, directory):
+    results = []
+    failed_count = 0
     if os.path.isdir(directory):
         print("Processing: " + directory)
         files = [(filename, os.path.join(directory, filename))
@@ -507,6 +509,8 @@ def _import_catalog(ctx, directory):
     return ("catalog", len(results) - failed_count, [(fp, et, em) for fn, fp, et, em in results if et])
 
 def _import_plugins(ctx, directory):
+    results = []
+    failed_count = 0
     if os.path.isdir(directory):
         print("Processing: " + directory)
         files = [(filename, os.path.join(directory, filename))
@@ -543,6 +547,8 @@ def _import_plugins(ctx, directory):
     return ("plugins", len(results) - failed_count, [(fp, et, em) for fn, fp, et, em in results if et])
 
 def _import_scorecards(ctx, directory):
+    results = []
+    failed_count = 0
     if os.path.isdir(directory):
         print("Processing: " + directory)
         files = [(filename, os.path.join(directory, filename))
@@ -579,6 +585,8 @@ def _import_scorecards(ctx, directory):
     return ("scorecards", len(results) - failed_count, [(fp, et, em) for fn, fp, et, em in results if et])
 
 def _import_workflows(ctx, directory):
+    results = []
+    failed_count = 0
     if os.path.isdir(directory):
         print("Processing: " + directory)
         files = [(filename, os.path.join(directory, filename))
@@ -690,3 +698,7 @@ def import_tenant(
                 print(f"cortex scorecards create -f \"{file_path}\"")
             elif import_type == "workflows":
                 print(f"cortex workflows create -f \"{file_path}\"")
+
+    # Exit with non-zero code if any imports failed
+    if total_failed > 0:
+        raise typer.Exit(1)

{cortexapps_cli-1.6.0 → cortexapps_cli-1.9.0}/cortexapps_cli/cortex_client.py

@@ -98,7 +98,7 @@ class CortexClient:
             max_retries=Retry(
                 total=3,
                 backoff_factor=0.3,
-                status_forcelist=[500, 502, 503, 504],  # Removed 429 - we avoid it with rate limiting
+                status_forcelist=[429],  # Only retry on rate limit errors
                 allowed_methods=["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"],
                 respect_retry_after_header=True
             )
@@ -149,6 +149,23 @@ class CortexClient:
                 # try to parse the error message
                 error = response.json()
                 status = response.status_code
+
+                # Check for validation error format with violations array
+                if 'violations' in error and isinstance(error['violations'], list):
+                    print(f'[red][bold]HTTP Error {status}[/bold][/red]: Validation failed')
+                    for violation in error['violations']:
+                        title = violation.get('title', 'Validation Error')
+                        description = violation.get('description', 'No description')
+                        violation_type = violation.get('violationType', '')
+                        pointer = violation.get('pointer', '')
+                        print(f'  [yellow]{title}[/yellow]: {description}')
+                        if pointer:
+                            print(f'    [dim]Location: {pointer}[/dim]')
+                        if violation_type:
+                            print(f'    [dim]Type: {violation_type}[/dim]')
+                    raise typer.Exit(code=1)
+
+                # Standard error format with message/details
                 message = error.get('message', 'Unknown error')
                 details = error.get('details', 'No details')
                 request_id = error.get('requestId', 'No request ID')
@@ -156,8 +173,12 @@ class CortexClient:
                 print(error_str)
                 raise typer.Exit(code=1)
             except json.JSONDecodeError:
-                # if we can't parse the error message, just raise the HTTP error
-                response.raise_for_status()
+                # if we can't parse the error message, print a clean error and exit
+                status = response.status_code
+                reason = response.reason or 'Unknown error'
+                error_str = f'[red][bold]HTTP Error {status}[/bold][/red]: {reason}'
+                print(error_str)
+                raise typer.Exit(code=1)
 
         if raw_response:
             return response

{cortexapps_cli-1.6.0 → cortexapps_cli-1.9.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "cortexapps-cli"
 # version will be incremented via command line as part of github actions build
-version = "1.6.0"
+version = "1.9.0"
 description = "Command Line Interface for cortexapps"
 license = "MIT"
 authors = [
@@ -19,7 +19,7 @@ classifiers = [
 python = "^3.11"
 requests = "^2.32.4"
 pyyaml = ">= 6.0.1, < 7"
-urllib3 = ">= 2.2.2"
+urllib3 = ">= 2.6.0"
 typer = "^0.12.5"
 click = "<8.2"