Update app.py

app.py

@@ -281,9 +281,9 @@ def generate_auswahl(prompt, file, chatbot, history, rag_option, model_option, o
             #geht nur über spezielle OpenAI-Schnittstelle...
             ext = analyze_file(file)
             if (ext == "png" or ext == "PNG" or ext == "jpg" or ext == "jpeg" or ext == "JPG" or ext == "JPEG"):
-                result= generate_text_zu_bild(file, prompt, k, rag_option, chatbot, db)
+                result= generate_text_zu_bild(file, prompt, k, rag_option, chatbot, history, db)
             else:
-                result = generate_text_zu_doc(file, prompt, k, rag_option, chatbot, db)
+                result = generate_text_zu_doc(file, prompt, k, rag_option, chatbot, history, db)
                 
             history = history + [[(file,), None],[prompt, result]]
         print ("history ....................")
@@ -329,7 +329,7 @@ def generate_bild(prompt, chatbot, model_option_zeichnen='HuggingFace', temperat
 
 ##################################################
 #zu einem Bild und Text-Prompt eine Analyse generieren
-def generate_text_zu_bild(file, prompt, k, rag_option, chatbot, db):
+def generate_text_zu_bild(file, prompt, k, rag_option, chatbot, history, db):
     global splittet
     print("Text mit Bild ..............................")
     print(file)
@@ -353,7 +353,7 @@ def generate_text_zu_bild(file, prompt, k, rag_option, chatbot, db):
 
 ##################################################
 #zu einem Bild und Text-Prompt eine Analyse generieren
-def generate_text_zu_doc(file, prompt, k, rag_option, chatbot, db):
+def generate_text_zu_doc(file, prompt, k, rag_option, chatbot, history, db):
     global splittet
     print("text mit doc ..............................")
     
@@ -362,9 +362,9 @@ def generate_text_zu_doc(file, prompt, k, rag_option, chatbot, db):
         print("Doc mit RAG..............................")
         neu_text_mit_chunks = rag_chain2(prompt, db, k)
         #für Chat LLM:
-        #prompt = generate_prompt_with_history_openai(neu_text_mit_chunks, history)
+        #prompt_neu = generate_prompt_with_history_openai(neu_text_mit_chunks, history)
         #als reiner prompt:
-        prompt_neu = generate_prompt_with_history(neu_text_mit_chunks, chatbot)
+        prompt_neu = generate_prompt_with_history(neu_text_mit_chunks, history) #chatbot)
         
     result = create_assistant_file(prompt_neu, file)
     return result    
@@ -403,9 +403,9 @@ def generate_text (prompt, chatbot, history, rag_option, model_option, openai_ap
             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
             if (rag_option == "An"):
-                history_text_und_prompt = generate_prompt_with_history(prompt, chatbot)
+                history_text_und_prompt = generate_prompt_with_history(prompt, history) #chatbot)
             else:
-                history_text_und_prompt = generate_prompt_with_history_openai(prompt, chatbot)
+                history_text_und_prompt = generate_prompt_with_history_openai(prompt, history) #chatbot)
         else:
             #oder an Hugging Face --------------------------
             print("HF Anfrage.......................")
@@ -415,7 +415,7 @@ def generate_text (prompt, chatbot, history, rag_option, model_option, openai_ap
             #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, chatbot)
+            history_text_und_prompt = generate_prompt_with_history(prompt, history) #chatbot)
     
         #zusätzliche Dokumenten Splits aus DB zum Prompt hinzufügen (aus VektorDB - Chroma oder Mongo DB)
         if (rag_option == "An"):