Add additional error handling for missing input

app.py

@@ -15,7 +15,7 @@ from models import (
     Messages,
 )
 
-# load_dotenv()
+load_dotenv()
 
 css_style = Path('./style.css').read_text()
 
@@ -30,15 +30,15 @@ with gr.Blocks(css=css_style) as demo:
 
     with gr.Row():
         gr.Markdown("""
-      <h2>
-        <img src='file/assets/zotero-logo.png' alt="Zotero Logo" style="width: 3.2rem; display: inline; margin-right: 10px;" />
-        Zotero Q&A
-      </h2>
+        <h2>
+          <img src='file/assets/zotero-logo.png' alt="Zotero Logo" style="width: 3.2rem; display: inline; margin-right: 10px;" />
+          Zotero Q&A
+        </h2>
 
-      Fan Li ([@FanLi_RnD](https://twitter.com/FanLi_RnD)) - https://apex974.com/articles/literature-reviews-with-paper-qa-and-zotero
-      
-      This tool allows you to ask questions based on your Zotero library. It was built upon [Paper QA](https://github.com/whitead/paper-qa), [LangChain AI](https://github.com/hwchase17/langchain) and [pyZotero](https://github.com/urschrei/pyzotero).
-      """)
+        Fan Li ([@FanLi_RnD](https://twitter.com/FanLi_RnD)) - https://apex974.com/articles/literature-reviews-with-paper-qa-and-zotero
+        
+        This tool allows you to ask questions based on your Zotero library. It was built upon [Paper QA](https://github.com/whitead/paper-qa), [LangChain AI](https://github.com/hwchase17/langchain) and [pyZotero](https://github.com/urschrei/pyzotero).
+        """)
 
     with gr.Row():
         with gr.Column(scale=1):
@@ -57,16 +57,16 @@ with gr.Blocks(css=css_style) as demo:
             zot_selected_col = gr.Radio(
                 [], label="Zotero Collection", elem_id="zotero-collection", visible=False)
             zot_msg = gr.HTML("""
-        <div style="padding: 1rem; background-color: #fffbe7; font-size: 0.8rem;">
-          <ul style="margin-bottom: 0;">
-            <li>Click <a href="https://www.zotero.org/settings/keys/new" target="_blank">here</a> to create Zotero API key.</li>
-            <li>To access your own library, select "User".</li>
-            <li>To access a shared group, select "Group".</li>
-            <li>Personal User ID can be found <a href="https://www.zotero.org/settings/keys" target="_blank">here</a>.</li>
-            <li style="margin-bottom: 0;">Group ID is part of the group URL (e.g. 4952526).</li>
-          </ul>
-        </div>
-        """, visible=True)
+            <div style="padding: 1rem; background-color: #fffbe7; font-size: 0.8rem;">
+              <ul style="margin-bottom: 0;">
+                <li>Click <a href="https://www.zotero.org/settings/keys/new" target="_blank">here</a> to create Zotero API key.</li>
+                <li>To access your own library, select "User".</li>
+                <li>To access a shared group, select "Group".</li>
+                <li>Personal User ID can be found <a href="https://www.zotero.org/settings/keys" target="_blank">here</a>.</li>
+                <li style="margin-bottom: 0;">Group ID is part of the group URL (e.g. 4952526).</li>
+              </ul>
+            </div>
+            """, visible=True)
             zot_fetch_col_btn = gr.Button('Fetch Collections')
 
             gr.Error("Some Error Message")
@@ -74,7 +74,7 @@ with gr.Blocks(css=css_style) as demo:
         with gr.Column(scale=3):
 
             question = gr.Textbox(
-                placeholder="You have to select a Zotero collection to proceed", label="Question", interactive=False, value="What predictive models are used in materials discovery?")
+                placeholder="You have to select a Zotero collection to proceed", label="Question", interactive=False)
 
             gr.HTML()
 
@@ -89,20 +89,23 @@ with gr.Blocks(css=css_style) as demo:
 
     zot_api_key.change(
         reset_collection,
-        inputs=[],
-        outputs=[zot_selected_col, zot_fetch_col_btn, question, answer],
+        inputs=[messages],
+        outputs=[zot_selected_col, zot_fetch_col_btn,
+                 question, answer, messages, msg_board, zot_selected_col],
         show_progress=False,
     )
     zot_library_type.change(
         reset_collection,
-        inputs=[],
-        outputs=[zot_selected_col, zot_fetch_col_btn, question, answer],
+        inputs=[messages],
+        outputs=[zot_selected_col, zot_fetch_col_btn,
+                 question, answer, messages, msg_board, zot_selected_col],
         show_progress=False,
     )
     zot_library_id.change(
         reset_collection,
-        inputs=[],
-        outputs=[zot_selected_col, zot_fetch_col_btn, question, answer],
+        inputs=[messages],
+        outputs=[zot_selected_col, zot_fetch_col_btn,
+                 question, answer, messages, msg_board, zot_selected_col],
         show_progress=False
     )
 
@@ -128,54 +131,5 @@ with gr.Blocks(css=css_style) as demo:
         show_progress=False
     )
 
