pyaws-s3 1.0.6__tar.gz → 1.0.8__tar.gz

{pyaws_s3-1.0.6 → pyaws_s3-1.0.8}/PKG-INFO

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

{pyaws_s3-1.0.6 → pyaws_s3-1.0.8}/pyaws_s3/s3.py

@@ -5,9 +5,9 @@ import aioboto3
 import pandas as pd
 import io
 import matplotlib.pyplot as plt
+from plotly.graph_objs import Figure
 from pandas.plotting import table
 from typing import Any, Literal
-from util import bytes_from_figure, html_from_figure
 from fpdf import FPDF
 
 logger = logging.getLogger(__name__)
@@ -39,6 +39,48 @@ 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"))
 
+    def _bytes_from_figure(self, f: Figure, **kwargs) -> bytes:
+        """
+        Convert a Plotly Figure to a PNG image as bytes.
+
+        Args:
+            f (Figure): The Plotly Figure object to be converted.
+
+        Returns:
+            bytes: The PNG image data as bytes.
+            :param f:  The Plotly Figure object to be converted into a PNG image.
+        """
+
+        format_file = kwargs.get("format_file", "png")  # The format of the image to be converted to
+        width = kwargs.get("width", 640)  # The width of the image in pixels
+        height = kwargs.get("height", 480)  # The height of the image in pixels
+
+        with io.BytesIO() as bytes_buffer:
+            f.write_image(bytes_buffer, 
+                        format=format_file, 
+                        width = width, 
+                        height = height)  # Write the figure to the bytes buffer as a PNG image
+            bytes_buffer.seek(0)  # Reset the buffer position to the beginning
+            return bytes_buffer.getvalue()  # Return the bytes data
+
+    def _html_from_figure(self, f: Figure) -> str:
+        """
+        Convert a Plotly Figure to an HTML string.
+
+        Args:
+            f (Figure): The Plotly Figure object to be converted.
+
+        Returns:
+            str: The HTML representation of the figure as a string.
+        """
+        with io.BytesIO() as bytes_buffer:
+            # Wrap the BytesIO with a TextIOWrapper to handle strings
+            with io.TextIOWrapper(bytes_buffer, encoding='utf-8') as text_buffer:
+                f.write_html(text_buffer)  # Write the figure to the text buffer
+                text_buffer.flush()  # Ensure all data is written
+                bytes_buffer.seek(0)  # Reset the buffer position to the beginning
+                return bytes_buffer.getvalue().decode('utf-8')  # Decode bytes to string and return
+
     async def _get_s3_client_async(self) -> Any:
         """
         Get an asynchronous S3 client using the provided AWS credentials and region.
@@ -148,11 +190,16 @@ class S3Client:
         """
         try:
             
-            fig = args[0] if len(args) > 0 else None
+            if args:
+                fig = args[0] if len(args) > 0 else None
+                object_name = args[1] if len(args) > 1 else None
+            else:
+                fig = kwargs.get("fig", None) 
+                object_name = kwargs.get("object_name", None)
+            
             if fig is None:
                 raise Exception("Figure is None")
             
-            object_name = args[1] if len(args) > 1 else None
             if object_name is None:
                 raise Exception("Object name is None")
 
@@ -178,12 +225,12 @@ class S3Client:
 
             if format_file == "html":
                 # Convert the figure to SVG
-                file_text = html_from_figure(fig)
+                file_text = self._html_from_figure(fig)
                 # Upload the html text to s3
                 s3_resource.Bucket(self.bucket_name).Object(object_name).put(Body=file_text, ContentType=mimetypes)
             else:
                 # Convert the figure to bytes
-                file_buffer = bytes_from_figure(fig, format_file=format_file)
+                file_buffer = self._bytes_from_figure(fig, format_file=format_file)
                 # Upload the image bytes to S3
                 s3_resource.Bucket(self.bucket_name).Object(object_name).put(Body=file_buffer, ContentType=mimetypes)
 
