update ui

app.py

@@ -5,8 +5,10 @@ import plotly.graph_objs as go
 import numpy as np
 from itertools import chain
 from PIL import Image
+from io import BytesIO
 import pandas as pd
 from typing import Union
+from google.oauth2 import service_account
 from streamlit_extras.let_it_rain import rain
 from vouchervision.LeafMachine2_Config_Builder import write_config_file
 from vouchervision.VoucherVision_Config_Builder import build_VV_config, run_demo_tests_GPT, run_demo_tests_Palm , TestOptionsGPT, TestOptionsPalm, check_if_usable, run_api_tests
@@ -284,151 +286,151 @@ def create_space_saver():
 #         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])
 
-    if st.session_state.private_file:
-        cfg_private = get_private_file()
-    else:
-        cfg_private = {}
-        cfg_private['openai'] = {}
-        cfg_private['openai']['OPENAI_API_KEY'] =''
+#     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'] =''
+#         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'] =''
     
 
-    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:
+#         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 = 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("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", 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("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", 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])
                 
-        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, 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, 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, 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.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
+#         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):
     # Save the API keys
@@ -561,6 +563,15 @@ def check_prompt_yaml_filename(fname):
     else:
         return False
 
+def create_download_button(zip_filepath):
+    with open(zip_filepath, 'rb') as f:
+        bytes_io = BytesIO(f.read())
+    st.download_button(
+        label="Download Results",
+        data=bytes_io,
+        file_name=os.path.basename(zip_filepath),
+        mime='application/zip'
+    )
 
 def btn_load_prompt(selected_yaml_file, dir_prompt):
     if selected_yaml_file:
@@ -921,7 +932,7 @@ def content_header():
 
                 path_custom_prompts = os.path.join(st.session_state.dir_home,'custom_prompts',st.session_state.config['leafmachine']['project']['prompt_version'])
                 # Call the machine function.
-                last_JSON_response, total_cost = voucher_vision(None, st.session_state.dir_home, path_custom_prompts, None, progress_report,path_api_cost=os.path.join(st.session_state.dir_home,'api_cost','api_cost.yaml'))
+                last_JSON_response, total_cost, st.session_state['zip_filepath'] = voucher_vision(None, st.session_state.dir_home, path_custom_prompts, None, progress_report,path_api_cost=os.path.join(st.session_state.dir_home,'api_cost','api_cost.yaml'))
                 
                 if total_cost:
                     st.success(f":money_with_wings: This run cost :heavy_dollar_sign:{total_cost:.4f}")
@@ -936,10 +947,15 @@ def content_header():
                         formatted_json = json.dumps(last_JSON_response, indent=4)
                     st.markdown(f"Last JSON object in the batch:\n```\n{formatted_json}\n```")
                     st.balloons()
+            
+            if st.session_state['zip_filepath']:
+                create_download_button(st.session_state['zip_filepath'])
+
 
         else:
             st.button("Start Processing", type='primary', disabled=True)
-            st.error(":heavy_exclamation_mark: Required API keys not set. Please visit the 'API Keys' tab and set the Google Vision OCR API key and at least one LLM key.")
+            # st.error(":heavy_exclamation_mark: Required API keys not set. Please visit the 'API Keys' tab and set the Google Vision OCR API key and at least one LLM key.")
+            st.error(":heavy_exclamation_mark: Required API keys not set. Please set the API keys as 'Secrets' for your Hugging Face Space. Visit the 'Settings' tab at the top of the page.")
 
     with col_run_2:
         st.subheader('Run Tests', help="")
@@ -1281,7 +1297,8 @@ def main():
     # Main App
     content_header()
 
-    tab_settings, tab_prompt, tab_domain, tab_component, tab_processing, tab_private, tab_delete = st.tabs(["Project Settings", "Prompt Builder", "Domain Knowledge","Component Detector", "Processing Options", "API Keys", "Space-Saver"])
+    # tab_settings, tab_prompt, tab_domain, tab_component, tab_processing, tab_private, tab_delete = st.tabs(["Project Settings", "Prompt Builder", "Domain Knowledge","Component Detector", "Processing Options", "API Keys", "Space-Saver"])
+    tab_settings, tab_prompt, tab_domain, tab_component, tab_processing, tab_delete = st.tabs(["Project Settings", "Prompt Builder", "Domain Knowledge","Component Detector", "Processing Options", "Space-Saver"])
 
     with tab_settings:
         content_tab_settings()
