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,3 +1,4 @@
 [theme]
-    base = "dark"
-    primaryColor = "#00ff00"
+    primaryColor = "#00ff00"
+    backgroundColor="#FFFFFF"
+    secondaryBackgroundColor="#5c5c5c"

.streamlit/secrets.toml

@@ -1,25 +0,0 @@
-# Streamlit secrets
-
-GOOGLE_APPLICATION_CREDENTIALS_JSON = '''
-{
-  "type": "service_account",
-  "project_id": "directed-curve-401601",
-  "private_key_id": "53457e69bc362dd27bacb83228839a93c7361640",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnnRop1c/YAwQZ\nWuXJn9brvNUVJDuf+zmSuhZt9J3J4xnbeGDVrqJ78YOfB/W9HfdywtSXP/m0q2LC\nIeatg+Kc4aFrfjQueexNr6pYV+TklU+vhFMEJP8AJcUCLC5YymYntqUWHTMy4swg\n/JsfDQPB5KgxIC7yo907QbF7KAD/VHiPqRje8J5OV+5yAnvEmdcc3E/lXvMEKVo3\nfpDf3IO6knpnvlxtcMlKCLFb23m070jJhuUqjbBS8rI8qKZI9mUutMPXGOeVucIV\nkFfRoTCCIlRlSnrq0DewPx+RQkXEJUVSQbTi9MLsXIqmu2RkwpusmBX3GFuUXBwk\n33/aJwqfAgMBAAECggEASE+JFYpWECGA97VU1C6+iFYfcW7/wC2gcXIRsh8poYr1\nwU7GK/maxLD1cTr8Y7nVYq+2CoiBoFWeFhWNEMeIkNjwjFDWj0RvUzaZXWKR76GQ\nzq5eKDgTwQsKWr0Xw5uSBckQoKE5UNcybHq+K1+wgso0W3lAd9KE44ccW/7uqzgg\n/ls/rSlFff0QU5yLawBHWHlNwDhAhElPeZHQNxJ4Cc46iy9z2cSBHMpOWxUBWh1Z\nOpRBsH8mnUzzYG7kiDQd6+wS1IJ5zPSM5b28GGChAbziWV0nVMKwvmWHShLk11N4\nxsSLLNFlA2nbRL1FxFDyMLfgBDbN517eTEyjlbhoNQKBgQDj0Cf+L+JxFQvcNPAR\nE/I7b2K0qDKiTBWsi7LLQxqUpGoVCAL0kixtFr8Lr+Jm+0ih0VBJUVYMePDqj3C1\nTeidAmeP0UPxDwDNh2VystrRKpRh9Q9tx0vvtvWhDfsZmTawjoC+/HFonppsQW+k\n3LMCzaXJAewIF5MhOa3Bw/MnuwKBgQC8WipEf3dBm4OwjazuGdQ6ywlNbfxFO7GD\nOZ4A+V+dldTpP20KFkV9D4hUXTgJw8fzhVJtEQs1gqm3E5AKhbY4VrsJFyw/0DWf\nUafcadMtKeTgr1p+28KiY+/DZLHwPTNwYun0dkhyPabSkrneLzVBIKmvxbKsqayl\nuWZuZBtgbQKBgGmo1aOzGddQ55tOgjmpgqPGWYVorXNQzoykjlxv1xgx2XG/sX81\nfJ1r+1e0T9FrophKuG4I51wJi9N+i8vLQqPvxZCSgmx/hOPOdGLqSUrR8NguDOXh\nlXqs5Oe50EhjI1ZoAZaTBxZ62Sx0fQ99vRkDwGymE479QCQc2FYSR+iZAoGADRgH\nkDN8SudQxFlVCEhrZJrwzp0yyG1Z7dF3loG/j+j2oDB0mBrsQcFurM6+Mo+Vuuwt\nyr9AlDu9KKkHfnPFMy10WzFtNhJ3Z9f5X21L7PvYmXYXSHJmmXtxE5hQdm8KwGlf\n8kq2xppampDwsu19OkXXBg0sWqyBABRfdpUnAhECgYEAme0nq52gw9TbDqrfqQ/r\nT4NzjX7AaI0/oXekeW2Dm+NIx+umgggsx1/Hf3q5PWiy/x8ViTyoWYFdgaM72yCW\n9gVCTXkE/IHsTq9zX4khsv/UHTkHFf3VADCEjW+ht2nYeCBN1HwtLjdRidwvrSrC\nfL666ill9fXvSFnC4KsEfxE=\n-----END PRIVATE KEY-----\n",
-  "client_email": "vouchervision@directed-curve-401601.iam.gserviceaccount.com",
-  "client_id": "100706991621579323653",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/vouchervision%40directed-curve-401601.iam.gserviceaccount.com",
-  "universe_domain": "googleapis.com"
-}
-'''
-
-OPENAI_API_KEY = "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"
-AZURE_API_VERSION = "2023-05-15"
-AZURE_API_KEY = "2a841cc7fde64109975d84ea0f9685d4"
-AZURE_API_BASE = "https://api.umgpt.umich.edu/azure-openai-api"
-AZURE_ORGANIZATION = "123456"
-AZURE_API_TYPE = "azure"
-GOOGLE_PALM_API = "AIzaSyCiTxmzxi6vHih0jbAf8wtSX9_dBBXttKA"

