python3-commons 0.18.9__tar.gz → 0.18.10__tar.gz

{python3_commons-0.18.9/src/python3_commons.egg-info → python3_commons-0.18.10}/PKG-INFO

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

{python3_commons-0.18.9 → python3_commons-0.18.10}/src/python3_commons/object_storage.py

@@ -140,7 +140,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']
@@ -151,7 +151,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()
@@ -159,21 +159,22 @@ async def get_objects(
         yield object_name, last_modified, data
 
 
-async def remove_object(bucket_name: str, object_name: str) -> None:
-    storage = ObjectStorage(s3_settings)
+async def remove_object(bucket_name: str, path: str) -> None:
+    logger.debug('Removing object from object storage: %s:%s', bucket_name, path)
 
-    async with storage.get_client() as s3_client:
-        try:
-            await s3_client.delete_object(Bucket=bucket_name, Key=object_name)
-            logger.debug('Removed object from object storage: %s:%s', bucket_name, object_name)
-        except Exception as e:
-            logger.exception('Failed to remove object from object storage: %s:%s', bucket_name, object_name, exc_info=e)
+    try:
+        client = get_client()
+        absolute_path = get_absolute_path(path)
+        url = f's3://{bucket_name}/{absolute_path}'
+        await client.remove_object(url)
+    except Exception as e:
+        logger.exception('Failed to remove object from object storage: %s:%s', bucket_name, path, exc_info=e)
 
-            raise
+        raise
 
 
 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)
 
@@ -196,7 +197,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.18.9 → python3_commons-0.18.10/src/python3_commons.egg-info}/PKG-INFO

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