style:

atstaeff · atstaeff · commit 80c4a9f94cf1 · 2025-04-04T17:53:40.000+02:00
diff --git a/Makefile b/Makefile
@@ -3,11 +3,14 @@ qa: analyze test
 analyze:
 	@poetry run pylint eventsourcingdb_client_python tests
 
+fix:
+	@poetry run autopep8 --in-place --aggressive --max-line-length=100 --recursive eventsourcingdb_client_python tests
+	
 test:
 	@poetry run pytest --maxfail=1
 
 clean:
 
 build: qa clean
 
-.PHONY: analyze build clean qa test
+.PHONY: fix analyze build clean qa test
diff --git a/eventsourcingdb_client_python/event/event.py b/eventsourcingdb_client_python/event/event.py
@@ -11,6 +11,8 @@
 # due to its business context. Splitting it into smaller
 # methods would increase cognitive load and make the
 # code less readable.
+
+
 class Event(EventContext):
     def __init__(
         self,
diff --git a/eventsourcingdb_client_python/handlers/is_event.py b/eventsourcingdb_client_python/handlers/is_event.py
@@ -8,11 +8,11 @@ def is_event(message: Any) -> bool:
     if isinstance(message, dict) and message.get('type') == EVENT_TYPE:
         payload = message.get('payload')
         return isinstance(payload, dict) and isinstance(payload.get('hash'), str)
-        
+
     # Otherwise check for old format (just for backward compatibility)
     if not isinstance(message, dict):
         return False
-        
+
     payload = message.get('payload')
     return (
         isinstance(payload, dict)
diff --git a/eventsourcingdb_client_python/handlers/lower_bound.py b/eventsourcingdb_client_python/handlers/lower_bound.py
@@ -2,7 +2,7 @@
 
 from eventsourcingdb_client_python.errors.invalid_parameter_error import InvalidParameterError
 
-# TODO: id must be a string.
+
 @dataclass
 class LowerBound:
     id: str
@@ -14,9 +14,8 @@ def __post_init__(self):
                 parameter_name="LowerBound",
                 reason='type must be either "inclusive" or "exclusive"'
             )
-        
         if int(self.id) < 0:
             raise InvalidParameterError(
                 parameter_name='LowerBound',
                 reason='id must be non-negative'
-            )
+            )
diff --git a/eventsourcingdb_client_python/handlers/observe_events/observe_events.py b/eventsourcingdb_client_python/handlers/observe_events/observe_events.py
@@ -23,6 +23,8 @@
 # for better readability. Even though it is not necessary,
 # it makes the return type clear without needing to read any
 # documentation or code.