-    # with gr.Accordion("See Docs:", open=False):
-    #     dataset = gr.Dataframe(
-    #         headers=["filepath", "citation string", "key"],
-    #         datatype=["str", "str", "str"],
-    #         col_count=(3, "fixed"),
-    #         interactive=False,
-    #         label="Documents and Citations",
-    #         overflow_row_behaviour='paginate',
-    #         max_rows=5
-    #     )
-    # buildb = gr.Textbox("⚠️Waiting for documents and key...",
-    #                     label="msg_board", interactive=False, show_label=True,
-    #                     max_lines=1)
-    # stats = gr.Dataframe(headers=['Docs', 'Chunks'],
-    #                      datatype=['number', 'number'],
-    #                      col_count=(2, "fixed"),
-    #                      interactive=False,
-    #                      label="Doc Stats")
-    # openai_api_key.change(validate_dataset, inputs=[
-    #                       dataset, openai_api_key], outputs=[buildb])
-    # dataset.change(validate_dataset, inputs=[
-    #                dataset, openai_api_key], outputs=[buildb])
-    # uploaded_files.change(request_pathname, inputs=[
-    #                       uploaded_files, data, openai_api_key], outputs=[stats, data, dataset, buildb])
-    # download.click(fn=download_repo, inputs=[
-    #                gh_repo, data, openai_api_key], outputs=[stats, data, dataset, buildb])
-    # query = gr.Textbox(
-    #     placeholder="Enter your question here...", label="Question")
-    # with gr.Row():
-    #     length = gr.Slider(25, 200, value=100, step=5,
-    #                        label='Words in answer')
-    #     marg = gr.Checkbox(True, label='Max marginal relevance')
-    #     k = gr.Slider(1, 20, value=10, step=1,
-    #                   label='Chunks to examine')
-    #     sources = gr.Slider(1, 10, value=5, step=1,
-    #                         label='Contexts to include')
-
-    # ask = gr.Button("Ask Question")
-    # answer = gr.Markdown(label="Answer")
-    # with gr.Accordion("Context", open=True):
-    #     context = gr.Markdown(label="Context")
-
-    # with gr.Accordion("Raw Text", open=False):
-    #     passages = gr.Markdown(label="Passages")
-    # ask.click(fn=do_ask, inputs=[query, buildb,
-    #                              openai_api_key, dataset,
-    #                              length, marg, k, sources,
-    #                              docs], outputs=[answer, context, passages, docs, stats])
-
 demo.queue(concurrency_count=10, api_open=False)
 demo.launch()

functions.py

@@ -146,13 +146,18 @@ def download_attachment(id, type, key, attachment):
             f'Unsupported link mode: {link_mode} for {attachment["key"]}.')
 
 
-def reset_collection():
+def reset_collection(messages):
+    messages.set([Message(
+        Icons.INFO, "Please provide all the required OpenAI and Zotero information in the left panel.")])
     return (
         gr.Radio.update(choices=[], visible=False),
         gr.HTML.update(visible=True),
         gr.Text.update(
             placeholder="You have to select a Zotero collection to proceed", interactive=False),
-        gr.HTML.update(value=None)
+        gr.HTML.update(value=None),
+        messages,
+        gr.HTML.update(value=str(messages)),
+        None
     )
 
 
