Update app.py

app.py

@@ -30,12 +30,16 @@ def query(payload, API_URL):
     response = requests.request("POST", API_URL, json=payload)
     return response.json()
 
-def pre_query(sender, recipient, recipient_name, context, input, model_id):
+def pre_query(recipient, recipient_name, sender, context, dates, input, model_id):
   API_URL = "https://api-inference.huggingface.co/models/" + model_id
   
-  if model_id == "bigscience/T0pp":
+  if model_id == "EleutherAI/gpt-neo-1.3B":
     input_string = "Write a professional email to my " + recipient.lower() + " starting with Hello " + recipient_name + ", about the subject " + context + " and the email should be based on this draft: " + input
-    data = query(input_string, API_URL)
+    data = query({
+        "inputs":input_string,
+        "parameters":{
+                      "wait_for_model": True}
+     }, API_URL)
     if type(data) is dict:
       return data['error']
     else:
@@ -46,34 +50,19 @@ def pre_query(sender, recipient, recipient_name, context, input, model_id):
     data = query({
         "inputs":input_string,
         "parameters":{"max_new_tokens":96,
-                      "return_full_text": False}
+                      "return_full_text": False,
+                      "wait_for_model": True}
      }, API_URL)
     if type(data) is dict:
       return data['error']
     else:
-          return "Hello " + recipient_name + ",\n\n" + data[0]['generated_text'].replace(input_string,'')
-
-  if model_id == "EleutherAI/gpt-neo-2.7B":
-    input_string = "Write a professional email to my " + recipient + " starting with Hello " + recipient_name + ", about the subject " + context + " and the email should be based on this draft: " + input
-    data = query(input_string, API_URL)
-
-    if type(data) is dict:
-      return data['error']
-    else:
-      return data[0]['generated_text']
+      return "Hello " + recipient_name + ",\n\n" + data[0]['generated_text'].replace(input_string,'')
   
   if model_id == "GPT-3":
     return openai_query(recipient, 250, recipient_name, context, input)
 
   return
 
-def set_email_link(email, recipient_address, subject):
-  email = email.replace(' ', '%20')
-  link = "<a href=\"" + "mailto:" + recipient_address + "?subject=" + subject.replace(' ', '%20') + "&body=" + email.replace('\n', '%0A') + "\">" + "<button class=\"gr-button-lg gr-button-secondary self-start\" id=\"17\">Link generated!<br>Click here</button></a>"
-  return link
-
-#def set_email_link_html():
-
 demo = gr.Blocks()
 
 with demo:
@@ -86,25 +75,22 @@ with demo:
       with gr.Column():
         with gr.Group():
           with gr.Row():
-            sender = gr.Dropdown(["student", "professor", "employee", "employer", "coworker", "applicant", "recruiter"], label="From", placeholder="I am a...")
-            recipient = gr.Dropdown(["student", "professor", "employee", "employer", "coworker", "applicant", "recruiter"], label="Recipient", placeholder="I am sending to my...")
+
+            sender = gr.Dropdown(["student", "professor", "employee", "employer", "coworker", "applicant", "recruiter"], label="I am a...")
+            recipient = gr.Dropdown(["student", "professor", "employee", "employer", "coworker", "applicant", "recruiter"], label="I am writing to my...")
             recipient_name = gr.Textbox(label="Recipient Name", placeholder = "Their name is...")
     
           
-    subject = gr.Dropdown([ "Requesting a meeting", "Conflict with scheduled meeting time", "Requesting clarification", "Requesting to leave early", "Requesting a leave of absence", "Requesting a letter of recommendation", "Requesting a referral for a job application"], label= "Subject/Context")
+    subject = gr.Dropdown([ "Requesting a meeting", "Reporting conflict with scheduled meeting time", "Requesting clarification", "Requesting to leave early", "Requesting a leave of absence", "Requesting a letter of recommendation", "Requesting a referral for a job application"], label= "In this email, I am...")
+    dates = gr.Textbox(label="Relevant Dates", placeholder ="MM/DD/YYYY")
     email = gr.Textbox(label="Input", lines=10, placeholder="Enter your Message Here!")
-    model_id = gr.Dropdown(["GPT-3", "bigscience/T0pp", "bigscience/bloom", "EleutherAI/gpt-neo-2.7B"] ,label = "model_id")
+    model_id = gr.Dropdown(["GPT-3", "EleutherAI/gpt-neo-1.3B", "bigscience/bloom"] ,label = "Choose a model")
+    
     submit_button = gr.Button("Generate my email!")
     text_output = gr.Textbox(lines=10, label = "Email", placeholder = "Your generated email!", interactive = True)
 
-    with gr.Row():
-      recipient_address = gr.Textbox(label="To", placeholder ="recipient's address")
-      link = gr.HTML("<p>Link not generated</p>")
-      send_email = gr.Button("Send my email!")
+    input_list = [sender, recipient, recipient_name, subject, dates, email, model_id]
 
-    input_list = [sender, recipient, recipient_name, subject, email, model_id]
-    
-    #email_link.change(set_email_link_html, inputs = email_link, outputs=link)
     submit_button.click(pre_query, inputs = input_list, outputs=text_output)
-    send_email.click(set_email_link, inputs = [text_output, recipient_address, subject], outputs = link)
-demo.launch(debug=True)
+
+demo.launch(debug=True)