Update app.py

app.py

@@ -12,7 +12,6 @@ import argparse
 from huggingface_hub import snapshot_download
 import random 
 import string
-import time
 
 #TODO : Cleanup and comment
 
@@ -151,36 +150,57 @@ def upload_to_google_drive():
         
 
 def generate(prompt, history):
-    global isFirstRun, initContext, Name, Occupation, Ethnicity, Gender, Age, context, YearsOfExp, agreed
+
+    global isFirstRun,initContext,Name,Occupation,Ethnicity,Gender,Age,context,YearsOfExp
+    
+    #if not len(Name) == 0 and not len(Occupation) == 0 and not len(Ethnicity) == 0 and not len(Gender) == 0 and not len(Age) == 0 and not len(YearsOfExp):
     if agreed:
-        firstmsg = ""
+        firstmsg =""
         if isFirstRun:
             context = initContext
             isFirstRun = False
             firstmsg = prompt
-        
-        context += f"""
-        Nurse:{prompt}
-        Barry:
-        """
-        
+            
+
+        context += """
+                  <|im_start|>nurse
+                  Nurse:"""+prompt+"""
+                  <|im_start|>barry
+                  Barry:
+                  """
+
         response = ""
+        history2 = []
+
         while(len(response) < 1):
             output = llm(context, max_tokens=400, stop=["Nurse:"], echo=False)
-            response = output["choices"][0]["text"].strip()
+            response = output["choices"][0]["text"]
+            response = response.strip()
+            #yield response
+
 
-        history.append((prompt, response))
-        if not isFirstRun:
+      #  for output in llm(input, stream=True, max_tokens=100, ):
+        #    piece = output['choices'][0]['text']
+       #     response += piece
+       #     chatbot[-1] = (chatbot[-1][0], response)
+
+       #     yield  response
+            
+        history.append((prompt,response))
+        if  not isFirstRun:
             chat_log_history.append({"user": prompt, "bot": response})
+            upload_to_google_drive()
         else:
-            chat_log_history.append({"user": firstmsg, "bot": response})
-
+            chat_log_history.append({"user": firstmsg, "bot": reponse})
+        
         context += response
         
-        return history
+        print (context)
+        return "", history
+        
     else:
-        output = "Did you forget to enter your Details? Please go to the User Info Tab and Input your data."
-        return [(prompt, output)]  # Ensure this is formatted as a list of tuples
+        output = "Did you forget to enter your Details? Please go to the User Info Tab and Input your data. "
+        return output
 
 def submit_user_info(name,occupation,yearsofexp,ethnicity,gender,age):
     global Name, Occupation,Ethnicity,Gender,Age,chat_log_name,YearsOfExp
@@ -225,19 +245,6 @@ def reset_name_interface():
     chat_log_name = ""
     return "User info has been reset."
 
-
-def add_text(history, text):
-    history = history + [(text, None)]
-    return history, gr.Textbox(value="", interactive=False)
-
-def bot(history):
-    response = "**That's cool!**"
-    history[-1][1] = ""
-    for character in response:
-        history[-1][1] += character
-        time.sleep(0.05)
-        yield history
-    
 def reset_all():
     global unique_id
     message1 = reset_chat_interface()
@@ -279,19 +286,12 @@ with gr.Blocks() as app:
        
         
     with gr.Tab("Chat Bot"):
-        chatbot = gr.Chatbot([],elem_id="chatbot",bubble_full_width=False,)
-        with gr.Row():
-
-          txt = gr.Textbox(
-                scale=4,
-                show_label=False,
-                placeholder="Enter text and press enter, or upload an image",
-                container=False,)
-
-          txt_msg = txt.submit(add_text, [chatbot, txt], [chatbot, txt], queue=False).then(
-            generate, chatbot, chatbot, api_name="bot_response"
-          )
-          txt_msg.then(lambda: gr.Textbox(interactive=True), None, [txt], queue=False)
+        chatbot = gr.Chatbot()
+        msg = gr.Textbox(label="Type your message")
+        send = gr.Button("Send")
+        clear = gr.Button("Clear Chat")
+        send.click(generate, inputs=[msg], outputs=chatbot)
+        clear.click(lambda: chatbot.clear(), inputs=[], outputs=chatbot)
     
     with gr.Tab("Reset"):
         reset_button = gr.Button("Reset ChatBot Instance")