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

iris_devtester/__init__.py

@@ -26,7 +26,7 @@ LangChain Integration:
     ...     # Build your RAG app...
 """
 
-__version__ = "1.9.1"
+__version__ = "1.9.3"
 __author__ = "InterSystems Community"
 __license__ = "MIT"
 

iris_devtester/cli/container.py

@@ -31,6 +31,12 @@ def container_group(ctx):
 @click.option(
     "--config", type=click.Path(exists=True), help="Path to iris-config.yml configuration file"
 )
+@click.option(
+    "--name",
+    type=str,
+    default=None,
+    help="Container name (default: iris_db)",
+)
 @click.option(
     "--detach/--no-detach",
     default=True,
@@ -41,7 +47,7 @@ def container_group(ctx):
 )
 @click.option("--cpf", help="Path to CPF merge file or raw CPF content")
 @click.pass_context
-def up(ctx, config, detach, timeout, cpf):
+def up(ctx, config, name, detach, timeout, cpf):
     """
     Create and start IRIS container from configuration.
 
@@ -58,6 +64,9 @@ def up(ctx, config, detach, timeout, cpf):
         # Zero-config (uses Community edition defaults)
         iris-devtester container up
 
+        # With custom container name
+        iris-devtester container up --name my-test-db
+
         # With custom configuration including volumes
         iris-devtester container up --config iris-config.yml
 
@@ -85,6 +94,11 @@ def up(ctx, config, detach, timeout, cpf):
                 container_config = ContainerConfig.default()
                 click.echo("⚡ Creating container from zero-config defaults")
 
+        # Override container name if provided via --name
+        if name:
+            container_config.container_name = name
+            click.echo(f"  → Container name: {name}")
+
         if cpf:
             container_config.cpf_merge = cpf
             click.echo(f"  → CPF Merge: {cpf[:50]}...")
@@ -95,6 +109,36 @@ def up(ctx, config, detach, timeout, cpf):
         if existing_container:
             # Container exists - check if running
             existing_container.reload()
+
+            # Warn if using default name and container already exists
+            # (user might be connecting to wrong container from different project)
+            if container_config.container_name == "iris_db" and not name:
+                existing_image = (
+                    existing_container.image.tags[0] if existing_container.image.tags else "unknown"
+                )
+                click.echo("")
+                click.echo(
+                    click.style(
+                        "⚠️  WARNING: Using default container name 'iris_db'", fg="yellow", bold=True
+                    )
+                )
+                click.echo(
+                    click.style(
+                        f"   A container with this name already exists (image: {existing_image})",
+                        fg="yellow",
+                    )
+                )
+                click.echo(
+                    click.style(
+                        "   If this is from a different project, use --name to avoid conflicts:",
+                        fg="yellow",
+                    )
+                )
+                click.echo(
+                    click.style("   iris-devtester container up --name my-project-db", fg="cyan")
+                )
+                click.echo("")
+
             if existing_container.status == "running":
                 click.echo(f"✓ Container '{container_config.container_name}' is already running")
 
@@ -808,9 +852,6 @@ def enable_callin(ctx, container_name, timeout):
     except (ImportError, ModuleNotFoundError) as e:
         progress.print_error(f"enable_callin utility not available: {e}")
         ctx.exit(1)
-    except (click.exceptions.Exit, SystemExit, KeyboardInterrupt):
-        # Let Click handle these - don't catch them
-        raise
     except Exception as e:
         progress.print_error(f"Failed to enable CallIn: {e}")
         ctx.exit(1)

iris_devtester/config/container_config.py

@@ -3,9 +3,9 @@
 import os
 import re
 from pathlib import Path
-from typing import List, Literal, Optional
+from typing import List, Literal, Optional, Union
 
-from pydantic import BaseModel, Field, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 
 from iris_devtester.config.yaml_loader import load_yaml
 
@@ -122,7 +122,7 @@ class ContainerConfig(BaseModel):
         return self
 
     @classmethod
