my-aws-helpers 2.6.3__tar.gz → 2.6.5__tar.gz

{my_aws_helpers-2.6.3 → my_aws_helpers-2.6.5}/PKG-INFO

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

{my_aws_helpers-2.6.3 → my_aws_helpers-2.6.5}/my_aws_helpers/bedrock.py

@@ -10,12 +10,6 @@ from enum import Enum
 import pymupdf
 import concurrent.futures
 from dataclasses import dataclass
-from my_aws_helpers.logging import select_powertools_logger
-
-
-logger = select_powertools_logger('bedrock-boy')
-
-logger.info("Got logger")
 
 class PromptType(str, Enum):
     json = "json_system_prompt.txt"
@@ -55,10 +49,12 @@ class OCRResult:
 class Bedrock:
     def __init__(
         self,
-        model_id: str = "apac.anthropic.claude-3-5-sonnet-20241022-v2:0",
+        model_id: str = "anthropic.claude-3-5-sonnet-20241022-v2:0",
+        logger = None,
     ):
 
         self.session = Bedrock._set_session_params()
+        self.logger = logger
         region_name = "ap-southeast-2"
         if self.session is None:
             self.session = boto3.Session(region_name = region_name)
@@ -87,7 +83,7 @@ class Bedrock:
                 region_name=region_name
             )
         except Exception as e:
-            logger.exception(e)
+            print(e)
             return None
 
     def _get_prompt(self, prompt_type: str) -> Optional[str]:
@@ -100,7 +96,7 @@ class Bedrock:
                 prompt = f.read()
                 return prompt
         except Exception as e:
-            logger.exception(f"Failed to get {prompt_type} prompt due to {e}")
+            self.logger.exception(f"Failed to get {prompt_type} prompt due to {e}")
         return None
 
     def _ocr(
@@ -127,13 +123,13 @@ class Bedrock:
         ]
         retries = 3
         for i in range(retries):
-            logger.info(f"Attempt number {i} for {self.model_id} converse")
+            self.logger.info(f"Attempt number {i} for {self.model_id} converse")
             try:
                 response = self.client.converse(modelId = self.model_id, messages = message, system = system_prompt)
                 if response['ResponseMetadata']['HTTPStatusCode'] == 200:
                     break
             except Exception as e:
-                logger.exception(f"Error during conversation due to {e}")
+                self.logger.exception(f"Error during conversation due to {e}")
                 if i >= len(retries) - 1: raise Exception(e)
                 continue
         
@@ -152,7 +148,7 @@ class Bedrock:
         results = list()
         prompt = self._get_prompt(prompt_type=prompt_type)
         with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
-            logger.info("Some log")
+            self.logger.info("Some log")
             execution_futures = {
                 executor.submit(
                     self._ocr, 
@@ -172,28 +168,27 @@ class Bedrock:
         prompt_type: str,
         zoom: int = 7,
     ) -> List[OCRResult]:
-        logger.info("Getting OCR Results")
         try:
+            self.logger.info("Getting OCR Results")
             document = pymupdf.open(stream=pdf_bytes, filetype="pdf")
+            pages: List[pymupdf.Page] = [p for p in document]
+
+            image_bytes_list: List[bytes] = list()
+            for i, p in enumerate(pages):
+                try:
+                    image_bytes: bytes = p.get_pixmap(matrix = pymupdf.Matrix(zoom, zoom)).tobytes("png")
+                    image_bytes_list.append(image_bytes)
+                except Exception as e:
+                    self.logger.error(f"Could not get pix map for page {i}")
+                    continue
+            prompt = self._get_prompt(prompt_type=prompt_type)
+            self.logger.info("Got Prompt")
+            results = list()
+            for i, image_bytes in enumerate(image_bytes_list):
+                self.logger.info(f"Starting OCR for page: {i}")
+                results.append(self._ocr(image_bytes=image_bytes, prompt=prompt))
+            return results
         except Exception as e:
-            logger.exception(f"Failed to open pdf due to {e}")
+            self.logger.exception(e)
             return []
-
-        pages: List[pymupdf.Page] = [p for p in document]
-
-        image_bytes_list: List[bytes] = list()
-        for i, p in enumerate(pages):
-            try:
-                image_bytes: bytes = p.get_pixmap(matrix = pymupdf.Matrix(zoom, zoom)).tobytes("png")
-                image_bytes_list.append(image_bytes)
-            except Exception as e:
-                logger.error(f"Could not get pix map for page {i}")
-                continue
-        prompt = self._get_prompt(prompt_type=prompt_type)
-        logger.info("Got Prompt")
-        results = list()
-        for i, image_bytes in enumerate(image_bytes_list):
-            logger.info(f"Starting OCR for page: {i}")
-            results.append(self._ocr(image_bytes=image_bytes, prompt=prompt))
-        return results
             

{my_aws_helpers-2.6.3 → my_aws_helpers-2.6.5}/my_aws_helpers.egg-info/PKG-INFO

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

{my_aws_helpers-2.6.3 → my_aws_helpers-2.6.5}/setup.py

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