iris-devtester 1.8.1__py3-none-any.whl → 1.9.1__py3-none-any.whl

iris_devtester/containers/models.py

@@ -159,12 +159,7 @@ class ValidationResult:
         return "\n".join(lines).rstrip()
 
     @classmethod
-    def healthy(
-        cls,
-        name: str,
-        container_id: str,
-        validation_time: float
-    ) -> "ValidationResult":
+    def healthy(cls, name: str, container_id: str, validation_time: float) -> "ValidationResult":
         """Factory method for healthy container.
 
         Args:
@@ -182,15 +177,12 @@ class ValidationResult:
             container_id=container_id,
             message=f"Container '{name}' is running and accessible",
             remediation_steps=[],
-            validation_time=validation_time
+            validation_time=validation_time,
         )
 
     @classmethod
     def not_found(
-        cls,
-        name: str,
-        available_containers: List[str],
-        validation_time: float
+        cls, name: str, available_containers: List[str], validation_time: float
     ) -> "ValidationResult":
         """Factory method for container not found.
 
@@ -211,19 +203,15 @@ class ValidationResult:
             remediation_steps=[
                 "1. List all containers:\n   docker ps -a",
                 f"2. Start container if it exists:\n   docker start {name}",
-                f"3. Or create new container:\n   docker run -d --name {name} intersystemsdc/iris-community:latest"
+                f"3. Or create new container:\n   docker run -d --name {name} intersystemsdc/iris-community:latest",
             ],
             available_containers=available_containers,
-            validation_time=validation_time
+            validation_time=validation_time,
         )
 
     @classmethod
     def not_running(
-        cls,
-        name: str,
-        container_id: str,
-        validation_time: float,
-        container_status: str = "exited"
+        cls, name: str, container_id: str, validation_time: float, container_status: str = "exited"
     ) -> "ValidationResult":
         """Factory method for stopped container.
 
@@ -242,19 +230,13 @@ class ValidationResult:
             container_name=name,
             container_id=container_id,
             message=f"Container exists but is not running (status: {container_status}).",
-            remediation_steps=[
-                f"docker start {name}"
-            ],
-            validation_time=validation_time
+            remediation_steps=[f"docker start {name}"],
+            validation_time=validation_time,
         )
 
     @classmethod
     def not_accessible(
-        cls,
-        name: str,
-        container_id: str,
-        error: str,
-        validation_time: float
+        cls, name: str, container_id: str, error: str, validation_time: float
     ) -> "ValidationResult":
         """Factory method for inaccessible container.
 
@@ -276,18 +258,14 @@ class ValidationResult:
             remediation_steps=[
                 f"1. Restart container:\n   docker restart {name}",
                 f"2. Check container logs:\n   docker logs {name} | tail -20",
-                f"3. Enable CallIn service (for IRIS):\n   iris-devtester container enable-callin {name}"
+                f"3. Enable CallIn service (for IRIS):\n   iris-devtester container enable-callin {name}",
             ],
-            validation_time=validation_time
+            validation_time=validation_time,
         )
 
     @classmethod
     def stale_reference(
-        cls,
-        name: str,
-        cached_id: str,
-        current_id: str,
-        validation_time: float
+        cls, name: str, cached_id: str, current_id: str, validation_time: float
     ) -> "ValidationResult":
         """Factory method for stale container reference.
 
@@ -314,17 +292,14 @@ class ValidationResult:
                 "1. Clear cached references and restart:\n"
                 "   # Exit Python session and restart\n"
                 "   # Or recreate IRISContainer context manager",
-                f"2. Verify container is running:\n   docker ps | grep {name}"
+                f"2. Verify container is running:\n   docker ps | grep {name}",
             ],
-            validation_time=validation_time
+            validation_time=validation_time,
         )
 
     @classmethod
     def docker_error(
-        cls,
-        name: str,
-        error: Exception,
-        validation_time: float
+        cls, name: str, error: Exception, validation_time: float
     ) -> "ValidationResult":
         """Factory method for Docker daemon errors.
 
