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

vouchervision/API_validation.py

@@ -1,4 +1,4 @@
-import os, io, openai, vertexai
+import os, io, openai, vertexai, json
 import google.generativeai as genai
 from mistralai.client import MistralClient
 from mistralai.models.chat_completion import ChatMessage
@@ -7,6 +7,7 @@ from langchain_openai import AzureChatOpenAI
 from vertexai.language_models import TextGenerationModel
 from vertexai.preview.generative_models import GenerativeModel
 from google.cloud import vision
+from google.oauth2 import service_account
 from datetime import datetime
 import google.generativeai as genai
 
@@ -56,14 +57,35 @@ class APIvalidation:
         #     return False
         
         try:
-            logo_path = os.path.join(self.dir_home, 'img','logo.png')
-            client = vision.ImageAnnotatorClient()
-            with io.open(logo_path, 'rb') as image_file:
-                content = image_file.read()
-            image = vision.Image(content=content)
-            response = client.document_text_detection(image=image)
-            texts = response.text_annotations       
-            normal_cleaned_text = texts[0].description if texts else None
+            if not self.cfg_private:
+                # Convert JSON key from string to a dictionary
+                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)
+                logo_path = os.path.join(self.dir_home, 'img','logo.png')
+                with io.open(logo_path, 'rb') as image_file:
+                    content = image_file.read()
+                image = vision.Image(content=content)
+                response = client.document_text_detection(image=image)
+                texts = response.text_annotations       
+                normal_cleaned_text = texts[0].description if texts else None
+            else:
+                logo_path = os.path.join(self.dir_home, 'img','logo.png')
+                client = vision.ImageAnnotatorClient()
+                with io.open(logo_path, 'rb') as image_file:
+                    content = image_file.read()
+                image = vision.Image(content=content)
+                response = client.document_text_detection(image=image)
+                texts = response.text_annotations       
+                normal_cleaned_text = texts[0].description if texts else None
             if normal_cleaned_text:
                 return True
             else:
@@ -240,6 +262,17 @@ class APIvalidation:
 
 
         # Check each key and add to the respective list
+        # Google OCR key check
+        if self.has_API_key(k_google_palm_api) and self.has_API_key(k_project_id) and self.has_API_key(k_location):
+            is_valid = self.check_google_ocr_api_key()
+            if is_valid:
+                present_keys.append('Google OCR (Valid)')
+            else:
+                present_keys.append('Google OCR (Invalid)')
+        else:
+            missing_keys.append('Google OCR')
+        
+        
         # OpenAI key check
         if self.has_API_key(k_OPENAI_API_KEY):
             is_valid = self.check_openai_api_key()
@@ -274,15 +307,7 @@ class APIvalidation:
         else:
             missing_keys.append('Google VertexAI/GenAI')
 
-        # Google OCR key check
-        if self.has_API_key(k_google_palm_api) and self.has_API_key(k_project_id) and self.has_API_key(k_location):
-            is_valid = self.check_google_ocr_api_key()
-            if is_valid:
-                present_keys.append('Google OCR (Valid)')
-            else:
-                present_keys.append('Google OCR (Invalid)')
-        else:
-            missing_keys.append('Google OCR')
+        
 
         # Mistral key check
         if self.has_API_key(k_mistral):