iris-devtester 1.9.3__tar.gz → 1.10.0__tar.gz

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-devtester
-Version: 1.9.3
+Version: 1.10.0
 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,9 +107,17 @@ def test_connection():
         assert cursor.fetchone()[0] == 1
 ```
 
-## Container API
+## Container Editions
 
-### Basic Usage
+Three canonical container editions are available:
+
+| Edition | Size | Use Case | Image |
+|---------|------|----------|-------|
+| **Community** | ~972MB | Development, testing | `intersystemsdc/iris-community` |
+| **Enterprise** | ~1GB+ | Production testing | `containers.intersystems.com/intersystems/iris` |
+| **Light** | **~580MB** | CI/CD pipelines | `caretdev/iris-community-light` |
+
+### Python API
 ```python
 from iris_devtester.containers import IRISContainer
 
@@ -117,11 +125,42 @@ from iris_devtester.containers import IRISContainer
 with IRISContainer.community() as iris:
     conn = iris.get_connection()
 
+# Light Edition (85% smaller, for CI/CD)
+with IRISContainer.light() 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()
+
+# Specify version
+with IRISContainer.community(version="2025.1") as iris:
+    conn = iris.get_connection()
+```
+
+### CLI Usage
+```bash
+# Community (default)
+iris-devtester container up
+
+# Light edition for CI/CD
+iris-devtester container up --edition light
+
+# Enterprise edition with license
+iris-devtester container up --edition enterprise --license /path/to/iris.key
+
+# List running IRIS containers
+iris-devtester container list
 ```
 
+### Light Edition Details
+
+The Light edition removes components unnecessary for SQL-only workloads:
+- **Removed**: Interoperability/Ensemble, Management Portal, DeepSee/BI, CSP/REST
+- **Kept**: SQL engine, DBAPI, JDBC, ODBC, SQLAlchemy-IRIS support
+
+Perfect for microservices, automated testing, and Python/SQL pipelines.
+
 ### Builder Methods
 ```python
 # Set a custom container name (for debugging, logs, multiple containers)

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/README.md

@@ -43,9 +43,17 @@ def test_connection():
         assert cursor.fetchone()[0] == 1
 ```
 
-## Container API
+## Container Editions
 
-### Basic Usage
+Three canonical container editions are available:
+
+| Edition | Size | Use Case | Image |
+|---------|------|----------|-------|
+| **Community** | ~972MB | Development, testing | `intersystemsdc/iris-community` |
+| **Enterprise** | ~1GB+ | Production testing | `containers.intersystems.com/intersystems/iris` |
+| **Light** | **~580MB** | CI/CD pipelines | `caretdev/iris-community-light` |
+
+### Python API
 ```python
 from iris_devtester.containers import IRISContainer
 
@@ -53,11 +61,42 @@ from iris_devtester.containers import IRISContainer
 with IRISContainer.community() as iris:
     conn = iris.get_connection()
 
+# Light Edition (85% smaller, for CI/CD)
+with IRISContainer.light() 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()
+
+# Specify version
+with IRISContainer.community(version="2025.1") as iris:
+    conn = iris.get_connection()
+```
+
+### CLI Usage
+```bash
+# Community (default)
+iris-devtester container up
+
+# Light edition for CI/CD
+iris-devtester container up --edition light
+
+# Enterprise edition with license
+iris-devtester container up --edition enterprise --license /path/to/iris.key
+
+# List running IRIS containers
+iris-devtester container list
 ```
 
+### Light Edition Details
+
+The Light edition removes components unnecessary for SQL-only workloads:
+- **Removed**: Interoperability/Ensemble, Management Portal, DeepSee/BI, CSP/REST
+- **Kept**: SQL engine, DBAPI, JDBC, ODBC, SQLAlchemy-IRIS support
+
+Perfect for microservices, automated testing, and Python/SQL pipelines.
+
 ### Builder Methods
 ```python
 # Set a custom container name (for debugging, logs, multiple containers)

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/SKILL.md

@@ -3,7 +3,7 @@ name: iris-devtester
 description: Battle-tested InterSystems IRIS infrastructure utilities for Python database testing.
 triggers: [iris, database, testing, container, fixture, gof, connection, remediation]
 metadata:
-  version: 1.9.3
+  version: 1.10.0
   author: InterSystems Community
   principles: [library-first, dbapi-first, isolation-by-default, fail-fast]
 ---

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/iris_devtester/__init__.py

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

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/iris_devtester/cli/container.py