@@ -1300,10 +1317,10 @@ def main():
     with tab_processing:
         content_tab_processing()
 
-    with tab_private:
-        if st.button("Edit API Keys"):
-            st.session_state.proceed_to_private = True
-            st.rerun()
+    # with tab_private:
+    #     if st.button("Edit API Keys"):
+    #         st.session_state.proceed_to_private = True
+    #         st.rerun()
 
     with tab_delete:
         create_space_saver()
@@ -1320,25 +1337,29 @@ 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()
-    if st.session_state.private_file:
-        st.session_state.proceed_to_main = True
+# if 'private_file' not in st.session_state:
+#     st.session_state.private_file = does_private_file_exist()
+#     if st.session_state.private_file:
+#         st.session_state.proceed_to_main = True
 
 # Initialize session_state variables if they don't exist
 if 'prompt_info' not in st.session_state:
     st.session_state['prompt_info'] = {}
 if 'rules' not in st.session_state:
     st.session_state['rules'] = {}
+if 'zip_filepath' not in st.session_state:
+    st.session_state['zip_filepath'] = None
+    
 
-if not st.session_state.private_file:
-    create_private_file()
-elif st.session_state.proceed_to_build_llm_prompt:
+# if not st.session_state.private_file:
+#     # create_private_file()
+#     st.header()
+if st.session_state.proceed_to_build_llm_prompt:
     build_LLM_prompt_config()
-elif st.session_state.proceed_to_private:
-    create_private_file()
+# elif st.session_state.proceed_to_private:
+#     create_private_file()
 elif st.session_state.proceed_to_main:
     main()

vouchervision/OCR_google_cloud_vision.py

@@ -26,8 +26,8 @@ def draw_boxes(image, bounds, color):
             )
     return image
 
-def detect_text(path):
-    client = vision.ImageAnnotatorClient()
+def detect_text(path, client):
+    # client = vision.ImageAnnotatorClient()
     with io.open(path, 'rb') as image_file:
         content = image_file.read()
     image = vision.Image(content=content)

vouchervision/VoucherVision_Config_Builder.py

@@ -527,50 +527,76 @@ def run_api_tests(api):
         print(e)
         return False
 
-def has_API_key(val):
-        if val != '':
-            return True
-        else:
-            return False
+# def has_API_key(val):
+#         if val != '':
+#             return True
+#         else:
+#             return False
+def has_API_key(key_name):
+    # Check if the environment variable by key_name is not None
+    return os.getenv(key_name) is not None
+
         
-def check_if_usable():
-    dir_home = os.path.dirname(os.path.dirname(__file__))
-    path_cfg_private = os.path.join(dir_home, 'PRIVATE_DATA.yaml')
-    cfg_private = get_cfg_from_full_path(path_cfg_private)
+# def check_if_usable():
+#     dir_home = os.path.dirname(os.path.dirname(__file__))
+#     path_cfg_private = os.path.join(dir_home, 'PRIVATE_DATA.yaml')
+#     cfg_private = get_cfg_from_full_path(path_cfg_private)
 
-    has_key_openai = has_API_key(cfg_private['openai']['OPENAI_API_KEY'])
+#     has_key_openai = has_API_key(cfg_private['openai']['OPENAI_API_KEY'])
 
-    has_key_azure_openai = has_API_key(cfg_private['openai_azure']['api_version']) 
+#     has_key_azure_openai = has_API_key(cfg_private['openai_azure']['api_version']) 
 
-    has_key_palm2 = has_API_key(cfg_private['google_palm']['google_palm_api'])
+#     has_key_palm2 = has_API_key(cfg_private['google_palm']['google_palm_api'])
     