@@ -347,9 +322,9 @@ class ValidationResult:
                 "2. Start Docker Desktop (macOS/Windows)\n"
                 "   # Or start Docker daemon (Linux):\n"
                 "   sudo systemctl start docker",
-                "3. Verify Docker is accessible:\n   docker ps"
+                "3. Verify Docker is accessible:\n   docker ps",
             ],
-            validation_time=validation_time
+            validation_time=validation_time,
         )
 
 
@@ -420,7 +395,7 @@ class ContainerHealth:
             "started_at": self.started_at,
             "port_bindings": self.port_bindings,
             "image": self.image,
-            "docker_sdk_version": self.docker_sdk_version
+            "docker_sdk_version": self.docker_sdk_version,
         }
 
     def is_healthy(self) -> bool:

iris_devtester/containers/monitor_utils.py

@@ -103,9 +103,7 @@ def is_monitor_collecting(conn) -> Tuple[bool, int]:
         return False, 0
 
 
-def get_monitor_samples(
-    conn, table: str = "HistoryPerf", limit: int = 10
-) -> List[Dict]:
+def get_monitor_samples(conn, table: str = "HistoryPerf", limit: int = 10) -> List[Dict]:
     """
     Get recent monitoring samples from %Monitor.System.
 

iris_devtester/containers/monitoring.py

@@ -136,9 +136,7 @@ class MonitoringPolicy:
 
         # Validate output directory is absolute path
         if not self.output_directory.startswith("/"):
-            raise ValueError(
-                f"Output directory must be absolute path: {self.output_directory}"
-            )
+            raise ValueError(f"Output directory must be absolute path: {self.output_directory}")
 
     def to_objectscript(self) -> str:
         """
@@ -369,8 +367,7 @@ class ResourceThresholds:
             True if monitoring should be disabled
         """
         return (
-            cpu_percent > self.cpu_disable_percent
-            or memory_percent > self.memory_disable_percent
+            cpu_percent > self.cpu_disable_percent or memory_percent > self.memory_disable_percent
         )
 
     def should_enable(self, cpu_percent: float, memory_percent: float) -> bool:
@@ -384,10 +381,7 @@ class ResourceThresholds:
         Returns:
             True if monitoring can be safely re-enabled
         """
-        return (
-            cpu_percent < self.cpu_enable_percent
-            and memory_percent < self.memory_enable_percent
-        )
+        return cpu_percent < self.cpu_enable_percent and memory_percent < self.memory_enable_percent
 
 
 @dataclass
@@ -520,7 +514,7 @@ def configure_monitoring(
         logger.debug(f"Executing ObjectScript to configure policy '{policy.name}'")
 
         # Check if connection has execute_objectscript method (test fixture provides this)
-        if hasattr(conn, 'execute_objectscript'):
+        if hasattr(conn, "execute_objectscript"):
             conn.execute_objectscript(objectscript)
         else:
             # Fallback error for production (until Feature 003)
@@ -800,9 +794,7 @@ def create_task(conn, schedule: TaskSchedule) -> str:
         result = cursor.fetchone()
 
         if not result:
-            raise RuntimeError(
-                f"Task '{schedule.name}' was created but ID could not be retrieved"
-            )
+            raise RuntimeError(f"Task '{schedule.name}' was created but ID could not be retrieved")
 
         task_id = str(result[0])
         logger.info(f"✓ Created Task Manager task: {schedule.name} (ID: {task_id})")
@@ -927,10 +919,7 @@ def suspend_task(conn, task_id: str) -> bool:
 
         # Use SQL UPDATE to suspend the task (works with DBAPI!)
         cursor = conn.cursor()
-        cursor.execute(
-            "UPDATE %SYS.Task SET Suspended = 1 WHERE ID = ?",
-            (task_id,)
-        )
+        cursor.execute("UPDATE %SYS.Task SET Suspended = 1 WHERE ID = ?", (task_id,))
         conn.commit()
 
         # Verify it was updated
@@ -945,23 +934,23 @@ def suspend_task(conn, task_id: str) -> bool:
             schedule = TaskSchedule(task_id=task_id)
             objectscript = schedule.disable()
 
-            if hasattr(conn, 'execute_objectscript'):
+            if hasattr(conn, "execute_objectscript"):
                 conn.execute_objectscript(objectscript)
             else:
                 raise NotImplementedError(
                     "ObjectScript execution not available\n"
                     "\n"
                     "What went wrong:\n"
-                "  This connection does not support ObjectScript execution.\n"
-                "  DBAPI connections are SQL-only.\n"
-                "\n"
-                "How to fix it:\n"
-                "  1. Use a JDBC connection (supports ObjectScript via stored procedures)\n"
-                "  2. Or wait for Feature 003 (Connection Manager) which provides\n"
-                "     hybrid DBAPI/JDBC connections with ObjectScript support\n"
-                "\n"
-                "See: docs/learnings/dbapi-objectscript-limitation.md\n"
-            )
+                    "  This connection does not support ObjectScript execution.\n"
+                    "  DBAPI connections are SQL-only.\n"
+                    "\n"
+                    "How to fix it:\n"
+                    "  1. Use a JDBC connection (supports ObjectScript via stored procedures)\n"
+                    "  2. Or wait for Feature 003 (Connection Manager) which provides\n"
+                    "     hybrid DBAPI/JDBC connections with ObjectScript support\n"
+                    "\n"
+                    "See: docs/learnings/dbapi-objectscript-limitation.md\n"
+                )
 
         logger.info(f"✓ Suspended task: {task_id}")
         return True
