Update app.py

app.py

@@ -355,6 +355,16 @@ def create_picture(history,  prompt):
 def invoke (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,):
     global splittet
     print(splittet)
+
+    if (openai_api_key == "" or openai_api_key == "sk-"):
+        #raise gr.Error("OpenAI API Key is required.")
+        #eigenen OpenAI key nutzen
+        openai_api_key= OAI_API_KEY
+    if (rag_option is None):
+        raise gr.Error("Retrieval Augmented Generation ist erforderlich.")
+    if (prompt == ""):
+        raise gr.Error("Prompt ist erforderlich.")
+        
     #Prompt an history anhängen und einen Text daraus machen
     if (file == None):
         history_text_und_prompt = generate_prompt_with_history(prompt, history)
@@ -368,14 +378,7 @@ def invoke (prompt, file, history, rag_option, model_option, openai_api_key, k=3
     #history für Langchain formatieren
     #history_text_und_prompt = generate_prompt_with_history_langchain(prompt, history)
     
-    if (openai_api_key == "" or openai_api_key == "sk-"):
-        #raise gr.Error("OpenAI API Key is required.")
-        #eigenen OpenAI key nutzen
-        openai_api_key= OAI_API_KEY
-    if (rag_option is None):
-        raise gr.Error("Retrieval Augmented Generation ist erforderlich.")
-    if (prompt == ""):
-        raise gr.Error("Prompt ist erforderlich.")
+
     try:
         ###########################
         #LLM auswählen (OpenAI oder HF)
@@ -545,7 +548,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, status_display], #[ chatbot, history, status_display],
         show_progress=True,
     )
 
@@ -556,12 +559,12 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
 
     # Chatbot
     transfer_input_args = dict(
-        fn=add_text, inputs=[ chatbot, user_input, upload], outputs=[chatbot,  user_input], show_progress=True
+        fn=add_text, inputs=[chatbot, user_input, upload], outputs=[chatbot,  user_input, user_question], show_progress=True
     )
 
     predict_event1 = user_input.submit(**transfer_input_args, queue=False,).then(**predict_args)
     predict_event2 = submitBtn.click(**transfer_input_args, queue=False,).then(**predict_args)
-    predict_event3 = upload.upload(file_anzeigen, [ upload], [file_display] ) #.then(**predict_args)
+    predict_event3 = upload.upload(file_anzeigen, [upload], [file_display] ) #.then(**predict_args)
     
     cancelBtn.click(
         cancels=[predict_event1,predict_event2, predict_event3 ]