Update ssh

model/models/__init__.py

@@ -34,8 +34,8 @@ IMAGE_GENERATION_MODELS = [
                             'huggingface_Stable-cascade_text2image',
                             'openai_Dalle-2_text2image',
                             'openai_Dalle-3_text2image',
-                            # 'other_Midjourney-v6.0_text2image',
-                            # 'other_Midjourney-v5.0_text2image',
+                            'other_Midjourney-v6.0_text2image',
+                            'other_Midjourney-v5.0_text2image',
                             ]
 
 

model/models/other_api_models.py

@@ -9,8 +9,7 @@ class OtherModel():
         self.model_name = model_name
         self.model_type = model_type
         self.url = "https://www.xdai.online/mj/submit/imagine"
-        # self.key = os.environ.get('MIDJOURNEY_KEY')
-        self.key = 'sk-yhIAe209CeWmk7ueC5D673A2D6164eE5919656Ea989913Fb'
+        self.key = os.environ.get('MIDJOURNEY_KEY')
         self.get_url = "https://www.xdai.online/mj/image/"
         self.repeat_num = 5
     
@@ -47,7 +46,8 @@ class OtherModel():
                     response_json = json.loads(response.content.decode('utf-8'))
                     img_id = response_json["result"]
                     result_url = self.get_url + img_id
-                    self.repeat_num = 120
+                    print(result_url)
+                    self.repeat_num = 180
                     while 1:
                         time.sleep(1)
                         img_response = requests.get(result_url)

serve/Ksort.py

@@ -328,4 +328,10 @@ def add_green_border(image):
     border_color = (0, 255, 0)  # RGB for green
     border_size = 10  # Size of the border
     img_with_border = ImageOps.expand(image, border=border_size, fill=border_color)
-    return img_with_border
+    return img_with_border
+
+def check_textbox(textbox):
+    if textbox=="":
+        return False
+    else:
+        return True

serve/gradio_web.py

@@ -32,6 +32,7 @@ from .Ksort import (
     reset_btn_rank,
     reset_vote_text,
     text_response_rank_igm,
+    check_textbox,
 )
 
 from functools import partial
@@ -278,7 +279,7 @@ def build_side_by_side_ui_anony(models):
 
     textbox.submit(
         disable_order_buttons,
-        inputs=None,
+        inputs=[textbox],
         outputs=order_btn_list
     ).then(
         gen_func,
@@ -288,13 +289,13 @@ def build_side_by_side_ui_anony(models):
         api_name="submit_btn_annony"
     ).then(
         enable_vote_mode_buttons,
-        inputs=[vote_mode],
+        inputs=[vote_mode, textbox],
         outputs=vote_order_list
     )   
 
     send_btn.click(
         disable_order_buttons,
-        inputs=None,
+        inputs=[textbox],
         outputs=order_btn_list
     ).then(
         gen_func,
@@ -304,7 +305,7 @@ def build_side_by_side_ui_anony(models):
         api_name="send_btn_annony"
     ).then(
         enable_vote_mode_buttons,
-        inputs=[vote_mode],
+        inputs=[vote_mode, textbox],
         outputs=vote_order_list
     )
 

serve/utils.py

@@ -177,25 +177,31 @@ def disable_vote_buttons():
     return tuple(gr.update(visible=False, interactive=False) for i in range(6))
 def disable_vote():
     return tuple(gr.update(interactive=False) for i in range(18))
-def enable_vote_mode_buttons(mode):
+def enable_vote_mode_buttons(mode, textbox):
     print(mode)
-    if mode == "Best":
-        return (gr.update(visible=True, interactive=True),) * 5 + \
-                (gr.update(visible=False, interactive=False),) * 16 + \
-                (gr.update(visible=True, interactive=False),) * 2 + \
-                (gr.update(visible=True, interactive=True),)
-    elif mode == "Rank":
-        return (gr.update(visible=False, interactive=False),) * 5 + \
-                (gr.update(visible=True, interactive=True),) * 16 + \
-                (gr.update(visible=True, interactive=True),) * 3
+    if not textbox.strip():
+        return tuple(gr.update(visible=False, interactive=False) for _ in range(24))
+    else:
+        if mode == "Best":
+            return (gr.update(visible=True, interactive=True),) * 5 + \
+                    (gr.update(visible=False, interactive=False),) * 16 + \
+                    (gr.update(visible=True, interactive=False),) * 2 + \
+                    (gr.update(visible=True, interactive=True),)
+        elif mode == "Rank":
+            return (gr.update(visible=False, interactive=False),) * 5 + \
+                    (gr.update(visible=True, interactive=True),) * 16 + \
+                    (gr.update(visible=True, interactive=True),) * 3
 def disable_vote_mode_buttons():
         return tuple(gr.update(visible=False, interactive=False) for _ in range(24))
 
     
 def enable_order_buttons():
     return tuple(gr.update(interactive=True) for _ in range(4))
-def disable_order_buttons():
-    return (gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=True))
+def disable_order_buttons(textbox):
+    if not textbox.strip():
+        return (gr.update(interactive=True), gr.update(interactive=True), gr.update(interactive=True), gr.update(interactive=True))
+    else:
+        return (gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=True))
 
 def clear_history():
     return None, "", None

serve/vote_utils.py

@@ -769,8 +769,8 @@ def generate_igm_museum(gen_func, state0, state1, model_name0, model_name1, requ
 
 
 def generate_igm_annoy(gen_func, state0, state1, state2, state3, text, model_name0, model_name1, model_name2, model_name3, request: gr.Request):
-    if not text:
-        raise gr.Warning("Prompt cannot be empty.")
+    if not text.strip():
+        return (gr.update(visible=False),) * 16
     if state0 is None:
         state0 = ImageStateIG(model_name0)
     if state1 is None: