python3-commons 0.18.0__py3-none-any.whl → 0.18.2__py3-none-any.whl

python3_commons/audit.py

@@ -1,10 +1,25 @@
+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__)
@@ -20,3 +35,45 @@ async def write_audit_data(settings: S3Settings, key: str, data: bytes) -> None:
             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/soap_client.py

@@ -5,23 +5,20 @@ Async SOAP client built on aiohttp + zeep.
 from __future__ import annotations
 
 import asyncio
+import concurrent.futures
 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 +27,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."""
@@ -207,6 +167,20 @@ class AsyncTransport(Transport):
 
         return await _fetch()
 
+    def load(self, url: str) -> bytes:
+        """Sync entry-point zeep calls during WSDL document init."""
+        if not url:
+            return b''
+
+        try:
+            loop = asyncio.get_event_loop()
+
+            return loop.run_until_complete(self._load_remote_data(url))
+        except RuntimeError:
+            with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
+                future = pool.submit(asyncio.run, self._load_remote_data(url))
+                return future.result()
+
     async def post(
         self,
         address: str,
@@ -298,13 +272,9 @@ async def soap_client(
     """
     transport = AsyncTransport.from_config(config, session=session)
 
-    async with transport:
-        yield build_soap_client(wsdl_url, transport, plugins)
-
+    try:
+        client = build_soap_client(wsdl_url, transport, plugins)  # WSDL loaded here (sync via load())
 
-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,
-    )
+        yield client
+    finally:
+        await transport.aclose()

{python3_commons-0.18.0.dist-info → python3_commons-0.18.2.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
 python3_commons/api_client.py,sha256=WuP2SDikWvdrJ6yCLUVrtUBxv0UDfcFKxLZwj-It6R8,5418
 python3_commons/async_functools.py,sha256=A2HvwFzZHxOWTp4IQM5UiBY2yg1S_0U1CWra5BWK0gk,9101
-python3_commons/audit.py,sha256=FdQ6GhDJuBE9L4YEqscAhHAN74FfcBuaHI_GAWOzpgw,714
+python3_commons/audit.py,sha256=uGoCwenDJ0Gdwbr_VNOZm5scT8luxW1weprJbbMoHo0,2608
 python3_commons/auth.py,sha256=oihQ1sNnK_bi9JhQf_NCu4JVWmWrwVfSHD_zrHwRfzA,5044
 python3_commons/cache.py,sha256=lowiXJqFgFy1Yg86wi9IhuoNqIUGP6nc5eNibmf0dfY,8018
 python3_commons/conf.py,sha256=qy5asXYVaquo_qPnA3L7Hcqk9a4wZukEVK3xmCuF-LU,2867
@@ -11,7 +11,7 @@ python3_commons/generators.py,sha256=P6sKdCFhHT79-DZgzPU-qmwZvHg3wU8a75UFIwrycOY
 python3_commons/helpers.py,sha256=2U0XyiBhylPrPIdPkZ16jrJRDZBE-yKv9GjRIY4C-EA,4541
 python3_commons/object_storage.py,sha256=JB39Wb6rluAHa9oprsmB8d9UlY3sehsjX-aFmY_A-us,7219
 python3_commons/permissions.py,sha256=gaMKSWg0MgPQTdP1voll4ItXcblXku9BlD0Lq3Xv64U,1724
-python3_commons/soap_client.py,sha256=yF0S-lIb3UJ4WF9HyeUKbqsrnK4XW5aO8gjGhqf0C-M,9400
+python3_commons/soap_client.py,sha256=dZZWkg2RxFWr5yHfzcDK7SCy21FMfxctuDCoYiRBJII,8296
 python3_commons/db/__init__.py,sha256=i60JvWiUY8kz8nEaVjc5MA1IN_P5g3tK7jX8KgcUd0Y,3105
 python3_commons/db/helpers.py,sha256=xRpWs4aVkBge6HCLjb6OLSnWc1nlV6rKGyaVhZ_x12w,2001
 python3_commons/db/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,9 +27,9 @@ python3_commons/serializers/common.py,sha256=VkA7C6wODvHk0QBXVX_x2JieDstihx3U__U
 python3_commons/serializers/json.py,sha256=UPkC3ps13x2C_NxwVV-K7Ewp4VjkVHSSUkJVw5k7Wiw,712
 python3_commons/serializers/msgpack.py,sha256=zESFBX34GsZ8rDu6Zk5V6CLT6P0mPilU0r04Ka6TblI,1474
 python3_commons/serializers/msgspec.py,sha256=upy5CBmK66-8hYnK5bAM_sZvZY5CAqZmzCw9GIF346I,2988
-python3_commons-0.18.0.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.18.0.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.18.0.dist-info/METADATA,sha256=_zsYYWNFNss7noCUZjiL1EZXUDL4rBl-erUL17uz0BM,2210
-python3_commons-0.18.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python3_commons-0.18.0.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.18.0.dist-info/RECORD,,
+python3_commons-0.18.2.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.18.2.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.18.2.dist-info/METADATA,sha256=kIEA0rAgEB2EWJF1BCMXFPhRmxKK4oVasgPbNyZQAoo,2160
+python3_commons-0.18.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python3_commons-0.18.2.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.18.2.dist-info/RECORD,,