Update app.py

app.py

@@ -490,9 +490,6 @@ def generate_text (prompt, chatbot, history, rag_option, model_option, openai_ap
         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
-    history_text_und_prompt = generate_prompt_with_history_openai(prompt, history)
 
     #history für HuggingFace Models formatieren
     #history_text_und_prompt = generate_prompt_with_history_hf(prompt, history)
@@ -510,6 +507,8 @@ def generate_text (prompt, chatbot, history, rag_option, model_option, openai_ap
             #Anfrage an OpenAI ----------------------------
             print("OpenAI normal.......................")
             llm = ChatOpenAI(model_name = MODEL_NAME,  openai_api_key = openai_api_key, temperature=temperature)#, top_p = top_p) 
+            #Prompt an history anhängen und einen Text daraus machen
+            history_text_und_prompt = generate_prompt_with_history_openai(prompt, history)
         else:
             #oder an Hugging Face --------------------------
             llm = HuggingFaceHub(repo_id=repo_id, model_kwargs={"temperature": 0.5, "max_length": 128}) 
@@ -517,7 +516,9 @@ def generate_text (prompt, chatbot, history, rag_option, model_option, openai_ap
             #llm = HuggingFaceHub(url_??? = "https://wdgsjd6zf201mufn.us-east-1.aws.endpoints.huggingface.cloud", model_kwargs={"temperature": 0.5, "max_length": 64}) 
             #llm = HuggingFaceTextGenInference( inference_server_url="http://localhost:8010/", max_new_tokens=max_new_tokens,top_k=10,top_p=top_p,typical_p=0.95,temperature=temperature,repetition_penalty=repetition_penalty,)
             print("HF")
-
+            #Prompt an history anhängen und einen Text daraus machen
+            history_text_und_prompt = generate_prompt_with_history(prompt, history)
+    
         #zusätzliche Dokumenten Splits aus DB zum Prompt hinzufügen (aus VektorDB - Chroma oder Mongo DB)
         if (rag_option == "An"):
             #muss nur einmal ausgeführt werden...