adapted secrets to HF

app.py

@@ -144,34 +144,34 @@ data = load_data(data_path)
 cache = None # load_content_cache(cache_path) 
 
 try:
-    # st.write("Loading secrets from secrets.toml")
-    Wapi_key = st.secrets['secrets']['WEAVIATE_API_KEY']
-    url = st.secrets['secrets']['WEAVIATE_ENDPOINT']
-    openai_api_key = st.secrets['secrets']['OPENAI_API_KEY']
-
-    hf_token = st.secrets['secrets']['LLAMA2_ENDPOINT_HF_TOKEN_chris']
-    hf_endpoint = st.secrets['secrets']['LLAMA2_ENDPOINT_UPLIMIT']
-    # st.write("Secrets loaded from secrets.toml")
-    # st.write("HF_TOKEN", hf_token)
+    # # st.write("Loading secrets from secrets.toml")
+    # Wapi_key = st.secrets['secrets']['WEAVIATE_API_KEY']
+    # url = st.secrets['secrets']['WEAVIATE_ENDPOINT']
+    # openai_api_key = st.secrets['secrets']['OPENAI_API_KEY']
+
+    # hf_token = st.secrets['secrets']['LLAMA2_ENDPOINT_HF_TOKEN_chris']
+    # hf_endpoint = st.secrets['secrets']['LLAMA2_ENDPOINT_UPLIMIT']
+    # # st.write("Secrets loaded from secrets.toml")
+    # # st.write("HF_TOKEN", hf_token)
+    
+    # for Huggingface (no [secrets] section)
+    Wapi_key = st.secrets['WEAVIATE_API_KEY']
+    url = st.secrets['WEAVIATE_ENDPOINT']
+    openai_api_key = st.secrets['OPENAI_API_KEY']
+
+    hf_token = st.secrets['LLAMA2_ENDPOINT_HF_TOKEN_chris']
+    hf_endpoint = st.secrets['LLAMA2_ENDPOINT_UPLIMIT']
+    model_token_id = st.secrets['MODAL_TOKEN_ID']
+    modal_token_secret = st.secrets['MODAL_TOKEN_SECRET']
 except:
-    try:
-        # for Huggingface (no [secrets] section)
-        Wapi_key = st.secrets['WEAVIATE_API_KEY']
-        url = st.secrets['WEAVIATE_ENDPOINT']
-        openai_api_key = st.secrets['OPENAI_API_KEY']
-
-        hf_token = st.secrets['LLAMA2_ENDPOINT_HF_TOKEN_chris']
-        hf_endpoint = st.secrets['LLAMA2_ENDPOINT_UPLIMIT']
-        model_token_id = st.secrets['MODAL_TOKEN_ID']
-        modal_token_secret = st.secrets['MODAL_TOKEN_SECRET']
-    except:
-        st.write("Loading secrets from environment variables")
-        api_key = os.environ['WEAVIATE_API_KEY']
-        url = os.environ['WEAVIATE_ENDPOINT']
-        openai_api_key = os.environ['OPENAI_API_KEY']
-
-        hf_token = os.environ['LLAMA2_ENDPOINT_HF_TOKEN_chris']
-        hf_endpoint = os.environ['LLAMA2_ENDPOINT_UPLIMIT']
+
+    st.write("Loading secrets from environment variables")
+    api_key = os.environ['WEAVIATE_API_KEY']
+    url = os.environ['WEAVIATE_ENDPOINT']
+    openai_api_key = os.environ['OPENAI_API_KEY']
+
+    hf_token = os.environ['LLAMA2_ENDPOINT_HF_TOKEN_chris']
+    hf_endpoint = os.environ['LLAMA2_ENDPOINT_UPLIMIT']
 #%% 
 # model_default = 'sentence-transformers/all-mpnet-base-v2'
 model_default = 'models/finetuned-all-mpnet-base-v2-300' if we_are_not_online \