Update app.py

app.py

@@ -141,7 +141,7 @@ def add_text(history, prompt, file):
         else:
             history = history + [((file.name,), None), (prompt, None)]
             
-    return history, prompt, "", gr.File( label=None, interactive=False,  height=20, min_width=20, visible=False, scale=2) #gr.Textbox(value="", interactive=False)
+    return history, history, prompt, "", gr.File( label=None, interactive=False,  height=20, min_width=20, visible=False, scale=2) #gr.Textbox(value="", interactive=False)
     
 def add_file(history, file, prompt):
     if (prompt == ""):
@@ -323,6 +323,9 @@ def generate_prompt_with_history_openai(prompt, history):
         history_openai_format.append({"role": "assistant", "content":assistant})
 
     history_openai_format.append({"role": "user", "content": prompt})
+    print("openai history und prompt................")
+    print(history_openai_format)
+    print (history_openai_format)
     return history_openai_format
 
 #Prompt und History für Hugging Face Schnittstelle
@@ -380,7 +383,7 @@ def umwandeln_fuer_anzeige(image):
         image.save(buffer, format='PNG')
         return buffer.getvalue()
 
-def generate_auswahl(prompt, file, history, rag_option, model_option, openai_api_key, k=3, top_p=0.6, temperature=0.5, max_new_tokens=4048, max_context_length_tokens=2048, repetition_penalty=1.3,):
+def generate_auswahl(prompt, file, chatbot, history, rag_option, model_option, openai_api_key, k=3, top_p=0.6, temperature=0.5, max_new_tokens=4048, max_context_length_tokens=2048, repetition_penalty=1.3,):
      if (prompt.find('zeichnen') != -1):
         response = generate_bild(prompt)
         result = response.content 
@@ -394,10 +397,10 @@ def generate_auswahl(prompt, file, history, rag_option, model_option, openai_api
      else:
         result = generate_text(prompt, file, history, rag_option, model_option, openai_api_key, k=3, top_p=0.6, temperature=0.5, max_new_tokens=4048, max_context_length_tokens=2048, repetition_penalty=1.3,)
         #Antwort als Stream ausgeben... wenn Textantwort gefordert
-        print("history vor Zusatz...........")
-        print(history)
         history[-1][1] = result
-        return history, "Success" 
+        print("history nach Zusatz und mit KI Antwort...........")
+        print(history)
+        return history, history, "Success" 
         """ 
         for character in result:
             history[-1][1] += character
@@ -417,7 +420,7 @@ def generate_bild(prompt):
     print("fertig Bild")
     return response
 
-def generate_text (prompt, file, history, rag_option, model_option, openai_api_key, k=3, top_p=0.6, temperature=0.5, max_new_tokens=4048, max_context_length_tokens=2048, repetition_penalty=1.3,):
+def generate_text (prompt, file, chatbot, history, rag_option, model_option, openai_api_key, k=3, top_p=0.6, temperature=0.5, max_new_tokens=4048, max_context_length_tokens=2048, repetition_penalty=1.3,):
     global splittet
     print(splittet)
 
@@ -586,7 +589,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
             user_question,
             upload,
             chatbot,
-            #history,
+            history,
             rag_option,
             model_option,
             openai_key,
@@ -597,7 +600,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
             max_context_length_tokens,
             repetition_penalty
         ],
-        outputs=[chatbot,  status_display], #[chatbot, history,  status_display]
+        outputs=[chatbot, history,  status_display], #[chatbot, history,  status_display]
         show_progress=True,
         postprocess=False
     )