python3-commons 0.14.16__tar.gz → 0.14.18__tar.gz

{python3_commons-0.14.16 → python3_commons-0.14.18}/PKG-INFO

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

{python3_commons-0.14.16 → python3_commons-0.14.18}/pyproject.toml

@@ -94,7 +94,7 @@ select = [
     "FBT",
     "FLY",
     "FURB",
-    #    "G",
+    "G",
     "ICN",
     "INP",
     "ISC",

{python3_commons-0.14.16 → python3_commons-0.14.18}/src/python3_commons/api_client.py

@@ -79,7 +79,7 @@ async def request(
 
     client_method = getattr(client, method)
 
-    logger.debug(f'Requesting {method} {url}')
+    logger.debug('Requesting %s %s', method, url)
 
     try:
         if method == 'get':

{python3_commons-0.14.16 → python3_commons-0.14.18}/src/python3_commons/audit.py

@@ -26,9 +26,9 @@ async def write_audit_data(settings: S3Settings, key: str, data: bytes) -> None:
         except Exception:
             logger.exception('Failed storing object in storage.')
         else:
-            logger.debug(f'Stored object in storage: {key}')
+            logger.debug('Stored object in storage: %s', key)
     else:
-        logger.debug(f'S3 is not configured, not storing object in storage: {key}')
+        logger.debug('S3 is not configured, not storing object in storage: %s', key)
 
 
 class ZeepAuditPlugin(Plugin):

{python3_commons-0.14.16 → python3_commons-0.14.18}/src/python3_commons/db/__init__.py

@@ -26,7 +26,7 @@ class AsyncSessionManager:
         try:
             return self.db_settings[name]
         except KeyError:
-            logger.exception(f'Missing database settings: {name}')
+            logger.exception('Missing database settings: %s', name)
 
             raise
 
@@ -47,7 +47,7 @@ class AsyncSessionManager:
         try:
             engine = self.engines[name]
         except KeyError:
-            logger.debug(f'Creating engine: {name}')
+            logger.debug('Creating engine: %s', name)
             engine = self.async_engine_from_db_settings(name)
             self.engines[name] = engine
 
@@ -57,7 +57,7 @@ class AsyncSessionManager:
         try:
             session_maker = self.session_makers[name]
         except KeyError:
-            logger.debug(f'Creating session maker: {name}')
+            logger.debug('Creating session maker: %s', name)
             engine = self.get_engine(name)
             session_maker = async_sessionmaker(engine, expire_on_commit=False)
             self.session_makers[name] = session_maker

{python3_commons-0.14.16 → python3_commons-0.14.18}/src/python3_commons/helpers.py

@@ -133,7 +133,7 @@ def log_execution_time(func):
             return await func(*args, **kwargs)
         finally:
             elapsed = time.monotonic() - start_time
-            _logger.info(f'{func.__module__}.{func.__name__} executed in {elapsed:.4f} seconds')
+            _logger.info('%s.%s executed in %.4f seconds', func.__module__, func.__name__, elapsed)
 
     wrapper.__signature__ = inspect.signature(func)
 

{python3_commons-0.14.16 → python3_commons-0.14.18}/src/python3_commons/log/formatters.py

@@ -10,14 +10,17 @@ correlation_id: ContextVar[str | None] = ContextVar('correlation_id', default=No
 
 class JSONFormatter(logging.Formatter):
     @staticmethod
-    def format_exception(exc_info):
+    def format_exception(exc_info: logging._SysExcInfoType) -> str:
         return ''.join(traceback.format_exception(*exc_info))
 
-    def format(self, record):
+    def format(self, record: logging.LogRecord) -> str:
         if corr_id := correlation_id.get():
             record.correlation_id = corr_id
 
-        record.message = record.getMessage()
+        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)

{python3_commons-0.14.16 → python3_commons-0.14.18}/src/python3_commons/object_storage.py

@@ -66,9 +66,9 @@ async def put_object(bucket_name: str, path: str, data: io.BytesIO, length: int,
 
             await s3_client.put_object(Bucket=bucket_name, Key=path, Body=data, ContentLength=length)
 
-            logger.debug(f'Stored object into object storage: {bucket_name}:{path}')
+            logger.debug('Stored object into object storage: %s:%s', bucket_name, path)
         except Exception as e:
-            logger.exception(f'Failed to put object to object storage: {bucket_name}:{path}', exc_info=e)
+            logger.exception('Failed to put object to object storage: %s:%s', bucket_name, path, exc_info=e)
 
             raise
 
@@ -80,7 +80,7 @@ async def get_object_stream(bucket_name: str, path: str) -> AsyncGenerator[Strea
     storage = ObjectStorage(s3_settings)
 
     async with storage.get_client() as s3_client:
-        logger.debug(f'Getting object from object storage: {bucket_name}:{path}')
+        logger.debug('Getting object from object storage: %s:%s', bucket_name, path)
 
         try:
             response = await s3_client.get_object(Bucket=bucket_name, Key=path)
@@ -88,7 +88,7 @@ async def get_object_stream(bucket_name: str, path: str) -> AsyncGenerator[Strea
             async with response['Body'] as stream:
                 yield stream
         except Exception as e:
-            logger.exception(f'Failed getting object from object storage: {bucket_name}:{path}', exc_info=e)
+            logger.exception('Failed getting object from object storage: %s:%s', bucket_name, path, exc_info=e)
 
             raise
 
@@ -97,7 +97,7 @@ async def get_object(bucket_name: str, path: str) -> bytes:
     async with get_object_stream(bucket_name, path) as stream:
         body = await stream.read()
 
-    logger.debug(f'Loaded object from object storage: {bucket_name}:{path}')
+    logger.debug('Loaded object from object storage: %s:%s', bucket_name, path)
 
     return body
 
@@ -142,9 +142,9 @@ async def remove_object(bucket_name: str, object_name: str) -> None:
     async with storage.get_client() as s3_client:
         try:
             await s3_client.delete_object(Bucket=bucket_name, Key=object_name)
-            logger.debug(f'Removed object from object storage: {bucket_name}:{object_name}')
+            logger.debug('Removed object from object storage: %s:%s', bucket_name, object_name)
         except Exception as e:
-            logger.exception(f'Failed to remove object from object storage: {bucket_name}:{object_name}', exc_info=e)
+            logger.exception('Failed to remove object from object storage: %s:%s', bucket_name, object_name, exc_info=e)
 
             raise
 
@@ -180,9 +180,9 @@ async def remove_objects(
                 if 'Errors' in response:
                     errors.extend(response['Errors'])
 
-            logger.debug(f'Removed {len(objects_to_delete)} objects from object storage: {bucket_name}')
+            logger.debug('Removed %d objects from object storage: %s', len(objects_to_delete), bucket_name)
         except Exception as e:
-            logger.exception(f'Failed to remove objects from object storage: {bucket_name}', exc_info=e)
+            logger.exception('Failed to remove objects from object storage: %s', bucket_name, exc_info=e)
 
             raise
 

{python3_commons-0.14.16 → python3_commons-0.14.18}/src/python3_commons.egg-info/PKG-INFO

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

{python3_commons-0.14.16 → python3_commons-0.14.18}/src/python3_commons.egg-info/SOURCES.txt

@@ -60,4 +60,6 @@ tests/unit/conftest.py
 tests/unit/test_audit.py
 tests/unit/test_helpers.py
 tests/unit/test_msgpack.py
-tests/unit/test_msgspec.py
+tests/unit/test_msgspec.py
+tests/unit/log/__init__.py
+tests/unit/log/test_formatters.py

python3_commons-0.14.18/tests/unit/log/test_formatters.py

@@ -0,0 +1,34 @@
+import json
+from logging import INFO, LogRecord
+
+import pytest
+
+from python3_commons.log.formatters import JSONFormatter
+
+
+def test_json_formatter_info_record() -> None:
+    formatter = JSONFormatter()
+    record = LogRecord(
+        name='test.log',
+        level=INFO,
+        pathname='/dev/null',
+        lineno=12345,
+        msg='This is a %s, %d, %s',
+        args=(
+            'test',
+            1234,
+            'magic',
+        ),
+        exc_info=None,
+    )
+    expected_message = 'This is a test, 1234, magic'
+    formatted_record_str = formatter.format(record)
+    formatted_record = json.loads(formatted_record_str)
+
+    with pytest.raises(KeyError):
+        _ = formatted_record['msg']
+
+    with pytest.raises(KeyError):
+        _ = formatted_record['args']
+
+    assert formatted_record['message'] == expected_message