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

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

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

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

@@ -5,11 +5,13 @@ import json
 import time
 import os
 import io
+import base64
 from typing import Optional, List, Dict
 from enum import Enum
 import pymupdf
 import concurrent.futures
 from dataclasses import dataclass
+from my_aws_helpers.s3 import ContentType
 
 
 class PromptType(str, Enum):
@@ -237,3 +239,35 @@ class Bedrock:
         except Exception as e:
             self.logger.exception(e)
             return []
+
+    def _get_image_block(self, image: bytes, image_content_type: ContentType) -> dict:
+        return {
+            "image": {
+                "format": image_content_type,
+                "source": {
+                    "bytes": image,
+                },
+            }
+        }
+
+    def image_analysis(
+        self, images: List[bytes], prompt: str, image_content_type: ContentType
+    ) -> 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],
+            }
+        ]
+        response = self.client.converse(
+            modelId=self.model_id, messages=message, system=system_prompt
+        )
+
+        result = {}
+        result["content"] = json.loads(
+            response["output"]["message"]["content"][0]["text"]
+        )
+        result["token_usage"] = response["usage"]
+        return OCRResult.from_dict(data=result)

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

@@ -1,7 +1,7 @@
 import boto3
 import io
 import json
-from typing import Optional, Any, Dict
+from typing import Optional, Any, Dict, List
 from datetime import datetime, date
 from copy import copy
 import os
@@ -41,6 +41,7 @@ class S3Serialiser:
             return {k: S3Serialiser.object_serialiser(v) for k, v in obj.items()}
         return S3Serialiser._serialise(obj=obj)
 
+
 class S3Location:
     bucket: str
     file_name: str
@@ -94,6 +95,18 @@ class S3:
             Body=json.dumps(object), Bucket=bucket_name, Key=file_name
         )
 
+    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
+            )
+            return response["Contents"]
+        except Exception as e:
+            logger.exception(
+                f"Failed to get objects from s3: {bucket_name}/{prefix} due to {e}"
+            )
+            return []
+
     def get_object(self, bucket_name: str, file_name: str):
         response = self.client.get_object(Bucket=bucket_name, Key=file_name)
         return self._streaming_body_to_dict(response["Body"])
@@ -247,7 +260,9 @@ class S3:
             )
         except Exception as e:
             logger.exception(f"Failed to save jpeg to s3 due to {e}")
-            return None        
+            return None
 
     def read_dict_from_s3(self, s3_location: S3Location) -> dict:
-        return json.loads(self.read_binary_from_s3(s3_location=s3_location).decode("utf-8"))
+        return json.loads(
+            self.read_binary_from_s3(s3_location=s3_location).decode("utf-8")
+        )

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

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

{my_aws_helpers-4.5.0 → my_aws_helpers-4.7.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.5.0"
+version = "4.7.0"
 
 core = [
     "boto3==1.34.36",