@@ -1013,10 +1002,7 @@ def resume_task(conn, task_id: str) -> bool:
 
         # Use SQL UPDATE to resume the task (works with DBAPI!)
         cursor = conn.cursor()
-        cursor.execute(
-            "UPDATE %SYS.Task SET Suspended = 0 WHERE ID = ?",
-            (task_id,)
-        )
+        cursor.execute("UPDATE %SYS.Task SET Suspended = 0 WHERE ID = ?", (task_id,))
         conn.commit()
 
         # Verify it was updated
@@ -1031,7 +1017,7 @@ def resume_task(conn, task_id: str) -> bool:
             schedule = TaskSchedule(task_id=task_id)
             objectscript = schedule.enable()
 
-            if hasattr(conn, 'execute_objectscript'):
+            if hasattr(conn, "execute_objectscript"):
                 conn.execute_objectscript(objectscript)
             else:
                 raise NotImplementedError(
@@ -1047,7 +1033,7 @@ def resume_task(conn, task_id: str) -> bool:
                     "     hybrid DBAPI/JDBC connections with ObjectScript support\n"
                     "\n"
                     "See: docs/learnings/dbapi-objectscript-limitation.md\n"
-            )
+                )
 
         logger.info(f"✓ Resumed task: {task_id}")
         return True
@@ -1096,16 +1082,13 @@ def delete_task(conn, task_id: str) -> bool:
 
         # Use SQL DELETE (works with DBAPI!)
         cursor = conn.cursor()
-        cursor.execute(
-            "DELETE FROM %SYS.Task WHERE ID = ?",
-            (task_id,)
-        )
+        cursor.execute("DELETE FROM %SYS.Task WHERE ID = ?", (task_id,))
         conn.commit()
 
         # Check if anything was deleted
         if cursor.rowcount == 0:
             # Fallback to ObjectScript if SQL didn't work
