python3-commons 0.4.0__py2.py3-none-any.whl → 0.5.1__py2.py3-none-any.whl

python3_commons/audit.py

@@ -1,7 +1,14 @@
+import asyncio
 import logging
 import tarfile
-from datetime import date, timedelta
+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
@@ -9,11 +16,62 @@ 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'):
-    today = date.today() - timedelta(days=1)
-    year = today.year
-    month = today.month
-    day = today.day
+    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 = []

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.dist-info → python3_commons-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-commons
-Version: 0.4.0
+Version: 0.5.1
 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.dist-info → python3_commons-0.5.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 python3_commons/__init__.py,sha256=h-KTJUaQ50E3RmkTn_GO88IRunmDTEpNc3ylpFvCTOc,339
-python3_commons/audit.py,sha256=UhjaUXzsTnDMdQAJfbZR4aFMieUf2jRgTkQjRbDVS9I,1601
+python3_commons/audit.py,sha256=n63-x3Segw7PjYvDak5RefMxQ8uC_IxtzmQr1L-VTaw,3571
 python3_commons/conf.py,sha256=vSXyFwXx2wb1uy8IffeeI-RoTqhUZs0RLSSG2OLc2ss,598
 python3_commons/db.py,sha256=qhaDIdzBWgFyeP_XPKfHZlYVlwS2bpBPYMv84yV6820,738
 python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
 python3_commons/helpers.py,sha256=wI7afc-8o-SBpLBHQnWXiudw456EAVKguJaeZiSNXwE,1377
-python3_commons/object_storage.py,sha256=9N_gWtEuS3cYLOObevGR1F9ARecpuKZ9dMWHyIngMT0,4320
+python3_commons/object_storage.py,sha256=xQy8Jzb0_nS6vxQ6RyNA5FV_ql3k88iZQ5RPWJJiBUo,3798
 python3_commons/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python3_commons/logging/filters.py,sha256=fuyjXZAUm-i2MNrxvFYag8F8Rr27x8W8MdV3ke6miSs,175
 python3_commons/logging/formatter.py,sha256=UXmmh1yd5Kc2dpvSHn6uCWLDWE2LMjlYAaH8cg3siV4,720
@@ -12,9 +12,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=P7CZoRTBeDtgALT5GTOZVCNM_3snOfCnfh5S3zcCIEY,1679
 python3_commons/serializers/msgspec.py,sha256=ZrfQWBz_67t3yjU_S6avnRJZzYN-HFzef2qGB5W21KI,2023
-python3_commons-0.4.0.dist-info/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.4.0.dist-info/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.4.0.dist-info/METADATA,sha256=mhH-cOFeu0Cw0o67I6XnuhPszqgDgLdQdjM9SynTchA,918
-python3_commons-0.4.0.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-python3_commons-0.4.0.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.4.0.dist-info/RECORD,,
+python3_commons-0.5.1.dist-info/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.5.1.dist-info/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.5.1.dist-info/METADATA,sha256=GZJx_6XasOPWyBd2YyafDhSB20ISvnkFwjXI8sakZJo,974
+python3_commons-0.5.1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+python3_commons-0.5.1.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.5.1.dist-info/RECORD,,