python3-commons 0.16.0__py3-none-any.whl → 0.16.2__py3-none-any.whl

python3_commons/db/__init__.py

@@ -17,28 +17,28 @@ Base = declarative_base(metadata=metadata)
 
 
 class AsyncSessionManager:
-    def __init__(self, db_settings: Mapping[str, DBSettings]) -> None:
-        self.db_settings: Mapping[str, DBSettings] = db_settings
+    def __init__(self, db_configs: Mapping[str, DBSettings]) -> None:
+        self.db_configs: Mapping[str, DBSettings] = db_configs
         self.engines: dict[str, AsyncEngine] = {}
         self.session_makers: dict = {}
 
-    def get_db_settings(self, name: str) -> DBSettings:
+    def get_db_config(self, name: str) -> DBSettings:
         try:
-            return self.db_settings[name]
+            return self.db_configs[name]
         except KeyError:
             logger.exception('Missing database settings: %s', name)
 
             raise
 
-    def async_engine_from_db_settings(self, name):
-        db_settings = self.get_db_settings(name)
+    def async_engine_from_db_config(self, name):
+        db_config = self.get_db_config(name)
         configuration = {
-            'url': str(db_settings.dsn),
-            'echo': db_settings.echo,
-            'pool_size': db_settings.pool_size,
-            'max_overflow': db_settings.max_overflow,
-            'pool_timeout': db_settings.pool_timeout,
-            'pool_recycle': db_settings.pool_recycle,
+            'url': str(db_config.dsn),
+            'echo': db_config.echo,
+            'pool_size': db_config.pool_size,
+            'max_overflow': db_config.max_overflow,
+            'pool_timeout': db_config.pool_timeout,
+            'pool_recycle': db_config.pool_recycle,
         }
 
         return async_engine_from_config(configuration, prefix='')
@@ -48,7 +48,7 @@ class AsyncSessionManager:
             engine = self.engines[name]
         except KeyError:
             logger.debug('Creating engine: %s', name)
-            engine = self.async_engine_from_db_settings(name)
+            engine = self.async_engine_from_db_config(name)
             self.engines[name] = engine
 
         return engine

python3_commons/log/formatters.py

@@ -1,35 +1,125 @@
-import json
 import logging
 import traceback
 from contextvars import ContextVar
+from datetime import UTC, datetime, date
+from decimal import Decimal
+from typing import Any, Final, Callable
 
-from python3_commons.serializers.json import CustomJSONEncoder
+import msgspec
 
 correlation_id: ContextVar[str | None] = ContextVar('correlation_id', default=None)
 
+_DEFAULT_MAX_TB_CHARS: Final[int] = 8_000
+_STD_LOG_FIELDS: Final[frozenset[str]] = frozenset(
+    {
+        'msg',
+        'args',
+        'levelname',
+        'levelno',
+        'pathname',
+        'filename',
+        'module',
+        'exc_info',
+        'exc_text',
+        'stack_info',
+        'lineno',
+        'funcName',
+        'created',
+        'msecs',
+        'relativeCreated',
+        'thread',
+        'threadName',
+        'process',
+        'processName',
+        'name',
+    }
+)
+
+
+# Keep normalization minimal and branch-based (unchanged)
+def _normalize(v: Any) -> Any:
+    if isinstance(v, datetime | date):
+        return v.isoformat()
+
+    if isinstance(v, bytes):
+        return v.decode('utf-8', errors='replace')
+
+    if isinstance(v, Decimal):
+        return str(v)
+
+    if isinstance(v, Exception):
+        return str(v)
+
+    return v
+
 
 class JSONFormatter(logging.Formatter):
-    @staticmethod
-    def format_exception(exc_info: logging._SysExcInfoType) -> str:
-        return ''.join(traceback.format_exception(*exc_info))
+    __slots__ = ('_get_correlation_id', '_max_tb_chars', '_encoder')
 
