Update app.py

app.py

@@ -84,9 +84,7 @@ pipe.to(device)
 @spaces.GPU()
 def generate_image(
     upload_images, 
-    # prompt, 
-    prompt_theme, #added
-    gender, #added
+    prompt, 
     negative_prompt, 
     aspect_ratio_name, 
     style_name, 
@@ -101,12 +99,6 @@ def generate_image(
     adapter_conditioning_factor,
     progress=gr.Progress(track_tqdm=True)
 ):
-#added
-    prompts = get_prompts_by_gender(gender)
-    prompt = prompts.get(prompt_theme)    
-    if prompt is None:
-        raise gr.Error(f"Prompt theme '{prompt_theme}' not found for gender '{gender}'")
-#
     if use_doodle:
         sketch_image = sketch_image["composite"]
         r, g, b, a = sketch_image.split()
@@ -120,17 +112,6 @@ def generate_image(
         adapter_conditioning_factor = 0.
         sketch_image = None
 
-    
-    #added
-    # prompt_dict = get_prompts_by_gender(gender)
-
-    # added
-    # actual_prompt = full_prompts[prompt]
-    # # prompt = actual_prompt
-    # full_prompt = current_prompts[prompt_theme]
-     
-    
-
     # check the trigger word
     image_token_id = pipe.tokenizer.convert_tokens_to_ids(pipe.trigger_word)
     input_ids = pipe.tokenizer.encode(prompt)
@@ -178,9 +159,7 @@ def generate_image(
         start_merge_step = 30
     print(start_merge_step)
     images = pipe(
-        # prompt=prompt,
-        # prompt=actual_prompt,
-        prompt=full_prompt,
+        prompt=prompt,
         width=output_w,
         height=output_h,
         input_id_images=input_id_images,
@@ -305,7 +284,8 @@ def update_theme_buttons_only(gender):
     for j in range(len(prompts), len(theme_buttons)):
         updates.append(gr.update(visible=False))
     return updates
-
+	
+	
 def update_prompt_on_gender_change(gender, theme_name, current_prompt):
     button_updates = update_theme_buttons_only(gender)
     if theme_name and theme_name in get_prompts_by_gender(gender):
@@ -358,7 +338,7 @@ For previous version of PhotoMaker, you could use our original gradio demos [Pho
 <br>
 ❗️❗️❗️[<b>Important</b>] Personalization steps:<br>
 1️⃣ Upload images of someone you want to customize. One image is ok, but more is better.  Although we do not perform face detection, the face in the uploaded image should <b>occupy the majority of the image</b>.<br>
-2️⃣ Enter a text prompt, making sure to <b>follow the class word</b> you want to customize with the <b>trigger word</b>: `img`, such as: `man img` or `woman img` or `girl img`.<br>
+2️⃣ Enter a text prompt, making sure to <b>follow the class word</b> you want to customize with the <b>trigger word</b>: img, such as: man img or woman img or girl img.<br>
 3️⃣ Choose your preferred style template.<br>
 4️⃣ <b>(Optional: but new feature)</b> Select the ‘Enable Drawing Doodle...’ option and draw on the canvas<br>
 5️⃣ Click the <b>Submit</b> button to start customizing.
@@ -373,14 +353,16 @@ article = r""" """
 # <br>
 # If our work is useful for your research, please consider citing:
 
-# ```bibtex
+# 
+bibtex
 # @article{li2023photomaker,
 #   title={PhotoMaker: Customizing Realistic Human Photos via Stacked ID Embedding},
 #   author={Li, Zhen and Cao, Mingdeng and Wang, Xintao and Qi, Zhongang and Cheng, Ming-Ming and Shan, Ying},
 #   booktitle={IEEE Conference on Computer Vision and Pattern Recognition (CVPR)},
 #   year={2024}
 # }
-# ```
+#
+
 # 📋 **License**
 # <br>
 # Apache-2.0 LICENSE. Please refer to the [LICENSE file](https://huggingface.co/TencentARC/PhotoMaker/blob/main/LICENSE) for details.
@@ -403,47 +385,35 @@ css = '''
 .gradio-container {width: 100% !important;
 background: linear-gradient(135deg, #CCFED9, #95BAFF);
 }
-
 #generate_btn {
     background: #553566 !important;
     color: white !important;
     }
-
 html body h1#app-title {
     text-align: center;
     font-size: 40px;
     font-weight: bold;
     color: #D46BCA !important;
     }
-
 #reupload_wrapper button {
     background: #553566 !important;
     color: white !important;
     }
-
 #usage_tips_section {
     display: none !important;
 }
-
-
 #doodle_section, #advanced_section {
     display: none !important;
     }
-
 #enable_doodle_container {
     display: none !important;
 }
-
-
 footer, [class*="footer"], [class*="api"], [class*="settings"] {
     display: none !important;
 }
-
 a[href*="api"], .api-button, #api-button {
     display: none !important;   
-
 }
-
 #prompt_suggestions_box {
     background: white;
     border: 2px solid #D46BCA;
@@ -456,7 +426,6 @@ a[href*="api"], .api-button, #api-button {
     transform: translate(-50%, 0);
     width: 40%;
     z-index: 9999;
-
 }
 .scrollable-prompts {
     flex: 1;
@@ -464,7 +433,6 @@ a[href*="api"], .api-button, #api-button {
     padding: 10px;
     max-height: 300px; /* or any height you prefer */
 }
-
 #suggested_prompts_btn {
     background: #D46BCA !important;
     color: white !important;
@@ -474,7 +442,6 @@ a[href*="api"], .api-button, #api-button {
     color: white !important;
     width: 100%;
 }
-
 input[type="radio"]:checked + span {
     border-color: #D46BCA !important; 
     }
@@ -506,29 +473,13 @@ with gr.Blocks(css=css) as demo:
             with gr.Column(visible=False, elem_id="reupload_wrapper") as clear_button:
                 remove_and_reupload = gr.ClearButton(value="Remove and upload new ones", components=files, size="sm")
 
-            # prompt = gr.Dropdown(
-            #     label="Select Prompt",
-            #     choices=list(get_prompts_by_gender("woman").values()),  # default to woman
-            #     # value=list(get_prompts_by_gender("woman").values())[0],
-            #     value = "Select Your Prompt",
-            #     interactive=True
-            # )
-
-            # default_gender = "woman"
-            # default_prompts = woman_prompts
-            # default_prompt_keys = list(get_prompts_by_gender(default_gender).keys())
-            # default_prompts = get_prompts_by_gender(default_gender)
-            # default_prompt_keys = list(default_prompts.keys())
-
-            # current_prompts = gr.State(default_prompts)
-            
             prompt = gr.Dropdown(
-                label="Select Prompt Theme",
-                choices=list(get_prompts_by_gender("woman").keys()),
-                value=list(get_prompts_by_gender("woman").keys())[0],
-                interactive=True,
+                label="Select Prompt",
+                choices=list(get_prompts_by_gender("woman").values()),  # default to woman
+                # value=list(get_prompts_by_gender("woman").values())[0],
+                value = "Select Your Prompt",
+                interactive=True
             )
-           
 
             gender_selector = gr.Radio(
                 label="Choose Gender",
@@ -545,41 +496,17 @@ with gr.Blocks(css=css) as demo:
             def update_prompt_dropdown(gender):
                 prompts = list(get_prompts_by_gender(gender).values())
                 return gr.update(choices=prompts, value=prompts[0])  # sets default to first
-            #     prompts = get_prompts_by_gender(gender)
-            #     return [
-            #         gr.update(choices=list(prompts.keys()), value=list(prompts.keys())[0]),
-            #         prompts  # Update the stored full prompts
-            #     ]
-
-
-            # def update_prompts_on_gender_change(gender):
-            #     prompts = woman_prompts if gender == "woman" else man_prompts
-            #     return [
-            #         gr.update(choices=list(prompts.keys())), 
-            #         prompts  # Update the stored prompts
-            #     ]
             
             gender_selector.change(
+                # fn=update_prompt_on_gender_change,
+                # inputs=[gender_selector, selected_theme, prompt],
+                # outputs=[prompt] + theme_buttons
+
                 fn=update_prompt_dropdown,
                 inputs=gender_selector,
                 outputs=prompt
             )
 
-            #     fn=update_prompts_on_gender_change,
-            #     inputs=gender_selector,
-            #     outputs=[prompt_dropdown, current_prompts]
-            # )
-
-
-            # def update_prompt_dropdown_on_gender_change(gender):
-            #     theme_names = list(get_prompts_by_gender(gender).keys())
-            #     # Update dropdown choices to new gender’s themes and select first theme by default
-            #     return gr.update(choices=theme_names, value=theme_names[0])
-            
-            # gender_selector.change(
-            #     fn=update_prompt_dropdown_on_gender_change,
-            #     inputs=gender_selector,
-            #     outputs=prompt,  # update the dropdown itself )
           
             style = gr.Dropdown(label="Style template", choices=STYLE_NAMES, value=DEFAULT_STYLE_NAME, visible=False)
             aspect_ratio = gr.Dropdown(label="Output aspect ratio", choices=ASPECT_RATIO_LABELS, value=DEFAULT_ASPECT_RATIO, visible=False)
@@ -675,7 +602,6 @@ with gr.Blocks(css=css) as demo:
         input_list = [
             files, 
             prompt, 
-            gender_selector,#added
             negative_prompt, 
             aspect_ratio, 
             style, 
@@ -687,8 +613,8 @@ with gr.Blocks(css=css) as demo:
             enable_doodle,
             sketch_image,
             adapter_conditioning_scale,
-            adapter_conditioning_factor,
-            ]
+            adapter_conditioning_factor
+        ]
 
         submit.click(
             fn=remove_tips,
@@ -724,4 +650,5 @@ with gr.Blocks(css=css) as demo:
     gr.Markdown(article)
     
 demo.launch(auth=(HF_TEST_USER_NAME, HF_PASS), ssr_mode=False)
-# demo.launch(ssr_mode=False)
+# demo.launch(ssr_mode=False)	
+