my-aws-helpers 5.4.0__tar.gz → 5.6.0__tar.gz

{my_aws_helpers-5.4.0 → my_aws_helpers-5.6.0}/PKG-INFO

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

{my_aws_helpers-5.4.0 → my_aws_helpers-5.6.0}/my_aws_helpers/bedrock.py

@@ -5,6 +5,7 @@ import json
 import time
 import os
 import io
+import re
 from copy import copy
 from typing import Optional, List, Dict
 from enum import Enum
@@ -69,7 +70,7 @@ class OCRResult(BaseS3Object):
 
     def to_s3_representation(self) -> dict:
         obj = copy(vars(self))
-        obj['token_usage'] = S3Serialiser.object_serialiser(obj=obj['token_usage'])
+        obj['token_usage'] = S3Serialiser.object_serialiser(obj=vars(obj['token_usage']))
         return S3Serialiser.object_serialiser(obj=obj)
 
     def get_save_location(self, bucket_name: str) -> S3Location:
@@ -122,7 +123,7 @@ class OCRResultQueries(BaseS3Queries):
 class Bedrock:
     def __init__(
         self,
-        model_id: str = "apac.anthropic.claude-3-5-sonnet-20241022-v2:0",
+        model_id: str = "apac.anthropic.claude-3-5-sonnet-20241022-v2:0",#anthropic.claude-sonnet-4-20250514-v1:0
         logger=None,
         sleep_time: float = 1.0,
     ):
@@ -162,6 +163,19 @@ class Bedrock:
             print(e)
             return None
 
+    @staticmethod
+    def extract_json_from_markdown(text: str):
+        """
+        Extracts the JSON object from a string that may be wrapped in ```json ... ``` code block
+        """
+        # Match a {...} block anywhere in the text
+        match = re.search(r"\{.*\}", text, re.DOTALL)
+        if match:
+            json_str = match.group(0)
+            return json.loads(json_str)
+        else:
+            raise ValueError("No JSON object found in the text")
+
     def _get_prompt(self, prompt_type: str) -> Optional[str]:
         if prompt_type not in list(PromptType):
             raise Exception(f"Error: Invalid prompt type")
@@ -339,8 +353,8 @@ class Bedrock:
         )
 
         result = {}
-        result["content"] = json.loads(
-            response["output"]["message"]["content"][0]["text"]
+        result["content"] = Bedrock.extract_json_from_markdown(
+            text = response["output"]["message"]["content"][0]["text"]
         )
         result["token_usage"] = response["usage"]
         return OCRResult.from_dict(data=result)

{my_aws_helpers-5.4.0 → my_aws_helpers-5.6.0}/my_aws_helpers.egg-info/PKG-INFO

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

{my_aws_helpers-5.4.0 → my_aws_helpers-5.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 = "5.4.0"
+version = "5.6.0"
 
 core = [
     "boto3==1.34.36",