fix: Fix async constructors (#36)

* fix: Fix async constructors

* fix: Update import to be realtive

Author: dotKuro

eventsourcingdb_client_python/client.py

@@ -19,15 +19,12 @@
 
 
 class Client(AbstractBaseClient):
-    __create_key = object()
-
-    @classmethod
-    async def create(
-        cls,
+    def __init__(
+        self,
         base_url: str,
         access_token: str,
         options: ClientOptions = ClientOptions()
-    ) -> 'Client':
+    ):
         configuration = ClientConfiguration(
             base_url=base_url,
             timeout_seconds=options.timeout_seconds,
@@ -36,19 +33,10 @@ async def create(
             max_tries=options.max_tries
         )
 
-        http_client = await HttpClient.create(configuration)
-
-        return cls(Client.__create_key, http_client)
-
-    def __init__(
-        self,
-        create_key,
-        http_client: HttpClient
-    ):
-        assert create_key == Client.__create_key, \
-            'Client objects must be created using Client.create.'
+        self.__http_client = HttpClient(configuration)
 
-        self.__http_client = http_client
+    async def initialize(self) -> None:
+        await self.__http_client.initialize()
 
     async def close(self):
         await self.__http_client.close()

eventsourcingdb_client_python/event/source.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 
-from eventsourcingdb_client_python.event.event_candidate import EventCandidate
-from eventsourcingdb_client_python.event.tracing import TracingContext
+from ..event.tracing import TracingContext
+from ..event.event_candidate import EventCandidate
 
 
 @dataclass

eventsourcingdb_client_python/handlers/read_event_types/event_type.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import TypeVar
 
-from eventsourcingdb_client_python.errors.validation_error import ValidationError
+from ...errors.validation_error import ValidationError
 
 Self = TypeVar("Self", bound="EventType")
 

eventsourcingdb_client_python/http_client/http_client.py

@@ -24,30 +24,20 @@ class UninitializedError(CustomError):
 
 
 class HttpClient:
-    __create_key = object()
-
-    @classmethod
-    async def create(cls, client_configuration: ClientConfiguration) -> 'HttpClient':
-        session = aiohttp.ClientSession(
-            timeout=aiohttp.ClientTimeout(
-                connect=client_configuration.timeout_seconds,
-                sock_read=client_configuration.timeout_seconds
-            )
-        )
-
-        return cls(HttpClient.__create_key, client_configuration, session)
-
     def __init__(
         self,
-        create_key,
-        client_configuration: ClientConfiguration,
-        session: aiohttp.ClientSession
+        client_configuration: ClientConfiguration
     ):
-        assert create_key == HttpClient.__create_key, \
-            'HttpClient objects must be created using HttpClient.create.'
-
         self.__client_configuration: ClientConfiguration = client_configuration
-        self.__session: ClientSession = session
+        self.__session: ClientSession | None = None
+
+    async def initialize(self) -> None:
+        self.__session = aiohttp.ClientSession(
+            timeout=aiohttp.ClientTimeout(
+                connect=self.__client_configuration.timeout_seconds,
+                sock_read=self.__client_configuration.timeout_seconds
+            )
+        )
 
     async def close(self):
         if self.__session is not None:

tests/conftest.py

@@ -5,6 +5,7 @@
 from eventsourcingdb_client_python.event.source import Source
 from eventsourcingdb_client_python.event.tracing import TracingContext
 from eventsourcingdb_client_python.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 \
@@ -14,6 +15,10 @@
 pytest_plugins = ('pytest_asyncio', )
 
 
+def pytest_sessionstart():
+    build_database('tests/shared/docker/eventsourcingdb')
+
+
 @pytest_asyncio.fixture
 async def get_http_client():
     stop_server: StopServer | None = None

tests/shared/containerized_testing_database.py

@@ -32,7 +32,8 @@ async def create(
         container = image.run(command, True, True)
         exposed_port = container.get_exposed_port(3_000)
         base_url = f'http://127.0.0.1:{exposed_port}'
-        client = await Client.create(base_url, access_token=access_token, options=options)
+        client = Client(base_url, access_token=access_token, options=options)
+        await client.initialize()
 
         await client.ping()
 

tests/shared/database.py

@@ -35,8 +35,12 @@ async def create(cls) -> 'Database':
             ClientOptions()
         )
 
+        with_invalid_url_client = Client(
+            base_url='http://localhost.invalid', access_token=access_token
+        )
+        await with_invalid_url_client.initialize()
         with_invalid_url = TestingDatabase(
-            await Client.create(base_url='http://localhost.invalid', access_token=access_token)
+            with_invalid_url_client
         )
 
         return cls(Database.__create_key, with_authorization, with_invalid_url)

tests/shared/start_local_http_server.py

@@ -59,10 +59,11 @@ def stop_server():
         server.terminate()
         server.join()
 
-    client = await Client.create(
+    client = Client(
         f'http://localhost:{port}',
         'access-token',
         ClientOptions(max_tries=2)
     )
+    await client.initialize()
 
     return client, stop_server

tests/test_observe_events.py

@@ -13,7 +13,6 @@
     IfEventIsMissingDuringObserve
 from .conftest import TestData
 
-from .shared.build_database import build_database
 from .shared.database import Database
 from .shared.event.assert_event import assert_event
 from .shared.start_local_http_server import \
@@ -23,10 +22,6 @@
 
 
 class TestObserveEvents:
-    @classmethod
-    def setup_class(cls):
-        build_database('tests/shared/docker/eventsourcingdb')
-
     @staticmethod
     @pytest.mark.asyncio
     async def test_throws_error_if_server_is_not_reachable(

tests/test_ping.py

@@ -5,7 +5,6 @@
 
 from eventsourcingdb_client_python.client import Client
 from eventsourcingdb_client_python.errors.server_error import ServerError
-from .shared.build_database import build_database
 from .shared.database import Database
 from .shared.start_local_http_server import \
     AttachHandler, \
@@ -14,12 +13,6 @@
 
 
 class TestPing:
-    database: Database
-
-    @classmethod
-    def setup_class(cls):
-        build_database('tests/shared/docker/eventsourcingdb')
-
     @staticmethod
     @pytest.mark.asyncio
     async def test_throws_no_error_if_server_is_reachable(database: Database):