update set api keys

app.py

@@ -276,165 +276,188 @@ def create_space_saver():
         st.session_state.config['leafmachine']['project']['delete_all_temps'] = st.checkbox("Keep only the final transcription file", st.session_state.config['leafmachine']['project'].get('delete_all_temps', False),help="*WARNING:* This limits your ability to do quality assurance. This will delete all folders created by VoucherVision, leaving only the `transcription.xlsx` file.")
 
 
-# def create_private_file():
-#     st.session_state.proceed_to_main = False
 
-#     if st.session_state.private_file:
-#         cfg_private = get_private_file()
-#         create_private_file_0(cfg_private)
-#     else:
-#         st.title("VoucherVision")
-#         create_private_file_0()
 
-# def create_private_file():
-#     st.session_state.proceed_to_main = False
-#     st.title("VoucherVision")
-#     col_private,_= st.columns([12,2])
+def create_private_file():
+    st.session_state.proceed_to_main = False
+    st.title("VoucherVision")
+    col_private, _ = st.columns([12, 2])
+
+    # Fetch the environment variables or set to empty if not found
+    env_variables = {
+        'OPENAI_API_KEY': os.getenv('OPENAI_API_KEY'),
+        'AZURE_API_VERSION': os.getenv('AZURE_API_VERSION'),
+        'AZURE_API_KEY': os.getenv('AZURE_API_KEY'),
+        'AZURE_API_BASE': os.getenv('AZURE_API_BASE'),
+        'AZURE_ORGANIZATION': os.getenv('AZURE_ORGANIZATION'),
+        'AZURE_API_TYPE': os.getenv('AZURE_API_TYPE'),
+        'AZURE_DEPLOYMENT_NAME': os.getenv('AZURE_DEPLOYMENT_NAME'),
+        'GOOGLE_APPLICATION_CREDENTIALS': os.getenv('GOOGLE_APPLICATION_CREDENTIALS'),
+        'GOOGLE_PALM_API': os.getenv('GOOGLE_PALM_API')
+    }
 
-#     if st.session_state.private_file:
-#         cfg_private = get_private_file()
-#     else:
-#         cfg_private = {}
-#         cfg_private['openai'] = {}
-#         cfg_private['openai']['OPENAI_API_KEY'] =''
-        
-#         cfg_private['openai_azure'] = {}
-#         cfg_private['openai_azure']['openai_api_key'] = ''
-#         cfg_private['openai_azure']['api_version'] = ''
-#         cfg_private['openai_azure']['openai_api_base'] =''
-#         cfg_private['openai_azure']['openai_organization'] =''
-#         cfg_private['openai_azure']['openai_api_type'] =''
-
-#         cfg_private['google_cloud'] = {}
-#         cfg_private['google_cloud']['path_json_file'] =''
-
-#         cfg_private['google_palm'] = {}
-#         cfg_private['google_palm']['google_palm_api'] =''
-    
+    # Check if all environment variables are set
+    all_env_set = all(value is not None for value in env_variables.values())
 
-#     with col_private:
-#         st.header("Set API keys")
-#         st.info("***Note:*** There is a known bug with tabs in Streamlit. If you update an input field it may take you back to the 'Project Settings' tab. Changes that you made are saved, it's just an annoying glitch. We are aware of this issue and will fix it as soon as we can.")
-#         st.warning("To commit changes to API keys you must press the 'Set API Keys' button at the bottom of the page.")
-#         st.write("Before using VoucherVision you must set your API keys. All keys are stored locally on your computer and are never made public.")
-#         st.write("API keys are stored in `../VoucherVision/PRIVATE_DATA.yaml`.")
-#         st.write("Deleting this file will allow you to reset API keys. Alternatively, you can edit the keys in the user interface.")
-#         st.write("Leave keys blank if you do not intend to use that service.")
+    with col_private:
+        # Your existing UI code for showing the forms goes here
+        st.header("Set API keys")
+        st.info("***Note:*** There is a known bug with tabs in Streamlit. If you update an input field it may take you back to the 'Project Settings' tab. Changes that you made are saved, it's just an annoying glitch. We are aware of this issue and will fix it as soon as we can.")
+        st.warning("To commit changes to API keys you must press the 'Set API Keys' button at the bottom of the page.")
+        st.write("Before using VoucherVision you must set your API keys. All keys are stored locally on your computer and are never made public.")
+        st.write("API keys are stored in `../VoucherVision/PRIVATE_DATA.yaml`.")
+        st.write("Deleting this file will allow you to reset API keys. Alternatively, you can edit the keys in the user interface.")
+        st.write("Leave keys blank if you do not intend to use that service.")
         
