Merge branch 'main' into roman/drop-ingest-2

# Conflicts:
#	CHANGELOG.md
#	unstructured/__version__.py

Author: christinestraub

CHANGELOG.md

@@ -7,6 +7,12 @@
   * Remove the `unstructured.ingest` submodule.
   * Delete all shell scripts previously used for destination ingest tests.
 
+### Features
+
+### Fixes
+
+* **Add language parameter to `OCRAgentGoogleVision`.**  Introduces an optional language parameter in the `OCRAgentGoogleVision` constructor to serve as a language hint for `document_text_detection`. This ensures compatibility with the OCRAgent's `get_instance` method and resolves errors when parsing PDFs with Google Cloud Vision as the OCR agent.
+
 ## 0.15.14
 
 ### Enhancements

test_unstructured/partition/pdf_image/test_ocr.py

@@ -1,4 +1,5 @@
 from collections import namedtuple
+from typing import Optional
 from unittest.mock import patch
 
 import numpy as np
@@ -226,12 +227,13 @@ def google_vision_client(google_vision_text_annotation):
     Response = namedtuple("Response", "full_text_annotation")
 
     class FakeGoogleVisionClient:
-        def document_text_detection(self, image):
+        def document_text_detection(self, image, image_context):
             return Response(full_text_annotation=google_vision_text_annotation)
 
     class OCRAgentFakeGoogleVision(OCRAgentGoogleVision):
-        def __init__(self):
+        def __init__(self, language: Optional[str] = None):
             self.client = FakeGoogleVisionClient()
+            self.language = language
 
     return OCRAgentFakeGoogleVision()
 
@@ -249,7 +251,7 @@ def test_get_layout_from_image_google_vision(google_vision_client):
     image = Image.new("RGB", (100, 100))
 
     ocr_agent = google_vision_client
-    regions = ocr_agent.get_layout_from_image(image, ocr_languages="eng")
+    regions = ocr_agent.get_layout_from_image(image)
     assert len(regions) == 1
     assert regions[0].text == "Hello World!"
     assert regions[0].source == Source.OCR_GOOGLEVISION
@@ -263,7 +265,7 @@ def test_get_layout_elements_from_image_google_vision(google_vision_client):
     image = Image.new("RGB", (100, 100))
 
     ocr_agent = google_vision_client
-    layout_elements = ocr_agent.get_layout_elements_from_image(image, ocr_languages="eng")
+    layout_elements = ocr_agent.get_layout_elements_from_image(image)
     assert len(layout_elements) == 1
 
 

unstructured/partition/utils/ocr_models/google_vision_ocr.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 from io import BytesIO
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
-from google.cloud.vision import Image, ImageAnnotatorClient, Paragraph, TextAnnotation
+from google.cloud.vision import Image, ImageAnnotatorClient, ImageContext, Paragraph, TextAnnotation
 
 from unstructured.logger import logger, trace_logger
 from unstructured.partition.utils.config import env_config
@@ -19,7 +19,8 @@
 class OCRAgentGoogleVision(OCRAgent):
     """OCR service implementation for Google Vision API."""
 
-    def __init__(self) -> None:
+    def __init__(self, language: Optional[str] = None) -> None:
+        self.language = language
         client_options = {}
         api_endpoint = env_config.GOOGLEVISION_API_ENDPOINT
         if api_endpoint:
@@ -32,40 +33,40 @@ def __init__(self) -> None:
     def is_text_sorted(self) -> bool:
         return True
 
-    def get_text_from_image(self, image: PILImage.Image, ocr_languages: str = "eng") -> str:
+    def get_text_from_image(self, image: PILImage.Image) -> str:
+        image_context = ImageContext(language_hints=[self.language]) if self.language else None
         with BytesIO() as buffer:
             image.save(buffer, format="PNG")
-            response = self.client.document_text_detection(image=Image(content=buffer.getvalue()))
+            response = self.client.document_text_detection(
+                image=Image(content=buffer.getvalue()), image_context=image_context
+            )
         document = response.full_text_annotation
         assert isinstance(document, TextAnnotation)
         return document.text
 
-    def get_layout_from_image(
-        self, image: PILImage.Image, ocr_languages: str = "eng"
-    ) -> list[TextRegion]:
+    def get_layout_from_image(self, image: PILImage.Image) -> list[TextRegion]:
         trace_logger.detail("Processing entire page OCR with Google Vision API...")
+        image_context = ImageContext(language_hints=[self.language]) if self.language else None
         with BytesIO() as buffer:
             image.save(buffer, format="PNG")
-            response = self.client.document_text_detection(image=Image(content=buffer.getvalue()))
+            response = self.client.document_text_detection(
+                image=Image(content=buffer.getvalue()), image_context=image_context
+            )
         document = response.full_text_annotation
         assert isinstance(document, TextAnnotation)
         regions = self._parse_regions(document)
         return regions
 
-    def get_layout_elements_from_image(
-        self, image: PILImage.Image, ocr_languages: str = "eng"
-    ) -> list[LayoutElement]:
+    def get_layout_elements_from_image(self, image: PILImage.Image) -> list[LayoutElement]:
         from unstructured.partition.pdf_image.inference_utils import (
             build_layout_elements_from_ocr_regions,
         )
 
         ocr_regions = self.get_layout_from_image(
             image,
-            ocr_languages=ocr_languages,
         )
         ocr_text = self.get_text_from_image(
             image,
-            ocr_languages=ocr_languages,
         )
         layout_elements = build_layout_elements_from_ocr_regions(
             ocr_regions=ocr_regions,