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

.streamlit/config.toml

@@ -1,4 +1,5 @@
 [theme]
     primaryColor = "#00ff00"
     backgroundColor="#1a1a1a"
-    secondaryBackgroundColor="#5c5c5c"
+    secondaryBackgroundColor="#303030"
+    textColor = "cccccc"

vouchervision/API_validation.py

@@ -7,10 +7,10 @@ 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
-
+from google.oauth2 import service_account
+from googleapiclient.discovery import build
 
 
 class APIvalidation:
@@ -181,6 +181,20 @@ class APIvalidation:
         
         return temp_filename
 
+    def init_google_client(opt, opt2):
+        # Fetch the credentials JSON string from Hugging Face Secrets
+        creds_json_str = os.getenv('google_service_account_json')
+
+        if creds_json_str:
+            creds_dict = json.loads(creds_json_str)
+            credentials = service_account.Credentials.from_service_account_info(creds_dict)
+
+            # Initialize Google API client (if needed for your use case)
+            client = build(opt, opt2, credentials=credentials)  # Adjust with actual service details
+
+            return client, credentials
+        else:
+            print("Google API credentials not found.")
 
     def check_google_vertex_genai_api_key(self):
         results = {"palm2": False, "gemini": False}
@@ -213,6 +227,7 @@ class APIvalidation:
                 except Exception as e:  
                     pass
 
+
                 return results
             except Exception as e:  # Replace with a more specific exception if possible
                 return results
@@ -222,7 +237,9 @@ class APIvalidation:
                 # Assuming genai and vertexai are clients for Google services
                 # os.environ["GOOGLE_API_KEY"] = os.getenv('PALM_API_KEY')
                 os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = self.get_google_credentials()
-                vertexai.init(project= os.getenv('GOOGLE_PROJECT_ID'), location=os.getenv('GOOGLE_LOCATION'))
+                client, credentials = self.init_google_client('gemini-pro', 'v1')
+                print(credentials)
+                vertexai.init(project= os.getenv('GOOGLE_PROJECT_ID'), location=os.getenv('GOOGLE_LOCATION'), credentials=credentials)
 
                 try:
                     model = TextGenerationModel.from_pretrained("text-bison@001")

vouchervision/general_utils.py

@@ -294,7 +294,7 @@ def test_GPU():
         success = True
     else:
         info.append("No GPU found!")
-        info.append("LeafMachine2 image cropping and embedding search will be slow or not possible.")
+        info.append("LeafMachine2 collages will run slowly, trOCR may not be available.")
 
     return success, info
 

vouchervision/utils_VoucherVision.py

@@ -7,6 +7,8 @@ from transformers import TrOCRProcessor, VisionEncoderDecoderModel
 from langchain_openai import AzureChatOpenAI
 from OCR_google_cloud_vision import OCRGoogle 
 import google.generativeai as genai
+from google.oauth2 import service_account
+from googleapiclient.discovery import build
 
 from vouchervision.LLM_OpenAI import OpenAIHandler
 from vouchervision.LLM_GooglePalm2 import GooglePalm2Handler
@@ -418,11 +420,26 @@ class VoucherVision():
         
         return temp_filename   
     
-    
+    def init_google_client(opt, opt2):
+        # Fetch the credentials JSON string from Hugging Face Secrets
+        creds_json_str = os.getenv('google_service_account_json')
+
+        if creds_json_str:
+            creds_dict = json.loads(creds_json_str)
+            credentials = service_account.Credentials.from_service_account_info(creds_dict)
+
+            # Initialize Google API client (if needed for your use case)
+            client = build(opt, opt2, credentials=credentials)  # Adjust with actual service details
+
+            return client, credentials
+        else:
+            print("Google API credentials not found.")
+
+        
     def set_API_keys(self):
         if self.is_hf:
             openai_api_key = os.getenv('OPENAI_API_KEY')
-            google_application_credentials = os.getenv('GOOGLE_APPLICATION_CREDENTIALS')
+            # google_application_credentials = os.getenv('google_service_account_json')
             palm_api_key = os.getenv('PALM_API_KEY')
             mistral_api_key = os.getenv('MISTRAL_API_KEY')
             here_api_key = os.getenv('here_api_key')
@@ -430,12 +447,12 @@ class VoucherVision():
             open_cage_api_key = os.getenv('open_cage_geocode')
             google_project_id = os.getenv('GOOGLE_PROJECT_ID')
             google_project_location = os.getenv('GOOGLE_LOCATION')
-            os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = self.get_google_credentials()
+            # os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = self.get_google_credentials()
 
 
 
             self.has_key_openai = openai_api_key is not None
-            self.has_key_google_OCR = google_application_credentials is not None
+            # self.has_key_google_OCR = google_application_credentials is not None
             self.has_key_palm2 = palm_api_key is not None
             self.has_key_mistral = mistral_api_key is not None
             self.has_key_here = here_api_key is not None
@@ -444,12 +461,29 @@ class VoucherVision():
             self.has_key_google_project_id = google_project_id is not None
             self.has_key_google_project_location = google_project_location is not None
 
-            if self.has_key_openai:
-                openai.api_key = openai_api_key
+            genai_api_key = os.getenv('PALM_API_KEY')
+            google_project_id = os.getenv('GOOGLE_PROJECT_ID')
+            google_location = os.getenv('GOOGLE_LOCATION')
 
-            if self.has_key_google_project_id and self.has_key_google_project_location:
-                genai.configure(api_key=os.getenv('PALM_API_KEY'))
-                vertexai.init(project=os.getenv('GOOGLE_PROJECT_ID'), location=os.getenv('GOOGLE_LOCATION'))
+            try:
+                if genai_api_key:
+                    genai.configure(api_key=genai_api_key)
+            except:
+                print(f"failed genai.configure")
+
+            try:
+                if google_project_id and google_location:
+                    clien, credentials = self.init_google_client('gemini-pro', 'v1')
+                    print(credentials)
+                    vertexai.init(project=google_project_id, location=google_location, credentials=credentials)
+            except:
+                print(f"failed vertexai.init")
+            # if self.has_key_openai:
+            #     openai.api_key = openai_api_key
+
+            # if self.has_key_google_project_id and self.has_key_google_project_location:
+            #     genai.configure(api_key=os.getenv('PALM_API_KEY'))
+            #     vertexai.init(project=os.getenv('GOOGLE_PROJECT_ID'), location=os.getenv('GOOGLE_LOCATION'))
 
             if os.getenv('AZURE_API_KEY') is not None:
                 azure_api_version = os.getenv('AZURE_API_VERSION')