feat: change valdiation issues with LowerBound and UpperBound changes to object

Author: atstaeff

eventsourcingdb_client_python/handlers/lower_bound.py

@@ -1,10 +1,21 @@
 from dataclasses import dataclass
 
+from eventsourcingdb_client_python.errors.invalid_parameter_error import InvalidParameterError
+
 @dataclass
 class LowerBound:
     id: int
     type: str
 
     def __post_init__(self):
         if self.type not in {"inclusive", "exclusive"}:
-            raise ValueError("type must be either 'inclusive' or 'exclusive'")
+            raise InvalidParameterError(
+                parameter_name="LowerBound",
+                reason="type must be either 'inclusive' or 'exclusive'"
+            )
+        
+        if self.id < 0:
+            raise InvalidParameterError(
+                parameter_name="LowerBound",
+                reason="id must be non-negative"
+            )

eventsourcingdb_client_python/handlers/observe_events/observe_events.py

@@ -75,6 +75,16 @@ async def observe_events(
 
             if is_event(message):
                 event = Event.parse(message['payload'])
+                # Add client-side filtering by event ID
+                event_id = int(message['payload']['id'])
+                
+                if options.lower_bound is not None:
+                    # For inclusive, include events with ID >= lower bound
+                    if options.lower_bound.type == 'inclusive' and event_id < options.lower_bound.id:
+                        continue
+                    # For exclusive, include events with ID > lower bound
+                    if options.lower_bound.type == 'exclusive' and event_id <= options.lower_bound.id:
+                        continue
 
                 yield StoreItem(event, message['payload']['hash'])
                 continue

eventsourcingdb_client_python/handlers/observe_events/observe_events_options.py

@@ -2,9 +2,11 @@
 
 from ..lower_bound import LowerBound
 from ...errors.validation_error import ValidationError
+from ...event.validate_subject import validate_subject
+from ...event.validate_type import validate_type
+from ...util.is_non_negativ_integer import is_non_negative_integer
 from .observe_from_latest_event import ObserveFromLatestEvent
 
-
 @dataclass
 class ObserveEventsOptions:
     recursive: bool
@@ -18,8 +20,29 @@ def validate(self) -> None:
                 'ObserveEventsOptions are invalid: lower_bound must be a LowerBound object.'
             )
 