-            if hasattr(conn, 'execute_objectscript'):
+            if hasattr(conn, "execute_objectscript"):
                 objectscript = f"""
                     set task = ##class(%SYS.Task).%OpenId("{task_id}")
                     if $IsObject(task) {{
@@ -1183,13 +1166,15 @@ def list_monitoring_tasks(conn) -> list:
 
         tasks = []
         for row in results:
-            tasks.append({
-                "task_id": str(row[0]) if row[0] else "",
-                "name": row[1] if row[1] else "",
-                "suspended": bool(row[2]) if row[2] is not None else False,
-                "daily_increment": int(row[3]) if row[3] else 0,
-                "task_class": row[4] if row[4] else "",
-            })
+            tasks.append(
+                {
+                    "task_id": str(row[0]) if row[0] else "",
+                    "name": row[1] if row[1] else "",
+                    "suspended": bool(row[2]) if row[2] is not None else False,
+                    "daily_increment": int(row[3]) if row[3] else 0,
+                    "task_class": row[4] if row[4] else "",
+                }
+            )
 
         logger.info(f"✓ Found {len(tasks)} monitoring task(s)")
         return tasks

iris_devtester/containers/performance.py

@@ -11,7 +11,7 @@ import json
 import logging
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     from iris_devtester.containers.monitoring import ResourceThresholds
@@ -142,7 +142,9 @@ def get_resource_metrics(conn) -> PerformanceMetrics:
             monitoring_enabled=has_active_task,
         )
 
-        logger.debug(f"✓ Metrics: CPU={metrics.cpu_percent:.1f}% Memory={metrics.memory_percent:.1f}%")
+        logger.debug(
+            f"✓ Metrics: CPU={metrics.cpu_percent:.1f}% Memory={metrics.memory_percent:.1f}%"
+        )
         return metrics
 
     except Exception as e:
@@ -161,9 +163,7 @@ def get_resource_metrics(conn) -> PerformanceMetrics:
         raise RuntimeError(error_msg) from e
 
 
-def check_resource_thresholds(
-    conn, thresholds: "ResourceThresholds"
-) -> tuple:
+def check_resource_thresholds(conn, thresholds: "ResourceThresholds") -> tuple:
     """
     Check if current resources exceed thresholds.
 

iris_devtester/containers/validation.py

@@ -12,16 +12,16 @@ Constitutional Compliance:
 
 import logging
 import time
-from typing import Optional, List
+from typing import List, Optional
 
 import docker
-from docker.errors import DockerException, NotFound, APIError
+from docker.errors import APIError, DockerException, NotFound
 
 from iris_devtester.containers.models import (
+    ContainerHealth,
     ContainerHealthStatus,
     HealthCheckLevel,
     ValidationResult,
-    ContainerHealth,
 )
 
 logger = logging.getLogger(__name__)
