pyaws-s3 1.0.23__tar.gz → 1.0.27__tar.gz

{pyaws_s3-1.0.23 → pyaws_s3-1.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyaws-s3
-Version: 1.0.23
+Version: 1.0.27
 Summary: A Python package for AWS S3 utilities
 Author-email: Giuseppe Zileni <giuseppe.zileni@gmail.com>
 Keywords: aws,s3,utilities

{pyaws_s3-1.0.23 → pyaws_s3-1.0.27}/pyaws_s3/s3.py

@@ -42,6 +42,25 @@ class S3Client:
         self.region_name = kwargs.get("region_name", os.getenv("AWS_REGION"))
         self.bucket_name = kwargs.get("bucket_name", os.getenv("AWS_BUCKET_NAME"))
 
+    # crea una funzione per verifica la presenza di un file nel bucket
+    def file_exists(self, object_name: str) -> bool:
+        """
+        Check if a file exists in the S3 bucket.
+
+        Args:
+            object_name (str): The name of the S3 object to check.
+
+        Returns:
+            bool: True if the file exists, False otherwise.
+        """
+        s3_client = self._get_s3_client()
+        try:
+            s3_client.head_object(Bucket=self.bucket_name, Key=object_name)
+            return True
+        except Exception as e:
+            logger.error(f"Error checking file existence: {str(e)}")
+            return False
+
     def _bytes_from_figure(self, f: Figure, **kwargs) -> bytes:
         """
         Convert a Plotly Figure to a PNG image as bytes.
@@ -173,23 +192,24 @@ class S3Client:
 
         return temp_url
     
-    def upload_bytes(self, *args, **kwargs: Any):
+    def upload_bytes(self, *args, **kwargs: Any) -> tuple[str, bool]:
         """
         Upload a Plotly Figure as a PNG image to an S3 bucket and generate a pre-signed URL.
 
         Args:
-            fig (Figure): The Plotly Figure object to upload.
-            bucket_name (str): The name of the S3 bucket.
+            bytes_data (bytes): The bytes data of the image to upload.
             object_name (str): The name of the S3 object.
+            format_file (str): Format of the image. Defaults to 'pdf' ["png", "jpeg", "svg", "html", "pdf"]. 
+            overwrite (bool): If True, overwrite the existing file in S3. Defaults to False.
+            presigned_url (bool): If True, generate a pre-signed URL for the uploaded image. Defaults to False.
+        Raises:
+            Exception: If there is an error uploading the image.
 
         Keyword Args:
             format_file (str): Format of the image. Defaults to 'png'.
 
         Returns:
             str: Pre-signed URL for the uploaded image.
-
-        Raises:
-            Exception: If there is an error uploading the image.
         """
         try:
             
@@ -199,6 +219,9 @@ class S3Client:
             else:
                 bytes_data = kwargs.get("bytes_data", None) 
                 object_name = kwargs.get("object_name", None)
+                
+            overwrite = kwargs.get("overwrite", False)
+            presigned_url = kwargs.get("presigned_url", False)
             
             if bytes_data is None:
                 raise Exception("Figure is None")
@@ -209,6 +232,16 @@ class S3Client:
             format_file : FormatFile = kwargs.get("format_file", "pdf")
             mimetypes = "application/pdf"
             
+            # Get S3 client and resource
+            s3_client = self._get_s3_client()
+            s3_resource = self._get_s3_resource()
+            
+            if not overwrite and self.file_exists(object_name):
+                print(f"File {object_name} already exists in the bucket {self.bucket_name}. Use overwrite=True to overwrite it.")
+                if presigned_url:
+                    return self._create_url(s3_client, self.bucket_name, object_name), False
+                return object_name, False
+            
             if format_file not in ["png", "jpeg", "svg", "html", "pdf"]:
                 raise Exception("Invalid format_file provided. Supported formats are: png, jpeg, svg, html, pdf")
             if format_file == "png":
@@ -224,15 +257,13 @@ class S3Client:
             else:
                 raise Exception("Invalid MIME type provided")
             
-            s3_resource = self._get_s3_resource()
-            
             s3_resource.Bucket(self.bucket_name).Object(object_name).put(Body=bytes_data, ContentType=mimetypes)
-
+            return self._create_url(s3_client, self.bucket_name, object_name), True
         except Exception as e:
             logger.error(f"Error uploading image: {str(e)}")
             raise Exception(f"Error uploading image: {str(e)}")
 
-    def upload_image(self, *args, **kwargs: Any) -> str:
+    def upload_image(self, *args, **kwargs: Any) -> tuple[str, bool]:
         """
         Upload a Plotly Figure as a PNG image to an S3 bucket and generate a pre-signed URL.
 
@@ -240,6 +271,11 @@ class S3Client:
             fig (Figure): The Plotly Figure object to upload.
             bucket_name (str): The name of the S3 bucket.
             object_name (str): The name of the S3 object.
+            format_file (str): Format of the image. Defaults to 'png' ["png", "jpeg", "svg", "html"].
+            overwrite (bool): If True, overwrite the existing file in S3. Defaults to False.
+            presigned_url (bool): If True, generate a pre-signed URL for the uploaded image. Defaults to False.
+        Raises:
+            Exception: If there is an error uploading the image.
 
         Keyword Args:
             format_file (str): Format of the image. Defaults to 'png'.
@@ -258,6 +294,13 @@ class S3Client:
             else:
                 fig = kwargs.get("fig", None) 
                 object_name = kwargs.get("object_name", None)
+                
+            overwrite = kwargs.get("overwrite", False)
+            presigned_url = kwargs.get("presigned_url", False)
+            
+            # Get S3 client and resource
+            s3_client = self._get_s3_client()
+            s3_resource = self._get_s3_resource()
             
             if fig is None:
                 raise Exception("Figure is None")
@@ -268,6 +311,12 @@ class S3Client:
             format_file : FormatFile = kwargs.get("format_file", "svg")
             mimetypes = "image/svg+xml"
             
+            if not overwrite and self.file_exists(object_name):
+                print(f"File {object_name} already exists in the bucket {self.bucket_name}. Use overwrite=True to overwrite it.")
+                if presigned_url:
+                    return self._create_url(s3_client, self.bucket_name, object_name), False
+                return object_name, False
+            
             if format_file not in ["png", "jpeg", "svg", "html"]:
                 raise Exception("Invalid format_file provided. Supported formats are: png, jpeg, svg, html")
             if format_file == "png":
@@ -281,10 +330,6 @@ class S3Client:
             else:
                 raise Exception("Invalid MIME type provided")
 
-            # Get S3 client and resource
-            s3_client = self._get_s3_client()
-            s3_resource = self._get_s3_resource()
-
             if format_file == "html":
                 # Convert the figure to SVG
                 file_text = self._html_from_figure(fig)
@@ -297,13 +342,13 @@ class S3Client:
                 s3_resource.Bucket(self.bucket_name).Object(object_name).put(Body=file_buffer, ContentType=mimetypes)
 
             # Generate and return a pre-signed URL for the uploaded image
-            return self._create_url(s3_client, self.bucket_name, object_name)
+            return self._create_url(s3_client, self.bucket_name, object_name), True
 
         except Exception as e:
             logger.error(f"Error uploading image: {str(e)}")
             raise Exception(f"Error uploading image: {str(e)}")
 
-    def upload_from_dataframe(self, *args : Any, **kwargs: Any) -> str:
+    def upload_from_dataframe(self, *args : Any, **kwargs: Any) -> tuple[str, bool]:
         """
         Upload a DataFrame as an Excel file to an S3 bucket and generate a pre-signed URL.
 
@@ -312,6 +357,10 @@ class S3Client:
             **kwargs (Any): Additional keyword arguments for AWS credentials, bucket name, and object name.
             Keyword Args:
                 format_file (str): Format of the file. Defaults to 'xlsx'.
+                overwrite (bool): If True, overwrite the existing file in S3. Defaults to False.
+                presigned_url (bool): If True, generate a pre-signed URL for the uploaded file. Defaults to False.
+        Raises:
+            Exception: If there is an error uploading the file.
         
         Returns:
             str: Pre-signed URL for the uploaded file.
@@ -329,6 +378,9 @@ class S3Client:
                 # Get the DataFrame and object name from the keyword arguments
                 df = kwargs.get("df", None)
                 object_name = kwargs.get("object_name", None)
+                
+            overwrite = kwargs.get("overwrite", False)
+            presigned_url = kwargs.get("presigned_url", False)
 
             if df is None:
                 raise Exception("Figure is None")
@@ -350,8 +402,15 @@ class S3Client:
             else:
                 raise Exception("Invalid MIME type provided")
 
+            # Get S3 client and resource
             s3_client = self._get_s3_client()
             s3_resource = self._get_s3_resource()
+            
+            if not overwrite and self.file_exists(object_name):
+                print(f"File {object_name} already exists in the bucket {self.bucket_name}. Use overwrite=True to overwrite it.")
+                if presigned_url:
+                    return self._create_url(s3_client, self.bucket_name, object_name), False
+                return object_name, False
 
             # Create a file buffer
             ext: str = ""
@@ -382,7 +441,7 @@ class S3Client:
 
             logger.info(f"Uploaded file to S3: {object_name}")
 
-            return self._create_url(s3_client, self.bucket_name, object_name)
+            return self._create_url(s3_client, self.bucket_name, object_name), True
         except Exception as e:
             logger.error(f"Error uploading file: {str(e)}")
             raise Exception(f"Error uploading file: {str(e)}")
@@ -413,15 +472,19 @@ class S3Client:
             logger.error(f"Error deleting files: {str(e)}")
             raise Exception(f"Error deleting files: {str(e)}")
 
-    def upload_to_pdf(self, *args: Any, **kwargs: Any) -> str:
+    def upload_to_pdf(self, *args: Any, **kwargs: Any) -> tuple[str, bool]:
         """
         Export the given text as a PDF and upload it to the S3 bucket.
 
         Args:
             text (str): The text to write in the PDF.
             object_name (str): The name of the S3 object.
+            presigned_url (bool): If True, generate a pre-signed URL for the uploaded PDF. Defaults to False.
+            overwrite (bool): If True, overwrite the existing file in S3. Defaults to False
+            
         Raises:
             Exception: If there is an error exporting the PDF.
+            
         Returns:
             str: Pre-signed URL for the uploaded PDF.
         """
@@ -432,6 +495,9 @@ class S3Client:
             else:
                 text = kwargs.get("text", None)
                 object_name = kwargs.get("object_name", None)
+                
+            overwrite = kwargs.get("overwrite", False)
+            presigned_url = kwargs.get("presigned_url", False)
 
             if text is None:
                 raise Exception("Text is None")
@@ -440,8 +506,15 @@ class S3Client:
                 raise Exception("Object name is None")
 
             mimetypes = "application/pdf"
+            # Get S3 client and resource
             s3_client = self._get_s3_client()
             s3_resource = self._get_s3_resource()
+            
+            if not overwrite and self.file_exists(object_name):
+                print(f"File {object_name} already exists in the bucket {self.bucket_name}. Use overwrite=True to overwrite it.")
+                if presigned_url:
+                    return self._create_url(s3_client, self.bucket_name, object_name), False
+                return object_name, False
 
             # Crea il PDF in memoria
             pdf_buffer = BytesIO()
@@ -450,29 +523,47 @@ class S3Client:
             c.setFont("Helvetica", 10)
             x_margin = 20 * mm
             y = height - 20 * mm
+            max_width = width - 2 * x_margin
+
+            def split_line(line, font_name, font_size):
+                # Divide la riga in più righe se supera la larghezza massima
+                words = line.split()
+                lines = []
+                current = ""
+                for word in words:
+                    test = current + (" " if current else "") + word
+                    if c.stringWidth(test, font_name, font_size) <= max_width:
+                        current = test
+                    else:
+                        if current:
+                            lines.append(current)
+                        current = word
+                if current:
+                    lines.append(current)
+                return lines
 
             for line in text.strip().split('\n'):
                 line = line.strip()
-                if y < 20 * mm:
-                    c.showPage()
-                    c.setFont("Helvetica", 10)
-                    y = height - 20 * mm
-
                 # Markdown-style header detection
                 if line.startswith("### "):
-                    c.setFont("Helvetica-Bold", 11)
+                    font_name, font_size = "Helvetica-Bold", 11
                     line = line[4:]
                 elif line.startswith("## "):
-                    c.setFont("Helvetica-Bold", 12)
+                    font_name, font_size = "Helvetica-Bold", 12
                     line = line[3:]
                 elif line.startswith("# "):
-                    c.setFont("Helvetica-Bold", 14)
+                    font_name, font_size = "Helvetica-Bold", 14
                     line = line[2:]
                 else:
-                    c.setFont("Helvetica", 10)
+                    font_name, font_size = "Helvetica", 10
 
-                c.drawString(x_margin, y, line)
-                y -= 12
+                for subline in split_line(line, font_name, font_size):
+                    if y < 20 * mm + font_size:
+                        c.showPage()
+                        y = height - 20 * mm
+                    c.setFont(font_name, font_size)
+                    c.drawString(x_margin, y, subline)
+                    y -= font_size + 2  # Spazio tra le righe
 
             c.save()
             pdf_buffer.seek(0)
@@ -482,7 +573,7 @@ class S3Client:
                 Body=pdf_buffer,
                 ContentType=mimetypes
             )
-            return self._create_url(s3_client, self.bucket_name, object_name)
+            return self._create_url(s3_client, self.bucket_name, object_name), True
 
         except Exception as e:
             logger.error(f"Error exporting PDF: {str(e)}")

{pyaws_s3-1.0.23 → pyaws_s3-1.0.27}/pyaws_s3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyaws-s3
-Version: 1.0.23
+Version: 1.0.27
 Summary: A Python package for AWS S3 utilities
 Author-email: Giuseppe Zileni <giuseppe.zileni@gmail.com>
 Keywords: aws,s3,utilities

{pyaws_s3-1.0.23 → pyaws_s3-1.0.27}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyaws-s3"
-version = "1.0.23"
+version = "1.0.27"
 description = "A Python package for AWS S3 utilities"
 authors = [
     { name="Giuseppe Zileni", email="giuseppe.zileni@gmail.com" }