Update app.py

app.py

@@ -58,7 +58,7 @@ def run_gpt(in_prompt,history,model_drop):
     return resp
 
 
-def run(purpose,history,model_drop,chat_drop):
+def generate(purpose,history,model_drop,chat_drop):
     print (history)
     task=None
     #if history:
@@ -71,23 +71,58 @@ def run(purpose,history,model_drop,chat_drop):
     #yield ([(purpose,out_prompt)],None)
     history.append((purpose,out_prompt))
     yield (history,None)
-    #out_img = infer(out_prompt)
-    model=loaded_model[int(model_drop)]
-    out_img=model(out_prompt)
-    print(out_img)
-    url=f'https://johann22-chat-diffusion.hf.space/file={out_img}'
-    print(url)
-    uid = uuid.uuid4()
-    #urllib.request.urlretrieve(image, 'tmp.png')
-    #out=Image.open('tmp.png')
-    r = requests.get(url, stream=True)
-    if r.status_code == 200:
-        out = Image.open(io.BytesIO(r.content))
-        #yield ([(purpose,out_prompt)],out)
-        yield (history,out)
-    else:
-        yield ([(purpose,"an Error occured")],None)
+    
+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))
+    yield (history,None)
+   
+def run(purpose,history,model_drop,chat_drop,choice):
+    if choice == "Generate":
+        #out_img = infer(out_prompt)
+        out_prompt=generate(purpose,history,model_drop,chat_drop)
+        model=loaded_model[int(model_drop)]
+        out_img=model(out_prompt)
+        print(out_img)
+        url=f'https://johann22-chat-diffusion-describe.hf.space/file={out_img}'
+        print(url)
+        uid = uuid.uuid4()
+        #urllib.request.urlretrieve(image, 'tmp.png')
+        #out=Image.open('tmp.png')
+        r = requests.get(url, stream=True)
+        if r.status_code == 200:
+            out = Image.open(io.BytesIO(r.content))
+            #yield ([(purpose,out_prompt)],out)
+            return (history,out)
+        else:
+            return ([(purpose,"an Error occured")],None)
+    if choice == "Describe":
+        #out_img = infer(out_prompt)
+        out_prompt=describe(purpose,history,model_drop,chat_drop)
+        model=loaded_model[int(model_drop)]
+        out_img=model(out_prompt)
+        print(out_img)
+        url=f'https://johann22-chat-diffusion-describe.hf.space/file={out_img}'
+        print(url)
+        uid = uuid.uuid4()
+        #urllib.request.urlretrieve(image, 'tmp.png')
+        #out=Image.open('tmp.png')
+        r = requests.get(url, stream=True)
+        if r.status_code == 200:
+            out = Image.open(io.BytesIO(r.content))
+            #yield ([(purpose,out_prompt)],out)
+            return (history,out)
+        else:
+            return ([(purpose,"an Error occured")],None)        
 ################################################
 style="""
 .top_head{
@@ -110,6 +145,8 @@ with gr.Blocks(css=style) as iface:
     with gr.Row():
         with gr.Column(scale=1):
             chatbot=gr.Chatbot(show_copy_button=True, layout='panel')
+            with gr.Row()
+                agent_choice = gr.Radio(choices=["Generate","Describe"])
             msg = gr.Textbox()
             model_drop=gr.Dropdown(label="Diffusion Models", type="index", choices=[m for m in models], value=models[0])
             chat_model_drop=gr.Dropdown(label="Chatbot Models", type="index", choices=[m for m in chat_models.models], value=chat_models.models[0])