update app

src/app.py

@@ -1,9 +1,11 @@
 import gradio as gr
 from download_new_papers import get_papers
+import utils
 from relevancy import generate_relevance_score, process_subject_fields
 from sendgrid.helpers.mail import Mail, Email, To, Content
 import sendgrid
 import os
+import openai
 
 topics = {
     "Physics": "",
@@ -72,6 +74,7 @@ def sample(email, topic, physics_topic, categories, interest):
     else:
         papers = get_papers(abbr, limit=4)
     if interest:
+        if not openai.api_key: raise gr.Error("Set your OpenAI api key on the left first")
         relevancy, _ = generate_relevance_score(
             papers,
             query={"interest": interest},
@@ -86,7 +89,6 @@ def change_subsubject(subject, physics_subject):
     if subject != "Physics":
         return gr.Dropdown.update(choices=categories_map[subject], value=[], visible=True)
     else:
-        print(physics_subject)
         if physics_subject and not isinstance(physics_subject, list):
             return gr.Dropdown.update(choices=categories_map[physics_subject], value=[], visible=True)
         else:
@@ -100,7 +102,9 @@ def change_physics(subject):
         return gr.Dropdown.update(physics_topics, visible=True)
 
 
-def test(email, topic, physics_topic, categories, interest):
+def test(email, topic, physics_topic, categories, interest, key):
+    if not email: raise gr.Error("Set your email")
+    if not key: raise gr.Error("Set your SendGrid key")
     if topic == "Physics":
         if isinstance(physics_topic, list):
             raise gr.Error("You must choose a physics topic.")
@@ -116,19 +120,19 @@ def test(email, topic, physics_topic, categories, interest):
     else:
         papers = get_papers(abbr, limit=4)
     if interest:
+        if not openai.api_key: raise gr.Error("Set your OpenAI api key on the left first")
         relevancy, hallucination = generate_relevance_score(
             papers,
             query={"interest": interest},
             threshold_score=7,
             num_paper_in_prompt=8)
-        print(relevancy[0].keys())
         body = "<br><br>".join([f'Title: <a href="{paper["main_page"]}">{paper["title"]}</a><br>Authors: {paper["authors"]}<br>Score: {paper["Relevancy score"]}<br>Reason: {paper["Reasons for match"]}' for paper in relevancy])
         if hallucination:
             body = "Warning: the model hallucinated some papers. We have tried to remove them, but the scores may not be accurate.<br><br>" + body
     else:
         body = "<br><br>".join([f'Title: <a href="{paper["main_page"]}">{paper["title"]}</a><br>Authors: {paper["authors"]}' for paper in papers])
-    sg = sendgrid.SendGridAPIClient(api_key=os.environ.get('SENDGRID_API_KEY'))
-    from_email = Email("") # CHANGE TO YOUR VERIFIED SENDER
+    sg = sendgrid.SendGridAPIClient(api_key=key)
+    from_email = Email(email)
     to_email = To(email)
     subject = "arXiv digest"
     content = Content("text/html", body)
@@ -138,30 +142,42 @@ def test(email, topic, physics_topic, categories, interest):
     # Send an HTTP POST request to /mail/send
     response = sg.client.mail.send.post(request_body=mail_json)
     if response.status_code >= 200 and response.status_code <= 300:
-        return "Send test email: Success!"
+        return "Success!"
     else:
-        return f"Send test email: Failure ({response.status_code})"
+        return "Failure: ({response.status_code})"
 
 
+def register_openai_token(token):
+    print(f"registering new key: {token[:5]}")
+    openai.api_key = token
+
 with gr.Blocks() as demo:
-    with gr.Column():
-        email = gr.Textbox(label="Email address")
-        subject = gr.Radio(
-            list(topics.keys()), label="Topic to subscribe to"
-        )
-        physics_subject = gr.Dropdown(physics_topics, value=[], multiselect=False, label="Physics category", visible=False, info="")
-        subsubject = gr.Dropdown(
-                [], value=[], multiselect=True, label="Subtopic", info="", visible=False)
-        subject.change(fn=change_physics, inputs=[subject], outputs=physics_subject)
-        subject.change(fn=change_subsubject, inputs=[subject, physics_subject], outputs=subsubject)
-        physics_subject.change(fn=change_subsubject, inputs=[subject, physics_subject], outputs=subsubject)
-
-
-        interest = gr.Textbox(label="A natural language description of what you are interested in. Press enter to update.")
-    sample_output = gr.Textbox(label="Examples")
-    test_btn = gr.Button("Send email")
-    output = gr.Textbox(label="Test email status")
-    test_btn.click(fn=test, inputs=[email, subject, physics_subject, subsubject, interest], outputs=output)
+    with gr.Row():
+        with gr.Column(scale=0.40):
+            with gr.Box():
+                token = gr.Textbox(label="OpenAI API Key", type="password")
+            with gr.Box():
+                description = gr.HTML(value="Send an email to the below address using the configuration on the right. Requires a sendgrid token")
+                email = gr.Textbox(label="Email address", type="email", placeholder="")
+                sendgrid_token = gr.Textbox(label="SendGrid API Key", type="password")
+                with gr.Row():
+                    test_btn = gr.Button("Send email")
+                    output = gr.Textbox(show_label=False, placeholder="email status")
+        with gr.Column(scale=1):
+            subject = gr.Radio(
+                list(topics.keys()), label="Topic"
+            )
+            physics_subject = gr.Dropdown(physics_topics, value=[], multiselect=False, label="Physics category", visible=False, info="")
+            subsubject = gr.Dropdown(
+                    [], value=[], multiselect=True, label="Subtopic", info="", visible=False)
+            subject.change(fn=change_physics, inputs=[subject], outputs=physics_subject)
+            subject.change(fn=change_subsubject, inputs=[subject, physics_subject], outputs=subsubject)
+            physics_subject.change(fn=change_subsubject, inputs=[subject, physics_subject], outputs=subsubject)
+
+            interest = gr.Textbox(label="A natural language description of what you are interested in. Press shift-enter to update.", lines=7)
+            sample_output = gr.Textbox(label="Examples")
+    test_btn.click(fn=test, inputs=[email, subject, physics_subject, subsubject, interest, sendgrid_token], outputs=output)
+    token.change(fn=register_openai_token, inputs=[token])
     subject.change(fn=sample, inputs=[email, subject, physics_subject, subsubject, interest], outputs=sample_output)
     physics_subject.change(fn=sample, inputs=[email, subject, physics_subject, subsubject, interest], outputs=sample_output)
     subsubject.change(fn=sample, inputs=[email, subject, physics_subject, subsubject, interest], outputs=sample_output)

src/utils.py

@@ -15,6 +15,7 @@ import copy
 
 StrOrOpenAIObject = Union[str, openai_object.OpenAIObject]
 
+
 openai_org = os.getenv("OPENAI_ORG")
 if openai_org is not None:
     openai.organization = openai_org