Major update. Support for 15 LLMs, World Flora Online taxonomy validation, geolocation, 2 OCR methods, significant UI changes, stability improvements, consistent JSON parsing

vouchervision/OCR_google_cloud_vision.py

@@ -1,4 +1,4 @@
-import os, io, sys, inspect, statistics
+import os, io, sys, inspect, statistics, json
 from statistics import mean 
 # from google.cloud import vision, storage
 from google.cloud import vision
@@ -6,6 +6,7 @@ from google.cloud import vision_v1p3beta1 as vision_beta
 from PIL import Image, ImageDraw, ImageFont
 import colorsys
 from tqdm import tqdm
+from google.oauth2 import service_account
 
 currentdir = os.path.dirname(os.path.abspath(
     inspect.getfile(inspect.currentframe())))
@@ -254,7 +255,18 @@ class OCRGoogle:
 
 
     def detect_text(self):
-        client = vision.ImageAnnotatorClient()
+        service_account_json_str = os.getenv('google_service_account_json')
+        if not service_account_json_str:
+            print("Service account JSON not found in environment variables.")
+            return False
+
+        # Convert JSON string to a dictionary
+        service_account_info = json.loads(service_account_json_str)
+        # Create credentials from the service account info
+        credentials = service_account.Credentials.from_service_account_info(service_account_info)
+        # Initialize the client with the credentials
+        client = vision.ImageAnnotatorClient(credentials=credentials)
+        # client = vision.ImageAnnotatorClient() #####################################################################################################################
         with io.open(self.path, 'rb') as image_file:
             content = image_file.read()
         image = vision.Image(content=content)
@@ -369,7 +381,19 @@ class OCRGoogle:
 
 
     def detect_handwritten_ocr(self):
-        client = vision_beta.ImageAnnotatorClient()
+        service_account_json_str = os.getenv('google_service_account_json')
+        if not service_account_json_str:
+            print("Service account JSON not found in environment variables.")
+            return False
+
+        # Convert JSON string to a dictionary
+        service_account_info = json.loads(service_account_json_str)
+        # Create credentials from the service account info
+        credentials = service_account.Credentials.from_service_account_info(service_account_info)
+        # Initialize the client with the credentials
+        client = vision.ImageAnnotatorClient(credentials=credentials)
+        # client = vision.ImageAnnotatorClient() #####################################################################################################################
+        
         with open(self.path, "rb") as image_file:
             content = image_file.read()