python3-commons 0.9.19__py3-none-any.whl → 0.9.21__py3-none-any.whl

python3_commons/audit.py

@@ -143,8 +143,8 @@ async def write_audit_data(settings: S3Settings, key: str, data: bytes):
             absolute_path = object_storage.get_absolute_path(f'audit/{key}')
 
             await object_storage.put_object(settings.s3_bucket, absolute_path, io.BytesIO(data), len(data))
-        except Exception as e:
-            logger.error(f'Failed storing object in storage: {e}')
+        except Exception:
+            logger.exception('Failed storing object in storage.')
         else:
             logger.debug(f'Stored object in storage: {key}')
     else:

python3_commons/auth.py

@@ -78,11 +78,11 @@ def get_token_verifier[T](
                 payload = jwt.decode(token, jwks, algorithms=['RS256'])
 
             token_data = token_cls(**payload)
-
-            return token_data
-        except jwt.ExpiredSignatureError:
-            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail='Token has expired')
+        except jwt.ExpiredSignatureError as e:
+            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail='Token has expired') from e
         except JWTError as e:
-            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail=f'Token is invalid: {str(e)}')
+            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail=f'Token is invalid: {str(e)}') from e
+
+        return token_data
 
     return get_verified_token

python3_commons/cache.py

@@ -131,8 +131,8 @@ async def store_sequence(name: str, data: Sequence, ttl: int = None):
 
             if ttl:
                 await r.expire(name, ttl)
-        except valkey.exceptions.ConnectionError as e:
-            logger.error(f'Failed to store sequence in cache: {e}')
+        except valkey.exceptions.ConnectionError:
+            logger.exception('Failed to store sequence in cache.')
 
 
 async def get_sequence(name: str, _type: type = list) -> Sequence:
@@ -151,8 +151,8 @@ async def store_dict(name: str, data: Mapping, ttl: int = None):
 
             if ttl:
                 await r.expire(name, ttl)
-        except valkey.exceptions.ConnectionError as e:
-            logger.error(f'Failed to store dict in cache: {e}')
+        except valkey.exceptions.ConnectionError:
+            logger.exception('Failed to store dict in cache.')
 
 
 async def get_dict(name: str, value_data_type=None) -> dict | None:
@@ -175,8 +175,8 @@ async def set_dict(name: str, mapping: dict, ttl: int = None):
 
             if ttl:
                 await r.expire(name, ttl)
-        except valkey.exceptions.ConnectionError as e:
-            logger.error(f'Failed to set dict in cache: {e}')
+        except valkey.exceptions.ConnectionError:
+            logger.exception('Failed to set dict in cache.')
 
 
 async def get_dict_item(name: str, key: str, data_type=None, default=None):
@@ -185,28 +185,28 @@ async def get_dict_item(name: str, key: str, data_type=None, default=None):
 
         if data := await r.hget(name, key):
             return deserialize_msgpack_native(data, data_type)
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to get dict item from cache.')
 
-        return default
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to get dict item from cache: {e}')
+        return None
 
-    return None
+    return default
 
 
 async def set_dict_item(name: str, key: str, obj: Any):
     try:
         r = get_valkey_client()
         await r.hset(name, key, serialize_msgpack_native(obj))
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to set dict item in cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to set dict item in cache.')
 
 
 async def delete_dict_item(name: str, *keys):
     try:
         r = get_valkey_client()
         await r.hdel(name, *keys)
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to delete dict item from cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to delete dict item from cache.')
 
 
 async def store_set(name: str, value: set, ttl: int = None):
@@ -216,8 +216,8 @@ async def store_set(name: str, value: set, ttl: int = None):
 
         if ttl:
             await r.expire(name, ttl)
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to store set in cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to store set in cache.')
 
 
 async def has_set_item(name: str, value: str) -> bool:
@@ -225,8 +225,8 @@ async def has_set_item(name: str, value: str) -> bool:
         r = get_valkey_client()
 
         return await r.sismember(name, serialize_msgpack_native(value)) == 1
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to check if set has item in cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to check if set has item in cache.')
 
     return False
 
