python3-commons 0.7.4__py3-none-any.whl → 0.7.6__py3-none-any.whl

python3_commons/api_client.py

@@ -1,12 +1,13 @@
 import logging
 from contextlib import asynccontextmanager
 from datetime import datetime, UTC
+from enum import Enum
 from http import HTTPStatus
 from json import dumps
 from typing import AsyncGenerator, Literal, Mapping, Sequence
 from uuid import uuid4
 
-from aiohttp import ClientResponse, ClientSession, client_exceptions
+from aiohttp import ClientResponse, ClientSession, client_exceptions, ClientTimeout
 from pydantic import HttpUrl
 
 from python3_commons import audit
@@ -49,6 +50,7 @@ async def request(
     headers: Mapping | None = None,
     json: Mapping | Sequence | str | None = None,
     data: bytes | None = None,
+    timeout: ClientTimeout | Enum | None = None,
     audit_name: str | None = None
 ) -> AsyncGenerator[ClientResponse]:
     now = datetime.now(tz=UTC)
@@ -80,7 +82,7 @@ async def request(
 
     try:
         if method == 'get':
-            async with client_method(url, params=query, headers=headers) as response:
+            async with client_method(url, params=query, headers=headers, timeout=timeout) as response:
                 if audit_name:
                     await _store_response_for_audit(response, audit_name, uri_path, method, request_id)
 
@@ -107,7 +109,7 @@ async def request(
                 else:
                     headers = {'Content-Type': 'application/json'}
 
-            async with client_method(url, params=query, data=data, headers=headers) as response:
+            async with client_method(url, params=query, data=data, headers=headers, timeout=timeout) as response:
                 if audit_name:
                     await _store_response_for_audit(response, audit_name, uri_path, method, request_id)
 

python3_commons/db/helpers.py

@@ -20,16 +20,23 @@ def get_query(search: Mapping[str, str] | None = None,
             3: exact match if True, LIKE %value% if False
     """
 
+    order_by_cols = {}
+
     if order_by:
-        if order_by.startswith('-'):
-            direction = desc
-            order_by = order_by[1:]
-        else:
-            direction = asc
+        for order_by_col in order_by.split(','):
+            if order_by_col.startswith('-'):
+                direction = desc
+                order_by_col = order_by_col[1:]
+            else:
+                direction = asc
+
+            order_by_cols[order_by_col] = direction
 
-        order_by_clause = direction(columns[order_by][0])
+        order_by_clauses = tuple(
+            direction(columns[order_by_col][0]) for order_by_col, direction in order_by_cols.items()
+        )
     else:
-        order_by_clause = None
+        order_by_clauses = None
 
     if search:
         where_parts = [
@@ -58,4 +65,4 @@ def get_query(search: Mapping[str, str] | None = None,
     else:
         where_clause = None
 
-    return where_clause, order_by_clause
+    return where_clause, order_by_clauses

{python3_commons-0.7.4.dist-info → python3_commons-0.7.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: python3-commons
-Version: 0.7.4
+Version: 0.7.6
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License: gpl-3
@@ -12,7 +12,7 @@ Requires-Python: >=3.13
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: aiohttp[speedups]~=3.11.13
+Requires-Dist: aiohttp[speedups]~=3.11.14
 Requires-Dist: asyncpg~=0.30.0
 Requires-Dist: fastapi-users-db-sqlalchemy~=7.0.0
 Requires-Dist: fastapi-users[sqlalchemy]~=14.0.1
@@ -22,7 +22,7 @@ Requires-Dist: msgpack~=1.1.0
 Requires-Dist: msgspec~=0.19.0
 Requires-Dist: pydantic[email]~=2.10.6
 Requires-Dist: pydantic-settings~=2.8.1
-Requires-Dist: SQLAlchemy[asyncio]~=2.0.38
+Requires-Dist: SQLAlchemy[asyncio]~=2.0.39
 Requires-Dist: zeep~=4.3.1
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"

{python3_commons-0.7.4.dist-info → python3_commons-0.7.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
-python3_commons/api_client.py,sha256=6F99vSGCV8pqcKJE9dECijlgggm40FB9TzkFZRgwDq4,4419
+python3_commons/api_client.py,sha256=zj6zTF-DhUMu4bjj9VWLi63mVODG_SB47Q5qlmG-Sxg,4539
 python3_commons/audit.py,sha256=DMQ-nrWSs0qilD7wkz_8PV4jXcee75O8FgAm2YIuOiY,6256
 python3_commons/conf.py,sha256=GAcjlFlloLriZXa9JmNGMtTPzvtHUActYDiE4C1DacU,749
 python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
@@ -7,7 +7,7 @@ python3_commons/helpers.py,sha256=OmuCF7UeJ6oe-rH1Y4ZYVW_uPQ973lCLsikj01wmNqs,31
 python3_commons/object_storage.py,sha256=Bte49twIJ4l6VAzIqK6tLx7DFYwijErUmmhWkrZpSJE,4074
 python3_commons/permissions.py,sha256=V6kT7gBQ0fZRDQwreM9es90BvvpB3gUofuqnFvx2g-o,1553
 python3_commons/db/__init__.py,sha256=pZk0Fv-Le2sFC-KaVDdJjDDsHtmv-IJz_aFP5o2PGHA,1682
-python3_commons/db/helpers.py,sha256=6xYgDgMhWUpVbtD3FctYtHVBRNahCkkpVIxx0matt-c,1644
+python3_commons/db/helpers.py,sha256=0z-pXAxQg0KqrqfoUcRooRHNrrKi-g2mSO6euVMscpE,1891
 python3_commons/db/models/__init__.py,sha256=AeeTLUqdqQrhCTi14ACWO0ccyVyWFppZVtCeWShSvR0,193
 python3_commons/db/models/auth.py,sha256=ctHiz_5x17TdXac7a3SjfuZ0-nEgnxK7RwKOY8qflZc,1195
 python3_commons/db/models/common.py,sha256=ScFEL04HwEomX3X7f8WHMq505uvoID6itBETRWfya9w,1402
@@ -19,9 +19,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=tzIGGyDL3UpZnnouCtnxuYDx6InKM_C3PP1N4PN8wd4,1269
 python3_commons/serializers/msgspec.py,sha256=FuZVqOLJb0-lEKrs7dtjhwEbHIpfMUk5yu1hD64zRdc,2038
-python3_commons-0.7.4.dist-info/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.7.4.dist-info/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.7.4.dist-info/METADATA,sha256=Vc9pCf8LuvYC2PurIjha_1x39yC8pyX_vKwH8mG9PgU,1127
-python3_commons-0.7.4.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-python3_commons-0.7.4.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.7.4.dist-info/RECORD,,
+python3_commons-0.7.6.dist-info/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.7.6.dist-info/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.7.6.dist-info/METADATA,sha256=GtDliyLHNI1Y-zqZCrMXr7ggUb98BhvLffLIu3ROTIs,1127
+python3_commons-0.7.6.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+python3_commons-0.7.6.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.7.6.dist-info/RECORD,,

{python3_commons-0.7.4.dist-info → python3_commons-0.7.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any