fix event type newest eventsourcingdb version

Author: atstaeff

eventsourcingdb/handlers/read_event_types/event_type.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import TypeVar
+from typing import TypeVar, Dict, Any, Union
 
 from ...errors.validation_error import ValidationError
 
@@ -10,7 +10,7 @@
 class EventType:
     event_type: str
     is_phantom: bool
-    schema: str | None = None
+    schema: Union[str, Dict[str, Any], None] = None
 
     @staticmethod
     def parse(unknown_object: dict) -> Self:
@@ -27,16 +27,21 @@ def parse(unknown_object: dict) -> Self:
             )
 
         schema = unknown_object.get('schema')
-        if schema is not None and not isinstance(schema, str):
+        if schema is not None and not isinstance(schema, (str, dict)):
             raise ValidationError(
-                f"Failed to parse schema '{schema}' to str."
+                f"Failed to parse schema '{schema}'. Schema must be either str or dict."
             )
 
         return EventType(
             event_type=event_type,
             is_phantom=is_phantom,
             schema=schema,
-        )
+        ) # type: ignore
 
     def __hash__(self):
+        # Convert dictionary schema to a hashable form (tuple of items)
+        if isinstance(self.schema, dict):
+            # Sort items to ensure consistent hashing
+            schema_items = tuple(sorted((k, str(v)) for k, v in self.schema.items()))
+            return hash((self.event_type, self.is_phantom, schema_items))
         return hash((self.event_type, self.is_phantom, self.schema))

eventsourcingdb/handlers/read_event_types/read_event_types.py

@@ -1,5 +1,6 @@
 from collections.abc import AsyncGenerator
 from http import HTTPStatus
+import json
 
 from .event_type import EventType
 from .is_event_type import is_event_type

tests/test_read_event_types.py

@@ -51,8 +51,14 @@ async def test_reads_all_types_of_existing_events_and_registered_schemas(
         ])
 
         # Use Python dictionaries instead of JSON strings
-        await client.register_event_schema("org.ban.ban", {"type": "object"})
-        await client.register_event_schema("org.bing.chilling", {"type": "object"})
+        await client.register_event_schema(
+            "org.ban.ban", 
+            {"type": "object"}
+        )
+        await client.register_event_schema(
+            "org.bing.chilling", 
+            {"type": "object"}
+        )
 
         actual_event_types: set[EventType] = set()
         async for event_type in client.read_event_types():
@@ -82,12 +88,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"},
             ),
             EventType(
                 event_type="org.bing.chilling",
                 is_phantom=True,
-                schema='{"type":"object"}',
+                schema={"type": "object"},
             ),
         }