Update app.py

app.py

@@ -3,27 +3,27 @@ import os
 import re
 import json
 from dotenv import load_dotenv
-from haystack.nodes.prompt import PromptNode, PromptTemplate
-from haystack.nodes import EmbeddingRetriever
-from haystack import Pipeline
 import numpy as np
 import pandas as pd
-from haystack.document_stores import FAISSDocumentStore, PineconeDocumentStore
-from haystack.nodes import EmbeddingRetriever
 from haystack.schema import Document
-from huggingface_hub import login, HfApi, hf_hub_download, InferenceClient
+from haystack.document_stores import PineconeDocumentStore
+from haystack.nodes import EmbeddingRetriever
+# from huggingface_hub import login, HfApi, hf_hub_download, InferenceClient
 import openai
 
-# Get HF token
-hf_token = os.environ["HF_TOKEN"]
-login(token=hf_token, add_to_git_credential=True)
+# for local st testing, may need to run source ~/.zshrc to point to env vars
+
+# Get HF token (used for llama2)
+# hf_token = os.environ["HF_TOKEN"]
+# login(token=hf_token, add_to_git_credential=True)
 
 # Get openai API key
-openai_key = os.environ["OPENAI_API_KEY"]
 openai.api_key = os.environ["OPENAI_API_KEY"]
+# openai.api_key = "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"
 
 # Get openai API key
 pinecone_key = os.environ["PINECONE_API_KEY"]
+# pinecone_key = "c3f5717c-f43a-46d0-893e-02b44dbcf13b"
 
 #___________________________________________________________________________________________________________
 
@@ -159,6 +159,7 @@ def run_query(input_text, country, model_sel):
                 res_box.success(result) # output to response text box
 
         references = get_refs(docs, result) # extract references from the generated text
+    # Llama2 selection (was running on HF)
     # else:
     #     res = client.text_generation(get_prompt(docs, query=input_query), max_new_tokens=4000, temperature=0.01, model=model)
     #     output = res
@@ -172,8 +173,8 @@ def run_query(input_text, country, model_sel):
 
 #___________________________________________________________________________________________________________
 
+# Sidebar (filters)
 with st.sidebar:
-    # Dropdown selectbox
     country = st.sidebar.multiselect('Filter by country:', country_options)
     vulnerabilities_cat = st.sidebar.multiselect('Filter by vulnerabilities category:', vulnerability_options)
     with st.expander("ℹ️ - About filters", expanded=False):
@@ -185,10 +186,12 @@ with st.sidebar:
             """
         )
 
+# Main window title
 with st.container():
         st.markdown("<h2 style='text-align: center;'> Climate Policy Documents: Vulnerabilities Analysis Q&A </h2>", unsafe_allow_html=True)
         st.write(' ')
 
+# Main window instructions
 with st.expander("ℹ️ - About this app", expanded=False):
     st.write(
         """
@@ -206,31 +209,23 @@ with st.expander("ℹ️ - About this app", expanded=False):
 
     Make sure your filters match the countries you have specified for the analysis!
     """)
-    # st.write(country)
-    # st.write(vulnerabilities_cat)
 
 
-# Dropdown selectbox: model
+# Dropdown selectbox: model (currently not used)
 # model_sel = st.selectbox('Select an LLM:', model_options)
 model_sel = "chatGPT"
 
 #----Model Select logic-------
 if model_sel == "chatGPT":
     model_name = "gpt-3.5-turbo"
-    # # Initialize the PromptNode
-    # pn = PromptNode(model_name_or_path=model_name, default_prompt_template=template, api_key=openai_key, max_length=2000, model_kwargs={"generation_kwargs": {"do_sample": False, "temperature": 0}})
-    
-    # # Initialize the pipeline
-    # pipe = Pipeline()
-    # pipe.add_node(component=pn, name="prompt_node", inputs=["Query"])
-else:
-    # Currently disabled
-    model = "meta-llama/Llama-2-70b-chat-hf"
-    # Instantiate the inference client
-    client = InferenceClient()
 
+# else:
+#     model = "meta-llama/Llama-2-70b-chat-hf"
+#     # Instantiate the inference client
+#     client = InferenceClient()
 
-if selected_example == "-":
+# get prompt from user or example prompt
+if selected_example == "-": #hyphen used as a work around (st won't allow null selection)
     text = st.text_area('Enter your question in the text box below using natural language or select an example from above:')
 else:
     text = st.text_area('Enter your question in the text box below using natural language or select an example from above:', value=selected_example)
@@ -242,3 +237,7 @@ if st.button('Submit'):
     run_query(text, country=country, model_sel=model_sel)
 
 
+
+
+
+