glaip-sdk 0.0.5__py3-none-any.whl → 0.0.6a0__py3-none-any.whl

glaip_sdk/utils/general.py

@@ -5,7 +5,9 @@ Authors:
 """
 
 import re
+from collections.abc import Iterable, Iterator
 from datetime import datetime
+from typing import Any
 from uuid import UUID
 
 import click
@@ -58,7 +60,7 @@ def format_file_size(size_bytes: int) -> str:
     return f"{size_bytes:.1f} TB"
 
 
-def format_datetime(dt):
+def format_datetime(dt: datetime | str | None) -> str:
     """Format datetime object to readable string.
 
     Args:
@@ -74,7 +76,9 @@ def format_datetime(dt):
     return str(dt)
 
 
-def progress_bar(iterable, description: str = "Processing"):
+def progress_bar(
+    iterable: Iterable[Any], description: str = "Processing"
+) -> Iterator[Any]:
     """Simple progress bar using click.
 
     Args:
@@ -86,9 +90,7 @@ def progress_bar(iterable, description: str = "Processing"):
     """
     try:
         with click.progressbar(iterable, label=description) as bar:
-            for item in bar:
-                yield item
+            yield from bar
     except ImportError:
         # Fallback if click not available
-        for item in iterable:
-            yield item
+        yield from iterable

glaip_sdk/utils/import_export.py

@@ -66,6 +66,58 @@ def convert_export_to_import_format(data: dict[str, Any]) -> dict[str, Any]:
     return import_data
 
 
+def _get_default_array_fields() -> list[str]:
+    """Get default array fields that should be merged."""
+    return ["tools", "agents"]
+
+
+def _should_use_cli_value(cli_value: Any) -> bool:
+    """Check if CLI value should be used."""
+    return cli_value is not None and (
+        not isinstance(cli_value, list | tuple) or len(cli_value) > 0
+    )
+
+
+def _handle_array_field_merge(
+    key: str, cli_value: Any, import_data: dict[str, Any]
+) -> Any:
+    """Handle merging of array fields."""
+    import_value = import_data[key]
+    if isinstance(import_value, list):
+        return list(cli_value) + import_value
+    else:
+        return cli_value
+
+
+def _merge_cli_values_with_import(
+    merged: dict[str, Any],
+    cli_args: dict[str, Any],
+    import_data: dict[str, Any],
+    array_fields: list[str],
+) -> None:
+    """Merge CLI values into merged dict."""
+    for key, cli_value in cli_args.items():
+        if _should_use_cli_value(cli_value):
+            # CLI value takes precedence (for non-empty values)
+            if key in array_fields and key in import_data:
+                # For array fields, combine CLI and imported values
+                merged[key] = _handle_array_field_merge(key, cli_value, import_data)
+            else:
+                merged[key] = cli_value
+        elif key in import_data:
+            # Use imported value if no CLI value
+            merged[key] = import_data[key]
+
+
+def _add_import_only_fields(
+    merged: dict[str, Any], import_data: dict[str, Any]
+) -> None:
+    """Add fields that exist only in import data."""
+    for key, import_value in import_data.items():
+        if key not in merged:
+            merged[key] = import_value
+
+
 def merge_import_with_cli_args(
     import_data: dict[str, Any],
     cli_args: dict[str, Any],
@@ -87,32 +139,11 @@ def merge_import_with_cli_args(
         - Empty arrays/lists are treated as None (no override)
     """
     if array_fields is None:
-        array_fields = ["tools", "agents"]
+        array_fields = _get_default_array_fields()
 
     merged = {}
-
-    for key, cli_value in cli_args.items():
-        if cli_value is not None and (
-            not isinstance(cli_value, list | tuple) or len(cli_value) > 0
-        ):
-            # CLI value takes precedence (for non-empty values)
-            if key in array_fields and key in import_data:
-                # For array fields, combine CLI and imported values
-                import_value = import_data[key]
-                if isinstance(import_value, list):
-                    merged[key] = list(cli_value) + import_value
-                else:
-                    merged[key] = cli_value
-            else:
-                merged[key] = cli_value
-        elif key in import_data:
-            # Use imported value if no CLI value
-            merged[key] = import_data[key]
-
-    # Add any import-only fields
-    for key, import_value in import_data.items():
-        if key not in merged:
-            merged[key] = import_value
+    _merge_cli_values_with_import(merged, cli_args, import_data, array_fields)
+    _add_import_only_fields(merged, import_data)
 
     return merged
 

glaip_sdk/utils/rendering/formatting.py

@@ -8,6 +8,8 @@ from __future__ import annotations
 
 import re
 import time
+from collections.abc import Callable
+from typing import Any
 
 # Constants for argument formatting
 DEFAULT_ARGS_MAX_LEN = 100
@@ -65,9 +67,7 @@ def redact_sensitive(text: str | dict | list) -> str | dict | list:
                 for sensitive in ["password", "secret", "token", "key", "api_key"]
             ):
                 result[key] = "••••••"
-            elif isinstance(value, dict | list):
-                result[key] = redact_sensitive(value)
-            elif isinstance(value, str):
+            elif isinstance(value, dict | list) or isinstance(value, str):
                 result[key] = redact_sensitive(value)
             else:
                 result[key] = value
@@ -156,7 +156,7 @@ def get_step_icon(step_kind: str) -> str:
     return ""
 
 
-def is_step_finished(step) -> bool:
+def is_step_finished(step: Any) -> bool:
     """Check if a step is finished.
 
     Args:
@@ -169,7 +169,9 @@ def is_step_finished(step) -> bool:
 
 
 def format_main_title(
-    header_text: str, has_running_steps: bool, get_spinner_char: callable
+    header_text: str,
+    has_running_steps: bool,
+    get_spinner_char: Callable[[], str],
 ) -> str:
     """Generate the main panel title with dynamic status indicators.
 
@@ -191,7 +193,11 @@ def format_main_title(
 
 
 def print_header_once(
-    console, text: str, last_header: str, rules_enabled: bool, style: str | None = None
+    console: Any,
+    text: str,
+    last_header: str,
+    rules_enabled: bool,
+    style: str | None = None,
 ) -> str:
     """Print header text only when it changes to avoid duplicate output.
 

glaip_sdk/utils/rendering/models.py

@@ -25,7 +25,7 @@ class Step:
     started_at: float = field(default_factory=monotonic)
     duration_ms: int | None = None
 
-    def finish(self, duration_raw: float | None):
+    def finish(self, duration_raw: float | None) -> None:
         if isinstance(duration_raw, int | float) and duration_raw > 0:
             # Use provided duration if it's a positive number (even if very small)
             self.duration_ms = round(float(duration_raw) * 1000)