-    def from_yaml(cls, file_path: str | Path) -> "ContainerConfig":
+    def from_yaml(cls, file_path: Union[str, Path]) -> "ContainerConfig":
         """
         Load configuration from YAML file.
 
@@ -290,10 +290,8 @@ class ContainerConfig(BaseModel):
 
         return errors
 
-    class Config:
-        """Pydantic model configuration."""
-
-        json_schema_extra = {
+    model_config = ConfigDict(
+        json_schema_extra={
             "example": {
                 "edition": "community",
                 "container_name": "iris_db",
@@ -306,3 +304,4 @@ class ContainerConfig(BaseModel):
                 "image_tag": "latest",
             }
         }
+    )

iris_devtester/config/container_state.py

@@ -3,9 +3,9 @@
 from datetime import datetime
 from enum import Enum
 from pathlib import Path
-from typing import Dict, Literal, Optional
+from typing import Dict, Optional
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 
 class ContainerStatus(str, Enum):
@@ -304,10 +304,8 @@ class ContainerState(BaseModel):
             "config_source": str(self.config_source) if self.config_source else None,
         }
 
-    class Config:
-        """Pydantic model configuration."""
-
-        json_schema_extra = {
+    model_config = ConfigDict(
+        json_schema_extra={
             "example": {
                 "container_id": "a1b2c3d4e5f6" + "0" * 52,  # 64 chars
                 "container_name": "iris_db",
@@ -316,8 +314,9 @@ class ContainerState(BaseModel):
                 "created_at": "2025-01-10T14:30:00Z",
                 "started_at": "2025-01-10T14:30:15Z",
                 "finished_at": None,
-                "ports": {1972: 1972, 52773: 52773},
+                "ports": {"1972": 1972, "52773": 52773},
                 "image": "intersystems/iris-community:latest",
                 "config_source": None,
             }
         }
+    )

iris_devtester/config/yaml_loader.py

@@ -28,7 +28,7 @@ def load_yaml(file_path: Path) -> Dict[str, Any]:
             config = yaml.safe_load(f)
             if config is None:
                 return {}
-            return config
+            return dict(config)
         except yaml.YAMLError as e:
             raise yaml.YAMLError(f"Invalid YAML syntax in {file_path}: {e}")
 

iris_devtester/connections/__init__.py

@@ -52,8 +52,8 @@ def reset_password_if_needed(config_or_error, **kwargs):
     If first arg is a config, attempts remediation and returns result object.
     """
     from iris_devtester.testing.models import PasswordResetResult as ContractResult
-    from iris_devtester.utils.password import reset_password_if_needed as modern_reset
     from iris_devtester.utils.password import PasswordResetResult as ModernResult
+    from iris_devtester.utils.password import reset_password_if_needed as modern_reset
 
     if isinstance(config_or_error, Exception):
         return modern_reset(config_or_error, **kwargs)

iris_devtester/containers/iris_container.py

@@ -1,10 +1,9 @@
 import logging
-import os
 import subprocess
 import time
-from typing import Any, Dict, List, Literal, Optional, Tuple, Type, Union
+from typing import Any, Optional
 
-from iris_devtester.config import IRISConfig, discover_config
+from iris_devtester.config import IRISConfig
 from iris_devtester.connections import get_connection
 
 logger = logging.getLogger(__name__)
@@ -185,7 +184,7 @@ class IRISContainer(IRISBase):
             if is_enabled:
                 self._callin_enabled = True
             return is_enabled
-        except:
+        except Exception:
             return False
 
     def get_test_namespace(self, prefix: str = "TEST") -> str:
@@ -238,9 +237,7 @@ class IRISContainer(IRISBase):
             self.host = self.get_container_host_ip()
             self._mapped_port = int(self.get_exposed_port(1972))  # Use internal port to get mapping
             config.host = self.host
-            config.port = (
-                self._mapped_port
-            )  # Config uses the host-mapped port for connections
+            config.port = self._mapped_port  # Config uses the host-mapped port for connections
         except Exception:
             pass
         return config

iris_devtester/ports/registry.py

@@ -7,7 +7,7 @@ Provides atomic file-based persistence with file locking for concurrent safety.
 import json
 from datetime import datetime
 from pathlib import Path
-from typing import List, Optional
+from typing import List, Literal, Optional
 
 from filelock import FileLock, Timeout
 
@@ -89,7 +89,7 @@ class PortRegistry:
                     # Manual port assignment
                     self._validate_port_available(assignments, preferred_port, project_path)
                     port = preferred_port
-                    assignment_type = "manual"
+                    assignment_type: Literal["auto", "manual"] = "manual"
                 else:
                     # Auto-assignment
                     port = self._find_available_port(assignments)

iris_devtester/utils/health_checks.py

