my-aws-helpers 3.1.0.dev3__tar.gz → 3.2.0__tar.gz

{my_aws_helpers-3.1.0.dev3 → my_aws_helpers-3.2.0}/PKG-INFO

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

{my_aws_helpers-3.1.0.dev3 → my_aws_helpers-3.2.0}/my_aws_helpers/bedrock.py

@@ -180,6 +180,7 @@ class Bedrock:
                 except Exception as e:
                     self.logger.error(f"Could not get pix map for page {i}")
                     continue
+            skip_page_zero = False
             header_ocr_result = None
             if len(image_bytes_list) > 1:
                 headers_prompt = self._get_prompt(prompt_type=PromptType.transaction_headers.value)
@@ -190,6 +191,7 @@ class Bedrock:
                         self.logger.info(f"No ocr result returned when getting headers {PromptType.transaction_headers.value}")
                     headers = header_ocr_result.content.get("headers")
                     if (len(headers) < 1) or (headers is None):
+                        skip_page_zero = True
                         continue
                     else:
                         break
@@ -201,6 +203,8 @@ class Bedrock:
             self.logger.info("Got Prompt")
             results = list()
 
+            if skip_page_zero:
+                image_bytes_list = image_bytes_list[1:] #page zero often has account summary info
             results = self._parallel_ocr(image_bytes_list=image_bytes_list, prompt=transactions_prompt)
 
             # for i, image_bytes in enumerate(image_bytes_list):

{my_aws_helpers-3.1.0.dev3 → my_aws_helpers-3.2.0}/my_aws_helpers/s3.py

@@ -51,7 +51,7 @@ class S3:
         resource: Optional[boto3.resource] = None,
     ) -> None:
         self.client = client if client else self._get_client()
-        self.resource = resource if resource else boto3.resource('s3')
+        self.resource = resource if resource else boto3.resource('s3', region_name = os.environ["AWS_DEFAULT_REGION"])
 
     def _get_client(self) -> boto3.client:
         region_name = os.environ["AWS_DEFAULT_REGION"]
@@ -77,7 +77,10 @@ class S3:
         return self._streaming_body_to_dict(response["Body"])
 
     def get_presigned_url(
-        self, bucket_name: str, file_name: str, expires_in: int = 3600
+        self, 
+        bucket_name: str, 
+        file_name: str, 
+        expires_in: int = 3600,
     ):
         return self.client.generate_presigned_url(
             "get_object",

{my_aws_helpers-3.1.0.dev3 → my_aws_helpers-3.2.0}/my_aws_helpers.egg-info/PKG-INFO

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

{my_aws_helpers-3.1.0.dev3 → my_aws_helpers-3.2.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_namespace_packages, setup
 
 base_path = os.path.abspath(os.path.dirname(__file__))
 
-version = "3.1.0.dev3"
+version = "3.2.0"
 
 setup(
     name="my_aws_helpers",