zenx 0.9.8__tar.gz → 0.10.0__tar.gz

{zenx-0.9.8 → zenx-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zenx
-Version: 0.9.8
+Version: 0.10.0
 Summary: mini-framework
 Requires-Python: >=3.12
 Requires-Dist: curl-cffi>=0.12.0

{zenx-0.9.8 → zenx-0.10.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zenx"
-version = "0.9.8"
+version = "0.10.0"
 description = "mini-framework"
 requires-python = ">=3.12"
 dependencies = [

{zenx-0.9.8 → zenx-0.10.0}/zenx/clients/http.py

@@ -12,7 +12,13 @@ import orjson
 from structlog import BoundLogger
 
 from zenx.settings import Settings
-from zenx.utils import get_time
+from zenx.utils import get_time, get_uuid
+
+@dataclass
+class SessionWrapper:
+    id: str
+    requests: int
+    _self: AsyncSession
 
 
 @dataclass
@@ -91,15 +97,24 @@ class CurlCffi(HttpClient):
         self._session_pool = asyncio.Queue(maxsize=settings.SESSION_POOL_SIZE)
         for _ in range(settings.SESSION_POOL_SIZE):
             impersonate = self._get_random_fingerprint()
-            self._session_pool.put_nowait(AsyncSession(max_clients=1, impersonate=impersonate))
+            obj = SessionWrapper(id=get_uuid(), requests=0, _self=AsyncSession(max_clients=1, impersonate=impersonate))
+            self._session_pool.put_nowait(obj)
         self.logger.debug("created", sessions=self._session_pool.qsize(), client=self.name)
 
         
     def _get_random_fingerprint(self) -> str:
         chosen_fingerprint = random.choice(self._fingerprints) 
         return chosen_fingerprint
-
     
+    
+    async def _replace_session(self, existing_session: SessionWrapper) -> None:
+        self.logger.debug("discarded", session_id=existing_session.id, requests=existing_session.requests, client=self.name)
+        await existing_session._self.close()
+        obj = SessionWrapper(id=get_uuid(), requests=0, _self=AsyncSession(max_clients=1, impersonate=self._get_random_fingerprint()))
+        self._session_pool.put_nowait(obj)
+        self.logger.debug("replaced", old_session=existing_session.id, new_session=obj.id, client=self.name)
+
+
     async def request(
         self,
         url: str,
@@ -139,11 +154,11 @@ class CurlCffi(HttpClient):
             # each session has its own fingerprint set
             kwargs.pop("impersonate", None)
             self.logger.debug("acquire_session", client=self.name)
-            session: AsyncSession = await self._session_pool.get()
-            self.logger.debug("acquired_session", impersonate=session.impersonate, client=self.name)
+            session_wrapper: SessionWrapper = await self._session_pool.get()
+            self.logger.debug("acquired_session", session_id=session_wrapper.id, client=self.name)
             try:
                 req_at = get_time()
-                response: CurlResponse = await asyncio.wait_for(session.request(
+                response: CurlResponse = await asyncio.wait_for(session_wrapper._self.request(
                     url=url, 
                     method=method, 
                     headers=headers, 
@@ -153,15 +168,21 @@ class CurlCffi(HttpClient):
                 ), timeout=10)
                 recv_at = get_time()
                 latency = recv_at - req_at
-                self.logger.debug("response", status=response.status_code, url=url, impersonate=session.impersonate, client=self.name, requested_at=req_at, responded_at=recv_at, latency_ms=latency)
+                session_wrapper.requests +=1
+                self.logger.debug("response", status=response.status_code, url=url, session_id=session_wrapper.id, requests=session_wrapper.requests, client=self.name, requested_at=req_at, responded_at=recv_at, latency_ms=latency)
             except TimeoutError:
-                self.logger.error("timeout", url=url, impersonate=session.impersonate, client=self.name)
+                self.logger.error("timeout", url=url, client=self.name)
+                await self._replace_session(session_wrapper)
                 raise
             except Exception:
-                self.logger.exception("request", url=url, client=self.name)
+                self.logger.error("request", url=url, client=self.name)
+                await self._replace_session(session_wrapper)
                 raise
-            finally:
-                self._session_pool.put_nowait(session)
+            else:
+                if response.status_code != 200:
+                    await self._replace_session(session_wrapper)
+                else:
+                    self._session_pool.put_nowait(session_wrapper)
 
         return Response(
             url=response.url,
@@ -178,6 +199,6 @@ class CurlCffi(HttpClient):
         count = self._session_pool.qsize()
         async with asyncio.TaskGroup() as tg:
             while not self._session_pool.empty():
-                session: AsyncSession = await self._session_pool.get()
-                tg.create_task(session.close())
+                session_wrapper: SessionWrapper = await self._session_pool.get()
+                tg.create_task(session_wrapper._self.close())
         self.logger.debug("closed", sessions=count, client=self.name)

{zenx-0.9.8 → zenx-0.10.0}/zenx/utils.py

@@ -1,4 +1,5 @@
 import time
+import uuid
 from typing import Dict
 import functools
 
@@ -19,3 +20,6 @@ def log_processing_time(func):
         return result
     return wrapper
 
+
+def get_uuid() -> str:
+    return uuid.uuid4().hex

{zenx-0.9.8 → zenx-0.10.0}/zenx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zenx
-Version: 0.9.8
+Version: 0.10.0
 Summary: mini-framework
 Requires-Python: >=3.12
 Requires-Dist: curl-cffi>=0.12.0