@@ -235,8 +235,8 @@ async def add_set_item(name: str, *values: str):
     try:
         r = get_valkey_client()
         await r.sadd(name, *map(serialize_msgpack_native, values))
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to add set item into cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to add set item into cache.')
 
 
 async def delete_set_item(name: str, value: str):
@@ -250,8 +250,8 @@ async def get_set_members(name: str) -> set[str] | None:
         smembers = await r.smembers(name)
 
         return set(map(deserialize_msgpack_native, smembers))
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to get set members from cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to get set members from cache.')
 
     return None
 

python3_commons/db/__init__.py

@@ -24,7 +24,7 @@ class AsyncSessionManager:
         try:
             return self.db_settings[name]
         except KeyError:
-            logger.error(f'Missing database settings: {name}')
+            logger.exception(f'Missing database settings: {name}')
 
             raise
 
@@ -83,7 +83,7 @@ async def is_healthy(engine: AsyncEngine) -> bool:
             result = await conn.execute('SELECT 1;')
 
             return result.scalar() == 1
-    except Exception as e:
-        logger.error(f'Database connection is not healthy: {e}')
+    except Exception:
+        logger.exception('Database connection is not healthy.')
 
         return False

python3_commons/helpers.py

@@ -67,9 +67,9 @@ def tries(times):
                 # noinspection PyBroadException
                 try:
                     return await f(*args, **kwargs)
-                except Exception as exc:
+                except Exception:
                     if _time >= times:
-                        raise exc
+                        raise
 
         return wrapper
 

python3_commons/object_storage.py

@@ -67,14 +67,13 @@ 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}')
-
-            return f's3://{bucket_name}/{path}'
-
         except Exception as e:
-            logger.error(f'Failed to put object to object storage: {bucket_name}:{path}', exc_info=e)
+            logger.exception(f'Failed to put object to object storage: {bucket_name}:{path}', exc_info=e)
 
             raise
 
+        return f's3://{bucket_name}/{path}'
+
 
 @asynccontextmanager
 async def get_object_stream(bucket_name: str, path: str) -> AsyncGenerator[StreamingBody]:
@@ -89,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.debug(f'Failed getting object from object storage: {bucket_name}:{path}', exc_info=e)
+            logger.exception(f'Failed getting object from object storage: {bucket_name}:{path}', exc_info=e)
 
             raise
 
@@ -145,7 +144,7 @@ async def remove_object(bucket_name: str, object_name: str):
             await s3_client.delete_object(Bucket=bucket_name, Key=object_name)
             logger.debug(f'Removed object from object storage: {bucket_name}:{object_name}')
         except Exception as e:
-            logger.error(f'Failed to remove object from object storage: {bucket_name}:{object_name}', exc_info=e)
+            logger.exception(f'Failed to remove object from object storage: {bucket_name}:{object_name}', exc_info=e)
 
             raise
 