-#         st.write("---")
-#         st.subheader("Google Vision  (*Required*)")
-#         st.markdown("VoucherVision currently uses [Google Vision API](https://cloud.google.com/vision/docs/ocr) for OCR. Generating an API key for this is more involved than the others. [Please carefully follow the instructions outlined here to create and setup your account.](https://cloud.google.com/vision/docs/setup) ")
-#         st.markdown("""
-#         Once your account is created, [visit this page](https://console.cloud.google.com) and create a project. Then follow these instructions:
-
-#         - **Select your Project**: If you have multiple projects, ensure you select the one where you've enabled the Vision API.
-#         - **Open the Navigation Menu**: Click on the hamburger menu (three horizontal lines) in the top left corner.
-#         - **Go to IAM & Admin**: In the navigation pane, hover over "IAM & Admin" and then click on "Service accounts."
-#         - **Locate Your Service Account**: Find the service account for which you wish to download the JSON key. If you haven't created a service account yet, you'll need to do so by clicking the "CREATE SERVICE ACCOUNT" button at the top.
-#         - **Download the JSON Key**:
-#             - Click on the three dots (actions menu) on the right side of your service account name.
-#             - Select "Manage keys."
-#             - In the pop-up window, click on the "ADD KEY" button and select "JSON."
-#             - The JSON key file will automatically be downloaded to your computer.
-#         - **Store Safely**: This file contains sensitive data that can be used to authenticate and bill your Google Cloud account. Never commit it to public repositories or expose it in any way. Always keep it safe and secure.
-#         """)
-#         with st.container():
-#             c_in_ocr, c_button_ocr = st.columns([10,2])
-#             with c_in_ocr:
-#                 google_vision = st.text_input(label = 'Full path to Google Cloud JSON API key file', value = cfg_private['google_cloud'].get('path_json_file', ''),
-#                                                  placeholder = 'e.g. C:/Documents/Secret_Files/google_API/application_default_credentials.json',
-#                                                  help ="This API Key is in the form of a JSON file. Please save the JSON file in a safe directory. DO NOT store the JSON key inside of the VoucherVision directory.",
-#                                                  type='password',key='924857298734590283750932809238')
-#             with c_button_ocr:
-#                 st.empty()
+        st.write("---")
+        st.subheader("Google Vision  (*Required*)")
+        st.markdown("VoucherVision currently uses [Google Vision API](https://cloud.google.com/vision/docs/ocr) for OCR. Generating an API key for this is more involved than the others. [Please carefully follow the instructions outlined here to create and setup your account.](https://cloud.google.com/vision/docs/setup) ")
+        st.markdown("""
+        Once your account is created, [visit this page](https://console.cloud.google.com) and create a project. Then follow these instructions:
+
+        - **Select your Project**: If you have multiple projects, ensure you select the one where you've enabled the Vision API.
+        - **Open the Navigation Menu**: Click on the hamburger menu (three horizontal lines) in the top left corner.
+        - **Go to IAM & Admin**: In the navigation pane, hover over "IAM & Admin" and then click on "Service accounts."
+        - **Locate Your Service Account**: Find the service account for which you wish to download the JSON key. If you haven't created a service account yet, you'll need to do so by clicking the "CREATE SERVICE ACCOUNT" button at the top.
+        - **Download the JSON Key**:
+            - Click on the three dots (actions menu) on the right side of your service account name.
+            - Select "Manage keys."
+            - In the pop-up window, click on the "ADD KEY" button and select "JSON."
+            - The JSON key file will automatically be downloaded to your computer.
+        - **Store Safely**: This file contains sensitive data that can be used to authenticate and bill your Google Cloud account. Never commit it to public repositories or expose it in any way. Always keep it safe and secure.
+        """)
+        with st.container():
+            c_in_ocr, c_button_ocr = st.columns([10,2])
+            with c_in_ocr:
+                google_vision = st.text_input(label = 'Full path to Google Cloud JSON API key file', value = os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''),
+                                                placeholder = 'e.g. copy contents of file application_default_credentials.json',
+                                                help ="This API Key is in the form of a JSON file. Please save the JSON file in a safe directory. DO NOT store the JSON key inside of the VoucherVision directory.",
+                                                type='password',key='924857298734590283750932809238')
+            with c_button_ocr:
+                st.empty()
 
         
-#         st.write("---")
-#         st.subheader("OpenAI")
-#         st.markdown("API key for first-party OpenAI API. Create an account with OpenAI [here](https://platform.openai.com/signup), then create an API key [here](https://platform.openai.com/account/api-keys).")
-#         with st.container():
-#             c_in_openai, c_button_openai = st.columns([10,2])
-#             with c_in_openai:
-#                 openai_api_key = st.text_input("openai_api_key", cfg_private['openai'].get('OPENAI_API_KEY', ''),
-#                                                  help='The actual API key. Likely to be a string of 2 character, a dash, and then a 48-character string: sk-XXXXXXXX...',
-#                                                  placeholder = 'e.g. sk-XXXXXXXX...',
-#                                                  type='password')
-#             with c_button_openai:
-#                 st.empty()
-
-#         st.write("---")
-#         st.subheader("OpenAI - Azure")
-#         st.markdown("This version OpenAI relies on Azure servers directly as is intended for private enterprise instances of OpenAI's services, such as [UM-GPT](https://its.umich.edu/computing/ai). Administrators will provide you with the following information.")
-#         azure_openai_api_version = st.text_input("azure_openai_api_version", cfg_private['openai_azure'].get('api_version', ''),
-#                                                  help='API Version e.g. "2023-05-15"',
-#                                                  placeholder = 'e.g. 2023-05-15',
-#                                                  type='password')
-#         azure_openai_api_key = st.text_input("azure_openai_api_key", cfg_private['openai_azure'].get('openai_api_key', ''),
-#                                                  help='The actual API key. Likely to be a 32-character string',
-#                                                  placeholder = 'e.g. 12333333333333333333333333333332',
-#                                                  type='password')
-#         azure_openai_api_base = st.text_input("azure_openai_api_base", cfg_private['openai_azure'].get('openai_api_base', ''),
-#                                                  help='The base url for the API e.g. "https://api.umgpt.umich.edu/azure-openai-api"',
-#                                                  placeholder = 'e.g. https://api.umgpt.umich.edu/azure-openai-api',
-#                                                  type='password')
-#         azure_openai_organization = st.text_input("azure_openai_organization", cfg_private['openai_azure'].get('openai_organization', ''),
-#                                                  help='Your organization code. Likely a short string',
-#                                                  placeholder = 'e.g. 123456',
-#                                                  type='password')
-#         azure_openai_api_type = st.text_input("azure_openai_api_type", cfg_private['openai_azure'].get('openai_api_type', ''),
-#                                                  help='The API type. Typically "azure"',
-#                                                  placeholder = 'e.g. azure',
-#                                                  type='password')
-#         with st.container():
-#             c_in_azure, c_button_azure = st.columns([10,2])
-#             with c_button_azure:
-#                 st.empty()
+        st.write("---")
+        st.subheader("OpenAI")
+        st.markdown("API key for first-party OpenAI API. Create an account with OpenAI [here](https://platform.openai.com/signup), then create an API key [here](https://platform.openai.com/account/api-keys).")
+        with st.container():
+            c_in_openai, c_button_openai = st.columns([10,2])
+            with c_in_openai:
+                openai_api_key = st.text_input("openai_api_key", os.environ.get('OPENAI_API_KEY', ''),
+                                                help='The actual API key. Likely to be a string of 2 character, a dash, and then a 48-character string: sk-XXXXXXXX...',
+                                                placeholder = 'e.g. sk-XXXXXXXX...',
+                                                type='password')
+            with c_button_openai:
+                st.empty()
+
+        st.write("---")
+        st.subheader("OpenAI - Azure")
+        st.markdown("This version OpenAI relies on Azure servers directly as is intended for private enterprise instances of OpenAI's services, such as [UM-GPT](https://its.umich.edu/computing/ai). Administrators will provide you with the following information.")
+        azure_openai_api_version = st.text_input("azure_openai_api_version", os.environ.get('AZURE_API_VERSION', ''),
+                                                help='API Version e.g. "2023-05-15"',
+                                                placeholder = 'e.g. 2023-05-15',
+                                                type='password')
+        azure_openai_api_key = st.text_input("azure_openai_api_key", os.environ.get('AZURE_API_KEY', ''),
+                                                help='The actual API key. Likely to be a 32-character string',
+                                                placeholder = 'e.g. 12333333333333333333333333333332',
+                                                type='password')
+        azure_openai_api_base = st.text_input("azure_openai_api_base", os.environ.get('AZURE_API_BASE', ''),
+                                                help='The base url for the API e.g. "https://api.umgpt.umich.edu/azure-openai-api"',
+                                                placeholder = 'e.g. https://api.umgpt.umich.edu/azure-openai-api',
+                                                type='password')
+        azure_openai_organization = st.text_input("azure_openai_organization", os.environ.get('AZURE_ORGANIZATION', ''),
+                                                help='Your organization code. Likely a short string',
+                                                placeholder = 'e.g. 123456',
+                                                type='password')
+        azure_openai_api_type = st.text_input("azure_openai_api_type", os.environ.get('AZURE_API_TYPE', ''),
+                                                help='The API type. Typically "azure"',
+                                                placeholder = 'e.g. azure',
+                                                type='password')
+        with st.container():
+            c_in_azure, c_button_azure = st.columns([10,2])
+            with c_button_azure:
+                st.empty()
         