@@ -268,7 +273,7 @@ def handle_submit(zot, collection_name, collections, question, messages):
                 None,
             )
 
-    # Index attachments
+    # Load attachments
     available_attachments = 0
     for attachment in attachments:
         try:
@@ -282,7 +287,7 @@ def handle_submit(zot, collection_name, collections, question, messages):
                 temp_file.flush()
                 docs.add(temp_file.name, citation_dict[attachment["key"]])
                 messages.append(Message(
-                    Icons.INDEX, f"Indexed PDF attachment: <a href='{attachment['links']['alternate']['href']}' target='_blank'>{attachment['data']['title']}</a>."))
+                    Icons.INDEX, f"Loaded PDF attachment: <a href='{attachment['links']['alternate']['href']}' target='_blank'>{attachment['data']['title']}</a>."))
                 available_attachments += 1
             else:
                 messages.append(Message(
@@ -312,18 +317,28 @@ def handle_submit(zot, collection_name, collections, question, messages):
         )
         return None, None, None
     if docs._faiss_index is None:
-        messages.append(Message(
-            Icons.WAIT, f"Building vector index based on {available_attachments} available PDF {'attachment' if attachments==1 else 'attachments'}"))
-        yield (
-            messages,
-            gr.HTML.update(value=str(messages)),
-            None,
-        )
-        docs._build_faiss_index()
+        try:
+            messages.append(Message(
+                Icons.WAIT, f"Building vector index based on {available_attachments} available PDF {'attachment' if available_attachments==1 else 'attachments'}."))
+            yield (
+                messages,
+                gr.HTML.update(value=str(messages)),
+                None,
+            )
+            docs._build_faiss_index()
+        except Exception as e:
+            messages.append(Message(
+                Icons.ERR, f"Unable to build vector index: {e}"))
+            yield (
+                messages,
+                gr.HTML.update(value=str(messages)),
+                None,
+            )
+            return None, None, None
 
     # Synthesize response
     messages.append(Message(
-        Icons.WAIT, f"Creating answer. This will loop through all available PDF {'attachment' if attachments==1 else 'attachments'} and may take {'a few' if available_attachments > 2 else 'a couple of'} minutes."))
+        Icons.WAIT, f"""Creating answer. {"This should be done within a minute." if available_attachments==1 else "This will loop through all available PDF attachments and may take a couple of minutes."}."""))
     yield (
         messages,
         gr.HTML.update(value=str(messages)),
@@ -335,7 +350,7 @@ def handle_submit(zot, collection_name, collections, question, messages):
         for i, answer in enumerate(docs.query_gen(question)):
             end_time = time.time()
             time_dif = end_time - start_time
-            if time_dif > 5:
+            if time_dif > 15:
                 start_time = end_time
                 total_time += time_dif
                 messages.append(Message(
@@ -345,18 +360,21 @@ def handle_submit(zot, collection_name, collections, question, messages):
                     gr.HTML.update(value=str(messages)),
                     None,
                 )
-        answer_text = '\n'.join(
-            [f"<div>{x}</div>" for x in answer.answer.split('\n')])
-        references = '\n'.join([f"<li>{x.split('.', 1)[1]}</li>"
-                                for x in answer.references.split('\n\n')])
+        answer_text = "\n".join(
+            [f"<div>{x}</div>" for x in answer.answer.split("\n")])
+        reference_list = "" if answer.references == "" else "\n".join([f"<li>{x.split('.', 1)[1]}</li>"
+                                                                       for x in answer.references.split('\n\n')])
+        references = "" if reference_list == "" else f"""
+        <h4 style="font-size: 1rem;">References:</h4>
+        <ol>
+        {reference_list}
+        </ol>
+        """
         formatted_answer = f"""
         <div>{answer_text}</div>
 
-        <h4 style="font-size: 1rem;">References:</h4>
-        <ol>
         {references}
-        </ol>
-        
+
         <div>Tokens Used: {answer.tokens} Cost: ${answer.tokens/1000 * 0.002:.2f}</div>
         """.strip()
         messages.append(Message(

style.css

@@ -8,7 +8,7 @@
   }
 
   .zotero-link {
-    font-size: 0.75rem;
+    font-size: 0.85rem;
     color: #2d7ea9;
   }