openai key as input

.env

@@ -1,3 +0,0 @@
-OPENAI_KEY=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
-EMBEDDING_MODEL=sentence-transformers/all-MiniLM-L12-v2
-GENERATIVE_MODEL=text-davinci-003

.gitignore

@@ -0,0 +1,3 @@
+.env
+.vscode
+*.pyc

.vscode/launch.json

@@ -1,29 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        // {
-        //     "name": "Python: Streamlit",
-        //     "type": "python",
-        //     "request": "launch",
-        //     "program": "${workspaceFolder}/app.py",
-        //     "args": ["--name", "My Opensearch Documentation Search"],
-        //     "cwd": "${workspaceFolder}",
-        //     "env": {
-        //         "STREAMLIT_SERVER_ON": "1"
-        //     },
-        // }
-        {
-            "name": "Python:Streamlit",
-            "type": "python",
-            "request": "launch",
-            "module": "streamlit",
-            "args": [
-                 "run",
-                 "${workspaceFolder}/app.py",
-                 "--",
-                 "--name", 
-                 "Document Insights: Extractive & Generative Methods",
-            ]
-        }
-    ]
-}

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "python.pythonPath": "/Users/h.borzymowski/opt/anaconda3/envs/haystag_rag/bin/python3"
-}

app.py

@@ -10,27 +10,41 @@ from utils.config import parser
 from utils.haystack import start_document_store, query, initialize_pipeline
 from utils.ui import reset_results, set_initial_state
 import pandas as pd
+import haystack
 
 try:
     args = parser.parse_args()
     document_store = start_document_store(type=args.store)
     st.set_page_config(
-        page_title="test",
+        page_title="MLReplySearch",
         layout="centered",
-        page_icon = (":shark:"),
+        page_icon=":shark:",
         menu_items={
-         'Get Help': 'https://www.extremelycoolapp.com/help',
-         'Report a bug': "https://www.extremelycoolapp.com/bug",
-         'About': "# This is a header. This is an *extremely* cool app!"
-     })
+            'Get Help': 'https://www.extremelycoolapp.com/help',
+            'Report a bug': "https://www.extremelycoolapp.com/bug",
+            'About': "# This is a header. This is an *extremely* cool app!"
+        }
+    )
     st.sidebar.image("ml_logo.png", use_column_width=True)
 
     # Sidebar for Task Selection
     st.sidebar.header('Options:')
-    task_selection = st.sidebar.radio('Select the task:', ['Extractive', 'Generative'])
-    
-    pipeline_rag = initialize_pipeline("rag", document_store)
-    pipeline_extractive = initialize_pipeline("extractive", document_store)
+
+    # OpenAI Key Input
+    openai_key = st.sidebar.text_input("Enter OpenAI Key:", type="password")
+
+    if openai_key:
+        task_options = ['Extractive', 'Generative']
+    else:
+        task_options = ['Extractive']
+
+    task_selection = st.sidebar.radio('Select the task:', task_options)
+
+    # Check the task and initialize pipeline accordingly
+    if task_selection == 'Extractive':
+        pipeline_extractive = initialize_pipeline("extractive", document_store)
+    elif task_selection == 'Generative' and openai_key:  # Check for openai_key to ensure user has entered it
+        pipeline_rag = initialize_pipeline("rag", document_store, openai_key=openai_key)
 
     set_initial_state()
 
@@ -76,9 +90,12 @@ try:
                         "👓    An error occurred reading the results. Is the document store working?"
                     )    
                 except Exception as e:
-                    logging.exception(e)
-                    st.error("🐞    An error occurred during the request.")
-
+                    if "API key is invalid" in str(e):
+                        logging.exception(e)
+                        st.error("🐞    incorrect API key provided. You can find your API key at https://platform.openai.com/account/api-keys.")
+                    else:
+                        logging.exception(e)
+                        st.error("🐞    An error occurred during the request.")
     # Display results
     if (st.session_state.results_extractive or st.session_state.results_generative) and run_query:
         

utils/config.py

@@ -7,9 +7,7 @@ load_dotenv()
 parser = argparse.ArgumentParser(description='This app lists animals')
 
 document_store_choices = ('inmemory', 'weaviate', 'milvus', 'opensearch')
-task_choices = ('extractive', 'rag')
 parser.add_argument('--store', choices=document_store_choices, default='inmemory', help='DocumentStore selection (default: %(default)s)')
-#parser.add_argument('--task', choices=task_choices, default='rag', help='Task selection (default: %(default)s)')
 parser.add_argument('--name', default="My Search App")
 
 model_configs = {

utils/haystack.py

@@ -62,14 +62,14 @@ def start_haystack_extractive(_document_store: BaseDocumentStore):
     return pipe
 
 @st.cache_resource(show_spinner=False)
-def start_haystack_rag(_document_store: BaseDocumentStore):
+def start_haystack_rag(_document_store: BaseDocumentStore, openai_key):
     retriever = EmbeddingRetriever(document_store=_document_store, 
                                    embedding_model=model_configs['EMBEDDING_MODEL'], 
                                    top_k=5)
     _document_store.update_embeddings(retriever)
     prompt_node = PromptNode(default_prompt_template="deepset/question-answering", 
                              model_name_or_path=model_configs['GENERATIVE_MODEL'],
-                             api_key=model_configs['OPENAI_KEY'])
+                             api_key=openai_key)
     pipe = Pipeline()
 
     pipe.add_node(component=retriever, name="Retriever", inputs=["Query"])
@@ -83,8 +83,8 @@ def query(_pipeline, question):
     results = _pipeline.run(question, params=params)
     return results
 
-def initialize_pipeline(task, document_store):
+def initialize_pipeline(task, document_store, openai_key = ""):
     if task == 'extractive':
         return start_haystack_extractive(document_store)
     elif task == 'rag':
-        return start_haystack_rag(document_store)
+        return start_haystack_rag(document_store, openai_key)