Update app.py

app.py

@@ -166,28 +166,12 @@ def chat_gpt_nofn(prompt=None, history=[], model=model, client=client):
         history.append({"role": "user", "content": f"{prompt}"})
         messages = history
 
-    # completion = client.chat.completions.create(
-#     model=model,
-#     messages=messages,
-# )
-#     return completion
-    completion = client.chat.completions.create(
-        model=model,
-        messages=messages,
-        stream=True
-    )
-
-    full_response = ""
-    for chunk in completion:
-        try:
-            if chunk.choices[0].delta.content is not None:
-                content = chunk.choices[0].delta.content
-                full_response += content
-                yield content
-        except:
-            pass
-        
-    return full_response
+     completion = client.chat.completions.create(
+     model=model,
+     messages=messages,
+     stream=True)
+
+     return completion
 
 def format_chat_prompt(chat_history):
     prompt = []
@@ -331,26 +315,12 @@ def chat(question, manual, history, liked):
             Ref-2:
             ...
             """
-    # final_response = chat_gpt_nofn(prompt=prompt, history=conv)
-    # response = final_response.choices[-1].message.content
-    # conv.append(final_response.choices[-1].message)
-    
-    # history.append((question, response))
-    final_response = ""
-    for chunk in chat_gpt_nofn(prompt=prompt, history=conv):
-        final_response += chunk
-        yield "", history + [(question, final_response)]
-
-    last_interaction.value = {
-        "question": question,
-        "response": final_response,
-        "manual": manual,
-        "point_id": uuid.uuid4().hex
-    }
+    #final_response = chat_gpt_nofn(prompt=prompt, history=conv)
+    #response = final_response.choices[-1].message.content
+    #conv.append(final_response.choices[-1].message)
     
-    conv.append({"role": "user", "content": prompt})
-    conv.append({"role": "assistant", "content": final_response})    
-    print("Answer:--- %s seconds ---" % (time.time() - start_time))
+    #history.append((question, response))  
+    #print("Answer:--- %s seconds ---" % (time.time() - start_time))
     # Store the last interaction without saving to the database yet
     #last_interaction.value = {
     #    "question": question,
@@ -361,6 +331,31 @@ def chat(question, manual, history, liked):
     
     #return '', history
 
+    final_response = chat_gpt_nofn(prompt=prompt, history=conv)
+    
+    partial_response = ""
+    for chunk in final_response:
+        if chunk.choices[0].delta.content is not None:
+            partial_response += chunk.choices[0].delta.content
+            yield partial_response, history + [(question, partial_response)]
+    
+    response = partial_response
+    conv.append({"role": "user", "content": prompt})
+    conv.append({"role": "assistant", "content": response})
+    
+    history.append((question, response))  
+    print("Answer:--- %s seconds ---" % (time.time() - start_time))
+    
+    # Store the last interaction without saving to the database yet
+    last_interaction.value = {
+        "question": question,
+        "response": response,
+        "manual": manual,
+        "point_id": uuid.uuid4().hex
+    }
+    
+    yield response, history
+
 def save_last_interaction(feedback):
     if last_interaction.value:
         DatabaseOperations.save_user_history_demo(
@@ -393,9 +388,8 @@ with gr.Blocks() as demo:
         save_last_interaction("N/A")  # Save previous interaction before starting a new one
         return chat(question, manual, history, liked_state.value)
 
-    # textbox.submit(gradio_chat, [textbox, manual, chatbot], [textbox, chatbot])
-    textbox.submit(gradio_chat, [textbox, manual, chatbot], [textbox, chatbot], api_name="chat")
+    textbox.submit(gradio_chat, [textbox, manual, chatbot], [textbox, chatbot])
     chatbot.like(handle_like, None, None)
-    
+demo.queue()    
 demo.launch()