-    def format(self, record: logging.LogRecord) -> str:
-        if corr_id := correlation_id.get():
-            record.correlation_id = corr_id
+    def __init__(
+        self,
+        *,
+        get_correlation_id: Callable[[], str | None] = lambda: correlation_id.get(),
+        max_exc_tb_chars: int = _DEFAULT_MAX_TB_CHARS,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__(**kwargs)
+
+        self._get_correlation_id = get_correlation_id
+        self._max_tb_chars = max_exc_tb_chars
+        self._encoder = msgspec.json.Encoder()
 
+    def format(self, record: logging.LogRecord) -> str:
+        # -------------------------
+        # message (fast path)
+        # -------------------------
         try:
-            record.message = record.getMessage()
-        except TypeError:
-            record.message = str(record.msg)
+            message = record.getMessage()
+        except Exception:
+            message = str(record.msg)
+
+        # -------------------------
+        # timestamp (no Formatter overhead)
+        # -------------------------
+        timestamp = datetime.fromtimestamp(record.created, UTC).isoformat().replace('+00:00', 'Z')
+
+        # -------------------------
+        # base log object (plain dict)
+        # -------------------------
+        log: dict[str, Any] = {
+            'message': message,
+            'level': record.levelname,
+            'logger': record.name,
+            'timestamp': timestamp,
+        }
+
+        if (corr_id := self._get_correlation_id()) is not None:
+            log['correlation_id'] = corr_id
+
+        if (exc_info := record.exc_info) and exc_info[0] is not None:
+            exc_type, exc_value, exc_tb = exc_info
 
-        if record.exc_info:
-            record.exc_text = self.format_exception(record.exc_info)
-        else:
-            record.exc_text = None
+            log['exc_type'] = f'{exc_type.__module__}.{exc_type.__qualname__}'
+            log['exc_value'] = str(exc_value)
+
+            tb = ''.join(traceback.format_exception(exc_type, exc_value, exc_tb)).rstrip()
+            cap = self._max_tb_chars
+
+            if cap and len(tb) > cap:
+                tb = tb[:cap] + '\n... <truncated>'
+
+            log['exc_traceback'] = tb
 
         record_dict = record.__dict__
+        std_log_fields = _STD_LOG_FIELDS
+
+        if len(record_dict) > len(std_log_fields):
+            normalize = _normalize
+            out_set = log.__setitem__
 
-        del record_dict['args']
-        del record_dict['msg']
+            for k, v in record_dict.items():
+                if k[0] == '_' or k in std_log_fields:
+                    continue
+                out_set(k, normalize(v))
 
-        return json.dumps(record_dict, cls=CustomJSONEncoder)
+        return self._encoder.encode(log).decode('utf-8')

python3_commons/object_storage.py

@@ -135,7 +135,7 @@ async def list_objects(bucket_name: str, prefix: str, *, recursive: bool = True)
 
 
 async def get_object_streams(
-        bucket_name: str, path: str, *, recursive: bool = True
+    bucket_name: str, path: str, *, recursive: bool = True
 ) -> AsyncGenerator[tuple[str, datetime, StreamingBody]]:
     async for obj in list_objects(bucket_name, path, recursive=recursive):
         object_name = obj['Key']
@@ -146,7 +146,7 @@ async def get_object_streams(
 
 
 async def get_objects(
-        bucket_name: str, path: str, *, recursive: bool = True
+    bucket_name: str, path: str, *, recursive: bool = True
 ) -> AsyncGenerator[tuple[str, datetime, bytes]]:
     async for object_name, last_modified, stream in get_object_streams(bucket_name, path, recursive=recursive):
         data = await stream.read()
@@ -168,7 +168,7 @@ async def remove_object(bucket_name: str, object_name: str) -> None:
 
 
 async def remove_objects(
-        bucket_name: str, prefix: str | None = None, object_names: Iterable[str] | None = None
+    bucket_name: str, prefix: str | None = None, object_names: Iterable[str] | None = None
 ) -> Sequence[Mapping] | None:
     storage = ObjectStorage(s3_settings)
 
@@ -191,7 +191,7 @@ async def remove_objects(
             chunk_size = 1000
 
             for i in range(0, len(objects_to_delete), chunk_size):
-                chunk = objects_to_delete[i: i + chunk_size]
+                chunk = objects_to_delete[i : i + chunk_size]
 
                 response = await s3_client.delete_objects(Bucket=bucket_name, Delete={'Objects': chunk})
 

{python3_commons-0.16.0.dist-info → python3_commons-0.16.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.16.0
+Version: 0.16.2
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0

{python3_commons-0.16.0.dist-info → python3_commons-0.16.2.dist-info}/RECORD

@@ -9,9 +9,9 @@ python3_commons/exceptions.py,sha256=EGjHZVBnsM6CeBfPMqhL0IPMKjDJ_2-Z-aSPXwq91LE
 python3_commons/fs.py,sha256=dn8ZcwsQf9xcAEg6neoxLN6IzJbWpprfm8wV8S55BL0,337
 python3_commons/generators.py,sha256=P6sKdCFhHT79-DZgzPU-qmwZvHg3wU8a75UFIwrycOY,1163
 python3_commons/helpers.py,sha256=2U0XyiBhylPrPIdPkZ16jrJRDZBE-yKv9GjRIY4C-EA,4541
-python3_commons/object_storage.py,sha256=F_0ea15N87So8XKTsJXc6KyZwFGhMZ9_Wjy_8x1VznE,7037
+python3_commons/object_storage.py,sha256=XpsU6ZtSgcobMcNFArisc6lF8ygzLI2pkZ9iZ9u5RJk,7026
 python3_commons/permissions.py,sha256=yIqOy98sZqK7xexcvOaKzE4re088-HiLP8DuFStA35Q,1588
-python3_commons/db/__init__.py,sha256=FFyd8CqEspCpJGOKkXLMILYerS1IFc2bvyAFjpPrdrg,2984
+python3_commons/db/__init__.py,sha256=zgEVqczGZP7NiodUqV03H7Dmy7Ph8aV8HEkuZvnSRE4,2958
 python3_commons/db/helpers.py,sha256=sXt7vwP4j_KSNScin0UG7KugDW2eeIuQIIi5v4iYlGo,1862
 python3_commons/db/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python3_commons/db/models/auth.py,sha256=WW2dkoD5qpm2nBSVA081RY5Xh41m0Rrwk7fe5HdGZnI,634
@@ -20,15 +20,15 @@ python3_commons/db/models/rbac.py,sha256=ARRQ1tn_GThxiBiIs_6IKkGnIIv37SmVgSi90cb
 python3_commons/db/models/users.py,sha256=zNN3bNWl3cVE6dJtTPzmPSo_5d1SsBZwwkvIs-WzUBA,644
 python3_commons/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python3_commons/log/filters.py,sha256=fuyjXZAUm-i2MNrxvFYag8F8Rr27x8W8MdV3ke6miSs,175
-python3_commons/log/formatters.py,sha256=_5lkCZPR7nlDXvCea45C1J74N9BLEK9BCL_Fc88iAzA,1010
+python3_commons/log/formatters.py,sha256=uFZit5Xl7k2_hAVjqVG8-6nwFR3C7fKoeuW2jiz2S8M,3496
 python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python3_commons/serializers/common.py,sha256=VkA7C6wODvHk0QBXVX_x2JieDstihx3U__UFbTYf654,120
 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.16.0.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.16.0.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.16.0.dist-info/METADATA,sha256=kghTmVLDTeJpwhRzlRyvY9ZgIDw7d832MFsawblXUEw,1021
-python3_commons-0.16.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python3_commons-0.16.0.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.16.0.dist-info/RECORD,,
+python3_commons-0.16.2.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.16.2.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.16.2.dist-info/METADATA,sha256=VHzo-ZDsPUIiAdIK3N2CHiOkc6EvdUgsSUjB6yAHBTc,1021
+python3_commons-0.16.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python3_commons-0.16.2.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.16.2.dist-info/RECORD,,