-#         st.write("---")
-#         st.subheader("Google PaLM 2")
-#         st.markdown('Follow these [instructions](https://developers.generativeai.google/tutorials/setup) to generate an API key for PaLM 2. You may need to also activate an account with [MakerSuite](https://makersuite.google.com/app/apikey) and enable "early access."')
-#         with st.container():
-#             c_in_palm, c_button_palm = st.columns([10,2])
-#             with c_in_palm:
-#                 google_palm = st.text_input("Google PaLM 2 API Key", cfg_private['google_palm'].get('google_palm_api', ''),
-#                                                  help='The MakerSuite API key e.g. a 32-character string',
-#                                                  placeholder='e.g. SATgthsykuE64FgrrrrEervr3S4455t_geyDeGq',
-#                                                  type='password')
-
-#         with st.container():
-#             with c_button_ocr:
-#                 st.write("##")
-#                 st.button("Test OCR", on_click=test_API, args=['google_vision',c_in_ocr, cfg_private,openai_api_key,azure_openai_api_version,azure_openai_api_key,
-#                                                                     azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
-
-#         with st.container():
-#             with c_button_openai:
-#                 st.write("##")
-#                 st.button("Test OpenAI", on_click=test_API, args=['openai',c_in_openai, cfg_private,openai_api_key,azure_openai_api_version,azure_openai_api_key,
-#                                                                     azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
+        st.write("---")
+        st.subheader("Google PaLM 2")
+        st.markdown('Follow these [instructions](https://developers.generativeai.google/tutorials/setup) to generate an API key for PaLM 2. You may need to also activate an account with [MakerSuite](https://makersuite.google.com/app/apikey) and enable "early access."')
+        with st.container():
+            c_in_palm, c_button_palm = st.columns([10,2])
+            with c_in_palm:
+                google_palm = st.text_input("Google PaLM 2 API Key", os.environ.get('GOOGLE_PALM_API', ''),
+                                                help='The MakerSuite API key e.g. a 32-character string',
+                                                placeholder='e.g. SATgthsykuE64FgrrrrEervr3S4455t_geyDeGq',
+                                                type='password')
+
+        with st.container():
+            with c_button_ocr:
+                st.write("##")
+                st.button("Test OCR", on_click=test_API, args=['google_vision',c_in_ocr,openai_api_key,azure_openai_api_version,azure_openai_api_key,
+                                                                    azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
+
+        with st.container():
+            with c_button_openai:
+                st.write("##")
+                st.button("Test OpenAI", on_click=test_API, args=['openai',c_in_openai,openai_api_key,azure_openai_api_version,azure_openai_api_key,
+                                                                    azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
                 
-#         with st.container():
-#             with c_button_azure:
-#                 st.write("##")
-#                 st.button("Test Azure OpenAI", on_click=test_API, args=['azure_openai',c_in_azure, cfg_private,openai_api_key,azure_openai_api_version,azure_openai_api_key,
-#                                                                     azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
+        with st.container():
+            with c_button_azure:
+                st.write("##")
+                st.button("Test Azure OpenAI", on_click=test_API, args=['azure_openai',c_in_azure,openai_api_key,azure_openai_api_version,azure_openai_api_key,
+                                                                    azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
                 
-#         with st.container():
-#             with c_button_palm:
-#                 st.write("##")
-#                 st.button("Test PaLM 2", on_click=test_API, args=['palm',c_in_palm, cfg_private,openai_api_key,azure_openai_api_version,azure_openai_api_key,
-#                                                                     azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
-
+        with st.container():
+            with c_button_palm:
+                st.write("##")
+                st.button("Test PaLM 2", on_click=test_API, args=['palm',c_in_palm,openai_api_key,azure_openai_api_version,azure_openai_api_key,
+                                                                    azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
+
+        st.button("Set API Keys",type='primary', on_click=set_API_keys, args=[openai_api_key,azure_openai_api_version,azure_openai_api_key,
+                                                                    azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
+
+        # # UI form for entering environment variables if not all are set
+        # with st.form("env_variables"):
+        #     for var, value in env_variables.items():
+        #         env_variables[var] = st.text_input(f"Enter {var}", value or "")
+        #     submitted = st.form_submit_button("Submit")
+        #     if submitted:
+        #         # Assuming the environment variables should be set for the session
+        #         for var, value in env_variables.items():
+        #             os.environ[var] = value
+        #         st.success("Environment variables updated. Please restart your app.")
+        if st.button('Proceed to VoucherVision'):
+            st.session_state.proceed_to_private = False
+            st.session_state.proceed_to_main = True
+
+def set_API_keys(openai_api_key, azure_openai_api_version, azure_openai_api_key, azure_openai_api_base, azure_openai_organization, azure_openai_api_type, google_vision, google_palm):
+    # Set the environment variable if the key is not None or an empty string
+    if openai_api_key:
+        os.environ['OPENAI_API_KEY'] = openai_api_key
+    if azure_openai_api_version:
+        os.environ['AZURE_API_VERSION'] = azure_openai_api_version
+    if azure_openai_api_key:
+        os.environ['AZURE_API_KEY'] = azure_openai_api_key
+    if azure_openai_api_base:
+        os.environ['AZURE_API_BASE'] = azure_openai_api_base
+    if azure_openai_organization:
+        os.environ['AZURE_ORGANIZATION'] = azure_openai_organization
+    if azure_openai_api_type:
+        os.environ['AZURE_API_TYPE'] = azure_openai_api_type
+    if google_vision:
+        os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = google_vision
+    if google_palm:
+        os.environ['GOOGLE_PALM_API'] = google_palm
+
+    st.success("API keys set successfully!")
 
-#         st.button("Set API Keys",type='primary', on_click=save_changes_to_API_keys, args=[cfg_private,openai_api_key,azure_openai_api_version,azure_openai_api_key,
-#                                                                     azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm])
-#         if st.button('Proceed to VoucherVision'):
-#             st.session_state.proceed_to_private = False
-#             st.session_state.proceed_to_main = True
-
-def test_API(api, message_loc, cfg_private,openai_api_key,azure_openai_api_version,azure_openai_api_key, azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm):
+    
+def test_API(api, message_loc,openai_api_key,azure_openai_api_version,azure_openai_api_key, azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm):
     # Save the API keys
-    save_changes_to_API_keys(cfg_private,openai_api_key,azure_openai_api_version,azure_openai_api_key,azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm)
+    # save_changes_to_API_keys(openai_api_key,azure_openai_api_version,azure_openai_api_key,azure_openai_api_base,azure_openai_organization,azure_openai_api_type,google_vision,google_palm)
+    set_API_keys(openai_api_key, azure_openai_api_version, azure_openai_api_key,
+                 azure_openai_api_base, azure_openai_organization, azure_openai_api_type,
+                 google_vision, google_palm)
     
     with st.spinner('Performing validation checks...'):
         if api == 'google_vision':
@@ -1337,8 +1360,8 @@ if 'proceed_to_main' not in st.session_state:
 
 if 'proceed_to_build_llm_prompt' not in st.session_state:
     st.session_state.proceed_to_build_llm_prompt = False  # New state variable to control the flow
-# if 'proceed_to_private' not in st.session_state:
-#     st.session_state.proceed_to_private = False  # New state variable to control the flow
+if 'proceed_to_private' not in st.session_state:
+    st.session_state.proceed_to_private = False  # New state variable to control the flow
 
 # if 'private_file' not in st.session_state:
 #     st.session_state.private_file = does_private_file_exist()
@@ -1355,8 +1378,7 @@ if 'zip_filepath' not in st.session_state:
     
 
 # if not st.session_state.private_file:
-#     # create_private_file()
-#     st.header()
+#     create_private_file()
 if st.session_state.proceed_to_build_llm_prompt:
     build_LLM_prompt_config()
 # elif st.session_state.proceed_to_private:

vouchervision/VoucherVision_Config_Builder.py

@@ -556,7 +556,7 @@ def has_API_key(key_name):
 #         return False
 def check_if_usable():
     has_key_openai = os.getenv('OPENAI_API_KEY') is not None
-    has_key_palm2 = os.getenv('PALM') is not None
+    has_key_palm2 = os.getenv('PALM_API_KEY') is not None
     has_key_google_OCR = os.getenv('GOOGLE_APPLICATION_CREDENTIALS') is not None
 
     return has_key_google_OCR and (has_key_openai or has_key_palm2)