iris-devtester 1.12.3__tar.gz → 1.12.4__tar.gz

{iris_devtester-1.12.3 → iris_devtester-1.12.4}/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to iris-devtester will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.12.4] - 2026-02-15 - Port Management Reliability
+
+### Fixed
+
+- **Host Port Availability**: Enhanced `PortRegistry` to perform live TCP socket checks on the host. This prevents `idt` from assigning ports that are occupied by non-Docker processes.
+- **Auto-Port Fallback**: Improved CLI logic to correctly trigger auto-assignment when the default port (1972) is taken, even if it's the configured default.
+- **Web Port Scaling**: Fixed logic for proportional adjustment of the WebServer port when the SuperServer port is shifted.
+
+### Added
+
+- **E2E Coverage**: Added full end-to-end coverage for port conflict scenarios in `tests/e2e/test_port_registry_e2e.py`.
+
 ## [1.12.3] - 2026-02-15 - Documentation Sync
 
 ### Changed

{iris_devtester-1.12.3 → iris_devtester-1.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-devtester
-Version: 1.12.3
+Version: 1.12.4
 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>

{iris_devtester-1.12.3 → iris_devtester-1.12.4}/iris_devtester/__init__.py

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

{iris_devtester-1.12.3 → iris_devtester-1.12.4}/iris_devtester/cli/container.py

@@ -172,24 +172,37 @@ def up(ctx, config, name, edition, image, license_key, detach, timeout, cpf, aut
             project_path = str(Path.cwd().absolute())
 
             click.echo(f"⏳ Engaging port registry for project: {project_path}")
-            # Use current config port as preferred
-            preferred = container_config.superserver_port
-            assignment = registry.assign_port(project_path, preferred_port=preferred)
+            
+            # Use current config port as preferred ONLY if it's NOT the default 1972
+            preferred = container_config.superserver_port if container_config.superserver_port != 1972 else None
+            
+            assignment = registry.assign_port(
+                project_path, preferred_port=preferred, allow_fallback=True
+            )
 
-            if assignment.port != preferred:
+            if assignment.port != preferred and preferred is not None:
                 click.echo(
                     click.style(
                         f"⚠️  Port {preferred} was unavailable. Assigned {assignment.port} instead.",
                         fg="yellow",
                     )
                 )
+            elif assignment.assignment_type == "auto" and preferred is None:
+                if assignment.port != 1972:
+                    click.echo(
+                        click.style(
+                            f"⚠️  Default port 1972 was unavailable. Assigned {assignment.port} instead.",
+                            fg="yellow",
+                        )
+                    )
+                else:
+                    click.echo(f"✓ Port {assignment.port} assigned and verified.")
             else:
                 click.echo(f"✓ Port {assignment.port} assigned and verified.")
 
             container_config.superserver_port = assignment.port
             # Update web port proportionally if it's the default
             if container_config.webserver_port == 52773:
-                # Simple logic: if superserver shifted by N, shift webserver by N
                 offset = assignment.port - 1972
                 if offset > 0:
                     container_config.webserver_port = 52773 + offset
@@ -565,16 +578,31 @@ def start(ctx, container_name, config, timeout, auto_port):
                     project_path = str(Path.cwd().absolute())
 
                     click.echo(f"⏳ Engaging port registry for project: {project_path}")
-                    preferred = container_config.superserver_port
-                    assignment = registry.assign_port(project_path, preferred_port=preferred)
+                    
+                    # Use current config port as preferred ONLY if it's NOT the default 1972
+                    preferred = container_config.superserver_port if container_config.superserver_port != 1972 else None
+                    
+                    assignment = registry.assign_port(
+                        project_path, preferred_port=preferred, allow_fallback=True
+                    )
 
-                    if assignment.port != preferred:
+                    if assignment.port != preferred and preferred is not None:
                         click.echo(
                             click.style(
                                 f"⚠️  Port {preferred} was unavailable. Assigned {assignment.port} instead.",
                                 fg="yellow",
                             )
                         )
+                    elif assignment.assignment_type == "auto" and preferred is None:
+                        if assignment.port != 1972:
+                            click.echo(
+                                click.style(
+                                    f"⚠️  Default port 1972 was unavailable. Assigned {assignment.port} instead.",
+                                    fg="yellow",
+                                )
+                            )
+                        else:
+                            click.echo(f"✓ Port {assignment.port} assigned and verified.")
                     else:
                         click.echo(f"✓ Port {assignment.port} assigned and verified.")
 

{iris_devtester-1.12.3 → iris_devtester-1.12.4}/iris_devtester/ports/registry.py

@@ -5,6 +5,7 @@ Provides atomic file-based persistence with file locking for concurrent safety.
 """
 
 import json
+import socket as _socket
 from datetime import datetime
 from pathlib import Path
 from typing import List, Literal, Optional
@@ -56,6 +57,7 @@ class PortRegistry:
         self,
         project_path: str,
         preferred_port: Optional[int] = None,
+        allow_fallback: bool = False,
     ) -> PortAssignment:
         """
         Assign port to project (idempotent - returns existing if already assigned).
@@ -63,13 +65,14 @@ class PortRegistry:
         Args:
             project_path: Absolute path to project directory
             preferred_port: Optional manual port override
+            allow_fallback: If True and preferred_port is occupied, fall back to auto-assignment
 
         Returns:
             PortAssignment with assigned port
 
         Raises:
             PortExhaustedError: All ports in range are in use
-            PortConflictError: preferred_port already assigned to different project
+            PortConflictError: preferred_port already assigned to different project (and fallback disabled)
             PortAssignmentTimeoutError: File lock timeout (>5 seconds)
         """
         lock = FileLock(self.lock_path, timeout=5)
@@ -85,11 +88,21 @@ class PortRegistry:
                     return existing
 
                 # Determine port to assign
+                port = None
+                assignment_type: Literal["auto", "manual"] = "auto"
+
                 if preferred_port is not None:
-                    # Manual port assignment
-                    self._validate_port_available(assignments, preferred_port, project_path)
-                    port = preferred_port
-                    assignment_type: Literal["auto", "manual"] = "manual"
+                    try:
+                        # Manual port assignment
+                        self._validate_port_available(assignments, preferred_port, project_path)
+                        port = preferred_port
+                        assignment_type = "manual"
+                    except PortConflictError:
+                        if not allow_fallback:
+                            raise
+                        # Fallback to auto-assignment
+                        port = self._find_available_port(assignments)
+                        assignment_type = "auto"
                 else:
                     # Auto-assignment
                     port = self._find_available_port(assignments)
@@ -283,8 +296,8 @@ class PortRegistry:
         """
         Find first available port in range.
 
-        Checks both registry assignments AND actual Docker port bindings
-        to avoid conflicts with external containers.
+        Checks registry assignments, actual Docker port bindings, AND 
+        live host port availability via socket.
 
         Raises:
             PortExhaustedError: All ports in range are in use
@@ -298,11 +311,20 @@ class PortRegistry:
 
         for port in range(self.min_port, self.max_port + 1):
             if port not in used_ports:
-                return port
+                # FINAL CHECK: Is the port actually free on the host?
+                if self._is_host_port_free(port):
+                    return port
 
         # All ports exhausted
         raise PortExhaustedError(port_range=self.port_range, current_assignments=assignments)
 
+    def _is_host_port_free(self, port: int) -> bool:
+        """Check if a port is actually free on the host using a socket."""
+        with _socket.socket(_socket.AF_INET, _socket.SOCK_STREAM) as s:
+            s.settimeout(0.1)
+            # connect_ex returns 0 if connection succeeded (port is in use)
+            return s.connect_ex(("localhost", port)) != 0
+
     def _get_docker_bound_ports(self) -> set:
         """
         Get ports currently bound by Docker containers.
@@ -352,8 +374,9 @@ class PortRegistry:
         Validate that preferred port is available.
 
         Raises:
-            PortConflictError: Port already assigned to different project
+            PortConflictError: Port already assigned to different project or occupied on host
         """
+        # 1. Check registry assignments
         for assignment in assignments:
             if assignment.port == port and assignment.status == "active":
                 raise PortConflictError(
@@ -363,3 +386,13 @@ class PortRegistry:
                     existing_assignment_type=assignment.assignment_type,
                     existing_status=assignment.status,
                 )
+
+        # 2. Check live host availability
+        if not self._is_host_port_free(port):
+            raise PortConflictError(
+                requested_port=port,
+                requested_project=requesting_project,
+                existing_project="Unknown (Occupied by non-Docker process on host)",
+                existing_assignment_type="manual",
+                existing_status="active",
+            )

{iris_devtester-1.12.3 → iris_devtester-1.12.4}/iris_devtester.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-devtester
-Version: 1.12.3
+Version: 1.12.4
 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>

{iris_devtester-1.12.3 → iris_devtester-1.12.4}/iris_devtester.egg-info/SOURCES.txt

@@ -183,6 +183,7 @@ tests/contract/cli/test_container_status_contract.py
 tests/contract/cli/test_container_stop_contract.py
 tests/contract/cli/test_container_up_contract.py
 tests/e2e/__init__.py
+tests/e2e/test_port_registry_e2e.py
 tests/e2e/test_skill_workflow.py
 tests/integration/__init__.py
 tests/integration/conftest.py

{iris_devtester-1.12.3 → iris_devtester-1.12.4}/pyproject.toml

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

iris_devtester-1.12.4/tests/e2e/test_port_registry_e2e.py

@@ -0,0 +1,96 @@
+"""End-to-end coverage for the port registry auto-port fallback."""
+
+import re
+import socket
+import uuid
+from pathlib import Path
+
+import pytest
+from click.testing import CliRunner
+
+from iris_devtester.cli import main
+from iris_devtester.config import IRISConfig
+from iris_devtester.connections import get_connection
+from iris_devtester.ports.registry import PortRegistry
+from iris_devtester.utils.iris_container_adapter import IRISContainerManager
+
+
+@pytest.mark.e2e
+@pytest.mark.integration
+def test_port_registry_auto_port_fallback():
+    """Ensure CLI falls back to a different port when 1972 is occupied."""
+
+    container_name = f"e2e-port-test-{uuid.uuid4().hex[:8]}"
+    project_path = str(Path.cwd().absolute())
+    runner = CliRunner()
+
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    sock.bind(("127.0.0.1", 1972))
+    sock.listen(1)
+
+    assigned_port = None
+
+    try:
+        result = runner.invoke(
+            main,
+            ["container", "up", "--auto-port", "--name", container_name],
+            catch_exceptions=False,
+        )
+
+        assert result.exit_code == 0, f"CLI failed:\n{result.output}"
+
+        # Check for conflict warning
+        assert "unavailable" in result.output.lower(), "Conflict warning missing"
+        assert "Assigned" in result.output, "Assignment message missing"
+
+        assigned_match = re.search(r"Assigned (\d+) instead", result.output)
+        assert assigned_match, "Assigned port not reported"
+
+        assigned_port = int(assigned_match.group(1))
+        assert assigned_port != 1972
+
+        superserver_match = re.search(
+            r"SuperServer: localhost:(\d+)", result.output
+        )
+        assert superserver_match, "Connection info missing superserver port"
+        assert assigned_port == int(superserver_match.group(1))
+
+        config = IRISConfig(
+            host="localhost",
+            port=assigned_port,
+            namespace="USER",
+            username="_SYSTEM",
+            password="SYS",
+            container_name=container_name,
+        )
+
+        conn = get_connection(config=config)
+        cursor = conn.cursor()
+        try:
+            cursor.execute("SELECT $NAMESPACE AS namespace")
+            assert cursor.fetchone() is not None
+        finally:
+            cursor.close()
+            conn.close()
+
+    finally:
+        sock.close()
+
+        container = IRISContainerManager.get_existing(container_name)
+        if container:
+            try:
+                container.stop(timeout=5)
+            except Exception:
+                pass
+            try:
+                container.remove(force=True)
+            except Exception:
+                pass
+
+        try:
+            PortRegistry().release_port(project_path)
+        except KeyError:
+            pass
+        except Exception:
+            pass