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

@@ -1854,12 +1854,12 @@ def content_collage_overlay():
         # Load the image only if it's not already in the session state
         if "demo_collage" not in st.session_state:
             # ba = os.path.join(st.session_state.dir_home, 'demo', 'ba', 'ba2.png')
-            ba = os.path.join(st.session_state.dir_home, 'demo', 'ba', 'ba2.jpg')
+            ba = os.path.join(st.session_state.dir_home, 'demo', 'ba', 'ba2.PNG')
             st.session_state["demo_collage"] = Image.open(ba)
 
         # Display the image
-        # st.image(st.session_state["demo_collage"], caption='LeafMachine2 Collage', output_format="PNG")
-        st.image(st.session_state["demo_collage"], caption='LeafMachine2 Collage', output_format="JPEG")
+        st.image(st.session_state["demo_collage"], caption='LeafMachine2 Collage', output_format="PNG")
+        # st.image(st.session_state["demo_collage"], caption='LeafMachine2 Collage', output_format="JPEG")
         
 
 
@@ -1928,11 +1928,11 @@ def content_collage_overlay():
     with col_ocr_2:
         if "demo_overlay" not in st.session_state:
             # ocr = os.path.join(st.session_state.dir_home,'demo', 'ba','ocr.png')
-            ocr = os.path.join(st.session_state.dir_home,'demo', 'ba','ocr.jpg')
+            ocr = os.path.join(st.session_state.dir_home,'demo', 'ba','ocr2_low.png')
             st.session_state["demo_overlay"] = Image.open(ocr)
         
-        # st.image(st.session_state["demo_overlay"], caption='OCR Overlay Images', output_format = "PNG")
-        st.image(st.session_state["demo_overlay"], caption='OCR Overlay Images', output_format = "JPEG")
+        st.image(st.session_state["demo_overlay"], caption='OCR Overlay Images', output_format = "PNG")
+        # st.image(st.session_state["demo_overlay"], caption='OCR Overlay Images', output_format = "JPEG")
 
 
 
@@ -2248,33 +2248,40 @@ st.set_page_config(layout="wide", page_icon='img/icon.ico', page_title='VoucherV
 # Parse the 'is_hf' argument and set it in session state
 if 'is_hf' not in st.session_state:
     st.session_state['is_hf'] = True
-    # try:
-    #     is_hf_arg  = parse_command_line_argument('is_hf')
-    #     if is_hf_arg == '1':
-    #         st.session_state['is_hf'] = True
-    #     else:
-    #         st.session_state['is_hf'] = False
-    # except:
-    #     st.session_state['is_hf'] = True
-
+    try:
+        is_hf_arg  = parse_command_line_argument('is_hf')
+        if is_hf_arg == '1':
+            st.session_state['is_hf'] = True
+        else:
+            st.session_state['is_hf'] = False
+    except:
+        st.session_state['is_hf'] = True
 
 # Default YAML file path
 if 'config' not in st.session_state:
     st.session_state.config, st.session_state.dir_home = build_VV_config(loaded_cfg=None)
     setup_streamlit_config(st.session_state.dir_home)
 
-if 'proceed_to_main' not in st.session_state:
-    st.session_state.proceed_to_main = False  # New state variable to control the flow
+
+if st.session_state['is_hf']:
+    if 'proceed_to_main' not in st.session_state:
+        st.session_state.proceed_to_main = True
+
+else:
+    if 'proceed_to_main' not in st.session_state:
+        st.session_state.proceed_to_main = 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 '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 '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 'processing_add_on' not in st.session_state:
@@ -2362,11 +2369,11 @@ if 'proceed_to_space_saver' not in st.session_state:
 # Main ##########################################################################################################################################
 #################################################################################################################################################
 
-# if not st.session_state.private_file and not st.session_state['is_hf']:
-#     create_private_file()
+if not st.session_state.private_file and not st.session_state['is_hf']:
+    create_private_file()
 if st.session_state.proceed_to_build_llm_prompt:
     build_LLM_prompt_config()
-# elif st.session_state.proceed_to_private and not st.session_state['is_hf']:
-#     create_private_file()
+elif st.session_state.proceed_to_private and not st.session_state['is_hf']:
+    create_private_file()
 elif st.session_state.proceed_to_main:
     main()