my-aws-helpers 4.7.0__tar.gz → 4.9.0__tar.gz

{my_aws_helpers-4.7.0 → my_aws_helpers-4.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: my_aws_helpers
-Version: 4.7.0
+Version: 4.9.0
 Summary: AWS Helpers
 Home-page: https://github.com/JarrodMccarthy/aws_helpers.git
 Author: Jarrod McCarthy

{my_aws_helpers-4.7.0 → my_aws_helpers-4.9.0}/my_aws_helpers/bedrock.py

@@ -11,7 +11,13 @@ from enum import Enum
 import pymupdf
 import concurrent.futures
 from dataclasses import dataclass
-from my_aws_helpers.s3 import ContentType
+
+
+class ImageType(str, Enum):
+    gif = "gif"
+    jpeg = "jpeg"
+    png = "png"
+    webp = "webp"
 
 
 class PromptType(str, Enum):
@@ -240,7 +246,7 @@ class Bedrock:
             self.logger.exception(e)
             return []
 
-    def _get_image_block(self, image: bytes, image_content_type: ContentType) -> dict:
+    def _get_image_block(self, image: bytes, image_content_type: ImageType) -> dict:
         return {
             "image": {
                 "format": image_content_type,
@@ -251,14 +257,19 @@ class Bedrock:
         }
 
     def image_analysis(
-        self, images: List[bytes], prompt: str, image_content_type: ContentType
+        self, images: List[bytes], prompt: str, image_content_type: ImageType
     ) -> OCRResult:
 
         system_prompt = [{"text": prompt}]
         message = [
             {
                 "role": "user",
-                "content": [self._get_image_block(image=image, image_content_type=image_content_type) for image in images],
+                "content": [
+                    self._get_image_block(
+                        image=image, image_content_type=image_content_type
+                    )
+                    for image in images
+                ],
             }
         ]
         response = self.client.converse(

{my_aws_helpers-4.7.0 → my_aws_helpers-4.9.0}/my_aws_helpers/s3.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
 import boto3
 import io
 import json
+from abc import ABC, abstractmethod
 from typing import Optional, Any, Dict, List
 from datetime import datetime, date
 from copy import copy
@@ -97,9 +99,7 @@ class S3:
 
     def list_objects_by_prefix(self, bucket_name: str, prefix: str) -> List[Dict]:
         try:
-            response = self.client.client.list_objects_v2(
-                Bucket=bucket_name, Prefix=prefix
-            )
+            response = self.client.list_objects_v2(Bucket=bucket_name, Prefix=prefix)
             return response["Contents"]
         except Exception as e:
             logger.exception(
@@ -266,3 +266,36 @@ class S3:
         return json.loads(
             self.read_binary_from_s3(s3_location=s3_location).decode("utf-8")
         )
+
+
+class BaseS3Object(ABC):
+    def to_s3_representation(self) -> dict:
+        obj = copy(vars(self))
+        return S3Serialiser.object_serialiser(obj=obj)
+
+    @classmethod
+    def from_s3_representation(cls, obj: dict) -> BaseS3Object:
+        return cls(**obj)
+
+    @abstractmethod
+    def get_save_location(self, bucket_name: str) -> S3Location:
+        pass
+
+
+class BaseS3Queries:
+    s3_client: S3
+    bucket_name: str
+
+    def __init__(self, s3_client: S3, bucket_name: str):
+        self.s3_client = s3_client
+        self.bucket_name = bucket_name
+
+    def save_s3_object_to_s3(self, object: BaseS3Object) -> Optional[S3Location]:
+        try:
+            obj = object.to_s3_representation()
+            return self.s3_client.save_dict_to_s3(
+                content=obj, s3_location=object.get_save_location()
+            )
+        except Exception as e:
+            logger.exception(f"Failed to save s3 object to s3 due to {e}")
+        return None

{my_aws_helpers-4.7.0 → my_aws_helpers-4.9.0}/my_aws_helpers.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: my-aws-helpers
-Version: 4.7.0
+Version: 4.9.0
 Summary: AWS Helpers
 Home-page: https://github.com/JarrodMccarthy/aws_helpers.git
 Author: Jarrod McCarthy

{my_aws_helpers-4.7.0 → my_aws_helpers-4.9.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_namespace_packages, setup
 
 base_path = os.path.abspath(os.path.dirname(__file__))
 
-version = "4.7.0"
+version = "4.9.0"
 
 core = [
     "boto3==1.34.36",