boto3-assist 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

boto3_assist/s3/s3.py

@@ -7,6 +7,7 @@ MIT License.  See Project Root for the license information.
 import os
 import tempfile
 import time
+import io
 from typing import Any, Dict, List, Optional
 
 from aws_lambda_powertools import Logger
@@ -50,6 +51,19 @@ class S3(S3Connection):
             aws_secret_access_key=aws_secret_access_key,
         )
 
+    def create_bucket(self, bucket_name: str) -> None:
+        """
+        Create an S3 bucket
+        :param bucket_name: Bucket to create
+        :return: True if bucket is created, else False
+        """
+        try:
+            self.client.create_bucket(Bucket=bucket_name)
+            logger.info(f"Bucket {bucket_name} created")
+        except ClientError as e:
+            logger.exception(e)
+            raise e
+
     def generate_presigned_url(
         self,
         bucket_name: str,
@@ -139,7 +153,7 @@ class S3(S3Connection):
 
         return response
 
-    def upload_file_obj(self, bucket: str, key: str, file_obj: bytes) -> str:
+    def upload_file_obj(self, bucket: str, key: str, file_obj: bytes | str) -> str:
         """
         Uploads a file object to s3. Returns the full s3 path s3://<bucket>/<key>
         """
@@ -156,7 +170,13 @@ class S3(S3Connection):
             }
         )
         try:
-            self.client.upload_fileobj(Fileobj=file_obj, Bucket=bucket, Key=key)
+            # convert if necessary
+            file_obj: bytes = (
+                file_obj.encode("utf-8") if isinstance(file_obj, str) else file_obj
+            )
+            self.client.upload_fileobj(
+                Fileobj=io.BytesIO(file_obj), Bucket=bucket, Key=key
+            )
 
         except ClientError as ce:
             error = {
@@ -503,3 +523,19 @@ class S3(S3Connection):
         else:
             # Not in AWS Lambda, use the system's default temp directory
             return tempfile.gettempdir()
+
+    def encode(
+        self, text: str, encoding: str = "utf-8", errors: str = "strict"
+    ) -> bytes:
+        """
+        Encodes a string for s3
+        """
+        return text.encode(encoding=encoding, errors=errors)
+
+    def decode(
+        self, file_obj: bytes, encoding: str = "utf-8", errors: str = "strict"
+    ) -> str:
+        """
+        Decodes bytes to a string
+        """
+        return file_obj.decode(encoding=encoding, errors=errors)

boto3_assist/utilities/file_operations.py

@@ -58,6 +58,16 @@ class FileOperations:
         dirname = os.path.dirname(path)
         return dirname
 
+    @staticmethod
+    def read_file(path: str, encoding: str = "utf-8") -> str:
+        """
+        Read a file
+        """
+        logger.debug(f"reading file {path}")
+        with open(path, "r", encoding=encoding) as file:
+            data = file.read()
+        return data
+
     @staticmethod
     def write_to_file(path: str, data: str, append: bool = False) -> str:
         """

boto3_assist/version.py

@@ -1 +1 @@
-__version__ = '0.2.2'
+__version__ = '0.2.4'

{boto3_assist-0.2.2.dist-info → boto3_assist-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: boto3_assist
-Version: 0.2.2
+Version: 0.2.4
 Summary: Additional boto3 wrappers to make your life a little easier
 Author-email: Eric Wilson <boto3-assist@geekcafe.com>
 Classifier: License :: Other/Proprietary License

{boto3_assist-0.2.2.dist-info → boto3_assist-0.2.4.dist-info}/RECORD

@@ -2,7 +2,7 @@ boto3_assist/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boto3_assist/boto3session.py,sha256=NWhWtYR3143thEbTpoklkwdz77-fTMs-QsoQdqfRm6E,6430
 boto3_assist/connection.py,sha256=EJlGueLIYqMSKs7aQlThK1S0Zkb8dOYBWch1iRZdgUI,3233
 boto3_assist/connection_tracker.py,sha256=_s1t7h2DOi3CCIHIr_HIKyGjku65WR-HJ_v8vJHDvO0,2977
-boto3_assist/version.py,sha256=QQ0yjZQnvXM7JeLLZEZWX6NmVUPu1lSROWOXF49_gug,22
+boto3_assist/version.py,sha256=N5-p8dQB8uwuCMpS1ADLf_E6rvWovtRRp3vY9Cq2gw4,22
 boto3_assist/cloudwatch/cloudwatch_connection.py,sha256=mnGWaLSQpHh5EeY7Ek_2o9JKHJxOELIYtQVMX1IaHn4,2480
 boto3_assist/cloudwatch/cloudwatch_connection_tracker.py,sha256=mzRtO1uHrcfJNh1XrGEiXdTqxwEP8d1RqJkraMNkgK0,410
 boto3_assist/cloudwatch/cloudwatch_log_connection.py,sha256=qQMZHjUJ6gA8wU9utjQhOURXNSPH2RjxSoAy83bvoCs,1737
@@ -28,16 +28,16 @@ boto3_assist/environment_services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 boto3_assist/environment_services/environment_loader.py,sha256=jvG1xwMtgkZqu70NbjG1b1IefKiWgaidjZZoqsSfULk,3370
 boto3_assist/environment_services/environment_variables.py,sha256=4ccBKdPt6O7hcRT3zBHd8vqu8yQU8udmoD5RLAT3iMs,6801
 boto3_assist/errors/custom_exceptions.py,sha256=zC2V2Y4PUtKj3uLPn8mB-JessksKWJWvKM9kp1dmvt8,760
-boto3_assist/s3/s3.py,sha256=j-u-gLxCDHS4XFEsFGSdfr3QBUxqc95g0NBmQQ5Z1g0,15965
+boto3_assist/s3/s3.py,sha256=NdfoU_vcg8ypyC2iYKm236zYTB3V7ave5vc_6Mdscxc,17065
 boto3_assist/s3/s3_connection.py,sha256=fMD1FxQazJ9gSFDrRmrv7YJE5QnCesGoWC1b5Dba_Jo,3774
 boto3_assist/utilities/datetime_utility.py,sha256=TbqGQkJDTahqvaZAIV550nhYnW1Bsq0Hdu3Go6P4RRs,10282
-boto3_assist/utilities/file_operations.py,sha256=HWQR6o3R5JaISixJS8CpUMsiNgW3Qp5yVZ9KA-jhPmA,3133
+boto3_assist/utilities/file_operations.py,sha256=Zy8fu8fpuVNf7U9NimrLdy5FRF71XSI159cnRdzmzGY,3411
 boto3_assist/utilities/http_utility.py,sha256=koFv7Va-8ng-47Nt1K2Sh7Ti95e62IYs9VMLlGh9Kt4,1173
 boto3_assist/utilities/logging_utility.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boto3_assist/utilities/serialization_utility.py,sha256=s_QQRIhtwIE7xN5nU13mNk2wtWyErBX_Sg7n0gbHj-M,4308
 boto3_assist/utilities/string_utility.py,sha256=w8l063UT3GE48tuJopETyZrjG4CgAzWkyDWMAYMg5Og,7432
-boto3_assist-0.2.2.dist-info/METADATA,sha256=6oHYMJUemswTElxmH2QeESelggP2rLyppiMc-vm7oBQ,1742
-boto3_assist-0.2.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-boto3_assist-0.2.2.dist-info/licenses/LICENSE-EXPLAINED.txt,sha256=WFREvTpfTjPjDHpOLADxJpCKpIla3Ht87RUUGii4ODU,606
-boto3_assist-0.2.2.dist-info/licenses/LICENSE.txt,sha256=PXDhFWS5L5aOTkVhNvoitHKbAkgxqMI2uUPQyrnXGiI,1105
-boto3_assist-0.2.2.dist-info/RECORD,,
+boto3_assist-0.2.4.dist-info/METADATA,sha256=6-R1661w1pMbKim2BiW3_Fq_rdVte73z5FM9oTmgyI4,1742
+boto3_assist-0.2.4.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+boto3_assist-0.2.4.dist-info/licenses/LICENSE-EXPLAINED.txt,sha256=WFREvTpfTjPjDHpOLADxJpCKpIla3Ht87RUUGii4ODU,606
+boto3_assist-0.2.4.dist-info/licenses/LICENSE.txt,sha256=PXDhFWS5L5aOTkVhNvoitHKbAkgxqMI2uUPQyrnXGiI,1105
+boto3_assist-0.2.4.dist-info/RECORD,,