+
+
 async def observe_events(
     client: AbstractBaseClient,
     subject: str,
@@ -77,13 +79,19 @@ async def observe_events(
                 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:
+                    if (
+                        options.lower_bound.type == 'inclusive' and # pylint: disable=R2004
+                        int(event_id) < int(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:
+                    if (
+                        options.lower_bound.type == 'exclusive' and # pylint: disable=R2004
+                        int(event_id) <= int(options.lower_bound.id)
+                    ):
                         continue
 
                 yield StoreItem(event, message['payload']['hash'])
diff --git a/eventsourcingdb_client_python/handlers/observe_events/observe_events_options.py b/eventsourcingdb_client_python/handlers/observe_events/observe_events_options.py
@@ -4,9 +4,9 @@
 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
@@ -19,7 +19,7 @@ def validate(self) -> None:
             raise ValidationError(
                 'ObserveEventsOptions are invalid: lower_bound must be a LowerBound object.'
             )
-            
+
         if self.from_latest_event is not None:
             if self.lower_bound is not None:
                 raise ValidationError(
@@ -43,7 +43,6 @@ def validate(self) -> None:
                     f'Failed to validate \'from_latest_event\': {str(validation_error)}'
                 ) from validation_error
 
-
     def to_json(self):
         json = {
             'recursive': self.recursive
@@ -55,8 +54,8 @@ def to_json(self):
                 'id': str(self.lower_bound.id),  # Ensure ID is a string
                 'type': self.lower_bound.type
             }
-            
+
         if self.from_latest_event is not None:
             json['fromLatestEvent'] = self.from_latest_event.to_json()
 
-        return json
+        return json
diff --git a/eventsourcingdb_client_python/handlers/read_event_types/read_event_types.py b/eventsourcingdb_client_python/handlers/read_event_types/read_event_types.py
@@ -17,6 +17,8 @@
 # for better readability. Even though it is not necessary,
 # it makes the return type clear without needing to read any
 # documentation or code.
+
+
 async def read_event_types(
     client: AbstractBaseClient,
 ) -> AsyncGenerator[EventType, None]:
diff --git a/eventsourcingdb_client_python/handlers/read_events/read_events.py b/eventsourcingdb_client_python/handlers/read_events/read_events.py
@@ -22,6 +22,8 @@
 # for better readability. Even though it is not necessary,
 # it makes the return type clear without needing to read any
 # documentation or code.
+
+
 async def read_events(
     client: AbstractBaseClient,
     subject: str,
@@ -71,28 +73,40 @@ async def read_events(
 
             if is_event(message):
                 event = Event.parse(message['payload'])
-                
+
                 event_id = int(message['payload']['id'])  # Access ID from raw payload
 
                 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:
+                    if (
+                        options.lower_bound.type == 'inclusive' and # pylint: disable=R2004
+                        int(event_id) < int(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:
+                    if (
+                        options.lower_bound.type == 'exclusive' and # pylint: disable=R2004
+                        int(event_id) <= int(options.lower_bound.id)
+                    ):
                         continue
-                
+
                 if options.upper_bound is not None:
                     # For inclusive, include events with ID <= upper bound
-                    if options.upper_bound.type == 'inclusive' and event_id > options.upper_bound.id:
+                    if (
+                        options.upper_bound.type == 'inclusive' and # pylint: disable=R2004
+                        int(event_id) > int(options.upper_bound.id)
+                    ):
                         continue
                     # For exclusive, include events with ID < upper bound
-                    if options.upper_bound.type == 'exclusive' and event_id >= options.upper_bound.id:
+                    if (
+                        options.upper_bound.type == 'exclusive' and # pylint: disable=R2004
+                        int(event_id) >= int(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}.'
diff --git a/eventsourcingdb_client_python/handlers/read_events/read_events_options.py b/eventsourcingdb_client_python/handlers/read_events/read_events_options.py
@@ -5,7 +5,6 @@
 from .order import Order
 from ...errors.validation_error import ValidationError
 from ...event.validate_subject import validate_subject
-from ...event.validate_type import validate_type
 from .read_from_latest_event import ReadFromLatestEvent
 
 
@@ -23,7 +22,7 @@ def validate(self) -> None:
             raise ValidationError(
                 'ReadEventOptions are invalid: lower_bound must be a LowerBound object.'
             )
-        
+
         if self.upper_bound is not None and not isinstance(self.upper_bound, UpperBound):
             raise ValidationError(
                 'ReadEventOptions are invalid: upper_bound must be a UpperBound object.'
@@ -58,21 +57,21 @@ def to_json(self):
 
         if self.order is not None:
             json['order'] = self.order.value
-            
+
         # Directly use the objects
         if self.lower_bound is not None:
             json['lowerBound'] = {
                 'id': str(self.lower_bound.id),  # Ensure ID is a string
                 'type': self.lower_bound.type
             }
-            
+
         if self.upper_bound is not None:
             json['upperBound'] = {
                 'id': str(self.upper_bound.id),  # Ensure ID is a string
                 'type': self.upper_bound.type
             }
-            
+
         if self.from_latest_event is not None:
             json['fromLatestEvent'] = self.from_latest_event.to_json()
 
-        return json
+        return json
diff --git a/eventsourcingdb_client_python/handlers/read_subjects/read_subjects.py b/eventsourcingdb_client_python/handlers/read_subjects/read_subjects.py
@@ -19,6 +19,8 @@
 # for better readability. Even though it is not necessary,
 # it makes the return type clear without needing to read any
 # documentation or code.
+
+
 async def read_subjects(
     client: AbstractBaseClient,
     base_subject: str
diff --git a/eventsourcingdb_client_python/handlers/upper_bound.py b/eventsourcingdb_client_python/handlers/upper_bound.py
@@ -13,4 +13,4 @@ def __post_init__(self):
             raise InvalidParameterError(
                 parameter_name='UpperBound',
                 reason='type must be either "inclusive" or "exclusive"'
-            )
+            )
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -20,6 +20,7 @@
 if not hasattr(_pytest.fixtures.FixtureDef, "unittest"):
     _pytest.fixtures.FixtureDef.unittest = False
 
+
 def pytest_sessionstart():
     build_database('tests/shared/docker/eventsourcingdb')
 
@@ -135,6 +136,7 @@ async def prepared_database(
 
     return database
 
+
 @pytest_asyncio.fixture
 async def events_for_mocked_server(
     # This is required in order to request a fixture defined in the same file
diff --git a/tests/shared/docker/container.py b/tests/shared/docker/container.py
@@ -51,4 +51,4 @@ def get_exposed_port(self, internal_port: int) -> int:
         except ValueError as value_error:
             raise ValueError(
                 f'Could not parse port from: {exposed_port_as_string}'
-            ) from value_error
+            ) from value_error
diff --git a/tests/shared/docker/image.py b/tests/shared/docker/image.py
@@ -49,4 +49,4 @@ def build(self, directory: str) -> None:
                     f'Build failed with output: {stderr.decode("utf-8")}')
 
     def __get_full_name(self) -> str:
-        return f'{self.name}:{self.tag}'
+        return f'{self.name}:{self.tag}'
diff --git a/tests/shared/event/assert_event.py b/tests/shared/event/assert_event.py
@@ -5,6 +5,8 @@
 # due to its business context. Splitting it into smaller
 # methods would increase cognitive load and make the
 # code less readable.
+
+
 def assert_event_equals(
         event: Event,
         source: str,
diff --git a/tests/shared/start_local_http_server.py b/tests/shared/start_local_http_server.py
@@ -49,7 +49,7 @@ async def ping_app() -> RetryResult[None]:
             try:
                 response = await session.get(
                     f'http://localhost:{local_http_server.port}/__python_test__/api/v1/ping',
-                timeout=aiohttp.ClientTimeout(total=1))
+                    timeout=aiohttp.ClientTimeout(total=1))
             except aiohttp.ClientError as error:
                 return Retry(cause=error)
             if not response.ok:
diff --git a/tests/test_observe_events.py b/tests/test_observe_events.py
@@ -59,7 +59,7 @@ async def test_supports_authorization(
 
             total_store_items_count = 4
             if observed_items_count == total_store_items_count:
-                break 
+                break
 
     @staticmethod
     @pytest.mark.asyncio
@@ -338,31 +338,13 @@ async def test_throws_error_for_mutually_exclusive_options(
                 )
             ):
                 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
     async def test_throws_error_for_negative_lower_bound(
         prepared_database: Database
     ):
         client = prepared_database.with_authorization.client
-
         with pytest.raises(InvalidParameterError):
             async for _ in client.observe_events(
                 '/users',
@@ -418,6 +400,7 @@ async def test_throws_error_for_invalid_type_in_from_latest_event(
             ):
                 pass
 
+
 class TestObserveEventsWithMockServer:
 
     @staticmethod
@@ -433,7 +416,7 @@ def handle_observe_events(response: Response) -> Response:
 
             attach_handler('/api/v1/observe-events', 'POST', handle_observe_events)
 
-        client= await get_client(attach_handlers)
+        client = await get_client(attach_handlers)
 
         with pytest.raises(ServerError):
             async for _ in client.observe_events(
diff --git a/tests/test_read_events.py b/tests/test_read_events.py
@@ -136,7 +136,6 @@ async def test_read_events_from_a_subject_including_children(
             None
         )
 
-
     @staticmethod
     @pytest.mark.asyncio
     async def test_read_events_in_antichronological_order(
