python3-commons 0.4.0__tar.gz → 0.5.0__tar.gz

{python3_commons-0.4.0/src/python3_commons.egg-info → python3_commons-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-commons
-Version: 0.4.0
+Version: 0.5.0
 Summary: Re-usable Python3 code
 Home-page: https://github.com/kamikaze/python3-commons
 Author: Oleg Korsak
@@ -15,11 +15,13 @@ Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: asyncpg==0.29.0
+Requires-Dist: lxml==5.2.2
 Requires-Dist: minio==7.2.7
 Requires-Dist: msgpack==1.0.8
 Requires-Dist: msgspec==0.18.6
 Requires-Dist: pydantic[email]==2.7.2
 Requires-Dist: pydantic-settings==2.2.1
+Requires-Dist: zeep==4.2.1
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"

{python3_commons-0.4.0 → python3_commons-0.5.0}/requirements.txt

@@ -1,6 +1,8 @@
 asyncpg==0.29.0
+lxml==5.2.2
 minio==7.2.7
 msgpack==1.0.8
 msgspec==0.18.6
 pydantic[email]==2.7.2
 pydantic-settings==2.2.1
+zeep==4.2.1

{python3_commons-0.4.0 → python3_commons-0.5.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = python3-commons
-version = 0.4.0
+version = 0.5.0
 description = Re-usable Python3 code
 author = Oleg Korsak
 author_email = kamikaze.is.waiting.you@gmail.com
@@ -24,11 +24,13 @@ package_dir =
 setup_requires = pyscaffold>=3.2a0,<3.3a0
 install_requires = 
 	asyncpg==0.29.0
+	lxml==5.2.2
 	minio==7.2.7
 	msgpack==1.0.8
 	msgspec==0.18.6
 	pydantic[email]==2.7.2
 	pydantic-settings==2.2.1
+	zeep==4.2.1
 python_requires = >=3.12
 
 [options.packages.find]

python3_commons-0.5.0/src/python3_commons/audit.py

@@ -0,0 +1,102 @@
+import asyncio
+import logging
+import tarfile
+from datetime import date, datetime, timedelta, UTC
+from io import BytesIO
+from uuid import uuid4
+from zoneinfo import ZoneInfo
+
+from lxml import etree
+from zeep.plugins import Plugin
+from zeep.wsdl.definitions import AbstractOperation
+
+from python3_commons import object_storage
+from python3_commons.conf import s3_settings
+
+logger = logging.getLogger(__name__)
+
+
+class ZeepAuditPlugin(Plugin):
+    def __init__(self, audit_name: str = 'zeep'):
+        super().__init__()
+        self.audit_name = audit_name
+
+    @staticmethod
+    def store_audit_in_s3(envelope, operation: AbstractOperation, direction: str):
+        xml = etree.tostring(envelope, encoding='UTF-8', pretty_print=True)
+        now = datetime.now(tz=UTC)
+        date_path = now.strftime('%Y/%m/%d')
+        timestamp = now.strftime('%H%M%S')
+        coro = object_storage.store_bytes_in_s3(
+            settings, xml,
+            f'audit/{date_path}/{self.audit_name}/{operation.name}/{timestamp}_{str(uuid4())[-12:]}_{direction}.xml'
+        )
+
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            loop = None
+
+        if loop and loop.is_running():
+            loop.create_task(coro)
+        else:
+            asyncio.run(coro)
+
+    def ingress(self, envelope, http_headers, operation: AbstractOperation):
+        self.store_audit_in_s3(envelope, operation, 'ingress')
+
+        return envelope, http_headers
+
+    def egress(self, envelope, http_headers, operation: AbstractOperation, binding_options):
+        self.store_audit_in_s3(envelope, operation, 'egress')
+
+        return envelope, http_headers
+
+
+async def write_audit_data(settings: S3Settings, key: str, data: bytes):
+    if settings.s3_secret_access_key:
+        try:
+            client = get_s3_client(settings)
+
+            client.put_object(settings.s3_bucket, key, io.BytesIO(data), len(data))
+        except S3Error as e:
+            logger.error(f'Failed storing object in storage: {e}')
+        else:
+            logger.debug(f'Stored object in storage: {key}')
+    else:
+        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
+    fo = BytesIO()
+    object_names = []
+    date_path = object_storage.get_absolute_path(f'{root_path}/{year}/{month:02}/{day:02}')
+
+    with tarfile.open(fileobj=fo, mode='w|bz2') as archive:
+        if objects := object_storage.get_objects(bucket_name, date_path, recursive=True):
+            logger.info(f'Compacting files in: {date_path}')
+
+            for name, last_modified, content in objects:
+                info = tarfile.TarInfo(name)
+                info.size = len(content)
+                info.mtime = last_modified.timestamp()
+                archive.addfile(info, BytesIO(content))
+                object_names.append(name)
+
+    fo.seek(0)
+
+    if object_names:
+        archive_path = object_storage.get_absolute_path(
+            f'.archive/{year}_{month:02}/{year}_{month:02}_{day:02}.tar.bz2')
+        object_storage.put_object(bucket_name, archive_path, fo, fo.getbuffer().nbytes)
+
+        if errors := object_storage.remove_objects(bucket_name, object_names=object_names):
+            for error in errors:
+                logger.error(f'Failed to delete object in {bucket_name=}: {error}')
+    else:
+        logger.info('No objects to archive found.')

{python3_commons-0.4.0 → python3_commons-0.5.0}/src/python3_commons/object_storage.py

@@ -125,17 +125,3 @@ def remove_objects(bucket_name: str, prefix: str = None,
     errors = s3_client.remove_objects(bucket_name, delete_object_list)
 
     return errors
-
-
-async def store_bytes_in_s3(settings: S3Settings, data: bytes, key: str):
-    if settings.s3_secret_access_key:
-        try:
-            client = get_s3_client(settings)
-
-            client.put_object(settings.s3_bucket, key, io.BytesIO(data), len(data))
-        except S3Error as e:
-            logger.error(f'Failed storing object in storage: {e}')
-        else:
-            logger.debug(f'Stored object in storage: {key}')
-    else:
-        logger.debug(f'S3 is not configured, not storing object in storage: {key}')

{python3_commons-0.4.0 → python3_commons-0.5.0/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-commons
-Version: 0.4.0
+Version: 0.5.0
 Summary: Re-usable Python3 code
 Home-page: https://github.com/kamikaze/python3-commons
 Author: Oleg Korsak
@@ -15,11 +15,13 @@ Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: asyncpg==0.29.0
+Requires-Dist: lxml==5.2.2
 Requires-Dist: minio==7.2.7
 Requires-Dist: msgpack==1.0.8
 Requires-Dist: msgspec==0.18.6
 Requires-Dist: pydantic[email]==2.7.2
 Requires-Dist: pydantic-settings==2.2.1
+Requires-Dist: zeep==4.2.1
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"

{python3_commons-0.4.0 → python3_commons-0.5.0}/src/python3_commons.egg-info/requires.txt

@@ -1,9 +1,11 @@
 asyncpg==0.29.0
+lxml==5.2.2
 minio==7.2.7
 msgpack==1.0.8
 msgspec==0.18.6
 pydantic[email]==2.7.2
 pydantic-settings==2.2.1
+zeep==4.2.1
 
 [testing]
 pytest

python3_commons-0.4.0/src/python3_commons/audit.py

@@ -1,44 +0,0 @@
-import logging
-import tarfile
-from datetime import date, timedelta
-from io import BytesIO
-
-from python3_commons import object_storage
-from python3_commons.conf import s3_settings
-
-logger = logging.getLogger(__name__)
-
-
-async def archive_audit_data(root_path: str = 'audit'):
-    today = date.today() - timedelta(days=1)
-    year = today.year
-    month = today.month
-    day = today.day
-    bucket_name = s3_settings.s3_bucket
-    fo = BytesIO()
-    object_names = []
-    date_path = object_storage.get_absolute_path(f'{root_path}/{year}/{month:02}/{day:02}')
-
-    with tarfile.open(fileobj=fo, mode='w|bz2') as archive:
-        if objects := object_storage.get_objects(bucket_name, date_path, recursive=True):
-            logger.info(f'Compacting files in: {date_path}')
-
-            for name, last_modified, content in objects:
-                info = tarfile.TarInfo(name)
-                info.size = len(content)
-                info.mtime = last_modified.timestamp()
-                archive.addfile(info, BytesIO(content))
-                object_names.append(name)
-
-    fo.seek(0)
-
-    if object_names:
-        archive_path = object_storage.get_absolute_path(
-            f'.archive/{year}_{month:02}/{year}_{month:02}_{day:02}.tar.bz2')
-        object_storage.put_object(bucket_name, archive_path, fo, fo.getbuffer().nbytes)
-
-        if errors := object_storage.remove_objects(bucket_name, object_names=object_names):
-            for error in errors:
-                logger.error(f'Failed to delete object in {bucket_name=}: {error}')
-    else:
-        logger.info('No objects to archive found.')