@@ -182,9 +181,9 @@ async def remove_objects(
                     errors.extend(response['Errors'])
 
             logger.debug(f'Removed {len(objects_to_delete)} objects from object storage: {bucket_name}')
-
-            return errors if errors else None
         except Exception as e:
-            logger.error(f'Failed to remove objects from object storage: {bucket_name}', exc_info=e)
+            logger.exception(f'Failed to remove objects from object storage: {bucket_name}', exc_info=e)
 
             raise
+
+        return errors if errors else None

{python3_commons-0.9.19.dist-info → python3_commons-0.9.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.9.19
+Version: 0.9.21
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -21,7 +21,7 @@ Requires-Dist: lxml~=6.0.2
 Requires-Dist: msgpack~=1.1.1
 Requires-Dist: msgspec~=0.19.0
 Requires-Dist: pydantic[email]~=2.11.9
-Requires-Dist: pydantic-settings~=2.10.1
+Requires-Dist: pydantic-settings~=2.11.0
 Requires-Dist: python-jose==3.5.0
 Requires-Dist: SQLAlchemy[asyncio]~=2.0.43
 Requires-Dist: valkey[libvalkey]~=6.1.1

{python3_commons-0.9.19.dist-info → python3_commons-0.9.21.dist-info}/RECORD

@@ -1,14 +1,14 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
 python3_commons/api_client.py,sha256=0PE8iYW5zq7n89veC6afSkwj_fzD_nldBc5wdXyg5jo,5266
-python3_commons/audit.py,sha256=p4KRKt0ogkHhJSulg6j5GU-JKBBE903H2c0nuW16GtM,6083
-python3_commons/auth.py,sha256=oc49EmKODXeZOl8oR1w4kL3cqf4J0f8W1ni9ETcFHA8,2936
-python3_commons/cache.py,sha256=nn296-96Vp-Zx0-YDby4mNpSaixhjokOK0Kp82BXy3w,7757
+python3_commons/audit.py,sha256=kfUaSiNAg9NJuUhnBXqplNiyuPQuDFM9NcD-HZV2qd4,6077
+python3_commons/auth.py,sha256=fWfoh5665F-YnGTgG9wDAosYIM9vFoTsQXEcCyzD72M,2951
+python3_commons/cache.py,sha256=Hib86F1k1SviF-a2RyoTxRrFi0XV2KaWOfBi5TlOu-g,7697
 python3_commons/conf.py,sha256=GOvR1oYss6AKnNlyj9JbT0mSrfQFrnzmgm0IiGVahho,2428
 python3_commons/fs.py,sha256=dn8ZcwsQf9xcAEg6neoxLN6IzJbWpprfm8wV8S55BL0,337
-python3_commons/helpers.py,sha256=WTd-uLxL8JgJncMYVQ5IboRQ-YKnYXxKkzNHlycKN-8,3939
-python3_commons/object_storage.py,sha256=xBKetm-04HVxttz0B8p55cteE_WPXTf9pKF5IpQk9XQ,6561
+python3_commons/helpers.py,sha256=utcorGvXvZLsC4H_H8WGwzeIMgCOCHac2jbKpVCeixA,3928
+python3_commons/object_storage.py,sha256=pvA-gJehnbIJmqu8ebT6oSqW-dR-uZl3E1AV86ffUpY,6568
 python3_commons/permissions.py,sha256=bhjTp-tq-oaTGFMHNnSBlcVX5XQCTL0nWcu6SdPEAB4,1555
-python3_commons/db/__init__.py,sha256=CiGlUcpb85OIEBXLOwqqZNukr7PVsCwdi-Evhqkr-J4,2944
+python3_commons/db/__init__.py,sha256=PZTIC0RPzYzZ2Fh4HeyKtYIHaUPB7A92yeOK--PGxnw,2942
 python3_commons/db/helpers.py,sha256=n56yYCE0fvzvU7nL1936NfZhbaQmvfumzRsGimBlNV4,1776
 python3_commons/db/models/__init__.py,sha256=zjZCf0DNDkqmPZ49quJ6KZohtKH87viI_ijDG3E0PVE,554
 python3_commons/db/models/auth.py,sha256=NMHirujigpaRR0Bhhe2gzy8Q8PPABuaA-D8ZY7aaqeE,1177
@@ -22,9 +22,9 @@ python3_commons/serializers/common.py,sha256=VkA7C6wODvHk0QBXVX_x2JieDstihx3U__U
 python3_commons/serializers/json.py,sha256=Dae0gouk9jiUOkmh8z1AcTIHD52OgBn2aXK9JLKMMms,718
 python3_commons/serializers/msgpack.py,sha256=AwzBSUdbdq8yYdGzmEsiWw0bnL9XRQFa1Vh-nt2s56k,1499
 python3_commons/serializers/msgspec.py,sha256=yp3LvsxDUTIv__3AaLed5ddZ0rHm7BYqmrrehVAJb14,3000
-python3_commons-0.9.19.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.9.19.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.9.19.dist-info/METADATA,sha256=Jr8y3hZV5nmpL6hpJcioxUv94-Eytwou4vhv7O7c3Fc,1134
-python3_commons-0.9.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_commons-0.9.19.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.9.19.dist-info/RECORD,,
+python3_commons-0.9.21.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.9.21.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.9.21.dist-info/METADATA,sha256=HRjkBEmKZRPPU7PU1T3XZtXWkYnEM2tFQUmOz9IxEfw,1134
+python3_commons-0.9.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_commons-0.9.21.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.9.21.dist-info/RECORD,,