@@ -31,7 +31,7 @@ def validate_container(
     container_name: str,
     level: HealthCheckLevel = HealthCheckLevel.STANDARD,
     timeout: int = 10,
-    docker_client: Optional[docker.DockerClient] = None
+    docker_client: Optional[docker.DockerClient] = None,
 ) -> ValidationResult:
     """
     Validate Docker container health with progressive checks.
@@ -90,9 +90,7 @@ def validate_container(
         except DockerException as e:
             elapsed = time.time() - start_time
             return ValidationResult.docker_error(
-                name=container_name,
-                error=e,
-                validation_time=elapsed
+                name=container_name, error=e, validation_time=elapsed
             )
 
     # Progressive validation strategy
@@ -105,9 +103,7 @@ def validate_container(
             elapsed = time.time() - start_time
             available = _get_available_containers(docker_client)
             return ValidationResult.not_found(
-                name=container_name,
-                available_containers=available,
-                validation_time=elapsed
+                name=container_name, available_containers=available, validation_time=elapsed
             )
 
         # Step 2: Check running status (MINIMAL level)
@@ -120,23 +116,18 @@ def validate_container(
                 name=container_name,
                 container_id=container.id,
                 validation_time=elapsed,
-                container_status=container.status
+                container_status=container.status,
             )
 
         # MINIMAL check complete
         if level == HealthCheckLevel.MINIMAL:
             elapsed = time.time() - start_time
             return ValidationResult.healthy(
-                name=container_name,
-                container_id=container.id,
-                validation_time=elapsed
+                name=container_name, container_id=container.id, validation_time=elapsed
             )
 
         # Step 3: Check exec accessibility (STANDARD level)
-        is_accessible, access_error = _check_exec_accessibility(
-            container,
-            timeout=timeout
-        )
+        is_accessible, access_error = _check_exec_accessibility(container, timeout=timeout)
 
         if not is_accessible:
             elapsed = time.time() - start_time
@@ -144,23 +135,18 @@ def validate_container(
                 name=container_name,
                 container_id=container.id,
                 error=access_error or "Unknown exec error",
-                validation_time=elapsed
+                validation_time=elapsed,
             )
 
         # STANDARD check complete
         if level == HealthCheckLevel.STANDARD:
             elapsed = time.time() - start_time
             return ValidationResult.healthy(
-                name=container_name,
-                container_id=container.id,
-                validation_time=elapsed
+                name=container_name, container_id=container.id, validation_time=elapsed
             )
 
         # Step 4: IRIS-specific health check (FULL level)
-        is_iris_healthy, iris_error = _check_iris_health(
-            container,
-            timeout=timeout
-        )
+        is_iris_healthy, iris_error = _check_iris_health(container, timeout=timeout)
 
         if not is_iris_healthy:
             elapsed = time.time() - start_time
@@ -168,29 +154,22 @@ def validate_container(
                 name=container_name,
                 container_id=container.id,
                 error=f"IRIS not responsive: {iris_error}",
-                validation_time=elapsed
+                validation_time=elapsed,
             )
 
         # FULL check complete - container is healthy
         elapsed = time.time() - start_time
         return ValidationResult.healthy(
-            name=container_name,
-            container_id=container.id,
-            validation_time=elapsed
+            name=container_name, container_id=container.id, validation_time=elapsed
         )
 
     except DockerException as e:
         elapsed = time.time() - start_time
-        return ValidationResult.docker_error(
-            name=container_name,
-            error=e,
-            validation_time=elapsed
-        )
+        return ValidationResult.docker_error(name=container_name, error=e, validation_time=elapsed)
 
 
 def _get_container_by_name(
-    client: docker.DockerClient,
-    name: str
+    client: docker.DockerClient, name: str
 ) -> Optional[docker.models.containers.Container]:
     """Get container by name.
 
