python3-commons 0.9.12__py3-none-any.whl → 0.9.13__py3-none-any.whl

python3_commons/api_client.py

@@ -8,6 +8,7 @@ from typing import AsyncGenerator, Literal, Mapping, Sequence
 from uuid import uuid4
 
 from aiohttp import ClientResponse, ClientSession, ClientTimeout, client_exceptions
+from aiohttp.abc import URL
 
 from python3_commons import audit
 from python3_commons.conf import s3_settings
@@ -57,12 +58,15 @@ async def request(
 
     if audit_name:
         curl_request = None
+        cookies = client.cookie_jar.filter_cookies(URL(base_url))
 
         if method == 'get':
             if headers or query:
-                curl_request = request_to_curl(url, query, method, headers)
+                curl_request = request_to_curl(url=url, query=query, method=method, headers=headers, cookies=cookies)
         else:
-            curl_request = request_to_curl(url, query, method, headers, json, data)
+            curl_request = request_to_curl(
+                url=url, query=query, method=method, headers=headers, cookies=cookies, json=json, data=data
+            )
 
         if curl_request:
             await audit.write_audit_data(
@@ -70,6 +74,7 @@ async def request(
                 f'{date_path}/{audit_name}/{uri_path}/{method}_{timestamp}_{request_id}_request.txt',
                 curl_request.encode('utf-8'),
             )
+
     client_method = getattr(client, method)
 
     logger.debug(f'Requesting {method} {url}')

python3_commons/audit.py

@@ -1,11 +1,7 @@
 import asyncio
 import io
 import logging
-import tarfile
-from bz2 import BZ2Compressor
-from collections import deque
-from datetime import UTC, datetime, timedelta
-from typing import AsyncGenerator
+from datetime import UTC, datetime
 from uuid import uuid4
 
 from lxml import etree
@@ -18,104 +14,127 @@ from python3_commons.conf import S3Settings, s3_settings
 logger = logging.getLogger(__name__)
 
 
-class GeneratedStream(io.BytesIO):
-    def __init__(self, generator: AsyncGenerator[bytes], *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.generator = generator
-
-    def read(self, size: int = -1):
-        if size < 0:
-            while True:
-                try:
-                    chunk = anext(self.generator)
-                except StopIteration:
-                    break
-                else:
-                    self.write(chunk)
-        else:
-            total_written_size = 0
-
-            while total_written_size < size:
-                try:
-                    chunk = anext(self.generator)
-                except StopIteration:
-                    break
-                else:
-                    total_written_size += self.write(chunk)
-
-        self.seek(0)
-
-        if chunk := super().read(size):
-            pos = self.tell()
-
-            buf = self.getbuffer()
-            unread_data_size = len(buf) - pos
-
-            if unread_data_size > 0:
-                buf[:unread_data_size] = buf[pos : pos + unread_data_size]
-
-            del buf
-
-            self.seek(0)
-            self.truncate(unread_data_size)
-
-        return chunk
-
-    def readable(self):
-        return True
-
-
-async def generate_archive(
-    objects: AsyncGenerator[tuple[str, datetime, bytes]], chunk_size: int = 4096
-) -> AsyncGenerator[bytes]:
-    buffer = deque()
-
-    with tarfile.open(fileobj=buffer, mode='w') as archive:
-        async for name, last_modified, content in objects:
-            logger.info(f'Adding {name} to archive')
-            info = tarfile.TarInfo(name)
-            info.size = len(content)
-            info.mtime = int(last_modified.timestamp())
-            archive.addfile(info, io.BytesIO(content))
-
-            buffer_length = buffer.tell()
-
-            while buffer_length >= chunk_size:
-                buffer.seek(0)
-                chunk = buffer.read(chunk_size)
-                chunk_len = len(chunk)
-
-                if not chunk:
-                    break
-
-                yield chunk
-
-                buffer.seek(0)
-                buffer.truncate(chunk_len)
-                buffer.seek(0, io.SEEK_END)
-                buffer_length = buffer.tell()
-
-    while True:
-        chunk = buffer.read(chunk_size)
-
-        if not chunk:
-            break
-
-        yield chunk
-
-    buffer.seek(0)
-    buffer.truncate(0)
-
-
-async def generate_bzip2(chunks: AsyncGenerator[bytes]) -> AsyncGenerator[bytes]:
-    compressor = BZ2Compressor()
-
-    async for chunk in chunks:
-        if compressed_chunk := compressor.compress(chunk):
-            yield compressed_chunk
-
-    if compressed_chunk := compressor.flush():
-        yield compressed_chunk
+# class GeneratedStream(io.BytesIO):
+#     def __init__(self, generator: AsyncGenerator[bytes], *args, **kwargs):
+#         super().__init__(*args, **kwargs)
+#         self.generator = generator
+#
+#     def read(self, size: int = -1):
+#         if size < 0:
+#             while True:
+#                 try:
+#                     chunk = anext(self.generator)
+#                 except StopIteration:
+#                     break
+#                 else:
+#                     self.write(chunk)
+#         else:
+#             total_written_size = 0
+#
+#             while total_written_size < size:
+#                 try:
+#                     chunk = anext(self.generator)
+#                 except StopIteration:
+#                     break
+#                 else:
+#                     total_written_size += self.write(chunk)
+#
+#         self.seek(0)
+#
+#         if chunk := super().read(size):
+#             pos = self.tell()
+#
+#             buf = self.getbuffer()
+#             unread_data_size = len(buf) - pos
+#
+#             if unread_data_size > 0:
+#                 buf[:unread_data_size] = buf[pos : pos + unread_data_size]
+#
+#             del buf
+#
+#             self.seek(0)
+#             self.truncate(unread_data_size)
+#
+#         return chunk
+#
+#     def readable(self):
+#         return True
+#
+#
+# async def generate_archive(
+#     objects: AsyncGenerator[tuple[str, datetime, bytes]], chunk_size: int = 4096
+# ) -> AsyncGenerator[bytes]:
+#     buffer = deque()
+#
+#     with tarfile.open(fileobj=buffer, mode='w') as archive:
+#         async for name, last_modified, content in objects:
+#             logger.info(f'Adding {name} to archive')
+#             info = tarfile.TarInfo(name)
+#             info.size = len(content)
+#             info.mtime = int(last_modified.timestamp())
+#             archive.addfile(info, io.BytesIO(content))
+#
+#             buffer_length = buffer.tell()
+#
+#             while buffer_length >= chunk_size:
+#                 buffer.seek(0)
+#                 chunk = buffer.read(chunk_size)
+#                 chunk_len = len(chunk)
+#
+#                 if not chunk:
+#                     break
+#
+#                 yield chunk
+#
+#                 buffer.seek(0)
+#                 buffer.truncate(chunk_len)
+#                 buffer.seek(0, io.SEEK_END)
+#                 buffer_length = buffer.tell()
+#
+#     while True:
+#         chunk = buffer.read(chunk_size)
+#
+#         if not chunk:
+#             break
+#
+#         yield chunk
+#
+#     buffer.seek(0)
+#     buffer.truncate(0)
+#
+#
+# async def generate_bzip2(chunks: AsyncGenerator[bytes]) -> AsyncGenerator[bytes]:
+#     compressor = BZ2Compressor()
+#
+#     async for chunk in chunks:
+#         if compressed_chunk := compressor.compress(chunk):
+#             yield compressed_chunk
+#
+#     if compressed_chunk := compressor.flush():
+#         yield compressed_chunk
+#
+
+# async def archive_audit_data(root_path: str = 'audit'):
+#     now = datetime.now(tz=UTC) - timedelta(days=1)
+#     year = now.year
+#     month = now.month
+#     day = now.day
+#     bucket_name = s3_settings.s3_bucket
+#     date_path = object_storage.get_absolute_path(f'{root_path}/{year}/{month:02}/{day:02}')
+#
+#     if objects := object_storage.get_objects(bucket_name, date_path, recursive=True):
+#         logger.info(f'Compacting files in: {date_path}')
+#
+#         generator = generate_archive(objects, chunk_size=900_000)
+#         bzip2_generator = generate_bzip2(generator)
+#         archive_stream = GeneratedStream(bzip2_generator)
+#
+#         archive_path = object_storage.get_absolute_path(f'audit/.archive/{year}_{month:02}_{day:02}.tar.bz2')
+#         await object_storage.put_object(bucket_name, archive_path, archive_stream, -1, part_size=5 * 1024 * 1024)
+#
+#         if errors := await object_storage.remove_objects(bucket_name, date_path):
+#             for error in errors:
+#                 logger.error(f'Failed to delete object in {bucket_name=}: {error}')
 
 
 async def write_audit_data(settings: S3Settings, key: str, data: bytes):
@@ -132,29 +151,6 @@ async def write_audit_data(settings: S3Settings, key: str, data: bytes):
         logger.debug(f'S3 is not configured, not storing object in storage: {key}')
 
 
-async def archive_audit_data(root_path: str = 'audit'):
-    now = datetime.now(tz=UTC) - timedelta(days=1)
-    year = now.year
-    month = now.month
-    day = now.day
-    bucket_name = s3_settings.s3_bucket
-    date_path = object_storage.get_absolute_path(f'{root_path}/{year}/{month:02}/{day:02}')
-
-    if objects := object_storage.get_objects(bucket_name, date_path, recursive=True):
-        logger.info(f'Compacting files in: {date_path}')
-
-        generator = generate_archive(objects, chunk_size=900_000)
-        bzip2_generator = generate_bzip2(generator)
-        archive_stream = GeneratedStream(bzip2_generator)
-
-        archive_path = object_storage.get_absolute_path(f'audit/.archive/{year}_{month:02}_{day:02}.tar.bz2')
-        await object_storage.put_object(bucket_name, archive_path, archive_stream, -1, part_size=5 * 1024 * 1024)
-
-        if errors := await object_storage.remove_objects(bucket_name, date_path):
-            for error in errors:
-                logger.error(f'Failed to delete object in {bucket_name=}: {error}')
-
-
 class ZeepAuditPlugin(Plugin):
     def __init__(self, audit_name: str = 'zeep'):
         super().__init__()

python3_commons/helpers.py

@@ -8,6 +8,7 @@ from abc import ABCMeta
 from collections import defaultdict
 from datetime import date, datetime, timedelta
 from decimal import ROUND_HALF_UP, Decimal
+from http.cookies import BaseCookie, SimpleCookie
 from json import dumps
 from typing import Literal, Mapping, Sequence
 from urllib.parse import urlencode
@@ -86,6 +87,7 @@ def request_to_curl(
     query: Mapping | None = None,
     method: Literal['get', 'post', 'put', 'patch', 'options', 'head', 'delete'] = 'get',
     headers: Mapping | None = None,
+    cookies: BaseCookie[str] | None = None,
     json: Mapping | Sequence | str | None = None,
     data: bytes | None = None,
 ) -> str:
@@ -100,6 +102,14 @@ def request_to_curl(
             curl_cmd.append('-H')
             curl_cmd.append(shlex.quote(header_line))
 
+    if cookies:
+        if isinstance(cookies, SimpleCookie):
+            cookie_str = '; '.join(f'{morsel.key}={morsel.value}' for morsel in cookies.values())
+        else:
+            cookie_str = '; '.join(f'{k}={v}' for k, v in cookies.items())
+
+        curl_cmd.extend(['-b', shlex.quote(cookie_str)])
+
     if json:
         curl_cmd.append('-H')
         curl_cmd.append(shlex.quote('Content-Type: application/json'))

{python3_commons-0.9.12.dist-info → python3_commons-0.9.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.9.12
+Version: 0.9.13
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -12,7 +12,7 @@ Requires-Python: ==3.13.*
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: aiobotocore~=2.24.0
+Requires-Dist: aiobotocore~=2.24.2
 Requires-Dist: aiohttp[speedups]~=3.12.15
 Requires-Dist: asyncpg~=0.30.0
 Requires-Dist: fastapi-users-db-sqlalchemy~=7.0.0

{python3_commons-0.9.12.dist-info → python3_commons-0.9.13.dist-info}/RECORD

@@ -1,11 +1,11 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
-python3_commons/api_client.py,sha256=zBZJTbRNnZxzhMSF6d1DzJAS5F3jgoitmnynv2n9U0M,4729
-python3_commons/audit.py,sha256=-jYGjkQ2r8rg3gj-C-5uTQ1lXhK3dRXkktonZxOs1PM,5994
+python3_commons/api_client.py,sha256=yqwwtxakpLWjJtu4LVmj0BtZUuX0CyGk0lKFWu_uECU,4948
+python3_commons/audit.py,sha256=p4KRKt0ogkHhJSulg6j5GU-JKBBE903H2c0nuW16GtM,6083
 python3_commons/auth.py,sha256=fINE7zeq-oaEk2lwkdP1KOhfCpcIBaC8P9UzXQI37J0,2922
 python3_commons/cache.py,sha256=lf27LTD4Z9Iqi5GaK8jH8UC0cL9sHH8wicZ88YDp6Mg,7725
 python3_commons/conf.py,sha256=DYFA2_n7W40MBbpaNWv4iTWh7-GPsGU6Ilygz32tHhs,2397
 python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
-python3_commons/helpers.py,sha256=lmVXsqaFcOFdQT_ZYz4onrbLYfxBn7_H4KzTLwOV1qM,3699
+python3_commons/helpers.py,sha256=PoaTYzygtIqDhrukyvqN_Fz_c2Fm5EAA6t8CPx5rwfk,4101
 python3_commons/object_storage.py,sha256=4-nWfcYF9Uj6bx3aVM6a4P5Ac2fFCTEaDfejDzn63Qk,6441
 python3_commons/permissions.py,sha256=bhjTp-tq-oaTGFMHNnSBlcVX5XQCTL0nWcu6SdPEAB4,1555
 python3_commons/db/__init__.py,sha256=5nArsGm17e-pelpOwAeBKy2n_Py20XqklZsNgkcJ-DQ,2947
@@ -21,9 +21,9 @@ python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 python3_commons/serializers/json.py,sha256=91UaXLGKGj0yPyrnuMeNrkG2GuPUgcgAsmIokUgEwpU,808
 python3_commons/serializers/msgpack.py,sha256=WrvaPE187shSK8zkH4UHHMimEZNMv9RaDSwsBE2HlCw,1269
 python3_commons/serializers/msgspec.py,sha256=0AliXlEl5sewi0UENjI8St5ZScXE5DNRERKzqWKy2Ps,2674
-python3_commons-0.9.12.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.9.12.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.9.12.dist-info/METADATA,sha256=gAGSfBJlw410-pIbCXPPx4GsFRoQjsk5xAhyJlCbPZM,1134
-python3_commons-0.9.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_commons-0.9.12.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.9.12.dist-info/RECORD,,
+python3_commons-0.9.13.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.9.13.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.9.13.dist-info/METADATA,sha256=noOYsttBcdoGBTps8zqTjZomvxGq28CgmgF4ZYevllE,1134
+python3_commons-0.9.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_commons-0.9.13.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.9.13.dist-info/RECORD,,