python3-commons 0.6.11__tar.gz → 0.6.13__tar.gz

{python3_commons-0.6.11/src/python3_commons.egg-info → python3_commons-0.6.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: python3-commons
-Version: 0.6.11
+Version: 0.6.13
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License: gpl-3

{python3_commons-0.6.11 → python3_commons-0.6.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-commons"
-version = "0.6.11"
+version = "0.6.13"
 description = "Re-usable Python3 code"
 authors = [
     {name = "Oleg Korsak", email = "kamikaze.is.waiting.you@gmail.com"}

{python3_commons-0.6.11 → python3_commons-0.6.13}/src/python3_commons/api_client.py

@@ -2,9 +2,9 @@ from contextlib import asynccontextmanager
 from datetime import datetime, UTC
 from json import dumps
 from typing import AsyncGenerator, Literal, Mapping, Sequence
+from uuid import uuid4
 
-from aiohttp import ClientSession, client_exceptions
-from aiohttp.web_response import Response
+from aiohttp import ClientResponse, ClientSession, client_exceptions
 from pydantic import HttpUrl
 
 from python3_commons import audit
@@ -13,6 +13,26 @@ from python3_commons.helpers import request_to_curl
 from python3_commons.serializers.json import CustomJSONEncoder
 
 
+async def _store_response_for_audit(
+        response: ClientResponse,
+        audit_name: str,
+        uri_path: str,
+        method: str,
+        request_id: str
+):
+    response_text = await response.text()
+
+    now = datetime.now(tz=UTC)
+    date_path = now.strftime('%Y/%m/%d')
+    timestamp = now.strftime('%H%M%S_%f')
+
+    await audit.write_audit_data(
+        s3_settings,
+        f'{date_path}/{audit_name}/{uri_path}/{method}_{timestamp}_{request_id}_response.txt',
+        response_text.encode('utf-8')
+    )
+
+
 @asynccontextmanager
 async def request(
     client: ClientSession,
@@ -24,13 +44,14 @@ async def request(
     json: Mapping | Sequence | str | None = None,
     data: bytes | None = None,
     audit_name: str | None = None
-) -> AsyncGenerator[Response]:
+) -> AsyncGenerator[ClientResponse]:
     now = datetime.now(tz=UTC)
     date_path = now.strftime('%Y/%m/%d')
     timestamp = now.strftime('%H%M%S_%f')
+    request_id = str(uuid4())[-12:]
     uri_path = uri[:-1] if uri.endswith('/') else uri
     uri_path = uri_path[1:] if uri_path.startswith('/') else uri_path
-    url = f'{base_url}{uri}'
+    url = f'{u[:-1] if (u := str(base_url).endswith('/')) else u}{uri}'
 
     if audit_name:
         curl_request = None
@@ -44,7 +65,7 @@ async def request(
         if curl_request:
             await audit.write_audit_data(
                 s3_settings,
-                f'{date_path}/{audit_name}/{uri_path}/{method}_{timestamp}_request.txt',
+                f'{date_path}/{audit_name}/{uri_path}/{method}_{timestamp}_{request_id}_request.txt',
                 curl_request.encode('utf-8')
             )
     client_method = getattr(client, method)
@@ -52,6 +73,9 @@ async def request(
     try:
         if method == 'get':
             async with client_method(url, params=query) as response:
+                if audit_name:
+                    await _store_response_for_audit(response, audit_name, uri_path, method, request_id)
+
                 yield response
         else:
             if json:
@@ -63,6 +87,9 @@ async def request(
                     headers = {'Content-Type': 'application/json'}
 
             async with client_method(url, params=query, data=data, headers=headers) as response:
+                if audit_name:
+                    await _store_response_for_audit(response, audit_name, uri_path, method, request_id)
+
                 yield response
     except client_exceptions.ClientOSError as e:
         if e.errno == 32:

{python3_commons-0.6.11 → python3_commons-0.6.13/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: python3-commons
-Version: 0.6.11
+Version: 0.6.13
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License: gpl-3