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

iris_devtester/__init__.py

@@ -26,14 +26,15 @@ LangChain Integration:
     ...     # Build your RAG app...
 """
 
-__version__ = "1.8.1"
+__version__ = "1.9.1"
 __author__ = "InterSystems Community"
 __license__ = "MIT"
 
+from iris_devtester.config import IRISConfig
+
 # Convenience imports for common usage
 from iris_devtester.connections import get_connection
 from iris_devtester.containers import IRISContainer
-from iris_devtester.config import IRISConfig
 
 # Optional LangChain integration (requires langchain-iris)
 try:

iris_devtester/cli/__init__.py

@@ -1,10 +1,12 @@
 """CLI commands for iris-devtester."""
 
 import click
+
 from iris_devtester import __version__
-from .fixture_commands import fixture
-from .container import container_group as container
+
 from .connection_commands import test_connection
+from .container import container_group as container
+from .fixture_commands import fixture
 
 
 @click.group()

iris_devtester/cli/__main__.py

@@ -1,6 +1,6 @@
 """CLI entry point for python -m iris_devtester.cli execution."""
 
-from .import main
+from . import main
 
 if __name__ == "__main__":
     main()

iris_devtester/cli/connection_commands.py

@@ -13,45 +13,17 @@ from iris_devtester.utils.iris_container_adapter import IRISContainerManager
 
 @click.command(name="test-connection")
 @click.option(
-    "--config",
-    type=click.Path(exists=True),
-    help="Path to iris-config.yml configuration file"
+    "--config", type=click.Path(exists=True), help="Path to iris-config.yml configuration file"
 )
 @click.option(
-    "--container",
-    type=str,
-    help="Container name to test connection against (default: iris_db)"
-)
-@click.option(
-    "--host",
-    type=str,
-    help="IRIS host (overrides config/container)"
-)
-@click.option(
-    "--port",
-    type=int,
-    help="IRIS SuperServer port (overrides config/container)"
-)
-@click.option(
-    "--namespace",
-    type=str,
-    help="IRIS namespace (default: USER)"
-)
-@click.option(
-    "--username",
-    type=str,
-    help="Username (default: _SYSTEM)"
-)
-@click.option(
-    "--password",
-    type=str,
-    help="Password (default: SYS)"
-)
-@click.option(
-    "--verbose", "-v",
-    is_flag=True,
-    help="Show detailed connection diagnostics"
+    "--container", type=str, help="Container name to test connection against (default: iris_db)"
 )
+@click.option("--host", type=str, help="IRIS host (overrides config/container)")
+@click.option("--port", type=int, help="IRIS SuperServer port (overrides config/container)")
+@click.option("--namespace", type=str, help="IRIS namespace (default: USER)")
+@click.option("--username", type=str, help="Username (default: _SYSTEM)")
+@click.option("--password", type=str, help="Password (default: SYS)")
+@click.option("--verbose", "-v", is_flag=True, help="Show detailed connection diagnostics")
 @click.pass_context
 def test_connection(ctx, config, container, host, port, namespace, username, password, verbose):
     """
