python3-commons 0.16.0__tar.gz → 0.16.2__tar.gz

{python3_commons-0.16.0 → python3_commons-0.16.2}/PKG-INFO

@@ -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 → python3_commons-0.16.2}/src/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-0.16.2/src/python3_commons/log/formatters.py

@@ -0,0 +1,125 @@
+import logging
+import traceback
+from contextvars import ContextVar
+from datetime import UTC, datetime, date
+from decimal import Decimal
+from typing import Any, Final, Callable
+
+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):
+    __slots__ = ('_get_correlation_id', '_max_tb_chars', '_encoder')
+
+    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:
+            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
+
+            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__
+
+            for k, v in record_dict.items():
+                if k[0] == '_' or k in std_log_fields:
+                    continue
+                out_set(k, normalize(v))
+
+        return self._encoder.encode(log).decode('utf-8')

{python3_commons-0.16.0 → python3_commons-0.16.2}/src/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 → python3_commons-0.16.2}/src/python3_commons.egg-info/PKG-INFO

@@ -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 → python3_commons-0.16.2}/uv.lock

@@ -715,7 +715,7 @@ wheels = [
 
 [[package]]
 name = "pre-commit"
-version = "4.5.1"
+version = "4.6.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cfgv" },
@@ -724,9 +724,9 @@ dependencies = [
     { name = "pyyaml" },
     { name = "virtualenv" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/40/f1/6d86a29246dfd2e9b6237f0b5823717f60cad94d47ddc26afa916d21f525/pre_commit-4.5.1.tar.gz", hash = "sha256:eb545fcff725875197837263e977ea257a402056661f09dae08e4b149b030a61", size = 198232, upload-time = "2025-12-16T21:14:33.552Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/8e/22/2de9408ac81acbb8a7d05d4cc064a152ccf33b3d480ebe0cd292153db239/pre_commit-4.6.0.tar.gz", hash = "sha256:718d2208cef53fdc38206e40524a6d4d9576d103eb16f0fec11c875e7716e9d9", size = 198525, upload-time = "2026-04-21T20:31:41.613Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/5d/19/fd3ef348460c80af7bb4669ea7926651d1f95c23ff2df18b9d24bab4f3fa/pre_commit-4.5.1-py2.py3-none-any.whl", hash = "sha256:3b3afd891e97337708c1674210f8eba659b52a38ea5f822ff142d10786221f77", size = 226437, upload-time = "2025-12-16T21:14:32.409Z" },
+    { url = "https://files.pythonhosted.org/packages/80/6e/4b28b62ecb6aae56769c34a8ff1d661473ec1e9519e2d5f8b2c150086b26/pre_commit-4.6.0-py2.py3-none-any.whl", hash = "sha256:e2cf246f7299edcabcf15f9b0571fdce06058527f0a06535068a86d38089f29b", size = 226472, upload-time = "2026-04-21T20:31:40.092Z" },
 ]
 
 [[package]]

python3_commons-0.16.0/src/python3_commons/log/formatters.py

@@ -1,35 +0,0 @@
-import json
-import logging
-import traceback
-from contextvars import ContextVar
-
-from python3_commons.serializers.json import CustomJSONEncoder
-
-correlation_id: ContextVar[str | None] = ContextVar('correlation_id', default=None)
-
-
-class JSONFormatter(logging.Formatter):
-    @staticmethod
-    def format_exception(exc_info: logging._SysExcInfoType) -> str:
-        return ''.join(traceback.format_exception(*exc_info))
-
-    def format(self, record: logging.LogRecord) -> str:
-        if corr_id := correlation_id.get():
-            record.correlation_id = corr_id
-
-        try:
-            record.message = record.getMessage()
-        except TypeError:
-            record.message = str(record.msg)
-
-        if record.exc_info:
-            record.exc_text = self.format_exception(record.exc_info)
-        else:
-            record.exc_text = None
-
-        record_dict = record.__dict__
-
-        del record_dict['args']
-        del record_dict['msg']
-
-        return json.dumps(record_dict, cls=CustomJSONEncoder)