Add docker config for integration tests

Author: ds1sqe

CLAUDE.md

@@ -33,6 +33,31 @@ uv sync --extra dev          # Install dependencies including dev tools
 uv pip install -e ".[dev]"   # Install in editable mode
 ```
 
+### Docker Setup for Integration Tests
+
+Integration tests require a TypeDB 3.5.5 server. The project includes Docker configuration for automated setup:
+
+**Requirements:**
+- Docker and Docker Compose installed
+- Ports: 1729 (TypeDB server)
+
+**Docker is managed automatically** by the test fixtures. Simply run:
+```bash
+./test-integration.sh          # Starts Docker, runs tests, stops Docker
+```
+
+**Manual Docker control:**
+```bash
+docker compose up -d           # Start TypeDB container
+docker compose down            # Stop TypeDB container
+docker compose logs typedb     # View TypeDB logs
+```
+
+**Skip Docker (use existing server):**
+```bash
+USE_DOCKER=false uv run pytest -m integration
+```
+
 ### Testing
 ```bash
 # Unit tests (fast, no external dependencies)
@@ -41,12 +66,17 @@ uv run pytest -v                           # Run unit tests with verbose output
 uv run pytest -k test_name                 # Run specific unit test
 
 # Integration tests (require running TypeDB)
+# Option 1: Use Docker (recommended - automatic management)
+./test-integration.sh                     # Run integration tests with Docker
+./test-integration.sh -v                  # Run integration tests with Docker (verbose)
+
+# Option 2: Use existing TypeDB server (set USE_DOCKER=false)
 # First, start TypeDB 3.x server: typedb server
-uv run pytest -m integration              # Run integration tests only
-uv run pytest -m integration -v           # Run integration tests with verbose output
+USE_DOCKER=false uv run pytest -m integration    # Run integration tests (no Docker)
+USE_DOCKER=false uv run pytest -m integration -v # Run integration tests (verbose)
 
 # Run all tests (unit + integration)
-uv run pytest -m ""                       # Run all tests
+uv run pytest -m ""                       # Run all tests (Docker managed automatically)
 ```
 
 ### Linting
@@ -193,11 +223,15 @@ Coverage:
 
 **Setup for integration tests:**
 ```bash
-# 1. Start TypeDB server
+# Option 1: Use Docker (recommended - automatic)
+./test-integration.sh -v
+
+# Option 2: Use existing TypeDB server
+# 1. Start TypeDB 3.x server
 typedb server
 