@@ -212,11 +259,18 @@ class S3Client:
         """
         try:
 
-            df = args[0] if len(args) > 0 else None
+            if args:    
+                # Get the DataFrame and object name from the arguments
+                df = args[0] if len(args) > 0 else None
+                object_name = args[1] if len(args) > 1 else None
+            else:
+                # Get the DataFrame and object name from the keyword arguments
+                df = kwargs.get("df", None)
+                object_name = kwargs.get("object_name", None)
+
             if df is None:
                 raise Exception("Figure is None")
             
-            object_name = args[1] if len(args) > 1 else None
             if object_name is None:
                 raise Exception("Object name is None")
             
@@ -297,7 +351,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) -> 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.
 
@@ -310,13 +364,18 @@ class S3Client:
             str: Pre-signed URL for the uploaded PDF.
         """
         try:
-            text = args[0] if len(args) > 0 else None
-            if text is None:
-                raise Exception("Text is None")
+            if args:
+                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) 
+                object_name = kwargs.get("object_name", None)
             
-            object_name = args[1] if len(args) > 1 else None
+            if 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()
@@ -359,7 +418,12 @@ class S3Client:
             str: The local path of the downloaded file.
         """
         try:
-            object_name = args[0] if len(args) > 0 else None
+            
+            if args:
+                object_name = args[0] if len(args) > 0 else None
+            else:
+                object_name = kwargs.get("object_name", None)
+            
             if object_name is None:
                 raise Exception("Object name is None")
             

{pyaws_s3-1.0.6 → pyaws_s3-1.0.8}/pyaws_s3.egg-info/PKG-INFO

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

{pyaws_s3-1.0.6 → pyaws_s3-1.0.8}/pyaws_s3.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ README.md
 pyproject.toml
 pyaws_s3/__init__.py
 pyaws_s3/s3.py
-pyaws_s3/util.py
 pyaws_s3.egg-info/PKG-INFO
 pyaws_s3.egg-info/SOURCES.txt
 pyaws_s3.egg-info/dependency_links.txt

{pyaws_s3-1.0.6 → pyaws_s3-1.0.8}/pyproject.toml

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

pyaws_s3-1.0.6/pyaws_s3/util.py

@@ -1,47 +0,0 @@
-import io
-import logging
-from plotly.graph_objs import Figure
-
-logger = logging.getLogger(__name__)
-
-def bytes_from_figure(f: Figure, **kwargs) -> bytes:
-    """
-    Convert a Plotly Figure to a PNG image as bytes.
-
-    Args:
-        f (Figure): The Plotly Figure object to be converted.
-
-    Returns:
-        bytes: The PNG image data as bytes.
-        :param f:  The Plotly Figure object to be converted into a PNG image.
-    """
-
-    format_file = kwargs.get("format_file", "png")  # The format of the image to be converted to
-    width = kwargs.get("width", 640)  # The width of the image in pixels
-    height = kwargs.get("height", 480)  # The height of the image in pixels
-
-    with io.BytesIO() as bytes_buffer:
-        f.write_image(bytes_buffer, 
-                      format=format_file, 
-                      width = width, 
-                      height = height)  # Write the figure to the bytes buffer as a PNG image
-        bytes_buffer.seek(0)  # Reset the buffer position to the beginning
-        return bytes_buffer.getvalue()  # Return the bytes data
-
-def html_from_figure(f: Figure) -> str:
-    """
-    Convert a Plotly Figure to an HTML string.
-
-    Args:
-        f (Figure): The Plotly Figure object to be converted.
-
-    Returns:
-        str: The HTML representation of the figure as a string.
-    """
-    with io.BytesIO() as bytes_buffer:
-        # Wrap the BytesIO with a TextIOWrapper to handle strings
-        with io.TextIOWrapper(bytes_buffer, encoding='utf-8') as text_buffer:
-            f.write_html(text_buffer)  # Write the figure to the text buffer
-            text_buffer.flush()  # Ensure all data is written
-            bytes_buffer.seek(0)  # Reset the buffer position to the beginning
-            return bytes_buffer.getvalue().decode('utf-8')  # Decode bytes to string and return