Update app.py

app.py

@@ -60,31 +60,13 @@ def run_gpt(in_prompt,history,model_drop):
 
 def generate(purpose,history,model_drop,chat_drop):
     print (history)
-    task=None
-    #if history:
-    #    history=str(history).strip("[]")
-    #if not history:
-    #    history = ""
-
-    #action_name, action_input = parse_action(line)
     out_prompt = run_gpt(purpose,history,model_drop)
-    #yield ([(purpose,out_prompt)],None)
-    history.append((purpose,out_prompt))
-    return (history,None)
-    
+    return out_prompt
+
 def describe(purpose,history,model_drop,chat_drop):
     print (history)
-    task=None
-    #if history:
-    #    history=str(history).strip("[]")
-    #if not history:
-    #    history = ""
-
-    #action_name, action_input = parse_action(line)
-    out_prompt = run_gpt(purpose,history,model_drop)
-    #yield ([(purpose,out_prompt)],None)
-    history.append((purpose,out_prompt))
-    return (history,None)
+      out_prompt = run_gpt(purpose,history,model_drop)
+    return out_prompt
    
 def run(purpose,history,model_drop,chat_drop,choice):
     if choice == "Generate":
@@ -92,6 +74,8 @@ def run(purpose,history,model_drop,chat_drop,choice):
         out_prompt=generate(purpose,history,model_drop,chat_drop)
         model=loaded_model[int(model_drop)]
         out_img=model(out_prompt)
+        history.append((purpose,out_prompt))
+        #return (history,None)
         print(out_img)
         url=f'https://johann22-chat-diffusion-describe.hf.space/file={out_img}'
         print(url)
@@ -108,6 +92,7 @@ def run(purpose,history,model_drop,chat_drop,choice):
     if choice == "Describe":
         #out_img = infer(out_prompt)
         out_prompt=describe(purpose,history,model_drop,chat_drop)
+        history.append((purpose,out_prompt))
         model=loaded_model[int(model_drop)]
         out_img=model(out_prompt)
         print(out_img)