@@ -37,6 +37,19 @@ def container_group(ctx):
     default=None,
     help="Container name (default: iris_db)",
 )
+@click.option(
+    "--edition",
+    type=click.Choice(["community", "enterprise", "light"], case_sensitive=False),
+    default="community",
+    help="IRIS edition: community (default), enterprise (requires license), light (minimal for CI/CD)",
+)
+@click.option(
+    "--license",
+    "license_key",
+    type=click.Path(exists=True),
+    default=None,
+    help="Path to iris.key license file (required for enterprise edition)",
+)
 @click.option(
     "--detach/--no-detach",
     default=True,
@@ -47,7 +60,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, name, detach, timeout, cpf):
+def up(ctx, config, name, edition, license_key, detach, timeout, cpf):
     """
     Create and start IRIS container from configuration.
 
@@ -64,18 +77,18 @@ def up(ctx, config, name, detach, timeout, cpf):
         # Zero-config (uses Community edition defaults)
         iris-devtester container up
 
+        # Light edition for CI/CD (85% smaller, faster startup)
+        iris-devtester container up --edition light
+
+        # Enterprise edition with license
+        iris-devtester container up --edition enterprise --license /path/to/iris.key
+
         # 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
 
-        # Example iris-config.yml with volumes:
-        # edition: community
-        # volumes:
-        #   - ./workspace:/external/workspace
-        #   - ./config:/opt/config:ro
-
         # Foreground mode (see logs)
         iris-devtester container up --no-detach
     """
@@ -99,6 +112,32 @@ def up(ctx, config, name, detach, timeout, cpf):
             container_config.container_name = name
             click.echo(f"  → Container name: {name}")
 
+        # Override edition if provided via --edition
+        if edition:
+            edition_lower = edition.lower()
+            container_config.edition = edition_lower
+
+            # Set appropriate image based on edition
+            if edition_lower == "light":
+                # Light edition: caretdev/iris-community-light (85% smaller)
+                container_config.image_tag = "latest-em"
+                click.echo(
+                    click.style(f"  → Edition: light", fg="cyan")
+                    + " (minimal for CI/CD, ~580MB vs ~3.5GB)"
+                )
+            elif edition_lower == "enterprise":
+                if not license_key:
+                    raise click.ClickException(
+                        "Enterprise edition requires --license option.\n"
+                        "\n"
+                        "Usage: iris-devtester container up --edition enterprise --license /path/to/iris.key"
+                    )
+                container_config.license_key = license_key
+                click.echo(f"  → Edition: enterprise")
+                click.echo(f"  → License: {license_key}")
+            else:
+                click.echo(f"  → Edition: community")
+
         if cpf:
             container_config.cpf_merge = cpf
             click.echo(f"  → CPF Merge: {cpf[:50]}...")
@@ -272,6 +311,141 @@ def up(ctx, config, name, detach, timeout, cpf):
         ctx.exit(1)
 
 