-    has_key_google_OCR = has_API_key(cfg_private['google_cloud']['path_json_file'])
-
-    if has_key_google_OCR and (has_key_azure_openai or has_key_openai or has_key_palm2):
-        return True
-    else:
-        return False
-
-def check_API_key(dir_home, api_version):
-    dir_home = os.path.dirname(os.path.dirname(__file__))
-    path_cfg_private = os.path.join(dir_home, 'PRIVATE_DATA.yaml')
-    cfg_private = get_cfg_from_full_path(path_cfg_private)
-
-    has_key_openai = has_API_key(cfg_private['openai']['OPENAI_API_KEY'])
-
-    has_key_azure_openai = has_API_key(cfg_private['openai_azure']['api_version']) 
-
-    has_key_palm2 = has_API_key(cfg_private['google_palm']['google_palm_api'])
-
-    has_key_google_OCR = has_API_key(cfg_private['google_cloud']['path_json_file'])
+#     has_key_google_OCR = has_API_key(cfg_private['google_cloud']['path_json_file'])
 
+#     if has_key_google_OCR and (has_key_azure_openai or has_key_openai or has_key_palm2):
+#         return True
+#     else:
+#         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_google_OCR = os.getenv('GOOGLE_APPLICATION_CREDENTIALS') is not None
+
+    return has_key_google_OCR and (has_key_openai or has_key_palm2)
+
+# def check_API_key(dir_home, api_version):
+#     dir_home = os.path.dirname(os.path.dirname(__file__))
+#     path_cfg_private = os.path.join(dir_home, 'PRIVATE_DATA.yaml')
+#     cfg_private = get_cfg_from_full_path(path_cfg_private)
+
+#     has_key_openai = has_API_key(cfg_private['openai']['OPENAI_API_KEY'])
+
+#     has_key_azure_openai = has_API_key(cfg_private['openai_azure']['api_version']) 
+
+#     has_key_palm2 = has_API_key(cfg_private['google_palm']['google_palm_api'])
+
+#     has_key_google_OCR = has_API_key(cfg_private['google_cloud']['path_json_file'])
+
+#     if api_version == 'palm' and has_key_palm2:
+#         return True
+#     elif api_version in ['gpt','openai'] and has_key_openai:
+#         return True
+#     elif api_version in ['gpt-azure', 'azure_openai'] and has_key_azure_openai:
+#         return True
+#     elif api_version == 'google-vision-ocr' and has_key_google_OCR:
+#         return True
+#     else:
+#         return False
+def check_API_key(api_version):
+    # The API keys are assumed to be set in the environment variables
+    has_key_openai = os.getenv('OPENAI_API_KEY') is not None
+    has_key_palm2 = os.getenv('PALM') is not None
+    has_key_google_OCR = os.getenv('GOOGLE_APPLICATION_CREDENTIALS') is not None
+
+    # Depending on the api_version, check if the corresponding key is present
     if api_version == 'palm' and has_key_palm2:
         return True
-    elif api_version in ['gpt','openai'] and has_key_openai:
-        return True
-    elif api_version in ['gpt-azure', 'azure_openai'] and has_key_azure_openai:
+    elif api_version in ['gpt', 'openai'] and has_key_openai:
         return True
     elif api_version == 'google-vision-ocr' and has_key_google_OCR:
         return True
     else:
         return False
+

vouchervision/general_utils.py

@@ -21,6 +21,10 @@ https://helpx.adobe.com/content/dam/help/en/photoshop/pdf/dng_commandline.pdf
 
 # https://stackoverflow.com/questions/287871/how-do-i-print-colored-text-to-the-terminal
 
+def make_zipfile(source_dir, output_filename):
+    shutil.make_archive(output_filename, 'zip', source_dir)
+    return output_filename + '.zip'
+    
 def validate_dir(dir):
     if not os.path.exists(dir):
         os.makedirs(dir)

vouchervision/utils_VoucherVision.py

@@ -4,6 +4,7 @@ import openpyxl
 from openpyxl import Workbook, load_workbook
 import google.generativeai as palm
 from langchain.chat_models import AzureChatOpenAI
