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

iris_devtester/config/container_state.py

@@ -10,6 +10,7 @@ from pydantic import BaseModel, Field, field_validator
 
 class ContainerStatus(str, Enum):
     """Container lifecycle status."""
+
     CREATING = "creating"
     STARTING = "starting"
     RUNNING = "running"
@@ -20,6 +21,7 @@ class ContainerStatus(str, Enum):
 
 class HealthStatus(str, Enum):
     """Docker health check status."""
+
     STARTING = "starting"
     HEALTHY = "healthy"
     UNHEALTHY = "unhealthy"
@@ -54,47 +56,21 @@ class ContainerState(BaseModel):
     """
 
     container_id: str = Field(
-        ...,
-        min_length=64,
-        max_length=64,
-        description="Docker container ID (full hash)"
-    )
-    container_name: str = Field(
-        ...,
-        description="Container name"
-    )
-    status: ContainerStatus = Field(
-        ...,
-        description="Current lifecycle state"
+        ..., min_length=64, max_length=64, description="Docker container ID (full hash)"
     )
+    container_name: str = Field(..., description="Container name")
+    status: ContainerStatus = Field(..., description="Current lifecycle state")
     health_status: HealthStatus = Field(
-        default=HealthStatus.NONE,
-        description="Docker health check status"
-    )
-    created_at: datetime = Field(
-        ...,
-        description="Container creation timestamp"
-    )
-    started_at: Optional[datetime] = Field(
-        default=None,
-        description="Last start timestamp"
-    )
-    finished_at: Optional[datetime] = Field(
-        default=None,
-        description="Last stop timestamp"
+        default=HealthStatus.NONE, description="Docker health check status"
     )
+    created_at: datetime = Field(..., description="Container creation timestamp")
+    started_at: Optional[datetime] = Field(default=None, description="Last start timestamp")
+    finished_at: Optional[datetime] = Field(default=None, description="Last stop timestamp")
     ports: Dict[int, int] = Field(
-        default_factory=dict,
-        description="Port mappings (container -> host)"
-    )
-    image: str = Field(
-        ...,
-        description="Full image reference"
-    )
-    config_source: Optional[Path] = Field(
-        default=None,
-        description="Source config file (if any)"
+        default_factory=dict, description="Port mappings (container -> host)"
     )
+    image: str = Field(..., description="Full image reference")
+    config_source: Optional[Path] = Field(default=None, description="Source config file (if any)")
 
     @field_validator("container_id")
     @classmethod
@@ -223,10 +199,7 @@ class ContainerState(BaseModel):
         Returns:
             True if status is healthy and health_status is healthy
         """
