Gemini 1.5

api_cost/api_cost.yaml

@@ -53,9 +53,14 @@ AZURE_GPT_3_5:
 # Google Gemini
 # https://ai.google.dev/pricing
 GEMINI_PRO:
-  in: 0.00025
-  out: 0.0005
-
+  in: 0.0005
+  out: 0.0015
+GEMINI_1_5_FLASH:
+  in: 0.00035
+  out: 0.00105
+GEMINI_1_5_PRO:
+  in: 0.0035
+  out: 0.0105
 
 # Google PaLM 2 (text-bison, text-unicorn)
 # https://cloud.google.com/vertex-ai/docs/generative-ai/pricing

app.py

@@ -1694,7 +1694,7 @@ def content_llm_cost():
 
 def content_prompt_and_llm_version():
     st.info("Note: The default settings may not work for your particular image. If VoucherVision does not produce the results that you were expecting: 1) try disabling the LM2 collage 2) Then try enabling 2 copies of OCR, SLTPvB_long prompt, Azure GPT 4. We are currently building 'recipes' for different scenarios, please stay tuned!")
-    st.info("UPDATE: May 25, 2024 - The default LLM used to be Azure GPT-3.5, which was served by the University of Michigan. However, UofM has sunset all but GPT-4 Turbo so that is now the default LLM. If you ran VV prior to this update and saw an empty result, that was the reason.")
+    st.warning("UPDATE :bell: May 25, 2024 - The default LLM used to be Azure GPT-3.5, which was served by the University of Michigan. However, UofM has sunset all but GPT-4 Turbo so that is now the default LLM. If you ran VV prior to this update and saw an empty result, that was the reason.")
     st.header('Prompt Version')
     col_prompt_1, col_prompt_2 = st.columns([4,2])              
     with col_prompt_1:
@@ -1725,7 +1725,7 @@ def content_prompt_and_llm_version():
         st.markdown("""
 Based on preliminary results, the following models perform the best. We are currently running tests of all possible OCR + LLM + Prompt combinations to create recipes for different workflows.
 - Any Mistral model e.g., `Mistral Large`          
-- `PaLM 2 text-bison@001`
+- `PaLM 2 text-bison@002`
 - `GPT 4 Turbo 1106-preview`
 - `GPT 3.5 Turbo`
 - `LOCAL Mixtral 7Bx8 Instruct`

vouchervision/API_validation.py

@@ -12,9 +12,9 @@ from langchain_google_vertexai import VertexAI
 
 
 from datetime import datetime
-import google.generativeai as genai
+# import google.generativeai as genai
 from google.oauth2 import service_account
-from googleapiclient.discovery import build
+# from googleapiclient.discovery import build
 
 
 class APIvalidation:

vouchervision/model_maps.py

@@ -10,10 +10,13 @@ class ModelMaps:
         'GPT_4_TURBO_0125': '#228B22',  # Forest Green
         'GPT_4_32K': '#006400',  # Dark Green
 
-        'PALM2_TB_1': '#87CEEB',  # Sky Blue
+        # 'PALM2_TB_1': '#87CEEB',  # Sky Blue
         'PALM2_TB_2': '#1E90FF',  # Dodger Blue
         'PALM2_TU_1': '#0000FF',  # Blue
         'GEMINI_PRO': '#1E00FF',  # 
+        'GEMINI_1_5_FLASH': '#1E00FF',  # gemini-1.5-flash
+        'GEMINI_1_5_PRO': '#1E00FF',  # gemini-1.5-pro
+        
 
         'AZURE_GPT_4': '#800080',  # Purple
         # 'AZURE_GPT_4_TURBO_1106': '#9370DB',  # Medium Purple
@@ -53,10 +56,14 @@ class ModelMaps:
                     #  "Azure GPT 3.5 Instruct",
                      ]
     
-    MODELS_GOOGLE = ["PaLM 2 text-bison@001",
+    MODELS_GOOGLE = [
+                    # "PaLM 2 text-bison@001",
                      "PaLM 2 text-bison@002",
                      "PaLM 2 text-unicorn@001",
-                     "Gemini Pro"]
+                     "Gemini 1.0 Pro ",
+                     "Gemini 1.5 Flash",
+                     "Gemini 1.5 Pro",
+                     ]
     
     MODELS_MISTRAL = ["Mistral Small",
                       "Mistral Medium",
@@ -89,9 +96,12 @@ class ModelMaps:
         # 'Azure GPT 3.5 Instruct': 'AZURE_GPT_3_5_INSTRUCT',
         # 'Azure GPT 3.5 Turbo': 'AZURE_GPT_3_5',
 
-        'Gemini Pro': 'GEMINI_PRO',
+        'Gemini 1.0 Pro ': 'GEMINI_PRO',
+        'Gemini 1.5 Flash': 'GEMINI_1_5_FLASH',  # gemini-1.5-flash
+        'Gemini 1.5 Pro': 'GEMINI_1_5_PRO',  # gemini-1.5-pro
+
         'PaLM 2 text-unicorn@001': 'PALM2_TU_1',
-        'PaLM 2 text-bison@001': 'PALM2_TB_1',
+        # 'PaLM 2 text-bison@001': 'PALM2_TB_1',
         'PaLM 2 text-bison@002': 'PALM2_TB_2',
 
         'Mistral Large': 'MISTRAL_LARGE',
@@ -128,10 +138,12 @@ class ModelMaps:
             # 'Azure GPT 4 Turbo 0125-preview': has_key_azure_openai,
             # 'Azure GPT 4 32k': has_key_azure_openai,
 
-            'PaLM 2 text-bison@001':  has_key_google_application_credentials,
+            # 'PaLM 2 text-bison@001':  has_key_google_application_credentials,
             'PaLM 2 text-bison@002':  has_key_google_application_credentials,
             'PaLM 2 text-unicorn@001':  has_key_google_application_credentials,
-            'Gemini Pro':  has_key_google_application_credentials,
+            'Gemini 1.0 Pro ':  has_key_google_application_credentials,
+            'Gemini 1.5 Flash':  has_key_google_application_credentials,
+            'Gemini 1.5 Pro ':  has_key_google_application_credentials,
 
             'Mistral Small':  has_key_mistral,
             'Mistral Medium':  has_key_mistral,
@@ -167,10 +179,12 @@ class ModelMaps:
             # 'Azure GPT 4 Turbo 0125-preview': True,
             # 'Azure GPT 4 32k': True,
 
-            'PaLM 2 text-bison@001':  False,
+            # 'PaLM 2 text-bison@001':  False,
             'PaLM 2 text-bison@002':  False,
             'PaLM 2 text-unicorn@001':  False,
-            'Gemini Pro':  False,
+            'Gemini 1.0 Pro ':  False,
+            'Gemini 1.5 Flash':  False,
+            'Gemini 1.5 Pro ':  False,
 
             'Mistral Small':  False,
             'Mistral Medium':  False,
@@ -235,8 +249,8 @@ class ModelMaps:
         #     return "gpt-4-32k"
         
         ### Google
-        elif key == 'PALM2_TB_1':
-            return "text-bison@001"
+        # elif key == 'PALM2_TB_1':
+        #     return "text-bison@001"
         
         elif key == 'PALM2_TB_2':
             return "text-bison@002"
@@ -245,7 +259,13 @@ class ModelMaps:
             return "text-unicorn@001"
         
         elif key == 'GEMINI_PRO':
-            return "gemini-1.0-pro"
+            return "gemini-1.0-pro" 
+        
+        elif key == 'GEMINI_1_5_FLASH':
+            return "gemini-1.5-flash" 
+
+        elif key == 'GEMINI_1_5_PRO':
+            return "gemini-1.5-pro" 
         
         ### Mistral 
         elif key == 'OPEN_MISTRAL_7B':