+from google.oauth2 import service_account
 
 currentdir = os.path.dirname(os.path.abspath(
     inspect.getfile(inspect.currentframe())))
@@ -54,6 +55,7 @@ class VoucherVision():
         self.Dirs = Dirs
         self.headers = None
         self.prompt_version = None
+        self.client = None
 
         self.set_API_keys()
         self.setup()
@@ -366,51 +368,38 @@ class VoucherVision():
         wb.save(path_transcription)
 
 
-    
-
-    def has_API_key(self, val):
-        if val != '':
-            return True
-        else:
-            return False
-
     def set_API_keys(self):
-        self.dir_home = os.path.dirname(os.path.dirname(__file__))
-        self.path_cfg_private = os.path.join(self.dir_home, 'PRIVATE_DATA.yaml')
-        self.cfg_private = get_cfg_from_full_path(self.path_cfg_private)
+        # Access secrets directly from the environment
+        openai_api_key = os.getenv('OPENAI_API_KEY')
+        google_application_credentials = os.getenv('GOOGLE_APPLICATION_CREDENTIALS')
+        palm_api_key = os.getenv('PALM')
 
-        self.has_key_openai = self.has_API_key(self.cfg_private['openai']['OPENAI_API_KEY'])
-
-        self.has_key_azure_openai = self.has_API_key(self.cfg_private['openai_azure']['api_version'])
-        
-        self.has_key_palm2 = self.has_API_key(self.cfg_private['google_palm']['google_palm_api'])
-
-        self.has_key_google_OCR = self.has_API_key(self.cfg_private['google_cloud']['path_json_file'])
-
-        if self.has_key_openai:
-            openai.api_key = self.cfg_private['openai']['OPENAI_API_KEY']
-            os.environ["OPENAI_API_KEY"] = self.cfg_private['openai']['OPENAI_API_KEY']
-            
-
-        if self.has_key_azure_openai:
-            # os.environ["OPENAI_API_KEY"] = self.cfg_private['openai_azure']['openai_api_key']
-            self.llm = AzureChatOpenAI(
-                deployment_name='gpt-35-turbo',
-                openai_api_version=self.cfg_private['openai_azure']['api_version'],
-                openai_api_key=self.cfg_private['openai_azure']['openai_api_key'],
-                openai_api_base=self.cfg_private['openai_azure']['openai_api_base'],
-                openai_organization=self.cfg_private['openai_azure']['openai_organization'],
-                openai_api_type=self.cfg_private['openai_azure']['openai_api_type']
-            )
+        self.has_key_openai = openai_api_key is not None
+        self.has_key_google_OCR = google_application_credentials is not None
+        self.has_key_palm2 = palm_api_key is not None
 
         if self.has_key_google_OCR:
-            os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = self.cfg_private['google_cloud']['path_json_file']
+            # Get the credentials JSON from the environment variable
+            google_credentials_json = os.getenv('GOOGLE_APPLICATION_CREDENTIALS')
+            # Convert the JSON string into a Python dictionary
+            google_credentials_dict = json.loads(google_credentials_json)
+            # Create a credentials object
+            google_credentials = service_account.Credentials.from_service_account_info(google_credentials_dict)
+
+            # Now, use this `google_credentials` object to authenticate your Google Cloud services
+            # For example, if you are using the Google Vision API, it would look like this:
+            from google.cloud import vision
+            self.client = vision.ImageAnnotatorClient(credentials=google_credentials)
 
         if self.has_key_palm2:
-            os.environ['PALM'] = self.cfg_private['google_palm']['google_palm_api']
-            palm.configure(api_key=os.environ['PALM'])
+            os.environ['PALM'] = palm_api_key
+            palm.configure(api_key=palm_api_key)
 
+        if self.has_key_openai:
+            openai.api_key = openai_api_key
+            os.environ["OPENAI_API_KEY"] = openai_api_key
         
+
     def initialize_embeddings(self):
         '''Loading embedding search       __init__(self, db_name, path_domain_knowledge, logger, build_new_db=False, model_name="hkunlp/instructor-xl", device="cuda")'''
         self.Voucher_Vision_Embedding = VoucherVisionEmbedding(self.db_name, self.path_domain_knowledge, logger=self.logger, build_new_db=self.build_new_db)
