Update app.py

app.py

@@ -364,22 +364,38 @@ def umwandeln_fuer_anzeige(image):
 
 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,):
      if (prompt.find('zeichnen') != -1):
-         generate_bild(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,)
+         result = generate_bild(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,)
+         #Bild ausgeben
+        image = Image.open(io.BytesIO(result)) 
+        
+        history[-1][1] =  "<img src='data:image/png;base64,{0}'/>".format(b64encode(umwandeln_fuer_anzeige(image)).decode('utf-8'))   
+        print("history zeichnen......................")
+        print(history)
+        return history, "Success"
      else:
-         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,)
+         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] = ""
+        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"
+                    return
+                except:
+                    pass
 
 def generate_bild(prompt, history,):
     data = {"inputs": prompt}
     response = requests.post(API_URL, headers=HEADERS, json=data)
     print("fertig Bild")
     result = response.content 
-    #Bild ausgeben
-    image = Image.open(io.BytesIO(result)) 
-        
-    history[-1][1] =  "<img src='data:image/png;base64,{0}'/>".format(b64encode(umwandeln_fuer_anzeige(image)).decode('utf-8'))   
-    print("history zeichnen......................")
-    print(history)
-    return history, "Fertig: Success"
+    return result
 
 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,):
     global splittet
@@ -414,16 +430,8 @@ def generate_text (prompt, file, history, rag_option, model_option, openai_api_k
         ###########################
         if (model_option == "OpenAI"):
             #Anfrage an OpenAI ----------------------------
-            if (prompt.find('zeichnen') != -1):
-                #print("OpenAI zeichnen.......................")
-                #llm = ChatOpenAI(model_name = MODEL_NAME_OAI_ZEICHNEN,  openai_api_key = openai_api_key, temperature=temperature)#, top_p = top_p)  
-                data = {"inputs": prompt}
-                response = requests.post(API_URL, headers=HEADERS, json=data)
-                print("fertig Bild")
-            else: 
-                print("OpenAI normal.......................")
-                llm = ChatOpenAI(model_name = MODEL_NAME,  openai_api_key = openai_api_key, temperature=temperature)#, top_p = top_p)
-                
+            print("OpenAI normal.......................")
+            llm = ChatOpenAI(model_name = MODEL_NAME,  openai_api_key = openai_api_key, temperature=temperature)#, top_p = top_p) 
             print("openAI")
         else:
             #oder an Hugging Face --------------------------
@@ -448,41 +456,15 @@ def generate_text (prompt, file, history, rag_option, model_option, openai_api_k
             result = rag_chain(llm, history_text_und_prompt, db)
         else:
             print("LLM aufrufen ohne RAG: ...........")
-            if (prompt.find('zeichnen') != -1):
-                result = response.content 
-            else:
-                print("ganz normale Ausführung.........................")
-                result = llm_chain(llm, history_text_und_prompt)
+            result = llm_chain(llm, history_text_und_prompt)
             
 
     except Exception as e:
         raise gr.Error(e)
 
+    return result
 
-    if (prompt.find('zeichnen') != -1):
-        #Bild ausgeben
-        image = Image.open(io.BytesIO(result)) 
         
-        history[-1][1] =  "<img src='data:image/png;base64,{0}'/>".format(b64encode(umwandeln_fuer_anzeige(image)).decode('utf-8'))   
-        print("history zeichnen......................")
-        print(history)
-        return history, "Fertig: Success"
-    else:
-        #Antwort als Stream ausgeben... wenn Textantwort gefordert
-        print("history vor Zusatz...........")
-        print(history)
-        history[-1][1] = ""
-        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"
-                    return
-                except:
-                    pass
       
 ################################################
 #GUI