-# 2. Run integration tests
-uv run pytest -m integration -v
+# 2. Run integration tests (skip Docker)
+USE_DOCKER=false uv run pytest -m integration -v
 ```
 
 **Test execution patterns:**

docker-compose.yml

@@ -0,0 +1,18 @@
+services:
+  typedb:
+    image: typedb/typedb:3.5.5
+    container_name: typedb_test
+    ports:
+      - "1729:1729"
+    healthcheck:
+      test: ["CMD-SHELL", "timeout 1 bash -c '</dev/tcp/localhost/1729' || exit 1"]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 10s
+    networks:
+      - typedb_network
+
+networks:
+  typedb_network:
+    driver: bridge

pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
 ]
 dependencies = [
     "typedb-driver==3.5.5",
-    "pydantic>=2.0.0",
+    "pydantic>=2.12.4",
     "isodate==0.7.2",
 ]
 
@@ -36,10 +36,11 @@ Issues = "https://github.com/ds1sqe/type_bridge/issues"
 
 [project.optional-dependencies]
 dev = [
-    "pytest>=8.0.0",
-    "pytest-asyncio>=0.23.0",
+    "pytest>=9.0.1",
+    "pytest-asyncio>=1.3.0",
     "pytest-order>=1.2.0",
-    "ruff>=0.6.0",
+    "ruff>=0.14.5",
+    "pyright>=1.1.407",
 ]
 
 [tool.ruff]

test-integration.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Helper script to run integration tests with Docker
+
+set -e
+
+# Colors for output
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+echo -e "${GREEN}Running integration tests with Docker...${NC}"
+
+# Run pytest with integration marker
+# Docker container management is handled by conftest.py
+uv run pytest -m integration "$@"
+
+echo -e "${GREEN}Integration tests completed!${NC}"

tests/integration/conftest.py

@@ -1,5 +1,9 @@
 """Pytest fixtures for integration tests."""
 
+import os
+import subprocess
+import time
+
 import pytest
 from typedb.driver import DriverOptions
 
@@ -11,9 +15,72 @@
 
 
 @pytest.fixture(scope="session")
-def typedb_driver():
+def docker_typedb():
+    """Start TypeDB Docker container for the test session.
+
+    Yields:
+        None (container runs in background)
+    """
+    # Check if we should use Docker (default: yes, unless USE_DOCKER=false)
+    use_docker = os.getenv("USE_DOCKER", "true").lower() != "false"
+
+    if not use_docker:
+        # Skip Docker management - assume TypeDB is already running
+        yield
+        return
+
+    # Get project root directory
+    project_root = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+
+    # Start Docker container
+    try:
+        # Stop any existing container
+        subprocess.run(
+            ["docker", "compose", "down"],
+            cwd=project_root,
+            capture_output=True,
+        )
+
+        # Start container
+        subprocess.run(
+            ["docker", "compose", "up", "-d"],
+            cwd=project_root,
+            check=True,
+            capture_output=True,
+        )
+
+        # Wait for TypeDB to be healthy
+        max_retries = 30
+        for i in range(max_retries):
+            result = subprocess.run(
+                ["docker", "inspect", "--format={{.State.Health.Status}}", "typedb_test"],
+                capture_output=True,
+                text=True,
+            )
+            if result.stdout.strip() == "healthy":
+                break
+            time.sleep(1)
+        else:
+            raise RuntimeError("TypeDB container failed to become healthy")
+
+        yield
+
+    finally:
+        # Stop Docker container
+        subprocess.run(
+            ["docker", "compose", "down"],
+            cwd=project_root,
+            capture_output=True,
+        )
+
+
+@pytest.fixture(scope="session")
+def typedb_driver(docker_typedb):
     """Create a TypeDB driver connection for the test session.
 
+    Args:
+        docker_typedb: Fixture that ensures Docker container is running
+
     Yields:
         TypeDB driver instance
 

tests/unit/validation/test_duplicate_attributes.py

@@ -4,13 +4,16 @@
 even when they share the same underlying value type.
 """
 
+from unittest.mock import Mock
+
 import pytest
 
 from type_bridge import Entity, SchemaManager
 from type_bridge.attribute.datetime import DateTime
 from type_bridge.attribute.flags import Flag, Key
 from type_bridge.attribute.string import String
 from type_bridge.schema import SchemaValidationError
+from type_bridge.session import Database
 
 
 class TestDuplicateAttributeValidation:
@@ -30,12 +33,9 @@ class Issue(Entity):
             created: TimeStamp
             modified: TimeStamp
 
-        # Mock database for schema manager
-        class MockDatabase:
-            def database_exists(self):
-                return False
-
-        db = MockDatabase()
+        # Mock database for unit test
+        db = Mock(spec=Database)
+        db.database_exists.return_value = False
         schema_manager = SchemaManager(db)
         schema_manager.register(Issue)
 
@@ -60,11 +60,9 @@ class Person(Entity):
             last_name: Name
             middle_name: Name
 
-        class MockDatabase:
-            def database_exists(self):
-                return False
-
-        db = MockDatabase()
+        # Mock database for unit test
+        db = Mock(spec=Database)
+        db.database_exists.return_value = False
         schema_manager = SchemaManager(db)
         schema_manager.register(Person)
 
@@ -95,11 +93,9 @@ class Issue(Entity):
             created: CreatedStamp
             modified: ModifiedStamp
 
-        class MockDatabase:
-            def database_exists(self):
-                return False
-
-        db = MockDatabase()
+        # Mock database for unit test
+        db = Mock(spec=Database)
+        db.database_exists.return_value = False
         schema_manager = SchemaManager(db)
         schema_manager.register(Issue)
 
@@ -119,11 +115,9 @@ class Task(Entity):
             current_status: Status
             previous_status: Status
 
-        class MockDatabase:
-            def database_exists(self):
-                return False
-
-        db = MockDatabase()
+        # Mock database for unit test
+        db = Mock(spec=Database)
+        db.database_exists.return_value = False
         schema_manager = SchemaManager(db)
         schema_manager.register(Task)
 
@@ -156,11 +150,9 @@ class Issue(Entity):
         class Task(Entity):
             name: IssueKey  # Using IssueKey is OK here (different entity)
 
-        class MockDatabase:
-            def database_exists(self):
-                return False
-
-        db = MockDatabase()
+        # Mock database for unit test
+        db = Mock(spec=Database)
+        db.database_exists.return_value = False
         schema_manager = SchemaManager(db)
         schema_manager.register(Issue, Task)
 
@@ -182,11 +174,9 @@ class Event(Entity):
             start: Timestamp
             end: Timestamp
 
-        class MockDatabase:
-            def database_exists(self):
-                return False
-
-        db = MockDatabase()
+        # Mock database for unit test
+        db = Mock(spec=Database)
+        db.database_exists.return_value = False
         schema_manager = SchemaManager(db)
         schema_manager.register(Event)
 

type_bridge/schema/info.py

@@ -55,9 +55,7 @@ def validate(self) -> None:
         """
         # Validate entities
         for entity_model in self.entities:
-            self._validate_no_duplicate_attribute_types(
-                entity_model, entity_model.get_type_name()
-            )
+            self._validate_no_duplicate_attribute_types(entity_model, entity_model.get_type_name())
 
         # Validate relations
         for relation_model in self.relations:
@@ -154,13 +152,17 @@ def _validate_no_duplicate_attribute_types(
             lines.append("")
             lines.append("    # Use:")
             for field in first_fields:
-                field_class_name = field.capitalize() + "Stamp" if "time" in field.lower() else field.capitalize()
+                field_class_name = (
+                    field.capitalize() + "Stamp" if "time" in field.lower() else field.capitalize()
+                )
                 lines.append(f"    class {field_class_name}({value_type}):")
                 lines.append("        pass")
                 lines.append("")
             lines.append(f"    class {type_name}(Entity):")
             for field in first_fields:
-                field_class_name = field.capitalize() + "Stamp" if "time" in field.lower() else field.capitalize()
+                field_class_name = (
+                    field.capitalize() + "Stamp" if "time" in field.lower() else field.capitalize()
+                )
                 lines.append(f"        {field}: {field_class_name}  # ✓ Distinct types")
 
             raise SchemaValidationError("\n".join(lines))