@@ -567,7 +556,7 @@ class VoucherVision():
                 # Use Google Vision API to get OCR
                 # self.OCR = detect_text(path_to_crop) 
                 self.logger.info(f'Working on {i+1}/{len(self.img_paths)} --- Starting OCR')
-                self.OCR, self.bounds, self.text_to_box_mapping = detect_text(path_to_crop)
+                self.OCR, self.bounds, self.text_to_box_mapping = detect_text(path_to_crop, self.client)
                 self.logger.info(f'Working on {i+1}/{len(self.img_paths)} --- Finished OCR')
                 if len(self.OCR) > 0:
                     self.logger.info(f'Working on {i+1}/{len(self.img_paths)} --- Creating OCR Overlay Image')
@@ -632,7 +621,7 @@ class VoucherVision():
                 filename_without_extension, txt_file_path, txt_file_path_OCR, txt_file_path_OCR_bounds, jpg_file_path_OCR_helper = self.generate_paths(path_to_crop, i)
                 
                 # Use Google Vision API to get OCR
-                self.OCR, self.bounds, self.text_to_box_mapping = detect_text(path_to_crop)
+                self.OCR, self.bounds, self.text_to_box_mapping = detect_text(path_to_crop, self.client)
                 if len(self.OCR) > 0:
                     self.logger.info(f'Working on {i+1}/{len(self.img_paths)} --- Starting OCR')
                     self.OCR = self.OCR.replace("\'", "Minutes").replace('\"', "Seconds")
@@ -755,7 +744,7 @@ class VoucherVision():
     def process_specimen_batch_OCR_test(self, path_to_crop):
         for img_filename in os.listdir(path_to_crop):
             img_path = os.path.join(path_to_crop, img_filename)
-        self.OCR, self.bounds, self.text_to_box_mapping = detect_text(img_path)
+        self.OCR, self.bounds, self.text_to_box_mapping = detect_text(img_path, self.client)
 
 
 

vouchervision/vouchervision_main.py

@@ -8,7 +8,7 @@ parentdir = os.path.dirname(currentdir)
 sys.path.append(parentdir)
 sys.path.append(currentdir)
 from vouchervision.component_detector.component_detector import detect_plant_components, detect_archival_components
-from general_utils import add_to_expense_report, save_token_info_as_csv, print_main_start, check_for_subdirs_VV, load_config_file, load_config_file_testing, report_config, save_config_file, subset_dir_images, crop_detections_from_images_VV
+from general_utils import make_zipfile, add_to_expense_report, save_token_info_as_csv, print_main_start, check_for_subdirs_VV, load_config_file, load_config_file_testing, report_config, save_config_file, subset_dir_images, crop_detections_from_images_VV
 from directory_structure_VV import Dir_Structure
 from data_project import Project_Info
 from LM2_logger import start_logging
@@ -88,7 +88,14 @@ def voucher_vision(cfg_file_path, dir_home, path_custom_prompts, cfg_test, progr
         handler.close()
         logger.removeHandler(handler)
 
-    return last_JSON_response, total_cost
+    # Create Higging Face zip file
+    dir_to_zip = os.path.join(Dirs.dir_home, Dirs.run_name)  
+    zip_filename = Dirs.run_name  
+
+    # Creating a zip file
+    zip_filepath = make_zipfile(dir_to_zip, zip_filename)
+
+    return last_JSON_response, total_cost, zip_filepath
 
 def voucher_vision_OCR_test(cfg_file_path, dir_home, cfg_test, path_to_crop):
     # get_n_overall = progress_report.get_n_overall()
@@ -143,6 +150,7 @@ def voucher_vision_OCR_test(cfg_file_path, dir_home, cfg_test, path_to_crop):
     Voucher_Vision = VoucherVision(cfg, logger, dir_home, None, Project, Dirs)
     last_JSON_response = Voucher_Vision.process_specimen_batch_OCR_test(path_to_crop)
 
+
 if __name__ == '__main__':    
     is_test = False