@@ -379,7 +379,7 @@ def enable_callin_service(container: Container) -> None:
     """
     # Execute ObjectScript to enable CallIn
     objectscript_cmd = (
-        "iris session iris -U%SYS "
+        "iris session IRIS -U%SYS "
         '"Do ##class(Security.Services).Get("%Service_CallIn", .service) '
         "Set service.Enabled = 1 "
         'Do ##class(Security.Services).Modify("%Service_CallIn", .service)"'

iris_devtester/utils/password.py

@@ -572,7 +572,7 @@ Halt
             container_name,
             "sh",
             "-c",
-            f'iris session iris -U %SYS << "EOF"\n{objectscript_commands}\nEOF',
+            f'iris session IRIS -U %SYS << "EOF"\n{objectscript_commands}\nEOF',
         ]
 
         logger.info(f"Unexpiring passwords in container: {container_name}")
@@ -626,7 +626,7 @@ Halt
             "\n"
             "Manual fix:\n"
             f"  docker exec {container_name} bash -c 'echo \"do ##class(Security.Users)"
-            f'.UnExpireUserPasswords(\\"*\\")" | iris session iris -U %SYS\'\n',
+            f'.UnExpireUserPasswords(\\"*\\")" | iris session IRIS -U %SYS\'\n',
         )
 
 

{iris_devtester-1.9.1.dist-info → iris_devtester-1.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-devtester
-Version: 1.9.1
+Version: 1.9.3
 Summary: Battle-tested InterSystems IRIS infrastructure utilities for Python development
 Author-email: InterSystems Community <community@intersystems.com>
 Maintainer-email: Thomas Dyar <thomas.dyar@intersystems.com>
@@ -107,6 +107,50 @@ def test_connection():
         assert cursor.fetchone()[0] == 1
 ```
 
+## Container API
+
+### Basic Usage
+```python
+from iris_devtester.containers import IRISContainer
+
+# Community Edition (auto-detects ARM64 vs x86)
+with IRISContainer.community() as iris:
+    conn = iris.get_connection()
+
+# Enterprise Edition (requires license)
+with IRISContainer.enterprise(license_key="/path/to/iris.key") as iris:
+    conn = iris.get_connection()
+```
+
+### Builder Methods
+```python
+# Set a custom container name (for debugging, logs, multiple containers)
+iris = IRISContainer.community().with_name("my-test-db")
+
+# Set credentials
+iris = IRISContainer.community().with_credentials("_SYSTEM", "MyPassword")
+
+# Pre-configure password (set via IRIS_PASSWORD env var at startup)
+iris = IRISContainer.community().with_preconfigured_password("MyPassword")
+
+# Chain multiple options
+with IRISContainer.community() \
+    .with_name("integration-test-db") \
+    .with_credentials("_SYSTEM", "TestPass123") as iris:
+    conn = iris.get_connection()
+```
+
+### Constructor Parameters
+```python
+IRISContainer(
+    image="intersystemsdc/iris-community:latest",  # Docker image
+    username="SuperUser",                           # Default username
+    password="SYS",                                 # Default password
+    namespace="USER",                               # Default namespace
+    name="my-container",                            # Container name (alternative to with_name)
+)
+```
+
 ## Key Features
 
 - **🔐 Automatic Password Management**: Remediates security flags using official system APIs.

{iris_devtester-1.9.1.dist-info → iris_devtester-1.9.3.dist-info}/RECORD

@@ -1,20 +1,20 @@
-iris_devtester/__init__.py,sha256=mpmoTVyFUXHzQWTZjATBla4cgWNl-s_34FIGo1ljoxY,1848
+iris_devtester/__init__.py,sha256=HzbADwcjJamdWENJTE4FaervonOKGTfKdxU8VkG_kcM,1848
 iris_devtester/cli/__init__.py,sha256=yakDJH-EsnTBmKl_K7r2n47EDiWvfpwLVcY11KriQQQ,691
 iris_devtester/cli/__main__.py,sha256=YgFAn0Q02AXgXRwAg70MR3U0IIjFHUSz38h5tPFJnGg,125
 iris_devtester/cli/connection_commands.py,sha256=cabAufSsrrhwpxlPZFlsE-5Zi54176eGdJOApPLdZXA,11467
-iris_devtester/cli/container.py,sha256=TROSWehO02J8FNdUaoMooasCZUhox_jzi05z5RasS-8,29211
+iris_devtester/cli/container.py,sha256=FcDb6EiSa8SYvzsntxu5j5q6PCh1jba7wosd_KUqe0U,30736
 iris_devtester/cli/container_commands.py,sha256=lOxa2TXnBK1ATCIzbbXexk-p0lItStUwU_gKVnv_p1w,4451
 iris_devtester/cli/fixture_commands.py,sha256=w1n6MIujQsY46ZKG_L0aRF4lhohWh5dOrF0lgH_K3r0,17493
 iris_devtester/config/__init__.py,sha256=acRVXpdKAp7lkZzrpKGnOYLgSfkxN3kpL1RU0b0hhlM,486
 iris_devtester/config/auto_discovery.py,sha256=y1BD26rfEut1vjw77IXh0yel95BaUvMfMxzskIPPQec,10638
-iris_devtester/config/container_config.py,sha256=oO44vKUImSXbSj9X1ka4g2gRJLyRqLv6mv7HVYzCU8w,10928
-iris_devtester/config/container_state.py,sha256=qIgSNQlpM6z417drSICbPfCWEvtb-L3YoB6JvkPl4T4,11239
+iris_devtester/config/container_config.py,sha256=UNtgjfWlO517KzH0upwpx1xBWpyvhXIZQmxRQ-OKLNI,10925
+iris_devtester/config/container_state.py,sha256=O2i69oVj_B1NQRZqmPKPdjmYwonhPD0QLe1UZmGupI4,11218
 iris_devtester/config/defaults.py,sha256=RgQal0IeDr215KIy6ZToDrsOdV4DwVJvMJE2SgAzVA4,1846
 iris_devtester/config/discovery.py,sha256=7R64ykibns6N2W9hNZlg_8CQqpNwiWSITl6G72VnNws,5879
 iris_devtester/config/models.py,sha256=aa2kd8t_UNawiA2BbU8GHlhVhVjqvEwLEmE75tewOo4,2706
 iris_devtester/config/presets.py,sha256=yXRiSfOUtUUUDQTW1wx-BHrUDzXhjYTCF8iiJ4kwyrU,453
-iris_devtester/config/yaml_loader.py,sha256=WF48AYDiuAMrI2XJpNkqfURvr3figvNcCrNInmvw0lI,1314
-iris_devtester/connections/__init__.py,sha256=sc2YFupRKBLUdiK3NFj3yhAsn5UfOABOvWRLvIJ2Xms,6018
+iris_devtester/config/yaml_loader.py,sha256=3OahoOeLtRtBAxo3pH0-a1RUdXwFB5wc2_jtF2WielQ,1320
+iris_devtester/connections/__init__.py,sha256=0ci2QuyQPJxdtoJzeyd8CSw_0I4C9MB6UnsVzztdh5U,6018
 iris_devtester/connections/auto_discovery.py,sha256=LCLdP90w7hfJrNj2oe6ueiSdmMDR5IdjztJ1wn9pvQc,5197
 iris_devtester/connections/connection.py,sha256=4QPV_D4kNCw61qg7XT9rgJOYxu5ZmOcw2km8LiuQ2Nc,5536
 iris_devtester/connections/dbapi.py,sha256=NmXwrgvfnN6K3051XenNFaqcbAipBNBvh7y3O2C4XUM,4767
@@ -24,7 +24,7 @@ iris_devtester/connections/models.py,sha256=rfKCFtm86wQZAv_cLOVS6N7P5vGlfkInSHbs
 iris_devtester/connections/retry.py,sha256=FxNhlTA2RHI2ayvEF5w7P_EjO7k6xKgeA3mplJd3-co,2893
 iris_devtester/containers/__init__.py,sha256=quWN4CtxRUMje8QkpZWMY79XlVOSM79HF5ewHLNz5YA,729
 iris_devtester/containers/cpf_manager.py,sha256=GBkuM5mPw85lo7djINlTNkrQ8bGgRe2QEWv7YQQL6KU,1969
-iris_devtester/containers/iris_container.py,sha256=2SEdxJ2-Sx0QqbZGCLnUvzjWtPfRh84uk-fvtsrQjaA,11173
+iris_devtester/containers/iris_container.py,sha256=GA9fgcjU0nLJnSP-PnZDWVMZcwOR7s45ZHK5pNxgYok,11083
 iris_devtester/containers/models.py,sha256=f66fwQjlmw1Sl4M33QlglCv4ewNtk4TJLXXcmhNsbDA,13693
 iris_devtester/containers/monitor_utils.py,sha256=cCsLp1cZYAbMmj7o6tUYhVurMEE7GOOe9Y5FLAxl6hM,4917
 iris_devtester/containers/monitoring.py,sha256=E4v-5VW-_W7CVSRm_ryzpOfLQgP9NZ6WN7GYglsAFro,41172
@@ -42,7 +42,7 @@ iris_devtester/integrations/langchain.py,sha256=cIV8bq_wDKMOXLFQ1P-wdSFsJdxIV7o0
 iris_devtester/ports/__init__.py,sha256=uLdbV7J7UJxJsoDqoyySTabIle72WltYDFKlN2-f7bI,506
 iris_devtester/ports/assignment.py,sha256=7ayWfeqLfHDICLAmr3LaJAGs8Uz-Ehm3dHX-V44Frj0,1954
 iris_devtester/ports/exceptions.py,sha256=mJLJAeZUmiBAfv0ubr6nh0K1iK-uk4bAX1gupyw5lzg,4967
-iris_devtester/ports/registry.py,sha256=f-UT2NyN2dNan9-5DfIlL-xRpBE_6w8KQKMCeHPXQeU,12880
+iris_devtester/ports/registry.py,sha256=vf-vlPKNJCPGCCijz_ioioO5qjjMII2WndUlfDkgyxc,12916
 iris_devtester/testing/__init__.py,sha256=VD02sIjDQ1HUFIRFrd1vQUwoExE2yRkeFJ1Goz4cCDs,1559
 iris_devtester/testing/fixtures.py,sha256=Rh7NFlhKrGWy0YOHP1Bwyj1-E_99OJz5-TcG-3BhI6w,1139
 iris_devtester/testing/helpers.py,sha256=fLJbs7A5Ay_TQ7sMimdtOpKONN4AdnFEzEhOsR28iBs,5021
@@ -53,14 +53,14 @@ iris_devtester/utils/container_port.py,sha256=BWz1f9DXJRavcH_FC1jY2mo3isb8lg_zB4
 iris_devtester/utils/container_status.py,sha256=WTpKp1aq4R72lGcn8qvoB_h6GxB-zRdBWwqwO57C5Gg,6309
 iris_devtester/utils/dbapi_compat.py,sha256=pYy8w8XA4syAI-dNeENCKv496BETyn_IsvpJpedMPDE,11782
 iris_devtester/utils/enable_callin.py,sha256=DtDd3fJUz41Z73IUWycchrd6DdO6O0gvxthuuGIUfRo,7874
-iris_devtester/utils/health_checks.py,sha256=fpvyomBSYfVGb2kzG_BUJ407G0HgfA_v-gyI_eOX9ag,17844
+iris_devtester/utils/health_checks.py,sha256=FF5NK1DiwI7Ymkb6bWJTaXEam2EZzFHg4FwWZnBqQb8,17844
 iris_devtester/utils/iris_container_adapter.py,sha256=0Vc55gDsVAxHZzk4wvZySGUJKRhFoDh5wM7RUMSLiCI,23239
-iris_devtester/utils/password.py,sha256=CAa3QHFS_85g_F7GCv-UGYlWaymmidhD82YSf-vqqf0,21968
+iris_devtester/utils/password.py,sha256=OqS6LNXMDopSoYGiodM2V9clghD4qcbIzftH4TdrMSU,21968
 iris_devtester/utils/progress.py,sha256=5OmuntItqCgUFXSmaQjHwILrTnVLYECZ5glpSbvOTOU,7795
 iris_devtester/utils/test_connection.py,sha256=cyEzxSbvxBxz44xLb7Jbz8OhHT8UgCZLO0lT-qShPEo,6950
-iris_devtester-1.9.1.dist-info/licenses/LICENSE,sha256=dISbikDYS2uP710ZFzSzaSmKzIBRyi_6YwuwO97bT94,1083
-iris_devtester-1.9.1.dist-info/METADATA,sha256=7MFPQyrdcoz0vMcx69Sow8Br7v1fwVx6x6bfehqJPYw,6286
-iris_devtester-1.9.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-iris_devtester-1.9.1.dist-info/entry_points.txt,sha256=svOltni3vX3ul_qxbWl8fOA6ZrJeFASuN29pON6ftqw,59
-iris_devtester-1.9.1.dist-info/top_level.txt,sha256=DnrLJ3laB5x_gTkmATDEg1v1lTOQxgmHgNd66bdXaoU,15
-iris_devtester-1.9.1.dist-info/RECORD,,
+iris_devtester-1.9.3.dist-info/licenses/LICENSE,sha256=dISbikDYS2uP710ZFzSzaSmKzIBRyi_6YwuwO97bT94,1083
+iris_devtester-1.9.3.dist-info/METADATA,sha256=It5jOKAoyNkbBiyaYQw3kO5TFRog3I9lKeQl2f0eTIo,7682
+iris_devtester-1.9.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+iris_devtester-1.9.3.dist-info/entry_points.txt,sha256=svOltni3vX3ul_qxbWl8fOA6ZrJeFASuN29pON6ftqw,59
+iris_devtester-1.9.3.dist-info/top_level.txt,sha256=DnrLJ3laB5x_gTkmATDEg1v1lTOQxgmHgNd66bdXaoU,15
+iris_devtester-1.9.3.dist-info/RECORD,,