remove inititalize and close

Author: atstaeff

eventsourcingdb/client.py

@@ -45,12 +45,6 @@ async def __aexit__(
     ) -> None:
         await self.__http_client.__aexit__(exc_type, exc_val, exc_tb)
 
-    async def initialize(self) -> None:
-        await self.__http_client.initialize()
-
-    async def close(self) -> None:
-        await self.__http_client.close()
-
     @property
     def http_client(self) -> HttpClient:
         return self.__http_client

eventsourcingdb/http_client/http_client.py

@@ -3,8 +3,6 @@
 import aiohttp
 from aiohttp import ClientSession
 
-from ..errors.custom_error import CustomError
-
 from .get_get_headers import get_get_headers
 from .get_post_headers import get_post_headers
 from .response import Response
@@ -21,7 +19,7 @@ def __init__(
         self.__session: ClientSession | None = None
 
     async def __aenter__(self):
-        await self.initialize()
+        await self.__initialize()
         return self
 
     async def __aexit__(
@@ -30,12 +28,12 @@ async def __aexit__(
         exc_val: BaseException | None = None,
         exc_tb: TracebackType | None = None,
     ) -> None:
-        await self.close()
+        await self.__close()
 
-    async def initialize(self) -> None:
+    async def __initialize(self) -> None:
         self.__session = aiohttp.ClientSession()
 
-    async def close(self):
+    async def __close(self):
         if self.__session is not None:
             await self.__session.close()
             self.__session = None
@@ -49,7 +47,7 @@ def join_segments(first: str, *rest: str) -> str:
 
     async def post(self, path: str, request_body: str) -> Response:
         if self.__session is None:
-            await self.initialize()
+            await self.__initialize()
 
         url_path = HttpClient.join_segments(self.__base_url, path)
         headers = get_post_headers(self.__api_token)
@@ -70,8 +68,7 @@ async def get(
         with_authorization: bool = True,
     ) -> Response:
         if self.__session is None:
-            raise CustomError(
-                "HTTP client session not initialized. Call initialize() before making requests.")
+            await self.__initialize()
 
         async def __request_executor() -> Response:
             url_path = HttpClient.join_segments(self.__base_url, path)

tests/conftest.py

@@ -6,10 +6,11 @@
 @pytest_asyncio.fixture
 async def database():
     testing_db = await Database.create()
-    yield testing_db
-
-    if testing_db is not None:
-        await testing_db.stop()
+    try:
+        yield testing_db
+    finally:
+        if testing_db is not None:
+            await testing_db.stop()
 
 
 class TestData:

tests/shared/database.py

@@ -35,13 +35,13 @@ def _create_container(cls, api_token, image_tag):
     @staticmethod
     async def _initialize_clients(container, api_token):
         with_authorization_client = container.get_client()
-        await with_authorization_client.initialize()
+        #await with_authorization_client.initialize()
 
         with_invalid_url_client = Client(
             base_url='http://localhost.invalid',
             api_token=api_token
         )
-        await with_invalid_url_client.initialize()
+        #await with_invalid_url_client.initialize()
 
         return with_authorization_client, with_invalid_url_client
 

tests/shared/start_local_http_server.py

@@ -73,6 +73,6 @@ def stop_server():
         f'http://localhost:{local_http_server.port}',
         'access-token',
     )
-    await client.initialize()
+    # await client.initialize()
 
     return client, stop_server