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

pyaws_s3/s3.py

@@ -8,7 +8,10 @@ import matplotlib.pyplot as plt
 from plotly.graph_objs import Figure
 from pandas.plotting import table
 from typing import Any, Literal
-from fpdf import FPDF
+from reportlab.lib.pagesizes import A4
+from reportlab.pdfgen import canvas
+from reportlab.lib.units import mm
+from io import BytesIO
 
 logger = logging.getLogger(__name__)
 
@@ -351,7 +354,7 @@ 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) -> str:
         """
         Export the given text as a PDF and upload it to the S3 bucket.
 
@@ -368,37 +371,60 @@ class S3Client:
                 text = args[0] if len(args) > 0 else None
                 object_name = args[1] if len(args) > 1 else None
             else:
-                text = kwargs.get("text", None) 
+                text = kwargs.get("text", None)
                 object_name = kwargs.get("object_name", None)
-            
+
             if text is None:
-                    raise Exception("Text is None")    
+                raise Exception("Text is None")
 
             if object_name is None:
-                    raise Exception("Object name is None")
+                raise Exception("Object name is None")
 
             mimetypes = "application/pdf"
             s3_client = self._get_s3_client()
             s3_resource = self._get_s3_resource()
-            
-            pdf = FPDF()
-            pdf.add_page()
-            pdf.set_auto_page_break(auto=True, margin=15)
-            pdf.set_font("Arial", size=12)
-            for line in text.splitlines():
-                pdf.multi_cell(0, 10, line)
-                
-            # Write PDF to a bytes buffer
-            with io.BytesIO() as pdf_buffer:
-                pdf_bytes = pdf.output(dest='S').encode('utf-8')
-                pdf_buffer.write(pdf_bytes)
-                pdf_buffer.seek(0)
-                
-                s3_resource.Bucket(self.bucket_name).Object(object_name).put(
-                    Body=pdf_buffer,
-                    ContentType=mimetypes
-                )
+
+            # Crea il PDF in memoria
+            pdf_buffer = BytesIO()
+            c = canvas.Canvas(pdf_buffer, pagesize=A4)
+            width, height = A4
+            c.setFont("Helvetica", 10)
+            x_margin = 20 * mm
+            y = height - 20 * mm
+
+            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)
+                    line = line[4:]
+                elif line.startswith("## "):
+                    c.setFont("Helvetica-Bold", 12)
+                    line = line[3:]
+                elif line.startswith("# "):
+                    c.setFont("Helvetica-Bold", 14)
+                    line = line[2:]
+                else:
+                    c.setFont("Helvetica", 10)
+
+                c.drawString(x_margin, y, line)
+                y -= 12
+
+            c.save()
+            pdf_buffer.seek(0)
+
+            # Upload su S3
+            s3_resource.Bucket(self.bucket_name).Object(object_name).put(
+                Body=pdf_buffer,
+                ContentType=mimetypes
+            )
             return self._create_url(s3_client, self.bucket_name, object_name)
+
         except Exception as e:
             logger.error(f"Error exporting PDF: {str(e)}")
             raise Exception(f"Error exporting PDF: {str(e)}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyaws_s3
-Version: 1.0.10
+Version: 1.0.12
 Summary: A Python package for AWS S3 utilities
 Author-email: Giuseppe Zileni <giuseppe.zileni@gmail.com>
 Keywords: aws,s3,utilities
@@ -19,12 +19,15 @@ Requires-Dist: aiosignal==1.3.2
 Requires-Dist: attrs==25.3.0
 Requires-Dist: boto3==1.37.3
 Requires-Dist: botocore==1.37.3
+Requires-Dist: build==1.2.2.post1
+Requires-Dist: chardet==5.2.0
 Requires-Dist: contourpy==1.3.2
 Requires-Dist: cycler==0.12.1
 Requires-Dist: fonttools==4.58.0
 Requires-Dist: fpdf==1.7.2
 Requires-Dist: frozenlist==1.6.0
 Requires-Dist: idna==3.10
+Requires-Dist: iniconfig==2.1.0
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: kiwisolver==1.4.8
 Requires-Dist: matplotlib==3.10.3
@@ -35,11 +38,16 @@ Requires-Dist: packaging==23.2
 Requires-Dist: pandas==2.2.3
 Requires-Dist: pillow==11.2.1
 Requires-Dist: plotly==6.1.0
+Requires-Dist: pluggy==1.6.0
 Requires-Dist: propcache==0.3.1
 Requires-Dist: pyparsing==3.2.3
+Requires-Dist: pyproject_hooks==1.2.0
+Requires-Dist: pytest==8.3.5
 Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: pytz==2025.2
+Requires-Dist: reportlab==4.4.1
 Requires-Dist: s3transfer==0.11.3
+Requires-Dist: setuptools==80.7.1
 Requires-Dist: six==1.17.0
 Requires-Dist: tzdata==2025.2
 Requires-Dist: urllib3==2.4.0

pyaws_s3-1.0.12.dist-info/RECORD

@@ -0,0 +1,7 @@
+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,,

pyaws_s3-1.0.10.dist-info/RECORD

@@ -1,7 +0,0 @@
-pyaws_s3/__init__.py,sha256=Tr7xJiCKOMWYydOJ4kxHlA7AR1X3pRsJ8MjxJev2wsw,24
-pyaws_s3/s3.py,sha256=oBG4-_Uk2uNI9ZuzGbmZl9eydbjErI-XW6cT-SFcy_s,18999
-pyaws_s3-1.0.10.dist-info/licenses/LICENSE.md,sha256=7WXohDebeZpcVn_nH2aIaLhFZRvZBdcPSqWsO12lhwM,1074
-pyaws_s3-1.0.10.dist-info/METADATA,sha256=2CUAzGGvq__e4jT-W-swTiWP9B6z-jbDr9ishaAAEmg,5235
-pyaws_s3-1.0.10.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-pyaws_s3-1.0.10.dist-info/top_level.txt,sha256=MxSSC4Q8Vr32wKgrUAlwT4BTXwqUaG_CAWoBuPeXYjQ,9
-pyaws_s3-1.0.10.dist-info/RECORD,,