my-aws-helpers 4.4.1__tar.gz → 4.6.0__tar.gz

{my_aws_helpers-4.4.1 → my_aws_helpers-4.6.0}/PKG-INFO

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

{my_aws_helpers-4.4.1 → my_aws_helpers-4.6.0}/my_aws_helpers/bedrock.py

@@ -5,6 +5,7 @@ import json
 import time
 import os
 import io
+import base64
 from typing import Optional, List, Dict
 from enum import Enum
 import pymupdf
@@ -237,3 +238,40 @@ class Bedrock:
         except Exception as e:
             self.logger.exception(e)
             return []
+
+
+    def image_analysis(self, images: List[bytes]) -> OCRResult:
+        instruction = (
+            "You are an assistant for real estate investors. Analyze the following property images "
+            "and return structured insights. Focus only on what can reasonably be inferred from the images. "
+            "Do not make up financial or legal data. Be objective and consistent.\n\n"
+            "Return ONLY valid JSON with this structure:\n"
+            "{\n"
+            '  "condition_score": "Integer from 1-10 (1 = very poor, 10 = excellent)",\n'
+            '  "materials": {\n'
+            '    "exterior_walls": "string", "roof": "string", "windows": "string",\n'
+            '    "flooring": "string", "kitchen_benchtops": "string", "bathroom_fittings": "string"\n'
+            "  },\n"
+            '  "features": [], "maintenance_risks": [], "energy_efficiency": [],\n'
+            '  "location_clues": [], "upgrade_potential": []\n'
+            "}"
+        )
+
+
+        system_prompt = [{"text": instruction}]
+        message = [
+            {
+                "role": "user",
+                "content": [self._get_image_block(image=image) 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.4.1 → my_aws_helpers-4.6.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
@@ -34,13 +34,12 @@ class S3Serialiser:
         return obj
 
     @staticmethod
-    def object_serialiser(obj_dict: Dict):
-        for k, obj in obj_dict.items():
-            if isinstance(obj, list):
-                return json.dumps([S3Serialiser.object_serialiser(obj=obj) for obj in obj])
-            if isinstance(obj, dict):
-                return json.dumps({k: S3Serialiser.object_serialiser(v) for k, v in obj.items()})
-        return S3Serialiser._serialise(obj=obj_dict)
+    def object_serialiser(obj: Dict):
+        if isinstance(obj, list):
+            return [S3Serialiser.object_serialiser(obj=obj) for obj in obj]
+        if isinstance(obj, dict):
+            return {k: S3Serialiser.object_serialiser(v) for k, v in obj.items()}
+        return S3Serialiser._serialise(obj=obj)
 
 class S3Location:
     bucket: str
@@ -95,6 +94,17 @@ 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"])
@@ -112,7 +122,7 @@ class S3:
                 "Key": file_name,
             },
             ExpiresIn=expires_in,
-        )
+        ) 
 
     def get_s3_location_from_bucket_file(
         bucket_name: str, file_name: str

{my_aws_helpers-4.4.1 → my_aws_helpers-4.6.0}/my_aws_helpers.egg-info/PKG-INFO

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

{my_aws_helpers-4.4.1 → my_aws_helpers-4.6.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.4.1"
+version = "4.6.0"
 
 core = [
     "boto3==1.34.36",