app.py

@@ -105,7 +105,7 @@ def create_download_button(zip_filepath, col):
             data=bytes_io,
             file_name=os.path.basename(zip_filepath),
             mime='application/zip',
-            use_container_width=True
+            use_container_width=True,key=129385,
         )
 
 
@@ -142,7 +142,7 @@ def create_download_button_yaml(file_path, selected_yaml_file):
             label=file_label,
             data=f,
             file_name=os.path.basename(file_path),
-            mime='application/x-yaml',use_container_width=True
+            mime='application/x-yaml',use_container_width=True,key=237895,
         )
 
 
@@ -2384,7 +2384,7 @@ if 'dir_uploaded_images' not in st.session_state:
 if 'dir_uploaded_images_small' not in st.session_state:
     st.session_state['dir_uploaded_images_small'] = os.path.join(st.session_state.dir_home,'uploads_small')
     validate_dir(os.path.join(st.session_state.dir_home,'uploads_small'))
-    
+
 if 'cost_openai' not in st.session_state:
     st.session_state['cost_openai'] = None
 if 'cost_azure' not in st.session_state:

vouchervision/API_validation.py

@@ -232,7 +232,12 @@ class APIvalidation:
                     # test_response_palm = llm_palm.invoke("Hello")
                     if test_response_palm:
                         results["palm2"] = True
+                        print(f"palm2 pass [{test_response_palm}]")
+                    else:
+                        print(f"palm2 yes [{test_response_palm}]")
+
                 except Exception as e:  
+                    print(f"palm2 [{e}]")
                     pass
 
                 try:
@@ -243,11 +248,17 @@ class APIvalidation:
                     # test_response_gemini = llm_gemini.invoke("Hello")
                     if test_response_gemini:
                         results["gemini"] = True
+                        print(f"gemini pass [{test_response_palm}]")
+                    else:
+                        print(f"gemini yes [{test_response_palm}]")
+
                 except Exception as e:  
+                    print(f"gemini [{e}]")
                     pass
 
                 return results
             except Exception as e:  # Replace with a more specific exception if possible
+                print(f"Immediate [{e}]")
                 return results
 
     def report_api_key_status(self):

vouchervision/utils_hf.py

@@ -81,19 +81,25 @@ def upload_to_drive(filepath, filename):
 
         # Get the folder ID from the environment variable
         folder_id = os.environ.get('GDRIVE')
-        # st.info(f"{folder_id}")
 
         if folder_id:
             file_metadata = {
                 'name': filename,
                 'parents': [folder_id]
             }
-            # st.info(f"{file_metadata}")
 
-            media = MediaFileUpload(filepath, mimetype='application/x-yaml')
+            # Determine the mimetype based on the file extension
+            if filename.endswith('.yaml') or filename.endswith('.yml'):
+                mimetype = 'application/x-yaml'
+            elif filename.endswith('.zip'):
+                mimetype = 'application/zip'
+            else:
+                mimetype = None  # or set a default mimetype
 
-            service.files().create(
-                body=file_metadata,
-                media_body=media,
-                fields='id'
-            ).execute()
+            if mimetype:
+                media = MediaFileUpload(filepath, mimetype=mimetype)
+                service.files().create(
+                    body=file_metadata,
+                    media_body=media,
+                    fields='id'
+                ).execute()