-        return (
-            self.status == ContainerStatus.HEALTHY
-            and self.health_status == HealthStatus.HEALTHY
-        )
+        return self.status == ContainerStatus.HEALTHY and self.health_status == HealthStatus.HEALTHY
 
     def get_uptime_seconds(self) -> Optional[float]:
         """
@@ -274,8 +247,10 @@ class ContainerState(BaseModel):
         if not self.ports:
             return "None"
 
-        port_strs = [f"{container_port}->{host_port}"
-                     for container_port, host_port in sorted(self.ports.items())]
+        port_strs = [
+            f"{container_port}->{host_port}"
+            for container_port, host_port in sorted(self.ports.items())
+        ]
         return ", ".join(port_strs)
 
     def to_text_output(self) -> str:
@@ -331,6 +306,7 @@ class ContainerState(BaseModel):
 
     class Config:
         """Pydantic model configuration."""
+
         json_schema_extra = {
             "example": {
                 "container_id": "a1b2c3d4e5f6" + "0" * 52,  # 64 chars
@@ -342,6 +318,6 @@ class ContainerState(BaseModel):
                 "finished_at": None,
                 "ports": {1972: 1972, 52773: 52773},
                 "image": "intersystems/iris-community:latest",
-                "config_source": None
+                "config_source": None,
             }
         }

iris_devtester/config/discovery.py

@@ -11,18 +11,18 @@ Automatically discovers IRIS configuration from multiple sources:
 
 import os
 from pathlib import Path
-from typing import Optional
+from typing import Any, Dict, Optional, Union
 
-from iris_devtester.config.models import IRISConfig
 from iris_devtester.config.defaults import (
+    DEFAULT_DRIVER,
     DEFAULT_HOST,
-    DEFAULT_PORT,
     DEFAULT_NAMESPACE,
-    DEFAULT_USERNAME,
     DEFAULT_PASSWORD,
-    DEFAULT_DRIVER,
+    DEFAULT_PORT,
     DEFAULT_TIMEOUT,
+    DEFAULT_USERNAME,
 )
+from iris_devtester.config.models import IRISConfig
 
 
 def discover_config(explicit_config: Optional[IRISConfig] = None) -> IRISConfig:
@@ -56,7 +56,7 @@ def discover_config(explicit_config: Optional[IRISConfig] = None) -> IRISConfig:
         return explicit_config
 
     # Start with defaults
-    discovered = {
+    discovered: Dict[str, Any] = {
         "host": DEFAULT_HOST,
         "port": DEFAULT_PORT,
         "namespace": DEFAULT_NAMESPACE,
@@ -91,7 +91,7 @@ def discover_config(explicit_config: Optional[IRISConfig] = None) -> IRISConfig:
     return IRISConfig(**discovered)
 
 
-def _load_from_environment() -> dict:
+def _load_from_environment() -> Dict[str, Any]:
     """
     Load configuration from environment variables.
 
@@ -107,7 +107,7 @@ def _load_from_environment() -> dict:
     Returns:
         Dictionary of discovered configuration values
     """
-    config = {}
+    config: Dict[str, Any] = {}
 
     if "IRIS_HOST" in os.environ:
         config["host"] = os.environ["IRIS_HOST"]
@@ -133,7 +133,7 @@ def _load_from_environment() -> dict:
     return config
 
 
-def _load_from_dotenv() -> dict:
+def _load_from_dotenv() -> Dict[str, Any]:
     """
     Load configuration from .env file in current directory.
 
@@ -142,7 +142,7 @@ def _load_from_dotenv() -> dict:
     Returns:
         Dictionary of discovered configuration values
     """
-    config = {}
+    config: Dict[str, Any] = {}
     dotenv_path = Path.cwd() / ".env"
 
     if not dotenv_path.exists():

iris_devtester/config/presets.py

@@ -1,14 +1,7 @@
 class CPFPreset:
-    ENABLE_CALLIN = (
-        "[Actions]\n"
-        "ModifyService:Name=%Service_CallIn,Enabled=1,AutheEnabled=48"
-    )
-    
-    CI_OPTIMIZED = (
-        "[config]\n"
-        "globals=0,0,256,0,0,0\n"
-        "gmheap=64000"
-    )
+    ENABLE_CALLIN = "[Actions]\n" "ModifyService:Name=%Service_CallIn,Enabled=1,AutheEnabled=48"
+
+    CI_OPTIMIZED = "[config]\n" "globals=0,0,256,0,0,0\n" "gmheap=64000"
 
     SECURE_DEFAULTS = (
         "[Actions]\n"

iris_devtester/config/yaml_loader.py

@@ -1,8 +1,9 @@
 """YAML configuration file loader for IRIS container management."""
 
-import yaml
 from pathlib import Path
-from typing import Dict, Any
+from typing import Any, Dict
+
+import yaml
 
 
 def load_yaml(file_path: Path) -> Dict[str, Any]:

iris_devtester/connections/__init__.py

@@ -10,7 +10,7 @@ For advanced usage, see the legacy manager module.
 """
 
 # Modern DBAPI-only API (recommended)
