python3-commons 0.18.0__tar.gz → 0.18.1__tar.gz

{python3_commons-0.18.0/src/python3_commons.egg-info → python3_commons-0.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.18.0
+Version: 0.18.1
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -19,7 +19,6 @@ Provides-Extra: all
 Requires-Dist: python3_commons[api-client,audit,authn,authz,cache,database,object-storage,soap-client]; extra == "all"
 Provides-Extra: api-client
 Requires-Dist: aiohttp[speedups]<3.15.0,>=3.13.5; extra == "api-client"
-Requires-Dist: lxml~=6.1.0; extra == "api-client"
 Requires-Dist: python3_commons[object-storage]; extra == "api-client"
 Provides-Extra: audit
 Requires-Dist: lxml~=6.1.0; extra == "audit"

{python3_commons-0.18.0 → python3_commons-0.18.1}/pyproject.toml

@@ -29,7 +29,6 @@ all = [
 ]
 api-client = [
     "aiohttp[speedups]>=3.13.5,<3.15.0",
-    "lxml~=6.1.0",
     "python3_commons[object-storage]"
 ]
 audit = [

python3_commons-0.18.1/src/python3_commons/audit.py

@@ -0,0 +1,79 @@
+import asyncio
+import io
+import logging
+from datetime import UTC, datetime
+from typing import TYPE_CHECKING
+from uuid import uuid4
+
+try:
+    from lxml import etree
+    from zeep.plugins import HistoryPlugin, Plugin
+except ImportError as e:
+    msg = 'Install python3-commons[audit] to use this feature'
+
+    raise RuntimeError(msg) from e
+
+from python3_commons import object_storage
+from python3_commons.conf import s3_settings
+
+if TYPE_CHECKING:
+    from zeep import AsyncClient
+    from zeep.wsdl.definitions import AbstractOperation
+
+    from python3_commons.conf import S3Settings
+
+logger = logging.getLogger(__name__)
+
+
+async def write_audit_data(settings: S3Settings, key: str, data: bytes) -> None:
+    if settings.aws_secret_access_key:
+        try:
+            await object_storage.put_object(settings.s3_bucket, f'audit/{key}', io.BytesIO(data), len(data))
+        except Exception:
+            logger.exception('Failed storing object in storage.')
+        else:
+            logger.debug('Stored object in storage: %s', key)
+    else:
+        logger.debug('S3 is not configured, not storing object in storage: %s', key)
+
+
+class ZeepAuditPlugin(Plugin):
+    def __init__(self, audit_name: str = 'zeep') -> None:
+        super().__init__()
+        self.audit_name = audit_name
+
+    def store_audit_in_s3(self, envelope, operation: AbstractOperation, direction: str) -> None:
+        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')
+        path = f'{date_path}/{self.audit_name}/{operation.name}/{timestamp}_{str(uuid4())[-12:]}_{direction}.xml'
+        coro = write_audit_data(s3_settings, path, 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
+
+
+def get_history_plugin(client: AsyncClient) -> HistoryPlugin | None:
+    """Return the first HistoryPlugin attached to *client*, or None."""
+    return next(
+        (p for p in client.plugins if isinstance(p, HistoryPlugin)),
+        None,
+    )

{python3_commons-0.18.0 → python3_commons-0.18.1}/src/python3_commons/soap_client.py

@@ -4,24 +4,19 @@ Async SOAP client built on aiohttp + zeep.
 
 from __future__ import annotations
 
-import asyncio
 import logging
 from collections.abc import AsyncIterator, Sequence
 from contextlib import asynccontextmanager
 from dataclasses import dataclass
-from datetime import UTC, datetime
 from typing import TYPE_CHECKING, Any, Self
-from uuid import uuid4
 
 try:
     import aiohttp
     from aiohttp import ClientSession, ClientTimeout, TCPConnector
-    from lxml import etree
     from requests import Response
     from requests.cookies import RequestsCookieJar
     from zeep import AsyncClient
     from zeep.exceptions import TransportError
-    from zeep.plugins import HistoryPlugin, Plugin
     from zeep.transports import Transport
     from zeep.utils import get_version
     from zeep.wsdl.utils import etree_to_string
@@ -30,49 +25,12 @@ except ImportError as e:
 
     raise RuntimeError(msg) from e
 
-from python3_commons.audit import write_audit_data
-from python3_commons.conf import s3_settings
-
 if TYPE_CHECKING:
-    from zeep.wsdl.definitions import AbstractOperation
+    from zeep.plugins import Plugin
 
 logger = logging.getLogger(__name__)
 
 
-class ZeepAuditPlugin(Plugin):
-    def __init__(self, audit_name: str = 'zeep') -> None:
-        super().__init__()
-        self.audit_name = audit_name
-
-    def store_audit_in_s3(self, envelope, operation: AbstractOperation, direction: str) -> None:
-        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')
-        path = f'{date_path}/{self.audit_name}/{operation.name}/{timestamp}_{str(uuid4())[-12:]}_{direction}.xml'
-        coro = write_audit_data(s3_settings, path, 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
-
-
 @dataclass(frozen=True, slots=True)
 class TransportConfig:
     """Immutable transport settings passed to AsyncTransport."""
@@ -300,11 +258,3 @@ async def soap_client(
 
     async with transport:
         yield build_soap_client(wsdl_url, transport, plugins)
-
-
-def get_history_plugin(client: AsyncClient) -> HistoryPlugin | None:
-    """Return the first HistoryPlugin attached to *client*, or None."""
-    return next(
-        (p for p in client.plugins if isinstance(p, HistoryPlugin)),
-        None,
-    )

{python3_commons-0.18.0 → python3_commons-0.18.1/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.18.0
+Version: 0.18.1
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -19,7 +19,6 @@ Provides-Extra: all
 Requires-Dist: python3_commons[api-client,audit,authn,authz,cache,database,object-storage,soap-client]; extra == "all"
 Provides-Extra: api-client
 Requires-Dist: aiohttp[speedups]<3.15.0,>=3.13.5; extra == "api-client"
-Requires-Dist: lxml~=6.1.0; extra == "api-client"
 Requires-Dist: python3_commons[object-storage]; extra == "api-client"
 Provides-Extra: audit
 Requires-Dist: lxml~=6.1.0; extra == "audit"

{python3_commons-0.18.0 → python3_commons-0.18.1}/src/python3_commons.egg-info/requires.txt

@@ -7,7 +7,6 @@ python3_commons[api-client,audit,authn,authz,cache,database,object-storage,soap-
 
 [api-client]
 aiohttp[speedups]<3.15.0,>=3.13.5
-lxml~=6.1.0
 python3_commons[object-storage]
 
 [audit]

python3_commons-0.18.0/src/python3_commons/audit.py

@@ -1,22 +0,0 @@
-import io
-import logging
-from typing import TYPE_CHECKING
-
-from python3_commons import object_storage
-
-if TYPE_CHECKING:
-    from python3_commons.conf import S3Settings
-
-logger = logging.getLogger(__name__)
-
-
-async def write_audit_data(settings: S3Settings, key: str, data: bytes) -> None:
-    if settings.aws_secret_access_key:
-        try:
-            await object_storage.put_object(settings.s3_bucket, f'audit/{key}', io.BytesIO(data), len(data))
-        except Exception:
-            logger.exception('Failed storing object in storage.')
-        else:
-            logger.debug('Stored object in storage: %s', key)
-    else:
-        logger.debug('S3 is not configured, not storing object in storage: %s', key)