my-aws-helpers 3.1.0.dev2__tar.gz → 3.1.0.dev4__tar.gz

{my_aws_helpers-3.1.0.dev2 → my_aws_helpers-3.1.0.dev4}/PKG-INFO

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

{my_aws_helpers-3.1.0.dev2 → my_aws_helpers-3.1.0.dev4}/my_aws_helpers/bedrock.py

@@ -149,22 +149,16 @@ class Bedrock:
             prompt: str,
             max_workers: int = 10,
     ):
-        results = list()
+        execution_futures = []
         with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
             for i, img in enumerate(image_bytes_list):
                 self.logger.info(f"Starting OCR for page: {i}")
-                time.sleep(self.sleep_time)
-                execution_futures = {
-                    executor.map(
-                        self._ocr, 
-                        prompt = prompt,
-                        image_bytes = img,
-                    )
-                }
-            for future in concurrent.futures.as_completed(execution_futures):
-                result = future.result()
-                if result:
-                    results.append(result)
+                time.sleep(self.sleep_time)  # Stagger start time
+                future = executor.submit(self._ocr, prompt=prompt, image_bytes=img)
+                execution_futures.append(future)
+
+        # Wait for all tasks and collect results in order of submission
+        results = [future.result() for future in execution_futures if future.result() is not None]
         return results
     
     def get_ocr_result(
@@ -186,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)
@@ -196,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
@@ -207,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.dev2 → my_aws_helpers-3.1.0.dev4}/my_aws_helpers.egg-info/PKG-INFO

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

{my_aws_helpers-3.1.0.dev2 → my_aws_helpers-3.1.0.dev4}/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.dev2"
+version = "3.1.0.dev4"
 
 setup(
     name="my_aws_helpers",