Update app.py

app.py

@@ -297,6 +297,24 @@ def generate_prompt_with_history(text, history, max_length=4048):
     else:
         return None
 
+def generate_prompt_and_file_with_history(text, history, file):
+    #prompt = "The following is a conversation between a human and an AI assistant named Baize (named after a mythical creature in Chinese folklore). Baize is an open-source AI assistant developed by UCSD and Sun Yat-Sen University. The human and the AI assistant take turns chatting. Human statements start with [|Human|] and AI assistant statements start with [|AI|]. The AI assistant always provides responses in as much detail as possible, and in Markdown format. The AI assistant always declines to engage with topics, questions and instructions related to unethical, controversial, or sensitive issues. Complete the transcript in exactly that format.\n[|Human|]Hello!\n[|AI|]Hi!"   
+    #prompt = "Das folgende ist eine Unterhaltung in deutsch zwischen einem Menschen und einem KI-Assistenten, der Baize genannt wird. Baize ist ein open-source KI-Assistent, der von UCSD entwickelt wurde. Der Mensch und der KI-Assistent chatten abwechselnd miteinander in deutsch. Die Antworten des KI Assistenten sind immer so ausführlich wie möglich und in Markdown Schreibweise und in deutscher Sprache. Wenn nötig übersetzt er sie ins Deutsche. Die Antworten des KI-Assistenten vermeiden Themen und Antworten zu unethischen, kontroversen oder sensiblen Themen. Die Antworten sind immer sehr höflich formuliert..\n[|Human|]Hallo!\n[|AI|]Hi!"   
+    prompt=""
+    history = ["\n{}\n{}".format(x[0],x[1]) for x in history]
+    history.append("\n{}\n".format(text))
+    history_text = ""
+    flag = False
+    for x in history[::-1]:
+            history_text = x + history_text
+            flag = True
+    print ("Prompt: ..........................")
+    print(prompt+history_text)
+    if flag:
+        return  prompt+history_text
+    else:
+        return None
+
 #Prompt und History für OPenAi Schnittstelle
 def generate_prompt_with_history_openai(prompt, history):
     history_openai_format = []
@@ -379,13 +397,19 @@ def generate_auswahl(prompt, file, history, rag_option, model_option, openai_api
         print("history vor Zusatz...........")
         print(history)
         history[-1][1] = result
-        #return history, "Success"   
+        return history, "Success" 
+        """ 
         for character in result:
             history[-1][1] += character
             time.sleep(0.03)
             yield history, "Generating"
-            
-        
+            if shared_state.interrupted:
+                shared_state.recover()
+                try:
+                    yield history, "Stop: Success"
+                except:
+                    pass
+        """
 
 def generate_bild(prompt):
     data = {"inputs": prompt}
@@ -410,7 +434,7 @@ def generate_text (prompt, file, history, rag_option, model_option, openai_api_k
     if (file == None):
         history_text_und_prompt = generate_prompt_with_history(prompt, history)
     else:
-        history_file_und_prompt = generate_prompt_with_history(prompt, history)
+        history_file_und_prompt = generate_prompt_history(prompt, file, history)
         
     #history für HuggingFace Models formatieren
     #history_text_und_prompt = generate_prompt_with_history_hf(prompt, history)