PyS3Uploader 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

{pys3uploader-0.2.1.dist-info → pys3uploader-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyS3Uploader
-Version: 0.2.1
+Version: 0.2.2
 Summary: Python module to upload objects to an S3 bucket.
 Author-email: Vignesh Rao <svignesh1793@gmail.com>
 License: MIT License

pys3uploader-0.2.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+s3/__init__.py,sha256=L12aFBb0plj8WISe0_He1vvQ55aOKd8VCyMlj_2LqrQ,66
+s3/exceptions.py,sha256=hH3jlMOe8yjBatQK9EdndWZz4QESU74KSY_iDhQ37SY,2585
+s3/logger.py,sha256=oH540oq8jY723jA4lDWlgfFPLbNgGXTkDwFpB7TLO_o,1196
+s3/tree.py,sha256=DiQ2ekMMaj2m_P3-iKkEqSuJCJZ_UZxcAwHtAoPVa5c,1824
+s3/uploader.py,sha256=I2An6Ix0rFMlvDLtLaDQ6F-YrN70IDCNFgh9E32cXHA,11489
+s3/utils.py,sha256=NbF28CYviK_St5qd1EOumMVyus9BvQON7clUFeR_SEQ,4473
+pys3uploader-0.2.2.dist-info/LICENSE,sha256=8k-hEraOzyum0GvmmK65YxNRTFXK7eIFHJ0OshJXeTk,1068
+pys3uploader-0.2.2.dist-info/METADATA,sha256=fIlyxO6dFHYH3uhFg4yZa7RtGGBKqaOynAHlrbuffoY,7449
+pys3uploader-0.2.2.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+pys3uploader-0.2.2.dist-info/top_level.txt,sha256=iQp4y1P58Q633gj8M08kHE4mqqT0hixuDWcniDk_RJ4,3
+pys3uploader-0.2.2.dist-info/RECORD,,

s3/__init__.py

@@ -1,3 +1,3 @@
 from s3.uploader import Uploader  # noqa: F401
 
-version = "0.2.1"
+version = "0.2.2"

s3/uploader.py

@@ -14,6 +14,7 @@ from s3.logger import default_logger
 from s3.utils import (
     RETRY_CONFIG,
     UploadResults,
+    convert_seconds,
     convert_to_folder_structure,
     getenv,
     urljoin,
@@ -134,7 +135,7 @@ class Uploader:
         self.logger.info(
             "Total number of uploads: %d, success: %d, failed: %d", total, self.results.success, self.results.failed
         )
-        self.logger.info("Run Time: %.2fs", time.time() - self.start)
+        self.logger.info("Run time: %s", convert_seconds(time.time() - self.start))
 
     def _proceed_to_upload(self, filepath: str, objectpath: str) -> bool:
         """Compares file size if the object already exists in S3.

s3/utils.py

@@ -3,18 +3,6 @@ from typing import Dict, Set
 
 from botocore.config import Config
 
-
-class UploadResults(dict):
-    """Object to store results of S3 upload.
-
-    >>> UploadResults
-
-    """
-
-    success: int = 0
-    failed: int = 0
-
-
 RETRY_CONFIG: Config = Config(
     retries={
         "max_attempts": 10,
@@ -27,6 +15,17 @@ RETRY_CONFIG: Config = Config(
 )
 
 
+class UploadResults(dict):
+    """Object to store results of S3 upload.
+
+    >>> UploadResults
+
+    """
+
+    success: int = 0
+    failed: int = 0
+
+
 def getenv(*args, default: str = None) -> str:
     """Returns the key-ed environment variable or the default value."""
     for key in args:
@@ -82,3 +81,67 @@ def convert_to_folder_structure(sequence: Set[str]) -> str:
         return result
 
     return generate_folder_structure(folder_structure)
+
+
+def convert_seconds(seconds: int | float, n_elem: int = 2) -> str:
+    """Calculate years, months, days, hours, minutes, seconds, and milliseconds from given input.
+
+    Args:
+        seconds: Number of seconds to convert (supports float values).
+        n_elem: Number of elements required from the converted list.
+
+    Returns:
+        str:
+        Returns a humanized string notion of the number of seconds.
+    """
+    if not seconds:
+        return "0s"
+    elif seconds < 1:
+        return f"{seconds * 1000:.0f}ms"
+
+    seconds_in_year = 365 * 24 * 3600
+    seconds_in_month = 30 * 24 * 3600
+
+    years = seconds // seconds_in_year
+    seconds %= seconds_in_year
+
+    months = seconds // seconds_in_month
+    seconds %= seconds_in_month
+
+    days = seconds // (24 * 3600)
+    seconds %= 24 * 3600
+
+    hours = seconds // 3600
+    seconds %= 3600
+
+    minutes = seconds // 60
+    seconds %= 60
+
+    milliseconds = round((seconds % 1) * 1000)
+    seconds = int(seconds)  # Convert remaining seconds to int for display
+
+    time_parts = []
+
+    if years > 0:
+        time_parts.append(f"{int(years)} year{'s' if years > 1 else ''}")
+    if months > 0:
+        time_parts.append(f"{int(months)} month{'s' if months > 1 else ''}")
+    if days > 0:
+        time_parts.append(f"{int(days)} day{'s' if days > 1 else ''}")
+    if hours > 0:
+        time_parts.append(f"{int(hours)} hour{'s' if hours > 1 else ''}")
+    if minutes > 0:
+        time_parts.append(f"{int(minutes)} minute{'s' if minutes > 1 else ''}")
+    if seconds > 0 or milliseconds > 0:
+        if seconds > 0 and milliseconds > 0:
+            time_parts.append(f"{seconds + milliseconds / 1000:.1f}s")
+        elif seconds > 0:
+            time_parts.append(f"{seconds}s")
+        else:
+            time_parts.append(f"{milliseconds}ms")
+
+    if len(time_parts) == 1:
+        return time_parts[0]
+
+    list_ = time_parts[:n_elem]
+    return ", and ".join([", ".join(list_[:-1]), list_[-1]] if len(list_) > 2 else list_)

pys3uploader-0.2.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-s3/__init__.py,sha256=IqcPR9iWMw0GDBEmKvLzW7P-AhInTkwRklkvYgiT1Xc,66
-s3/exceptions.py,sha256=hH3jlMOe8yjBatQK9EdndWZz4QESU74KSY_iDhQ37SY,2585
-s3/logger.py,sha256=oH540oq8jY723jA4lDWlgfFPLbNgGXTkDwFpB7TLO_o,1196
-s3/tree.py,sha256=DiQ2ekMMaj2m_P3-iKkEqSuJCJZ_UZxcAwHtAoPVa5c,1824
-s3/uploader.py,sha256=v6TGdm8EcAldoIw3GOAwkuoUzi9b9IRj8b94hl1Pkyw,11454
-s3/utils.py,sha256=dd1OeLbswLzFVyjYiXixkJlFsoGWRtRCOHha6wLG5zQ,2485
-pys3uploader-0.2.1.dist-info/LICENSE,sha256=8k-hEraOzyum0GvmmK65YxNRTFXK7eIFHJ0OshJXeTk,1068
-pys3uploader-0.2.1.dist-info/METADATA,sha256=NA7x6YqpWEKvn3XEYzVug7XTl1vPcwiphUzWtMvlzHE,7449
-pys3uploader-0.2.1.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-pys3uploader-0.2.1.dist-info/top_level.txt,sha256=iQp4y1P58Q633gj8M08kHE4mqqT0hixuDWcniDk_RJ4,3
-pys3uploader-0.2.1.dist-info/RECORD,,