-        # Rest of validation logic
-        # ...
+        if self.from_latest_event is not None:
+            if self.lower_bound is not None:
+                raise ValidationError(
+                    'ReadEventsOptions are invalid: '
+                    'lowerBoundId and fromLatestEvent are mutually exclusive'
+                )
+
+            try:
+                validate_subject(self.from_latest_event.subject)
+            except ValidationError as validation_error:
+                raise ValidationError(
+                    f'ReadEventsOptions are invalid: '
+                    f'Failed to validate \'from_latest_event\': {str(validation_error)}'
+                ) from validation_error
+
+            try:
+                validate_type(self.from_latest_event.type)
+            except ValidationError as validation_error:
+                raise ValidationError(
+                    f'ReadEventsOptions are invalid: '
+                    f'Failed to validate \'from_latest_event\': {str(validation_error)}'
+                ) from validation_error
+
 
     def to_json(self):
         json = {

eventsourcingdb_client_python/handlers/read_events/read_events.py

@@ -89,6 +89,11 @@ async def read_events(
                     # For exclusive, include events with ID < upper bound
                     if options.upper_bound.type == 'exclusive' and event_id >= options.upper_bound.id:
                         continue
-                
+
                 yield StoreItem(event, message['payload']['hash'])
                 continue
+            
+            raise ServerError(
+                f'Failed to read events, an unexpected stream item was received: '
+                f'{message}.'
+            )

eventsourcingdb_client_python/handlers/read_events/read_events_options.py

@@ -36,8 +36,20 @@ def validate(self) -> None:
                     'lowerBound and fromLatestEvent are mutually exclusive'
                 )
 
-            # Rest of validation remains the same
-            # ...
+            try:
+                validate_subject(self.from_latest_event.subject)
+            except ValidationError as validation_error:
+                raise ValidationError(
+                    f'ReadEventsOptions are invalid: '
+                    f'from_latest_event.subject: {str(validation_error)}'
+                ) from validation_error
+
+            # Add validation for empty type too
+            if not self.from_latest_event.type:
+                raise ValidationError(
+                    'ReadEventsOptions are invalid: '
+                    'from_latest_event.type cannot be empty'
+                )
 
     def to_json(self):
         json = {

eventsourcingdb_client_python/handlers/upper_bound.py

@@ -1,5 +1,7 @@
 from dataclasses import dataclass
 
+from eventsourcingdb_client_python.errors.invalid_parameter_error import InvalidParameterError
+
 
 @dataclass
 class UpperBound:
@@ -8,4 +10,7 @@ class UpperBound:
 
     def __post_init__(self):
         if self.type not in {"inclusive", "exclusive"}:
-            raise ValueError("type must be either 'inclusive' or 'exclusive'")
+            raise InvalidParameterError(
+                parameter_name="UpperBound",
+                reason="type must be either 'inclusive' or 'exclusive'"
+            )

tests/test_observe_events.py

@@ -7,6 +7,7 @@
 from eventsourcingdb_client_python.errors.client_error import ClientError
 from eventsourcingdb_client_python.errors.invalid_parameter_error import InvalidParameterError
 from eventsourcingdb_client_python.errors.server_error import ServerError
+from eventsourcingdb_client_python.handlers.lower_bound import LowerBound
 from eventsourcingdb_client_python.handlers.observe_events import \
     ObserveEventsOptions, \
     ObserveFromLatestEvent, \
@@ -263,7 +264,10 @@ async def test_observes_event_starting_from_given_lower_bound(
             '/users',
             ObserveEventsOptions(
                 recursive=True,
-                lower_bound='2'
+                lower_bound=LowerBound(
+                    id=2,
+                    type='inclusive'
+                )
             )
         ):
             observed_items.append(event)
@@ -322,7 +326,10 @@ async def test_throws_error_for_mutually_exclusive_options(
                 '/users',
                 ObserveEventsOptions(
                     recursive=True,
-                    lower_bound='3',
+                    lower_bound=LowerBound(
+                        id=3,
+                        type='excl'
+                    ),
                     from_latest_event=ObserveFromLatestEvent(
                         subject='/',
                         type='com.foo.bar',
@@ -331,23 +338,23 @@ async def test_throws_error_for_mutually_exclusive_options(
                 )
             ):
                 pass
-
-    @staticmethod
-    @pytest.mark.asyncio
-    async def test_throws_error_for_non_integer_lower_bound(
-        prepared_database: Database
-    ):
-        client = prepared_database.with_authorization.client
-
-        with pytest.raises(InvalidParameterError):
-            async for _ in client.observe_events(
-                '/users',
-                ObserveEventsOptions(
-                    recursive=True,
-                    lower_bound='hello',
-                )
-            ):
-                pass
+    # TODO: Test restructured. String not used in the new code.
+    # @staticmethod
+    # @pytest.mark.asyncio
+    # async def test_throws_error_for_non_integer_lower_bound(
+    #     prepared_database: Database
+    # ):
+    #     client = prepared_database.with_authorization.client
+    #
+    #     with pytest.raises(InvalidParameterError):
+    #         async for _ in client.observe_events(
+    #             '/users',
+    #             ObserveEventsOptions(
+    #                 recursive=True,
+    #                 lower_bound='hello',
+    #             )
+    #         ):
+    #            pass
 
     @staticmethod
     @pytest.mark.asyncio
@@ -361,7 +368,10 @@ async def test_throws_error_for_negative_lower_bound(
                 '/users',
                 ObserveEventsOptions(
                     recursive=True,
-                    lower_bound='-1',
+                    lower_bound=LowerBound(
+                        id=-1,
+                        type='inclusive'
+                    ),
                 )
             ):
                 pass