pyaws-s3 1.0.12__py3-none-any.whl → 1.0.17__py3-none-any.whl

pyaws_s3/s3.py

@@ -470,7 +470,7 @@ class S3Client:
             logger.error(f"Error downloading file: {str(e)}")
             raise Exception(f"Error downloading file: {str(e)}")
         
-    def list_files(self, *args : Any) -> list[str]:
+    def list_files(self, *args: Any, **kwargs : Any) -> list[str]:
         """
         List all files in the S3 bucket.
 
@@ -482,15 +482,31 @@ class S3Client:
             list[str]: List of file names in the S3 bucket.
         """
         try:
-            filter = args[0] if len(args) > 0 else None
+            prefix = args[0] if args else None
+            if prefix is None:
+                prefix = kwargs.get("prefix", None) 
+                
+            if prefix is None:
+                raise Exception("Prefix is None")    
+                
+            filter = kwargs.get("filter", None)
+            
             s3_client = self._get_s3_client()
-            objects = s3_client.list_objects_v2(Bucket=self.bucket_name)
+            objects = s3_client.list_objects_v2(Bucket=self.bucket_name, Prefix=prefix)
 
             # Check if the bucket contains any objects
+            docs : list[str] = []
             if 'Contents' in objects:
-                return [obj['Key'] for obj in objects['Contents'] if filter in obj['Key']]
-            else:
-                return []
+                for obj in objects['Contents']:
+                    if obj['Key']:
+                        # Log the object key
+                        if filter is not None:
+                            if filter in obj['Key']:
+                                logger.info(f"Object: {obj['Key']}")
+                                docs.append(obj['Key'])
+                        else:
+                            docs.append(obj['Key'])
+            return docs
         except Exception as e:
             logger.error(f"Error listing files: {str(e)}")
             raise Exception(f"Error listing files: {str(e)}")

{pyaws_s3-1.0.12.dist-info → pyaws_s3-1.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyaws_s3
-Version: 1.0.12
+Version: 1.0.17
 Summary: A Python package for AWS S3 utilities
 Author-email: Giuseppe Zileni <giuseppe.zileni@gmail.com>
 Keywords: aws,s3,utilities
@@ -33,8 +33,7 @@ Requires-Dist: kiwisolver==1.4.8
 Requires-Dist: matplotlib==3.10.3
 Requires-Dist: multidict==6.4.3
 Requires-Dist: narwhals==1.39.1
-Requires-Dist: numpy==2.2.5
-Requires-Dist: packaging==23.2
+Requires-Dist: packaging>=23.2
 Requires-Dist: pandas==2.2.3
 Requires-Dist: pillow==11.2.1
 Requires-Dist: plotly==6.1.0

pyaws_s3-1.0.17.dist-info/RECORD

@@ -0,0 +1,7 @@
+pyaws_s3/__init__.py,sha256=Tr7xJiCKOMWYydOJ4kxHlA7AR1X3pRsJ8MjxJev2wsw,24
+pyaws_s3/s3.py,sha256=ZuhqpK5uwL-0jxnKXoT-nil0QnzApNXxHUSyGypk1sc,20366
+pyaws_s3-1.0.17.dist-info/licenses/LICENSE.md,sha256=7WXohDebeZpcVn_nH2aIaLhFZRvZBdcPSqWsO12lhwM,1074
+pyaws_s3-1.0.17.dist-info/METADATA,sha256=HpIOBvZPjsHDaEOuzMOlpYOzO1sy13OH5w3O37pxorg,5465
+pyaws_s3-1.0.17.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+pyaws_s3-1.0.17.dist-info/top_level.txt,sha256=MxSSC4Q8Vr32wKgrUAlwT4BTXwqUaG_CAWoBuPeXYjQ,9
+pyaws_s3-1.0.17.dist-info/RECORD,,

pyaws_s3-1.0.12.dist-info/RECORD

@@ -1,7 +0,0 @@
-pyaws_s3/__init__.py,sha256=Tr7xJiCKOMWYydOJ4kxHlA7AR1X3pRsJ8MjxJev2wsw,24
-pyaws_s3/s3.py,sha256=ZkYeD96LeoovDHR49G9LE1jhCssAN_bObmG9n85euWI,19723
-pyaws_s3-1.0.12.dist-info/licenses/LICENSE.md,sha256=7WXohDebeZpcVn_nH2aIaLhFZRvZBdcPSqWsO12lhwM,1074
-pyaws_s3-1.0.12.dist-info/METADATA,sha256=p-RlVIVY4nqB0b6eS6AXPIgmsyvMBRlAPZewHOaV2C4,5493
-pyaws_s3-1.0.12.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-pyaws_s3-1.0.12.dist-info/top_level.txt,sha256=MxSSC4Q8Vr32wKgrUAlwT4BTXwqUaG_CAWoBuPeXYjQ,9
-pyaws_s3-1.0.12.dist-info/RECORD,,