python3-commons 0.5.4__tar.gz → 0.5.5__tar.gz

{python3_commons-0.5.4/src/python3_commons.egg-info → python3_commons-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-commons
-Version: 0.5.4
+Version: 0.5.5
 Summary: Re-usable Python3 code
 Home-page: https://github.com/kamikaze/python3-commons
 Author: Oleg Korsak

{python3_commons-0.5.4 → python3_commons-0.5.5}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = python3-commons
-version = 0.5.4
+version = 0.5.5
 description = Re-usable Python3 code
 author = Oleg Korsak
 author_email = kamikaze.is.waiting.you@gmail.com

{python3_commons-0.5.4 → python3_commons-0.5.5}/src/python3_commons/audit.py

@@ -22,8 +22,9 @@ async def write_audit_data(settings: S3Settings, key: str, data: bytes):
     if settings.s3_secret_access_key:
         try:
             client = get_s3_client(settings)
+            absolute_path = object_storage.get_absolute_path(f'audit/{key}')
 
-            client.put_object(settings.s3_bucket, f'audit/{key}', io.BytesIO(data), len(data))
+            client.put_object(settings.s3_bucket, absolute_path, io.BytesIO(data), len(data))
         except S3Error as e:
             logger.error(f'Failed storing object in storage: {e}')
         else:

{python3_commons-0.5.4 → python3_commons-0.5.5}/src/python3_commons/object_storage.py

@@ -3,7 +3,7 @@ import logging
 from datetime import datetime
 from typing import Generator, Iterable
 
-from minio import Minio, S3Error
+from minio import Minio
 from minio.datatypes import Object
 from minio.deleteobjects import DeleteObject, DeleteError
 
@@ -43,6 +43,7 @@ def put_object(bucket_name: str, path: str, data: io.BytesIO, length: int) -> st
     s3_client = get_s3_client(s3_settings)
 
     if s3_client:
+        path = get_absolute_path(path)
         result = s3_client.put_object(bucket_name, path, data, length)
 
         logger.debug(f'Stored object into object storage: {bucket_name}:{path}')
@@ -56,6 +57,7 @@ def get_object_stream(bucket_name: str, path: str):
     s3_client = get_s3_client(s3_settings)
 
     if s3_client:
+        path = get_absolute_path(path)
         logger.debug(f'Getting object from object storage: {bucket_name}:{path}')
 
         try:
@@ -92,6 +94,8 @@ def list_objects(bucket_name: str, prefix: str, recursive: bool = True) -> Gener
 
 def get_objects(bucket_name: str, path: str,
                 recursive: bool = True) -> Generator[tuple[str, datetime, bytes], None, None]:
+    path = get_absolute_path(path)
+
     for obj in list_objects(bucket_name, path, recursive):
         object_name = obj.object_name
 
@@ -113,6 +117,7 @@ def remove_objects(bucket_name: str, prefix: str = None,
     s3_client = get_s3_client(s3_settings)
 
     if prefix:
+        prefix = get_absolute_path(prefix)
         delete_object_list = map(
             lambda obj: DeleteObject(obj.object_name), s3_client.list_objects(bucket_name, prefix=prefix,
                                                                               recursive=True)

{python3_commons-0.5.4 → python3_commons-0.5.5/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-commons
-Version: 0.5.4
+Version: 0.5.5
 Summary: Re-usable Python3 code
 Home-page: https://github.com/kamikaze/python3-commons
 Author: Oleg Korsak