@@ -108,7 +80,9 @@ def test_connection(ctx, config, container, host, port, namespace, username, pas
             if docker_container:
                 docker_container.reload()
                 if verbose:
-                    click.echo(f"  → Found container: {container_name} (status: {docker_container.status})")
+                    click.echo(
+                        f"  → Found container: {container_name} (status: {docker_container.status})"
+                    )
 
                 # Get port mapping
                 port_bindings = docker_container.attrs.get("NetworkSettings", {}).get("Ports", {})
@@ -175,12 +149,7 @@ def test_connection(ctx, config, container, host, port, namespace, username, pas
                 click.echo(f"  → Connecting to SuperServer {conn_host}:{conn_port}...")
 
             connection_string = f"{conn_host}:{conn_port}/{conn_namespace}"
-            conn = dbapi.connect(
-                connection_string,
-                conn_username,
-                conn_password,
-                timeout=5
-            )
+            conn = dbapi.connect(connection_string, conn_username, conn_password, timeout=5)
 
             if verbose:
                 click.echo("  → Executing test query...")
@@ -204,6 +173,7 @@ def test_connection(ctx, config, container, host, port, namespace, username, pas
             click.echo(f"  ✗ DBAPI connection failed: {e}")
             if verbose:
                 import traceback
+
                 click.echo(f"\n{traceback.format_exc()}")
 
         # Test JDBC connection
@@ -216,7 +186,9 @@ def test_connection(ctx, config, container, host, port, namespace, username, pas
             if not jpype.isJVMStarted():
                 if verbose:
                     click.echo("  → Starting JVM...")
-                jpype.startJVM(jpype.getDefaultJVMPath(), "-Djava.class.path=./intersystems-jdbc-3.8.1.jar")
+                jpype.startJVM(
+                    jpype.getDefaultJVMPath(), "-Djava.class.path=./intersystems-jdbc-3.8.1.jar"
+                )
 
             if verbose:
                 click.echo(f"  → Connecting via JDBC to {conn_host}:{conn_port}...")
@@ -226,7 +198,7 @@ def test_connection(ctx, config, container, host, port, namespace, username, pas
                 "com.intersystems.jdbc.IRISDriver",
                 jdbc_url,
                 [conn_username, conn_password],
-                "./intersystems-jdbc-3.8.1.jar"
+                "./intersystems-jdbc-3.8.1.jar",
             )
 
             if verbose:
@@ -252,21 +224,26 @@ def test_connection(ctx, config, container, host, port, namespace, username, pas
             click.echo(f"  ✗ JDBC connection failed: {e}")
             if verbose:
                 import traceback
+
                 click.echo(f"\n{traceback.format_exc()}")
 
         # Summary
-        click.echo("\n" + "="*60)
+        click.echo("\n" + "=" * 60)
         if dbapi_success or jdbc_success:
             click.echo("✓ Connection test PASSED")
             if dbapi_success and jdbc_success:
                 click.echo("  → Both DBAPI and JDBC working")
             elif dbapi_success:
                 click.echo("  → DBAPI working (recommended)")
-                click.echo("  → JDBC not available (install with: pip install iris-devtester[jdbc])")
+                click.echo(
+                    "  → JDBC not available (install with: pip install iris-devtester[jdbc])"
+                )
             else:
                 click.echo("  → JDBC working (slower fallback)")
-                click.echo("  → DBAPI not available (install with: pip install intersystems-irispython)")
-            click.echo("="*60)
+                click.echo(
+                    "  → DBAPI not available (install with: pip install intersystems-irispython)"
+                )
+            click.echo("=" * 60)
             return  # Success - exit with code 0
         else:
             click.echo("✗ Connection test FAILED")
@@ -282,8 +259,10 @@ def test_connection(ctx, config, container, host, port, namespace, username, pas
             click.echo("     pip install iris-devtester[all]")
             click.echo("  4. Check firewall/network access to port")
             click.echo("\nDocumentation:")
-            click.echo("  https://github.com/intersystems-community/iris-devtester#connection-issues")
-            click.echo("="*60)
+            click.echo(
+                "  https://github.com/intersystems-community/iris-devtester#connection-issues"
+            )
+            click.echo("=" * 60)
             ctx.exit(1)
 
     except ValueError as e:
@@ -295,6 +274,7 @@ def test_connection(ctx, config, container, host, port, namespace, username, pas
         progress.print_error(f"Unexpected error: {e}")
         if verbose:
             import traceback
+
             click.echo(f"\n{traceback.format_exc()}")
         ctx.exit(1)
 

iris_devtester/cli/container.py

@@ -29,25 +29,17 @@ def container_group(ctx):
 
 @container_group.command(name="up")
 @click.option(
-    "--config",
-    type=click.Path(exists=True),
-    help="Path to iris-config.yml configuration file"
+    "--config", type=click.Path(exists=True), help="Path to iris-config.yml configuration file"
 )
 @click.option(
     "--detach/--no-detach",
     default=True,
-    help="Run container in background mode (default: detached)"
-)
-@click.option(
-    "--timeout",
-    type=int,
-    default=60,
-    help="Health check timeout in seconds (default: 60)"
+    help="Run container in background mode (default: detached)",
 )
 @click.option(
-    "--cpf",
-    help="Path to CPF merge file or raw CPF content"
+    "--timeout", type=int, default=60, help="Health check timeout in seconds (default: 60)"
 )
+@click.option("--cpf", help="Path to CPF merge file or raw CPF content")
 @click.pass_context
 def up(ctx, config, detach, timeout, cpf):
     """
@@ -122,7 +114,7 @@ def up(ctx, config, detach, timeout, cpf):
                     superserver_port=superserver_port,
                     webserver_port=webserver_port,
                     namespace=container_config.namespace,
-                    password=container_config.password
+                    password=container_config.password,
                 )
                 return
 
@@ -134,7 +126,9 @@ def up(ctx, config, detach, timeout, cpf):
             # Create new container using Docker SDK (Feature 011 - T015: CLI mode persistence)
             click.echo(f"  → Edition: {container_config.edition}")
             click.echo(f"  → Image: {container_config.get_image_name()}")
-            click.echo(f"  → Ports: {container_config.superserver_port}, {container_config.webserver_port}")
+            click.echo(
+                f"  → Ports: {container_config.superserver_port}, {container_config.webserver_port}"
+            )
             if container_config.volumes:
                 click.echo(f"  → Volumes: {len(container_config.volumes)} mount(s)")
 
@@ -151,16 +145,14 @@ def up(ctx, config, detach, timeout, cpf):
             try:
                 existing_container = IRISContainerManager.create_from_config(
                     container_config,
-                    use_testcontainers=False  # CLI mode: manual lifecycle, no ryuk cleanup
+                    use_testcontainers=False,  # CLI mode: manual lifecycle, no ryuk cleanup
                 )
                 click.echo(f"✓ Container '{container_config.container_name}' created and started")
 
                 # Verify container persistence (Feature 011 - T015)
                 click.echo("⏳ Verifying container persistence...")
                 check = verify_container_persistence(
-                    container_config.container_name,
-                    container_config,
-                    wait_seconds=2.0
+                    container_config.container_name, container_config, wait_seconds=2.0
                 )
 
                 if not check.success:
@@ -180,9 +172,7 @@ def up(ctx, config, detach, timeout, cpf):
             click.echo(f"  {msg}")
 
         state = health_checks.wait_for_healthy(
-            existing_container,
-            timeout=timeout,
-            progress_callback=progress_callback
+            existing_container, timeout=timeout, progress_callback=progress_callback
         )
 
         # Enable CallIn service (required for DBAPI)
@@ -215,7 +205,7 @@ def up(ctx, config, detach, timeout, cpf):
             superserver_port=superserver_port,
             webserver_port=webserver_port,
             namespace=container_config.namespace,
-            password=container_config.password
+            password=container_config.password,
         )
 
         # Exit code 0 (success)
@@ -225,7 +215,6 @@ def up(ctx, config, detach, timeout, cpf):
         raise
     except ValueError as e:
 
-
         # Configuration error (exit code 2)
         progress.print_error(str(e))
         ctx.exit(2)
@@ -244,13 +233,10 @@ def up(ctx, config, detach, timeout, cpf):
 @click.option(
     "--config",
     type=click.Path(exists=True),
-    help="Path to configuration file (used if creating new container)"
+    help="Path to configuration file (used if creating new container)",
 )
 @click.option(
-    "--timeout",
-    type=int,
-    default=60,
-    help="Health check timeout in seconds (default: 60)"
+    "--timeout", type=int, default=60, help="Health check timeout in seconds (default: 60)"
 )
 @click.pass_context
 def start(ctx, container_name, config, timeout):
@@ -308,15 +294,13 @@ def start(ctx, container_name, config, timeout):
             try:
                 container = IRISContainerManager.create_from_config(
                     container_config,
-                    use_testcontainers=False  # CLI mode: manual lifecycle, no ryuk cleanup
+                    use_testcontainers=False,  # CLI mode: manual lifecycle, no ryuk cleanup
                 )
                 click.echo(f"✓ Container '{container_name}' created and started")
 
                 # Verify container persistence (Feature 011 - T015)
                 check = verify_container_persistence(
-                    container_name,
-                    container_config,
-                    wait_seconds=2.0
+                    container_name, container_config, wait_seconds=2.0
                 )
 
                 if not check.success:
@@ -354,10 +338,7 @@ def start(ctx, container_name, config, timeout):
 @container_group.command(name="stop")
 @click.argument("container_name", required=False, default="iris_db")
 @click.option(
-    "--timeout",
-    type=int,
-    default=30,
-    help="Grace period before force kill (default: 30 seconds)"
+    "--timeout", type=int, default=30, help="Grace period before force kill (default: 30 seconds)"
 )
 @click.pass_context
 def stop(ctx, container_name, timeout):
@@ -405,10 +386,7 @@ def stop(ctx, container_name, timeout):
 @container_group.command(name="restart")
 @click.argument("container_name", required=False, default="iris_db")
 @click.option(
-    "--timeout",
-    type=int,
-    default=60,
-    help="Health check timeout in seconds (default: 60)"
+    "--timeout", type=int, default=60, help="Health check timeout in seconds (default: 60)"
 )
 @click.pass_context
 def restart(ctx, container_name, timeout):
@@ -458,7 +436,7 @@ def restart(ctx, container_name, timeout):
     "--format",
     type=click.Choice(["text", "json"]),
     default="text",
-    help="Output format (default: text)"
+    help="Output format (default: text)",
 )
 @click.pass_context
 def status(ctx, container_name, format):
@@ -508,22 +486,9 @@ def status(ctx, container_name, format):
 
 @container_group.command(name="logs")
 @click.argument("container_name", required=False, default="iris_db")
-@click.option(
-    "--follow", "-f",
-    is_flag=True,
-    help="Stream logs continuously (CTRL+C to exit)"
-)
-@click.option(
-    "--tail",
-    type=int,
-    default=100,
-    help="Number of lines to show (default: 100)"
-)
-@click.option(
-    "--since",
-    type=str,
-    help="Show logs since timestamp (ISO 8601 format)"
-)
+@click.option("--follow", "-f", is_flag=True, help="Stream logs continuously (CTRL+C to exit)")
+@click.option("--tail", type=int, default=100, help="Number of lines to show (default: 100)")
+@click.option("--since", type=str, help="Show logs since timestamp (ISO 8601 format)")
 @click.pass_context
 def logs(ctx, container_name, follow, tail, since):
     """
@@ -586,16 +551,8 @@ def logs(ctx, container_name, follow, tail, since):
 
 @container_group.command(name="remove")
 @click.argument("container_name", required=False, default="iris_db")
-@click.option(
-    "--force", "-f",
-    is_flag=True,
-    help="Force remove running container"
-)
-@click.option(
-    "--volumes", "-v",
-    is_flag=True,
-    help="Remove associated volumes (data loss!)"
-)
+@click.option("--force", "-f", is_flag=True, help="Force remove running container")
+@click.option("--volumes", "-v", is_flag=True, help="Remove associated volumes (data loss!)")
 @click.pass_context
 def remove(ctx, container_name, force, volumes):
     """
@@ -631,9 +588,7 @@ def remove(ctx, container_name, force, volumes):
         # Check if running without --force
         container.reload()
         if container.status == "running" and not force:
-            raise ValueError(
-                "Container is running. Stop it first or use --force to force removal."
-            )
+            raise ValueError("Container is running. Stop it first or use --force to force removal.")
 
         # Remove container
         click.echo(f"⚡ Removing container '{container_name}'...")
@@ -659,21 +614,10 @@ def remove(ctx, container_name, force, volumes):
 
 @container_group.command(name="reset-password")
 @click.argument("container_name")
+@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(
-    "--user",
-    default="_SYSTEM",
-    help="Username to reset password for (default: _SYSTEM)"
-)
-@click.option(
-    "--password",
-    default="SYS",
-    help="New password (default: SYS)"
-)
-@click.option(
-    "--port",
-    default=None,
-    type=int,
-    help="IRIS SuperServer port (auto-detected if not specified)"
+    "--port", default=None, type=int, help="IRIS SuperServer port (auto-detected if not specified)"
 )
 @click.pass_context
 def reset_password_cmd(ctx, container_name, user, password, port):
@@ -695,8 +639,8 @@ def reset_password_cmd(ctx, container_name, user, password, port):
         iris-devtester container reset-password my_iris --port 51972
     """
     try:
-        from iris_devtester.utils.password_reset import reset_password
         from iris_devtester.utils.container_port import get_container_port
+        from iris_devtester.utils.password import reset_password
 
         # Auto-detect port if not specified (for random port containers like testcontainers)
         if port is None:
@@ -707,14 +651,13 @@ def reset_password_cmd(ctx, container_name, user, password, port):
             else:
                 port = 1972  # Default fallback
 
-        click.echo(f"⚡ Resetting password for user '{user}' in container '{container_name}' on port {port}...")
+        click.echo(
+            f"⚡ Resetting password for user '{user}' in container '{container_name}' on port {port}..."
+        )
 
         # Call password reset utility
         success, message = reset_password(
-            container_name=container_name,
-            username=user,
-            new_password=password,
-            port=port
+            container_name=container_name, username=user, new_password=password, port=port
         )
 
         if success:
@@ -738,20 +681,10 @@ def reset_password_cmd(ctx, container_name, user, password, port):
 @container_group.command(name="test-connection")
 @click.argument("container_name")
 @click.option(
-    "--namespace",
-    default="USER",
-    help="IRIS namespace to test connection to (default: USER)"
-)
-@click.option(
-    "--username",
-    default="_SYSTEM",
-    help="Username for connection (default: _SYSTEM)"
-)
-@click.option(
-    "--password",
-    default="SYS",
-    help="Password for connection (default: SYS)"
+    "--namespace", default="USER", help="IRIS namespace to test connection to (default: USER)"
 )
+@click.option("--username", default="_SYSTEM", help="Username for connection (default: _SYSTEM)")
+@click.option("--password", default="SYS", help="Password for connection (default: SYS)")
 @click.pass_context
 def test_connection_cmd(ctx, container_name, namespace, username, password):
     """
@@ -774,7 +707,9 @@ def test_connection_cmd(ctx, container_name, namespace, username, password):
         from iris_devtester.config import IRISConfig
         from iris_devtester.connections import get_connection
 
-        click.echo(f"⚡ Testing connection to container '{container_name}' namespace '{namespace}'...")
+        click.echo(
+            f"⚡ Testing connection to container '{container_name}' namespace '{namespace}'..."
+        )
 
         # Get container to extract connection details
         container = IRISContainerManager.get_existing(container_name)
@@ -799,7 +734,7 @@ def test_connection_cmd(ctx, container_name, namespace, username, password):
             namespace=namespace,
             username=username,
             password=password,
-            driver="auto"
+            driver="auto",
         )
 
         # Try to connect
@@ -835,10 +770,7 @@ def test_connection_cmd(ctx, container_name, namespace, username, password):
 @container_group.command(name="enable-callin")
 @click.argument("container_name")
 @click.option(
-    "--timeout",
-    type=int,
-    default=30,
-    help="Timeout in seconds for docker commands (default: 30)"
+    "--timeout", type=int, default=30, help="Timeout in seconds for docker commands (default: 30)"
 )
 @click.pass_context
 def enable_callin(ctx, container_name, timeout):
@@ -861,10 +793,7 @@ def enable_callin(ctx, container_name, timeout):
         click.echo(f"⚡ Enabling CallIn service in container '{container_name}'...")
 
         # Call enable callin utility
-        success, message = enable_callin_service(
-            container_name=container_name,
-            timeout=timeout
-        )
+        success, message = enable_callin_service(container_name=container_name, timeout=timeout)
 
         if success:
             click.echo(f"✓ CallIn service enabled in container '{container_name}'")

iris_devtester/cli/container_commands.py

@@ -12,11 +12,11 @@ Pattern: Follows fixture_commands.py Click structure.
 
 import click
 
-from iris_devtester.utils.password_reset import reset_password
+from iris_devtester.utils.container_port import get_container_port
+from iris_devtester.utils.container_status import get_container_status
 from iris_devtester.utils.enable_callin import enable_callin_service
+from iris_devtester.utils.password import reset_password
 from iris_devtester.utils.test_connection import test_connection
-from iris_devtester.utils.container_status import get_container_status
-from iris_devtester.utils.container_port import get_container_port
 
 
 @click.group()
@@ -36,7 +36,9 @@ def container():
 @click.argument("container_name")
 @click.option("--user", default="_SYSTEM", help="Username to reset (default: _SYSTEM)")
 @click.option("--password", default="SYS", help="New password (default: SYS)")
-@click.option("--port", default=None, type=int, help="IRIS SuperServer port (auto-detected if not specified)")
+@click.option(
+    "--port", default=None, type=int, help="IRIS SuperServer port (auto-detected if not specified)"
+)
 def reset_password_command(container_name: str, user: str, password: str, port: int):
     """
     Reset password for IRIS user.