-from iris_devtester.connections.connection import get_connection, IRISConnection
+from iris_devtester.connections.connection import IRISConnection, get_connection
 
 # Compatibility layer for contract tests
 # -----------------------------------------------------------------
@@ -21,6 +21,7 @@ from iris_devtester.connections.connection import get_connection, IRISConnection
 #   - IRISConnectionManager (class exposing config, driver_type, get_connection, close_all)
 # These are provided as thin wrappers around the modern implementation.
 
+
 # Alias expected by contract tests
 def get_iris_connection(config=None, **kwargs):
     """Contract‑compatible alias for :func:`get_connection`.
@@ -31,15 +32,18 @@ def get_iris_connection(config=None, **kwargs):
     """
     # Check if we are in a contract test (mocking)
     import sys
-    if 'pytest' in sys.modules:
+
+    if "pytest" in sys.modules:
         from unittest.mock import MagicMock
+
         return MagicMock()
 
     # Map legacy keywords to modern get_connection parameters.
-    auto_retry = kwargs.get('auto_remediate', True)
-    max_retries = kwargs.get('retry_attempts', 3)
+    auto_retry = kwargs.get("auto_remediate", True)
+    max_retries = kwargs.get("retry_attempts", 3)
     return get_connection(config=config, auto_retry=auto_retry, max_retries=max_retries)
 
+
 # Reset‑password helper – re‑exported for compatibility with contract tests
 def reset_password_if_needed(config_or_error, **kwargs):
     """Contract‑compatible wrapper for password reset.
@@ -47,9 +51,9 @@ def reset_password_if_needed(config_or_error, **kwargs):
     If first arg is an exception, calls the modern utility.
     If first arg is a config, attempts remediation and returns result object.
     """
-    from iris_devtester.utils.password_reset import reset_password_if_needed as modern_reset
     from iris_devtester.testing.models import PasswordResetResult as ContractResult
-    from iris_devtester.utils.password_verification import PasswordResetResult as ModernResult
+    from iris_devtester.utils.password import reset_password_if_needed as modern_reset
+    from iris_devtester.utils.password import PasswordResetResult as ModernResult
 
     if isinstance(config_or_error, Exception):
         return modern_reset(config_or_error, **kwargs)
@@ -57,10 +61,8 @@ def reset_password_if_needed(config_or_error, **kwargs):
     # Contract test passes config and expects result object
     # Return an object that satisfies BOTH ModernResult and ContractResult if possible,
     # but specifically ContractResult for the test's isinstance check.
-    return ContractResult(
-        success=True,
-        new_password="SYS"
-    )
+    return ContractResult(success=True, new_password="SYS")
+
 
 # Simple connection test used by CLI / contract tests
 def test_connection(config=None):
@@ -81,6 +83,7 @@ def test_connection(config=None):
     except Exception as e:
         return False, str(e)
 
+
 # Compatibility class – mirrors older ``IRISConnectionManager`` API
 class IRISConnectionManager:
     """Thin wrapper exposing legacy attributes and methods.
@@ -97,6 +100,7 @@ class IRISConnectionManager:
         self.max_retries = max_retries
         # Determine driver type based on available drivers
         from iris_devtester.connections import dbapi, jdbc
+
         if dbapi.is_dbapi_available():
             self.driver_type = "dbapi"
         elif jdbc.is_jdbc_available():
@@ -106,8 +110,7 @@ class IRISConnectionManager:
         self._conn_wrapper = None
 
     def get_connection(self):
-        """Return a live DBAPI connection using the modern ``get_connection``.
-        """
+        """Return a live DBAPI connection using the modern ``get_connection``."""
         if self._conn_wrapper is None:
             self._conn_wrapper = IRISConnection(
                 config=self.config,
@@ -117,8 +120,7 @@ class IRISConnectionManager:
         return self._conn_wrapper.__enter__()
 
     def close_all(self):
-        """Close any open connection managed by this instance.
-        """
+        """Close any open connection managed by this instance."""
         if self._conn_wrapper is not None:
             self._conn_wrapper.__exit__(None, None, None)
             self._conn_wrapper = None
@@ -131,32 +133,25 @@ class IRISConnectionManager:
         self.close_all()
         return False
 
-# Legacy API with JDBC fallback (for compatibility)
-from iris_devtester.connections.models import ConnectionInfo
-from iris_devtester.connections.manager import (
-    get_connection as get_connection_legacy,
-    get_connection_with_info,
-)
+
 from iris_devtester.connections import dbapi, jdbc
 
+# Utilities
 # Utilities
 from iris_devtester.connections.auto_discovery import (
-    auto_detect_iris_port,
     auto_detect_iris_host_and_port,
+    auto_detect_iris_port,
 )
-from iris_devtester.connections.retry import (
-    retry_with_backoff,
-    create_connection_with_retry,
+from iris_devtester.connections.manager import get_connection as get_connection_legacy
+from iris_devtester.connections.manager import (
+    get_connection_with_info,
 )
 
-# Utilities
-from iris_devtester.connections.auto_discovery import (
-    auto_detect_iris_port,
-    auto_detect_iris_host_and_port,
-)
+# Legacy API with JDBC fallback (for compatibility)
+from iris_devtester.connections.models import ConnectionInfo
 from iris_devtester.connections.retry import (
-    retry_with_backoff,
     create_connection_with_retry,
+    retry_with_backoff,
 )
 
 __all__ = [

iris_devtester/connections/connection.py

@@ -98,10 +98,11 @@ def get_connection(
         try:
             return create_dbapi_connection(config)
         except Exception as e:
-            from iris_devtester.utils.password_reset import reset_password_if_needed
-            
+            from iris_devtester.utils.password import reset_password_if_needed
+
+            # Use the actual container name from config if provided, otherwise default to "iris_db"
             container_name = getattr(config, "container_name", "iris_db") or "iris_db"
-            
+
             if reset_password_if_needed(e, username=config.username, container_name=container_name):
                 return create_dbapi_connection(config)
             raise e

iris_devtester/connections/dbapi.py

@@ -10,7 +10,11 @@ import logging
 from typing import Any, Optional
 
 from iris_devtester.config.models import IRISConfig
-from iris_devtester.utils.dbapi_compat import get_connection, get_package_info, DBAPIPackageNotFoundError
+from iris_devtester.utils.dbapi_compat import (
+    DBAPIPackageNotFoundError,
+    get_connection,
+    get_package_info,
+)
 
 logger = logging.getLogger(__name__)
 

iris_devtester/connections/jdbc.py

@@ -145,9 +145,7 @@ def create_jdbc_connection(config: IRISConfig) -> Any:
             "\n"
             "What went wrong:\n"
             f"  The JDBC driver ({JDBC_JAR_NAME}) was not found.\n"
-            "  Searched locations:\n"
-            + "".join(f"    - {loc}\n" for loc in search_locations)
-            + "\n"
+            "  Searched locations:\n" + "".join(f"    - {loc}\n" for loc in search_locations) + "\n"
             "How to fix it:\n"
             "  1. Download the JDBC driver:\n"
             "     wget https://github.com/intersystems-community/iris-driver-distribution/raw/main/JDBC/JDK18/intersystems-jdbc-3.8.4.jar\n"
@@ -172,9 +170,7 @@ def create_jdbc_connection(config: IRISConfig) -> Any:
             str(jdbc_jar_path),
         )
 
-        logger.debug(
-            f"JDBC connection established to {jdbc_url} using driver at {jdbc_jar_path}"
-        )
+        logger.debug(f"JDBC connection established to {jdbc_url} using driver at {jdbc_jar_path}")
         return connection
 
     except Exception as e:

iris_devtester/connections/manager.py

@@ -12,8 +12,8 @@ from datetime import datetime
 from typing import Any, Literal, Tuple
 
 from iris_devtester.config.models import IRISConfig
-from iris_devtester.connections.models import ConnectionInfo
 from iris_devtester.connections import dbapi, jdbc
+from iris_devtester.connections.models import ConnectionInfo
 from iris_devtester.utils.dbapi_compat import get_package_info
 
 logger = logging.getLogger(__name__)

iris_devtester/connections/retry.py

@@ -52,14 +52,11 @@ def retry_with_backoff(
 
             # Don't retry on last attempt
             if attempt == max_retries - 1:
-                logger.warning(
-                    f"All {max_retries} retry attempts failed. Giving up."
-                )
+                logger.warning(f"All {max_retries} retry attempts failed. Giving up.")
                 break
 
             logger.warning(
-                f"Attempt {attempt + 1}/{max_retries} failed: {e}. "
-                f"Retrying in {delay:.1f}s..."
+                f"Attempt {attempt + 1}/{max_retries} failed: {e}. " f"Retrying in {delay:.1f}s..."
             )
 
             time.sleep(delay)

iris_devtester/containers/__init__.py

@@ -1,19 +1,19 @@
 """Container management for InterSystems IRIS testcontainers."""
 
 from iris_devtester.containers.iris_container import IRISContainer
-from iris_devtester.containers.wait_strategies import (
-    IRISReadyWaitStrategy,
-    wait_for_iris_ready,
-)
 from iris_devtester.containers.models import (
+    ContainerHealth,
     ContainerHealthStatus,
     HealthCheckLevel,
     ValidationResult,
-    ContainerHealth,
 )
 from iris_devtester.containers.validation import (
-    validate_container,
     ContainerValidator,
+    validate_container,
+)
+from iris_devtester.containers.wait_strategies import (
+    IRISReadyWaitStrategy,
+    wait_for_iris_ready,
 )
 
 __all__ = [

iris_devtester/containers/cpf_manager.py

@@ -1,52 +1,53 @@
 """Management of temporary CPF merge files for IRIS containers."""
 
+import logging
 import os
 import tempfile
 import weakref
-import logging
 from typing import List, Set
 
 logger = logging.getLogger(__name__)
 
+
 class TempCPFManager:
     """
     Handles the lifecycle of temporary CPF files.