@@ -210,9 +189,7 @@ def _get_container_by_name(
         return None
 
 
-def _get_available_containers(
-    client: docker.DockerClient
-) -> List[str]:
+def _get_available_containers(client: docker.DockerClient) -> List[str]:
     """Get list of available container names.
 
     Args:
@@ -234,8 +211,7 @@ def _get_available_containers(
 
 
 def _check_exec_accessibility(
-    container: docker.models.containers.Container,
-    timeout: int = 10
+    container: docker.models.containers.Container, timeout: int = 10
 ) -> tuple[bool, Optional[str]]:
     """Check if container accepts exec commands.
 
@@ -248,10 +224,7 @@ def _check_exec_accessibility(
     """
     try:
         # Simple echo command to test exec
-        exec_result = container.exec_run(
-            "echo healthy",
-            demux=False
-        )
+        exec_result = container.exec_run("echo healthy", demux=False)
 
         if exec_result.exit_code == 0:
             return True, None
@@ -263,8 +236,7 @@ def _check_exec_accessibility(
 
 
 def _check_iris_health(
-    container: docker.models.containers.Container,
-    timeout: int = 10
+    container: docker.models.containers.Container, timeout: int = 10
 ) -> tuple[bool, Optional[str]]:
     """Check IRIS-specific health (FULL validation level).
 
@@ -281,8 +253,7 @@ def _check_iris_health(
         # Try to execute simple IRIS query
         # This uses the iris session command available in IRIS containers
         exec_result = container.exec_run(
-            "iris session IRIS -U %SYS '##class(%SYSTEM.Process).CurrentDirectory()'",
-            demux=False
+            "iris session IRIS -U %SYS '##class(%SYSTEM.Process).CurrentDirectory()'", demux=False
         )
 
         if exec_result.exit_code == 0:
@@ -312,7 +283,7 @@ class ContainerValidator:
         self,
         container_name: str,
         docker_client: Optional[docker.DockerClient] = None,
-        cache_ttl: int = 5
+        cache_ttl: int = 5,
     ):
         """
         Initialize validator for specific container.
@@ -335,9 +306,7 @@ class ContainerValidator:
         self._cached_health: Optional[ContainerHealth] = None
 
     def validate(
-        self,
-        level: HealthCheckLevel = HealthCheckLevel.STANDARD,
-        force_refresh: bool = False
+        self, level: HealthCheckLevel = HealthCheckLevel.STANDARD, force_refresh: bool = False
     ) -> ValidationResult:
         """
         Validate container health.
@@ -350,15 +319,13 @@ class ContainerValidator:
             ValidationResult (may be cached).
         """
         # Check cache
-        if not force_refresh and self._is_cache_valid():
+        if not force_refresh and self._is_cache_valid() and self._cached_result is not None:
             logger.debug(f"Using cached validation result for {self._container_name}")
             return self._cached_result
 
         # Perform validation
         result = validate_container(
-            container_name=self._container_name,
-            level=level,
-            docker_client=self._docker_client
+            container_name=self._container_name, level=level, docker_client=self._docker_client
         )
 
         # Update cache
@@ -419,7 +386,7 @@ class ContainerValidator:
                 started_at=container.attrs.get("State", {}).get("StartedAt"),
                 port_bindings=port_bindings,
                 image=container.image.tags[0] if container.image.tags else None,
-                docker_sdk_version=docker.__version__
+                docker_sdk_version=docker.__version__,
             )
 
             # Cache result
@@ -455,7 +422,7 @@ class ContainerValidator:
 
         try:
             container = self._docker_client.containers.get(self._container_name)
-            return container.id
+            return str(container.id) if container.id else None
         except Exception:
             return None
 

iris_devtester/containers/wait_strategies.py

@@ -129,7 +129,18 @@ class IRISReadyWaitStrategy:
     def check_iris_initialized(self, container_name: str) -> bool:
         try:
             result = subprocess.run(
-                ["docker", "exec", container_name, "iris", "session", "IRIS", "-U", "%SYS", "W 1", "Halt"],
+                [
+                    "docker",
+                    "exec",
+                    container_name,
+                    "iris",
+                    "session",
+                    "IRIS",
+                    "-U",
+                    "%SYS",
+                    "W 1",
+                    "Halt",
+                ],
                 capture_output=True,
                 text=True,
                 timeout=10,
@@ -218,9 +229,7 @@ def wait_for_iris_ready(
         ... else:
         ...     print("Timeout waiting for IRIS")
     """
-    strategy = IRISReadyWaitStrategy(
-        port=port, timeout=timeout, poll_interval=poll_interval
-    )
+    strategy = IRISReadyWaitStrategy(port=port, timeout=timeout, poll_interval=poll_interval)
 
     try:
         return strategy.wait_until_ready(host, port, timeout)

iris_devtester/fixtures/__init__.py

@@ -52,36 +52,37 @@ pytest Integration:
 
 __version__ = "0.1.0"
 
+from .creator import FixtureCreator
+from .loader import DATFixtureLoader
+
 # Import data models and exceptions
 from .manifest import (
+    ChecksumMismatchError,
+    FixtureCreateError,
+    FixtureError,
+    FixtureLoadError,
     FixtureManifest,
+    FixtureValidationError,
+    LoadResult,
     TableInfo,
     ValidationResult,
-    LoadResult,
-    FixtureError,
-    FixtureValidationError,
-    FixtureLoadError,
-    FixtureCreateError,
-    ChecksumMismatchError,
 )
 
-# Import validator, loader, and creator
-from .validator import FixtureValidator
-from .loader import DATFixtureLoader
-from .creator import FixtureCreator
-
 # Import $SYSTEM.OBJ export/import utilities
 # Source: docs/learnings/iris-backup-patterns.md
 from .obj_export import (
     ExportResult,
     ImportResult,
     export_classes,
-    import_classes,
     export_global,
-    import_global,
     export_package,
+    import_classes,
+    import_global,
 )
 
+# Import validator, loader, and creator
+from .validator import FixtureValidator
+
 # Public API
 __all__ = [
     # Data models