spport eventsourcingdb version 0.118.*

Author: atstaeff

eventsourcingdb/event/event_candidate.py

@@ -10,8 +10,8 @@ class EventCandidate:
     subject: str
     type: str
     data: dict
-    trace_parent: str = None
-    trace_state: str = None
+    trace_parent: str | None = None
+    trace_state: str | None = None
 
     """def validate(self) -> None:
         validate_subject(self.subject)

eventsourcingdb/event/source.py

@@ -17,8 +17,8 @@ def new_event(
         subject: str,
         event_type: str,
         data: dict,
-        trace_parent: str = None,
-        trace_state: str = None
+        trace_parent: str | None = None,
+        trace_state: str | None = None
     ) -> EventCandidate:
         return EventCandidate(
             self.source,

tests/conftest.py

@@ -8,7 +8,6 @@
 from eventsourcingdb.event.event_candidate import EventCandidate
 from eventsourcingdb.event.source import Source
 from eventsourcingdb.http_client.http_client import HttpClient
-from .shared.build_database import build_database
 from .shared.database import Database
 
 from .shared.start_local_http_server import \
@@ -17,14 +16,6 @@
 
 pytest_plugins = ('pytest_asyncio', )
 
-if not hasattr(_pytest.fixtures.FixtureDef, "unittest"):
-    _pytest.fixtures.FixtureDef.unittest = False
-
-
-def pytest_sessionstart():
-    build_database('tests/shared/docker/eventsourcingdb')
-
-
 @pytest_asyncio.fixture
 async def get_http_client():
     stop_server: StopServer | None = None
@@ -77,7 +68,7 @@ class TestData:
     TEST_SOURCE_STRING = 'tag:thenativeweb.io,2023:eventsourcingdb:test'
     TEST_SOURCE = Source(TEST_SOURCE_STRING)
     REGISTERED_SUBJECT = '/users/registered'
-    LOGGED_IN_SUBJECT = '/users/loggedIn'
+    LOGGED_IN_SUBJECT = '/users/logged-in'
     REGISTERED_TYPE = 'io.thenativeweb.users.registered'
     LOGGED_IN_TYPE = 'io.thenativeweb.users.loggedIn'
     JANE_DATA = {'name': 'jane'}

tests/shared/build_database.py

@@ -1,7 +1,9 @@
 import uuid
+import time
 from eventsourcingdb.client import Client
 from eventsourcingdb.container import Container
 from .testing_database import TestingDatabase
+import os
 
 class Database:
     __create_key = object()
@@ -19,34 +21,75 @@ def __init__(
         self.with_invalid_url: TestingDatabase = with_invalid_url
 
     @classmethod
-    async def create(cls) -> 'Database':
+    async def create(cls, max_retries=3, retry_delay=2.0) -> 'Database':
+        """Create a new Database instance with retry mechanism for container startup"""
         api_token = str(uuid.uuid4())
 
-        # Erstellen und Starten des Containers mit der zentralen Container-Klasse
+        dockerfile_path = os.path.join(os.path.dirname(__file__), 'docker/eventsourcingdb/Dockerfile')
+        with open(dockerfile_path, 'r') as dockerfile:
+            content = dockerfile.read().strip()
+            image_tag = content.split(':')[-1]
+            
         container = Container(
-            api_token=api_token
+            image_name="thenativeweb/eventsourcingdb",
+            image_tag=image_tag,  
+            api_token=api_token,
+            internal_port=3000
         )
-        container.start()
 
-        # Client mit Autorisierung erstellen
-        with_authorization_client = container.get_client()
-        await with_authorization_client.initialize()
-        with_authorization = TestingDatabase(
-            with_authorization_client,
-            container  # Container an TestingDatabase übergeben für cleanup
-        )
+        # Try with retries
+        for attempt in range(max_retries):
+            try:
+                # Start the container with timeout handling
+                container.start()
+                
+                # Create client with authorization
+                with_authorization_client = container.get_client()
+                await with_authorization_client.initialize()
+                with_authorization = TestingDatabase(
+                    with_authorization_client,
+                    container  # Pass container to TestingDatabase for cleanup
+                )
 
-        # Client mit ungültiger URL erstellen - api_token statt auth_token verwenden
-        with_invalid_url_client = Client(
-            base_url='http://localhost.invalid',
-            api_token=api_token
-        )
-        await with_invalid_url_client.initialize()
-        with_invalid_url = TestingDatabase(
-            with_invalid_url_client
-        )
+                # Create client with invalid URL but valid token
+                with_invalid_url_client = Client(
+                    base_url='http://localhost.invalid',
+                    api_token=api_token
+                )
+                await with_invalid_url_client.initialize()
+                with_invalid_url = TestingDatabase(
+                    with_invalid_url_client
+                )
 
-        return cls(Database.__create_key, with_authorization, with_invalid_url)
+                return cls(Database.__create_key, with_authorization, with_invalid_url)
+                
+            except Exception as e:
+                # On the last attempt, raise the error
+                if attempt == max_retries - 1:
+                    # Cleanup the container if it was created
+                    try:
+                        container.stop()
+                    except:
+                        pass
+                    raise RuntimeError(f"Failed to initialize database container after {max_retries} attempts: {e}")
+                
+                # Otherwise wait and retry
+                print(f"Container startup attempt {attempt+1} failed: {e}. Retrying in {retry_delay} seconds...")
+                time.sleep(retry_delay)
+                
+                # Try to clean up the failed container before retrying
+                try:
+                    container.stop()
+                except:
+                    pass
+                
+                # Create a new container for the next attempt
+                container = Container(
+                    image_name="thenativeweb/eventsourcingdb",
+                    image_tag="latest",
+                    api_token=api_token,
+                    internal_port=3000
+                )
 
     async def stop(self):
         await self.with_authorization.stop()

tests/shared/database.py

@@ -1 +1 @@
-FROM thenativeweb/eventsourcingdb:0.113.2
+FROM thenativeweb/eventsourcingdb:0.118.10

tests/shared/docker/__init__.py

@@ -54,7 +54,6 @@ async def ping_app():
                 try:
                     await session.get(
                         f"http://localhost:{local_http_server.port}/__python_test__/api/v1/ping", 
-                        timeout=2
                     )
                     # Wenn die Anfrage erfolgreich ist, brechen wir die Schleife ab
                     return True

tests/shared/docker/eventsourcingdb/Dockerfile

@@ -9,16 +9,11 @@
 from eventsourcingdb.errors.server_error import ServerError
 from eventsourcingdb.handlers.read_event_types.event_type import EventType
 from .conftest import TestData
-from .shared.build_database import build_database
 from .shared.database import Database
 from .shared.start_local_http_server import AttachHandlers, AttachHandler
 
 
 class TestReadEventTypes:
-    @classmethod
-    def setup_class(cls):
-        build_database('tests/shared/docker/eventsourcingdb')
-
     @staticmethod
     @pytest.mark.asyncio
     async def test_reads_all_types_of_existing_events_and_registered_schemas(
@@ -52,11 +47,11 @@ async def test_reads_all_types_of_existing_events_and_registered_schemas(
 
         await client.register_event_schema(
             "org.ban.ban", 
-            {"type": "object"} # type: ignore
+            {"type": "object", "properties": {}} # Add required properties field
         )
         await client.register_event_schema(
             "org.bing.chilling", 
-            {"type": "object"} # type: ignore
+            {"type": "object", "properties": {}} # Add required properties field
         )
 
         actual_event_types: set[EventType] = set()
@@ -87,12 +82,12 @@ async def test_reads_all_types_of_existing_events_and_registered_schemas(
             EventType(
                 event_type="org.ban.ban",
                 is_phantom=True,
-                schema={"type": "object"},
+                schema={"type": "object", "properties": {}},  # Update expected schema
             ),
             EventType(
                 event_type="org.bing.chilling",
                 is_phantom=True,
-                schema={"type": "object"},
+                schema={"type": "object", "properties": {}},  # Update expected schema
             ),
         }
 

tests/shared/start_local_http_server.py

@@ -355,7 +355,7 @@ async def test_throws_error_for_negative_lower_bound(
     ):
         client = prepared_database.with_authorization.client
 
-        with pytest.raises(ServerError):
+        with pytest.raises(ClientError):
             async for _ in client.read_events(
                 '/',
                 ReadEventsOptions(