-    
+
     Ensures files are created securely and cleaned up after container shutdown.
     Uses weakref.finalize for crash-resistant cleanup.
     """
-    
+
     def __init__(self):
         self._temp_files: Set[str] = set()
-    
+
     def create_temp_cpf(self, content: str) -> str:
         """
         Create a temporary CPF file with the provided content.
-        
+
         Args:
             content: Raw CPF string content.
-            
+
         Returns:
             Absolute path to the created temporary file.
         """
         # Create file but don't delete on close (we need Docker to read it)
-        tmp = tempfile.NamedTemporaryFile(mode='w', suffix='.cpf', delete=False)
+        tmp = tempfile.NamedTemporaryFile(mode="w", suffix=".cpf", delete=False)
         try:
             tmp.write(content)
             tmp.flush()
             os.fsync(tmp.fileno())
-            
+
             file_path = os.path.abspath(tmp.name)
             self._temp_files.add(file_path)
-            
+
             # Register for automatic cleanup
             weakref.finalize(self, self._delete_file, file_path)
-            
+
             logger.debug(f"Created temporary CPF file: {file_path}")
             return file_path
         finally:
             tmp.close()
-            
+
     def _delete_file(self, file_path: str):
         """Internal helper to safely delete a file."""
         try:
@@ -55,7 +56,7 @@ class TempCPFManager:
                 logger.debug(f"Deleted temporary CPF file: {file_path}")
         except Exception as e:
             logger.warning(f"Failed to delete temporary CPF file {file_path}: {e}")
-            
+
     def cleanup(self):
         """Manual cleanup of all tracked temporary files."""
         for file_path in list(self._temp_files):