PyS3Uploader 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

{pys3uploader-0.2.3.dist-info → pys3uploader-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyS3Uploader
-Version: 0.2.3
+Version: 0.2.4
 Summary: Python module to upload objects to an S3 bucket.
 Author-email: Vignesh Rao <svignesh1793@gmail.com>
 License: MIT License
@@ -121,6 +121,8 @@ if __name__ == '__main__':
 - **file_exclusion** - Sequence of files to exclude during upload. Defaults to ``None``
 - **folder_exclusion** - Sequence of directories to exclude during upload. Defaults to ``None``
 - **logger** - Bring your own custom pre-configured logger. Defaults to on-screen logging.
+- **log_handler** - Choose between `stdout` vs `file` logging. Defaults to `s3.LogHandler.stdout`
+- **log_level** - Choose the logging level. Defaults to `s3.LogLevel.debug`
 - **env_file** – Path to a `.env` file for loading environment variables. Defaults to scanning the current directory.
 <br><br>
 - **region_name** - AWS region name. Defaults to the env var `AWS_DEFAULT_REGION`

pys3uploader-0.2.4.dist-info/RECORD

@@ -0,0 +1,11 @@
+s3/__init__.py,sha256=YsBU1Xy4sLbm_8jU5kKP8QP3ayKBmnJDaF3NCNaDOsk,66
+s3/exceptions.py,sha256=hH3jlMOe8yjBatQK9EdndWZz4QESU74KSY_iDhQ37SY,2585
+s3/logger.py,sha256=igwMubdTQ_GrMkwie5DAIvmxIcgj6a9UA_EGFrwFYiQ,2571
+s3/tree.py,sha256=DiQ2ekMMaj2m_P3-iKkEqSuJCJZ_UZxcAwHtAoPVa5c,1824
+s3/uploader.py,sha256=S480dteogtnA3xWVkHb2aRr5gtL1WnRIukw3_aAX1z0,14228
+s3/utils.py,sha256=NbF28CYviK_St5qd1EOumMVyus9BvQON7clUFeR_SEQ,4473
+pys3uploader-0.2.4.dist-info/LICENSE,sha256=8k-hEraOzyum0GvmmK65YxNRTFXK7eIFHJ0OshJXeTk,1068
+pys3uploader-0.2.4.dist-info/METADATA,sha256=Dd-gyQ387bU7NcVC7Y0aqAeyXUzxlW1nsMWbMvfRDLg,7969
+pys3uploader-0.2.4.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+pys3uploader-0.2.4.dist-info/top_level.txt,sha256=iQp4y1P58Q633gj8M08kHE4mqqT0hixuDWcniDk_RJ4,3
+pys3uploader-0.2.4.dist-info/RECORD,,

s3/__init__.py

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

s3/logger.py

@@ -5,9 +5,46 @@
 """
 
 import logging
+import os
+from datetime import datetime
+from enum import IntEnum, StrEnum
 
 
-def default_handler() -> logging.StreamHandler:
+class LogHandler(StrEnum):
+    """Logging handlers to choose from when default logger is used.
+
+    >>> LogHandler
+
+    """
+
+    file = "file"
+    stdout = "stdout"
+
+
+class LogLevel(IntEnum):
+    """Logging levels to choose from when default logger is used.
+
+    >>> LogLevel
+
+    """
+
+    debug = logging.DEBUG
+    info = logging.INFO
+    warning = logging.WARNING
+    error = logging.ERROR
+
+    @classmethod
+    def _missing_(cls, value):
+        """Allow constructing from string names."""
+        if isinstance(value, str):
+            value = value.lower()
+            for member in cls:
+                if member.name == value:
+                    return member
+        return None
+
+
+def stream_handler() -> logging.StreamHandler:
     """Creates a ``StreamHandler`` and assigns a default format to it.
 
     Returns:
@@ -19,6 +56,20 @@ def default_handler() -> logging.StreamHandler:
     return handler
 
 
+def file_handler() -> logging.FileHandler:
+    """Creates a ``StreamHandler`` and assigns a default format to it.
+
+    Returns:
+        logging.StreamHandler:
+        Returns an instance of the ``StreamHandler`` object.
+    """
+    os.makedirs("logs", exist_ok=True)
+    filename = os.path.join("logs", datetime.now().strftime("PyS3Uploader_%d-%m-%Y_%H:%M.log"))
+    handler = logging.FileHandler(filename, mode="a")
+    handler.setFormatter(fmt=default_format())
+    return handler
+
+
 def default_format() -> logging.Formatter:
     """Creates a logging ``Formatter`` with a custom message and datetime format.
 
@@ -32,7 +83,7 @@ def default_format() -> logging.Formatter:
     )
 
 
-def default_logger() -> logging.Logger:
+def setup_logger(handler: LogHandler, level: LogLevel):
     """Creates a default logger with debug mode enabled.
 
     Returns:
@@ -40,6 +91,10 @@ def default_logger() -> logging.Logger:
         Returns an instance of the ``Logger`` object.
     """
     logger = logging.getLogger(__name__)
-    logger.addHandler(hdlr=default_handler())
-    logger.setLevel(level=logging.DEBUG)
+    if handler == LogHandler.file:
+        logger.addHandler(hdlr=file_handler())
+    elif handler == LogHandler.stdout:
+        logger.addHandler(hdlr=stream_handler())
+
+    logger.setLevel(level)
     return logger

s3/uploader.py

@@ -11,7 +11,7 @@ from botocore.exceptions import ClientError
 from tqdm import tqdm
 
 from s3.exceptions import BucketNotFound
-from s3.logger import default_logger
+from s3.logger import LogHandler, LogLevel, setup_logger
 from s3.utils import (
     RETRY_CONFIG,
     UploadResults,
@@ -45,6 +45,8 @@ class Uploader:
         aws_secret_access_key: str = None,
         retry_config: Config = RETRY_CONFIG,
         logger: logging.Logger = None,
+        log_handler: LogHandler = LogHandler.stdout,
+        log_level: LogLevel = LogLevel.debug,
         env_file: str = None,
     ):
         """Initiates all the necessary args and creates a boto3 session with retry logic.
@@ -63,6 +65,8 @@ class Uploader:
             aws_access_key_id: AWS access key ID.
             aws_secret_access_key: AWS secret access key.
             logger: Bring your own logger.
+            log_handler: Default log handler, can be ``file`` or ``stdout``.
+            log_level: Default log level, can be ``debug``, ``info``, ``warning`` or ``error``.
             env_file: Dotenv file (.env) filepath to load environment variables.
 
         See Also:
@@ -85,7 +89,7 @@ class Uploader:
                 If a filepath is provided, PyS3Uploader loads it directly or searches the root directory for the file.
                 If no filepath is provided, PyS3Uploader searches the current directory for a .env file.
         """
-        self.logger = logger or default_logger()
+        self.logger = logger or setup_logger(handler=LogHandler(log_handler), level=LogLevel(log_level))
         self.env_file = env_file or getenv("ENV_FILE", default=".env")
 
         # Check for env_file in current working directory
@@ -184,19 +188,21 @@ class Uploader:
         """
         if self.overwrite:
             return True
+        try:
+            file_size = os.path.getsize(filepath)
+        except (OSError, PermissionError) as error:
+            self.logger.error(error)
+            file_size = 0
         # Indicates that the object path already exists in S3
         if object_size := self.object_size_map.get(objectpath):
-            try:
-                file_size = os.path.getsize(filepath)
-            except (OSError, PermissionError) as error:
-                self.logger.error(error)
-                return True
             if object_size == file_size:
                 self.logger.info("S3 object %s exists, and size [%d] matches, skipping..", objectpath, object_size)
                 return False
             self.logger.info(
                 "S3 object %s exists, but size mismatch. Local: [%d], S3: [%d]", objectpath, file_size, object_size
             )
+        else:
+            self.logger.debug("S3 object '%s' of size [%d bytes] doesn't exist, uploading..", objectpath, file_size)
         return True
 
     def _uploader(self, filepath: str, objectpath: str) -> None:

pys3uploader-0.2.3.dist-info/RECORD

@@ -1,11 +0,0 @@
-s3/__init__.py,sha256=aZ2woJ8TD2tgqXi0ElG-wWwJWoQLIdqTdm50FLaxL8w,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=KxrWbIInXxXQszP_uJLf_dBI5rUNjNnhco3gr9Vdrto,13767
-s3/utils.py,sha256=NbF28CYviK_St5qd1EOumMVyus9BvQON7clUFeR_SEQ,4473
-pys3uploader-0.2.3.dist-info/LICENSE,sha256=8k-hEraOzyum0GvmmK65YxNRTFXK7eIFHJ0OshJXeTk,1068
-pys3uploader-0.2.3.dist-info/METADATA,sha256=ae2lA8b7dsGWZSMfB8w4joDiAlaE6Wk1f3p1Fxywkc4,7795
-pys3uploader-0.2.3.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-pys3uploader-0.2.3.dist-info/top_level.txt,sha256=iQp4y1P58Q633gj8M08kHE4mqqT0hixuDWcniDk_RJ4,3
-pys3uploader-0.2.3.dist-info/RECORD,,