+@container_group.command(name="list")
+@click.option(
+    "--all", "-a", "show_all", is_flag=True, help="Show all containers (including stopped)"
+)
+@click.option(
+    "--format",
+    "output_format",
+    type=click.Choice(["table", "json"], case_sensitive=False),
+    default="table",
+    help="Output format (default: table)",
+)
+@click.pass_context
+def list_containers(ctx, show_all, output_format):
+    """
+    List IRIS containers.
+
+    Shows all IRIS containers managed by iris-devtester, with their status,
+    edition, ports, and age.
+
+    \b
+    Examples:
+        # List running containers
+        iris-devtester container list
+
+        # List all containers (including stopped)
+        iris-devtester container list --all
+
+        # JSON output for scripting
+        iris-devtester container list --format json
+    """
+    from datetime import datetime
+
+    import docker
+
+    try:
+        client = docker.from_env()
+
+        # Find IRIS containers (by image name patterns)
+        iris_patterns = [
+            "iris-community",
+            "intersystems/iris",
+            "caretdev/iris",
+            "intersystemsdc/iris",
+        ]
+
+        containers = client.containers.list(all=show_all)
+        iris_containers = []
+
+        for container in containers:
+            image_name = (
+                container.image.tags[0] if container.image.tags else str(container.image.id)[:12]
+            )
+
+            # Check if this is an IRIS container
+            is_iris = any(pattern in image_name.lower() for pattern in iris_patterns)
+            if not is_iris:
+                continue
+
+            # Determine edition from image name
+            if "light" in image_name.lower():
+                edition = "light"
+            elif "community" in image_name.lower():
+                edition = "community"
+            else:
+                edition = "enterprise"
+
+            # Get port mappings
+            ports = container.attrs.get("NetworkSettings", {}).get("Ports", {})
+            port_str = "-"
+            if ports and ports.get("1972/tcp"):
+                host_port = ports["1972/tcp"][0]["HostPort"]
+                port_str = f"{host_port}->1972"
+
+            # Calculate age
+            created = container.attrs.get("Created", "")
+            age_str = "unknown"
+            if created:
+                try:
+                    # Parse ISO format timestamp
+                    created_dt = datetime.fromisoformat(created.replace("Z", "+00:00"))
+                    now = datetime.now(created_dt.tzinfo)
+                    delta = now - created_dt
+                    if delta.days > 0:
+                        age_str = f"{delta.days}d"
+                    elif delta.seconds > 3600:
+                        age_str = f"{delta.seconds // 3600}h"
+                    else:
+                        age_str = f"{delta.seconds // 60}m"
+                except Exception:
+                    pass
+
+            iris_containers.append(
+                {
+                    "name": container.name,
+                    "edition": edition,
+                    "status": container.status,
+                    "ports": port_str,
+                    "age": age_str,
+                    "image": image_name,
+                }
+            )
+
+        if output_format == "json":
+            import json as json_module
+
+            click.echo(json_module.dumps(iris_containers, indent=2))
+        else:
+            # Table format
+            if not iris_containers:
+                click.echo("No IRIS containers found.")
+                if not show_all:
+                    click.echo("Use --all to include stopped containers.")
+            else:
+                # Print header
+                click.echo(f"{'NAME':<20} {'EDITION':<12} {'STATUS':<10} {'PORTS':<15} {'AGE':<6}")
+                click.echo("-" * 65)
+
+                for c in iris_containers:
+                    status_color = "green" if c["status"] == "running" else "yellow"
+                    click.echo(
+                        f"{c['name']:<20} "
+                        f"{c['edition']:<12} "
+                        f"{click.style(c['status'], fg=status_color):<19} "
+                        f"{c['ports']:<15} "
+                        f"{c['age']:<6}"
+                    )
+
+    except docker.errors.DockerException as e:
+        progress.print_error(f"Docker error: {e}")
+        ctx.exit(1)
+    except Exception as e:
+        progress.print_error(f"Error listing containers: {e}")
+        ctx.exit(1)
+
+
 @container_group.command(name="start")
 @click.argument("container_name", required=False, default="iris_db")
 @click.option(
@@ -657,7 +831,7 @@ def remove(ctx, container_name, force, volumes):
 
 
 @container_group.command(name="reset-password")
-@click.argument("container_name")
+@click.argument("container_name", required=False, default="iris_db")
 @click.option("--user", default="_SYSTEM", help="Username to reset password for (default: _SYSTEM)")
 @click.option("--password", default="SYS", help="New password (default: SYS)")
 @click.option(
@@ -723,7 +897,7 @@ def reset_password_cmd(ctx, container_name, user, password, port):
 
 
 @container_group.command(name="test-connection")
-@click.argument("container_name")
+@click.argument("container_name", required=False, default="iris_db")
 @click.option(
     "--namespace", default="USER", help="IRIS namespace to test connection to (default: USER)"
 )
@@ -812,7 +986,7 @@ def test_connection_cmd(ctx, container_name, namespace, username, password):
 
 
 @container_group.command(name="enable-callin")
-@click.argument("container_name")
+@click.argument("container_name", required=False, default="iris_db")
 @click.option(
     "--timeout", type=int, default=30, help="Timeout in seconds for docker commands (default: 30)"
 )

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/iris_devtester/config/container_config.py

@@ -51,7 +51,7 @@ class ContainerConfig(BaseModel):
         ... )
     """
 
-    edition: Literal["community", "enterprise"] = Field(
+    edition: Literal["community", "enterprise", "light"] = Field(
         default="community", description="IRIS edition to use"
     )
     container_name: str = Field(
@@ -245,15 +245,21 @@ class ContainerConfig(BaseModel):
         return cls()
 
     def get_image_name(self) -> str:
+        """Get the Docker image name based on edition and configuration."""
         if self.image:
             return self.image
 
         if self.edition == "community":
-
-            # Bug Fix #1: Community images use 'intersystemsdc/' prefix on Docker Hub
+            # Community images use 'intersystemsdc/' prefix on Docker Hub
             return f"intersystemsdc/iris-community:{self.image_tag}"
+        elif self.edition == "light":
+            # Light edition: caretdev/iris-community-light (85% smaller)
+            # Use latest-em for LTS stability
+            tag = self.image_tag if self.image_tag != "latest" else "latest-em"
+            return f"caretdev/iris-community-light:{tag}"
         else:
-            return f"intersystems/iris:{self.image_tag}"
+            # Enterprise edition
+            return f"containers.intersystems.com/intersystems/iris:{self.image_tag}"
 
     def validate_volume_paths(self) -> List[str]:
         """

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/iris_devtester/containers/iris_container.py

@@ -94,25 +94,107 @@ class IRISContainer(IRISBase):
         self._preconfigure_username: Optional[str] = None
 
     @classmethod
-    def community(cls, image: Optional[str] = None, **kwargs) -> "IRISContainer":
-        """Create a Community Edition container."""
+    def community(
+        cls, image: Optional[str] = None, version: str = "latest", **kwargs
+    ) -> "IRISContainer":
+        """
+        Create a Community Edition container.
+
+        Auto-detects architecture (ARM64 vs x86) and pulls the appropriate image.
+
+        Args:
+            image: Docker image to use. If None, auto-detects based on architecture.
+            version: Image version tag. Options: 'latest', '2025.1', '2025.2', etc.
+        """
         if image is None:
             import platform as platform_module
 
             if platform_module.machine() == "arm64":
-                image = "containers.intersystems.com/intersystems/iris-community:2025.1"
+                # ARM64 (Apple Silicon) - use official InterSystems registry
+                tag = version if version != "latest" else "2025.1"
+                image = f"containers.intersystems.com/intersystems/iris-community:{tag}"
             else:
-                image = "intersystemsdc/iris-community:latest"
+                # x86_64 - use Docker Hub community image
+                image = f"intersystemsdc/iris-community:{version}"
         return cls(image=image, **kwargs)
 
     @classmethod
-    def enterprise(cls, license_key: str, image: Optional[str] = None, **kwargs) -> "IRISContainer":
-        """Create an Enterprise Edition container."""
+    def enterprise(
+        cls, license_key: Optional[str] = None, image: Optional[str] = None, **kwargs
+    ) -> "IRISContainer":
+        """
+        Create an Enterprise Edition container.
+
+        Args:
+            license_key: Path to iris.key file. If None, checks IRIS_LICENSE_KEY env var.
+            image: Docker image to use. Defaults to containers.intersystems.com/intersystems/iris:latest
+
+        Raises:
+            ValueError: If no license key is provided or found in environment.
+        """
+        import os
+
+        if license_key is None:
+            license_key = os.environ.get("IRIS_LICENSE_KEY")
+
+        if license_key is None:
+            raise ValueError(
+                "Enterprise edition requires a license key.\n"
+                "\n"
+                "Provide license_key parameter or set IRIS_LICENSE_KEY environment variable:\n"
+                "  IRISContainer.enterprise(license_key='/path/to/iris.key')\n"
+                "  # or\n"
+                "  export IRIS_LICENSE_KEY=/path/to/iris.key"
+            )
+
+        if not os.path.exists(license_key):
+            raise ValueError(
+                f"License key file not found: {license_key}\n"
+                "\n"
+                "Verify the license key path exists and is readable."
+            )
+
         if image is None:
             image = "containers.intersystems.com/intersystems/iris:latest"
+
         container = cls(image=image, **kwargs)
+        # Mount license key into container
+        container._license_key_path = license_key
         return container
 
+    @classmethod
+    def light(
+        cls, image: Optional[str] = None, version: str = "latest", **kwargs
+    ) -> "IRISContainer":
+        """
+        Create a Light Edition container optimized for CI/CD.
+
+        Light edition is ~85% smaller than full Community edition (~580MB vs ~3.5GB).
+        It removes Interoperability, Management Portal, DeepSee, and web components.
+        DBAPI, JDBC, and ODBC connectivity are fully supported.
+
+        Args:
+            image: Docker image to use. Defaults to caretdev/iris-community-light.
+            version: Image version tag. Options: 'latest', 'latest-em' (LTS), '2025.1', etc.
+
+        Best for:
+            - CI/CD pipelines
+            - Microservices
+            - Automated testing
+            - SQL-only workloads
+
+        Not supported:
+            - Interoperability/Ensemble
+            - Management Portal
+            - DeepSee/BI
+            - CSP/REST web framework
+        """
+        if image is None:
+            # Use latest-em for LTS stability, or allow version override
+            tag = version if version != "latest" else "latest-em"
+            image = f"caretdev/iris-community-light:{tag}"
+        return cls(image=image, **kwargs)
+
     def with_name(self, name: str) -> "IRISContainer":
         """Set the container name."""
         self._container_name = name

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/iris_devtester.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-devtester
-Version: 1.9.3
+Version: 1.10.0
 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,9 +107,17 @@ def test_connection():
         assert cursor.fetchone()[0] == 1
 ```
 
-## Container API
+## Container Editions
 
-### Basic Usage
+Three canonical container editions are available:
+
+| Edition | Size | Use Case | Image |
+|---------|------|----------|-------|
+| **Community** | ~972MB | Development, testing | `intersystemsdc/iris-community` |
+| **Enterprise** | ~1GB+ | Production testing | `containers.intersystems.com/intersystems/iris` |
+| **Light** | **~580MB** | CI/CD pipelines | `caretdev/iris-community-light` |
+
+### Python API
 ```python
 from iris_devtester.containers import IRISContainer
 
@@ -117,11 +125,42 @@ from iris_devtester.containers import IRISContainer
 with IRISContainer.community() as iris:
     conn = iris.get_connection()
 
+# Light Edition (85% smaller, for CI/CD)
+with IRISContainer.light() 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()
+
+# Specify version
+with IRISContainer.community(version="2025.1") as iris:
+    conn = iris.get_connection()
+```
+
+### CLI Usage
+```bash
+# Community (default)
+iris-devtester container up
+
+# Light edition for CI/CD
+iris-devtester container up --edition light
+
+# Enterprise edition with license
+iris-devtester container up --edition enterprise --license /path/to/iris.key
+
+# List running IRIS containers
+iris-devtester container list
 ```
 
+### Light Edition Details
+
+The Light edition removes components unnecessary for SQL-only workloads:
+- **Removed**: Interoperability/Ensemble, Management Portal, DeepSee/BI, CSP/REST
+- **Kept**: SQL engine, DBAPI, JDBC, ODBC, SQLAlchemy-IRIS support
+
+Perfect for microservices, automated testing, and Python/SQL pipelines.
+
 ### Builder Methods
 ```python
 # Set a custom container name (for debugging, logs, multiple containers)

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "iris-devtester"
-version = "1.9.3"
+version = "1.10.0"
 description = "Battle-tested InterSystems IRIS infrastructure utilities for Python development"
 readme = "README.md"
 requires-python = ">=3.9"

{iris_devtester-1.9.3 → iris_devtester-1.10.0}/tests/unit/config/test_container_config.py

@@ -379,12 +379,23 @@ class TestContainerConfigImageName:
     def test_get_image_name_enterprise_latest(self):
         """Test image name for enterprise edition with latest tag."""
         config = ContainerConfig(edition="enterprise", license_key="TEST-KEY", image_tag="latest")
-        assert config.get_image_name() == "intersystems/iris:latest"
+        assert config.get_image_name() == "containers.intersystems.com/intersystems/iris:latest"
 
     def test_get_image_name_enterprise_specific_tag(self):
         """Test image name for enterprise edition with specific tag."""
         config = ContainerConfig(edition="enterprise", license_key="TEST-KEY", image_tag="2024.1")
-        assert config.get_image_name() == "intersystems/iris:2024.1"
+        assert config.get_image_name() == "containers.intersystems.com/intersystems/iris:2024.1"
+
+    def test_get_image_name_light_latest(self):
+        """Test image name for light edition with latest tag."""
+        config = ContainerConfig(edition="light", image_tag="latest")
+        # Light uses latest-em for LTS stability
+        assert config.get_image_name() == "caretdev/iris-community-light:latest-em"
+
+    def test_get_image_name_light_specific_tag(self):
+        """Test image name for light edition with specific tag."""
+        config = ContainerConfig(edition="light", image_tag="2025.1")
+        assert config.get_image_name() == "caretdev/iris-community-light:2025.1"
 
 
 class TestContainerConfigVolumeValidation: