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

app.py

@@ -1468,7 +1468,7 @@ def check_api_key_status():
     except:
         cfg_private = None
 
-    API_Validator = APIvalidation(cfg_private, st.session_state.dir_home)
+    API_Validator = APIvalidation(cfg_private, st.session_state.dir_home, st.session_state['is_hf'])
     present_keys, missing_keys, date_of_check = API_Validator.report_api_key_status()  # Assuming this function returns two lists
 
     # Prepare annotations for present keys

vouchervision/API_validation.py

@@ -14,9 +14,10 @@ from googleapiclient.discovery import build
 
 class APIvalidation:
 
-    def __init__(self, cfg_private, dir_home) -> None:
+    def __init__(self, cfg_private, dir_home, is_hf) -> None:
         self.cfg_private = cfg_private
         self.dir_home = dir_home
+        self.is_hf = is_hf
         self.formatted_date = self.get_formatted_date()
 
     def get_formatted_date(self):
@@ -94,7 +95,7 @@ class APIvalidation:
     #         return False
         
     def check_azure_openai_api_key(self):
-        if self.cfg_private:
+        if not self.is_hf:
             try:
                 # Initialize the Azure OpenAI client
                 model = AzureChatOpenAI(
@@ -145,7 +146,7 @@ class APIvalidation:
         
     def check_mistral_api_key(self):
         try:
-            if self.cfg_private:
+            if not self.is_hf:
                 client = MistralClient(api_key=self.cfg_private['mistral']['mistral_key'])
             else:
                 client = MistralClient(api_key=os.getenv('MISTRAL_API_KEY'))
@@ -179,6 +180,10 @@ class APIvalidation:
     #         temp_filename = temp.name
         
     #     return temp_filename
+    def get_google_credentials(self):
+            creds_json_str = os.getenv('GOOGLE_SERVICE_ACCOUNT_JSON')
+            credentials = service_account.Credentials.from_service_account_info(json.loads(creds_json_str))
+            return credentials
 
     # def init_google_client(opt, opt2):
     #     # Fetch the credentials JSON string from Hugging Face Secrets
@@ -197,7 +202,7 @@ class APIvalidation:
 
     def check_google_vertex_genai_api_key(self):
         results = {"palm2": False, "gemini": False}
-        if self.cfg_private:
+        if not self.is_hf:
             try: # Local
                 # Assuming genai and vertexai are clients for Google services
                 # os.environ["GOOGLE_API_KEY"] = self.cfg_private['google_palm']['google_palm_api']
@@ -238,13 +243,15 @@ class APIvalidation:
                 # os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = self.get_google_credentials()
                 # client, credentials = self.init_google_client('gemini-pro', 'v1')
                 # print(credentials)
+                print("service account")
                 palm_api_key = os.getenv('PALM_API_KEY')
                 google_project_id = os.getenv('GOOGLE_PROJECT_ID')
                 google_location = os.getenv('GOOGLE_LOCATION')
                 os.environ['GOOGLE_API_KEY'] =  os.getenv('PALM_API_KEY')
-                vertexai.init(project=os.getenv('GOOGLE_PROJECT_ID'), location=os.getenv('GOOGLE_LOCATION'))
+                vertexai.init(project=os.getenv('GOOGLE_PROJECT_ID'), location=os.getenv('GOOGLE_LOCATION'),credentials=self.get_google_credentials())
                 # genai.configure(api_key=palm_api_key)
                 # vertexai.init(project=google_project_id, location=google_location)#, credentials=credentials)
+                print("service account pass")
 
                 try:
                     model = TextGenerationModel.from_pretrained("text-bison@001")
@@ -283,11 +290,11 @@ class APIvalidation:
                 print(f"Immediate [{e}]")
                 return results
 
-    def report_api_key_status(self):
+    def report_api_key_status(self, is_hf):
         missing_keys = []
         present_keys = []
 
-        if self.cfg_private:
+        if not self.is_hf:
             k_OPENAI_API_KEY = self.cfg_private['openai']['OPENAI_API_KEY']
             k_openai_azure = self.cfg_private['openai_azure']['api_version']
             k_google_palm_api = self.cfg_private['google_palm']['google_palm_api']

vouchervision/utils_VoucherVision.py

@@ -434,7 +434,10 @@ class VoucherVision():
     #         return client, credentials
     #     else:
     #         print("Google API credentials not found.")
-
+    def get_google_credentials(self):
+        creds_json_str = os.getenv('GOOGLE_SERVICE_ACCOUNT_JSON')
+        credentials = service_account.Credentials.from_service_account_info(json.loads(creds_json_str))
+        return credentials
         
     def set_API_keys(self):
         if self.is_hf:
@@ -461,9 +464,13 @@ 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
 
-            genai_api_key = os.getenv('PALM_API_KEY')
+            # genai_api_key = os.getenv('PALM_API_KEY')
             os.environ['GOOGLE_API_KEY'] =  os.getenv('PALM_API_KEY')
             vertexai.init(project=os.getenv('GOOGLE_PROJECT_ID'), location=os.getenv('GOOGLE_LOCATION'))
+
+
+            os.environ['GOOGLE_API_KEY'] =  os.getenv('PALM_API_KEY')
+            vertexai.init(project=os.getenv('GOOGLE_PROJECT_ID'), location=os.getenv('GOOGLE_LOCATION'),credentials=self.get_google_credentials())
             # try:
                 # if genai_api_key:
                     # genai.configure(api_key=genai_api_key)
@@ -551,7 +558,7 @@ class VoucherVision():
                 vertexai.init(project=os.environ['GOOGLE_PROJECT_ID'], location=os.environ['GOOGLE_LOCATION'])
 
 
-                
+
                 # os.environ.pop("GOOGLE_APPLICATION_CREDENTIALS", None)
                 # os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = self.cfg_private['google_cloud']['path_json_file'] #### 
                 # os.environ['GOOGLE_API_KEY'] = self.cfg_private['google_palm']['google_palm_api']