python3-commons 0.6.10__py3-none-any.whl → 0.6.12__py3-none-any.whl

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
-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,10 +44,11 @@ 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}'
@@ -44,22 +65,38 @@ 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)
 
-    if method == 'get':
-        async with client_method(url, params=query) as response:
-            yield response
-    else:
-        if json:
-            data = dumps(json, cls=CustomJSONEncoder).encode('utf-8')
+    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:
+                data = dumps(json, cls=CustomJSONEncoder).encode('utf-8')
+
+                if headers:
+                    headers = {**headers, 'Content-Type': 'application/json'}
+                else:
+                    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)
 
-            if headers:
-                headers = {**headers, 'Content-Type': 'application/json'}
-            else:
-                headers = {'Content-Type': 'application/json'}
+                yield response
+    except client_exceptions.ClientOSError as e:
+        if e.errno == 32:
+            raise ConnectionResetError('Broken pipe') from e
+        elif e.errno == 104:
+            raise ConnectionResetError('Connection reset by peer') from e
 
-        async with client_method(url, params=query, data=data, headers=headers) as response:
-            yield response
+        raise
+    except client_exceptions.ServerDisconnectedError as e:
+        raise ConnectionResetError('Server disconnected') from e

{python3_commons-0.6.10.dist-info → python3_commons-0.6.12.dist-info}/METADATA

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

{python3_commons-0.6.10.dist-info → python3_commons-0.6.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
-python3_commons/api_client.py,sha256=bfAy3HoN3Olo5dlhZAm3beTNIcya3mJ4z0vGYQa-vao,2219
+python3_commons/api_client.py,sha256=ZUgqqTHUuGL1a6-xenLV7OTIxpdMI2StwdmvHjZCLek,3518
 python3_commons/audit.py,sha256=DMQ-nrWSs0qilD7wkz_8PV4jXcee75O8FgAm2YIuOiY,6256
 python3_commons/conf.py,sha256=qm2a2yWOhfawicBPjWnUett8TrsMtoyQXDxEJ_N-v-Y,637
 python3_commons/db.py,sha256=qhaDIdzBWgFyeP_XPKfHZlYVlwS2bpBPYMv84yV6820,738
@@ -13,9 +13,9 @@ python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 python3_commons/serializers/json.py,sha256=P288wWz9ic38QWEMrpp_uwKPYkQiOgvE1cI4WZn6ZCg,808
 python3_commons/serializers/msgpack.py,sha256=tzIGGyDL3UpZnnouCtnxuYDx6InKM_C3PP1N4PN8wd4,1269
 python3_commons/serializers/msgspec.py,sha256=FuZVqOLJb0-lEKrs7dtjhwEbHIpfMUk5yu1hD64zRdc,2038
-python3_commons-0.6.10.dist-info/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.6.10.dist-info/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.6.10.dist-info/METADATA,sha256=neGGKla_09MXjhoGJMQt3S1HQARBXaF8YI4etSbEi9c,986
-python3_commons-0.6.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-python3_commons-0.6.10.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.6.10.dist-info/RECORD,,
+python3_commons-0.6.12.dist-info/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.6.12.dist-info/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.6.12.dist-info/METADATA,sha256=qpV7yFXEO1_wjMu7RA8X1-Lvc7JT-T4S6em8pGuzYVQ,986
+python3_commons-0.6.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+python3_commons-0.6.12.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.6.12.dist-info/RECORD,,