add character info

app.py

@@ -28,15 +28,16 @@ if __name__ == '__main__':
                 label=LANG["character3"],
                 value='none',
                 allow_custom_value=False,
-            )
+            )                    
             
             dummy_dropdown = gr.Dropdown(visible=False, allow_custom_value=True)
             dummy_textbox = gr.Textbox(visible=False)
             
         with gr.Row(elem_classes='main_row'):            
             with gr.Column(elem_classes='column_prompts'):
-                    thumb_image = gr.Gallery(type="pil", columns=3, show_download_button=False, object_fit='contain', label="Thumb")    
-        with gr.Row():
+                thumb_image = gr.Gallery(type="pil", columns=3, show_download_button=False, object_fit='contain', label="Thumb")    
+                output_info = gr.Textbox(label="Characters' Info")
+        with gr.Row():            
             with gr.Column():
                 custom_prompt = gr.Textbox(value='', label='Semi-auto tag complete test. Try tag* *tag *tag* (e621_sfw.csv@DominikDoom)', elem_id="custom_prompt_text") 
             with gr.Column():
@@ -45,13 +46,13 @@ if __name__ == '__main__':
             
         character1.change(fn=refresh_character_thumb_image,
                           inputs=[character1,character2,character3],
-                          outputs=[thumb_image])
+                          outputs=[thumb_image, output_info])
         character2.change(fn=refresh_character_thumb_image,
                           inputs=[character1,character2,character3],
-                          outputs=[thumb_image])
+                          outputs=[thumb_image, output_info])
         character3.change(fn=refresh_character_thumb_image,
                           inputs=[character1,character2,character3],
-                          outputs=[thumb_image])
+                          outputs=[thumb_image, output_info])
         
         # Prompt Auto Complete JS
         # Have to use dummy components

scripts/lib.py

@@ -102,26 +102,16 @@ def load_jsons():
     character_list_cn = list(character_dict.keys())   
     character_list_cn.insert(0, "none")
 
-def illustrious_character_select_ex(character = 'random', optimise_tags = True, random_action_seed = 1, use_cn=False):
+def illustrious_character_select_ex(character = 'random', optimise_tags = True, use_cn=False):
     chara = ''
-    rnd_character = ''
     
     if 'none' == character:
         return '', '', None
-    
-    if 'random' == character:
-        index = random_action_seed % len(character_list)
-        rnd_character = character_list[index]
-        if 'random' == rnd_character:
-            rnd_character = character_list[index+2]
-        elif 'none' == rnd_character:
-            rnd_character = character_list[index+1]
-    else:
-        rnd_character = character
+            
     if not use_cn:
-        chara = rnd_character
+        chara = character
     else:
-        chara = character_dict[rnd_character]
+        chara = character_dict[character]
         
     md5_chara = get_md5_hash(chara.replace('(','\\(').replace(')','\\)'))                
     thumb_image = Image.new('RGB', (128, 128), (128, 128, 128))
@@ -131,26 +121,50 @@ def illustrious_character_select_ex(character = 'random', optimise_tags = True,
     opt_chara = chara
     if optimise_tags:
         opt_chara = opt_chara.replace('(', '\\(').replace(')', '\\)')  
-        #print(f'{CAT}:Optimise Tags:[{chara}]->[{opt_chara}]')
+        print(f'{CAT}:Optimise Tags:[{chara}]->[{opt_chara}]')
     
     if not opt_chara.endswith(','):
         opt_chara = f'{opt_chara},'   
             
-    return rnd_character, opt_chara, thumb_image
+    return character, opt_chara, thumb_image
+
+def create_prompt_info(rnd_character1, opt_chara1,
+                        rnd_character2, opt_chara2,
+                        rnd_character3, opt_chara3):
+    info = ''    
+    if '' != opt_chara1:
+        info += f'Character 1:{rnd_character1}\nPrompt: {opt_chara1}\n\n'
+        
+    if '' != opt_chara2:
+        info += f'Character 2:{rnd_character2}\nPrompt: {opt_chara2}\n\n'
+    
+    if '' != opt_chara3:
+        info += f'Character 3:{rnd_character3}\nPrompt: {opt_chara3}'
+
+    prompt = f'{opt_chara1}{opt_chara2}{opt_chara3}'
+
+    return prompt, info
 
 def refresh_character_thumb_image(character1, character2, character3):
     thumb_image = []
-    if 'none' != character1 and 'random' != character1:
-        _, _, thumb_image1 = illustrious_character_select_ex(character = character1)        
-        thumb_image.append(thumb_image1)
+    rnd_character = [''] *3
+    opt_chara = [''] *3
     
+    if 'none' != character1 and 'random' != character1:
+        rnd_character[0], opt_chara[0], thumb_image1 = illustrious_character_select_ex(character = character1)        
+        thumb_image.append(thumb_image1)    
     if 'none' != character2 and 'random' != character2:
-        _, _, thumb_image2 = illustrious_character_select_ex(character = character2)        
+        rnd_character[1], opt_chara[1], thumb_image2 = illustrious_character_select_ex(character = character2)        
         thumb_image.append(thumb_image2)
     if 'none' != character3 and 'random' != character3:
-        _, _, thumb_image3 = illustrious_character_select_ex(character = character3, use_cn=True)        
+        rnd_character[2], opt_chara[2], thumb_image3 = illustrious_character_select_ex(character = character3, use_cn=True)        
         thumb_image.append(thumb_image3)
-    return thumb_image
+    
+    _, character_info = create_prompt_info(rnd_character[0], opt_chara[0],
+                        rnd_character[1], opt_chara[1],
+                        rnd_character[2], opt_chara[2])
+    
+    return thumb_image, character_info
 
 def get_prompt_manager():
     return PROMPT_MANAGER