Update app.py

app.py

@@ -10,12 +10,12 @@ from dotenv import load_dotenv
 load_dotenv()
 
 # ========== 默认选项和数据 ==========
-EXPRESSIONS = ["smiling", "determined", "surprised", "serene", "laughing", "angry", "pensive", "confident"]
-ITEMS = ["magic wand", "sword", "flower", "book of spells", "ancient scroll", "music instrument", "shield", "dagger", "staff", "potion"]
-OTHER_DETAILS = ["sparkles", "magical aura", "lens flare", "fireworks in the background", "smoke effects", "light trails", "falling leaves", "glowing embers"]
-SCENES = ["sunset beach", "rainy city street at night", "fantasy forest with glowing mushrooms", "futuristic skyline at dawn", "abandoned castle", "snowy mountain peak", "desert ruins", "underwater city"]
-CAMERA_ANGLES = ["low-angle shot", "close-up shot", "bird's-eye view", "wide-angle shot", "over-the-shoulder shot", "extreme close-up", "panoramic view", "dynamic tracking shot"]
-QUALITY_PROMPTS = ["cinematic lighting", "award-winning", "masterpiece", "vivid colors", "high dynamic range", "immersive", "studio quality", "fine art", "dreamlike", "8K", "HD", "high quality", "best quality"]
+EXPRESSIONS = ["smiling", "determined", "surprised", "serene", "smug", "thinking", "looking back", "laughing", "angry", "pensive", "confident", "grinning", "thoughtful", "sad tears", "bewildered"]
+ITEMS = ["magic wand", "sword", "flower", "book of spells", "earrings", "loincloth", "slippers", "ancient scroll", "music instrument", "shield", "dagger", "headband", "leg ties", "staff", "potion", "crystal ball", "anklet", "ribbon", "lantern", "amulet", "ring"]
+OTHER_DETAILS = ["sparkles", "magical aura", "lens flare", "fireworks in the background", "smoke effects", "light trails", "falling leaves", "glowing embers", "floating particles", "rays of light", "shimmering mist", "ethereal glow"]
+SCENES = ["sunset beach", "rainy city street at night", "floating ash land", "particles magic world", "high blue sky", "top of the building", "fantasy forest with glowing mushrooms", "futuristic skyline at dawn", "abandoned castle", "snowy mountain peak", "desert ruins", "underwater city", "enchanted meadow", "haunted mansion", "steampunk marketplace", "glacial cavern"]
+CAMERA_ANGLES = ["low-angle shot", "close-up shot", "bird's-eye view", "wide-angle shot", "over-the-shoulder shot", "extreme close-up", "panoramic view", "dynamic tracking shot", "fisheye view", "point-of-view shot"]
+QUALITY_PROMPTS = ["cinematic lighting", "sharp shadow", "award-winning", "masterpiece", "vivid colors", "high dynamic range", "immersive", "studio quality", "fine art", "dreamlike", "8K", "HD", "high quality", "best quality", "artistic", "vibrant"]
 
 # Hugging Face DTR 数据集路径
 DTR_DATASET_PATTERN = "https://huggingface.co/datasets/X779/Danbooruwildcards/resolve/main/*DTR*.txt"
@@ -70,9 +70,9 @@ def generate_natural_language_description(tags, api_key=None, base_url=None, mod
                 {
                     "role": "system",
                     "content": (
-                        "You are a creative assistant that generates vivid and imaginative scene descriptions for painting prompts. "
+                        "You are a creative assistant that generates detailed and imaginative scene descriptions for AI generation prompts. "
                         "Focus on the details provided and incorporate them into a cohesive narrative. "
-                        "Use at least three sentences."
+                        "Use at least three sentences but no more than five sentences"
                     ),
                 },
                 {
@@ -89,23 +89,23 @@ def generate_natural_language_description(tags, api_key=None, base_url=None, mod
 def generate_prompt(
     action_file, style_file, artist_files, character_files, dtr_enabled, api_key, selected_categories,
     expression_count, item_count, detail_count, scene_count, angle_count, quality_count, action_count, style_count,
-    use_deepseek, deepseek_key
+    artist_count, use_deepseek, deepseek_key
 ):
     """
     生成随机提示词和描述。
     """
     actions = get_random_items(load_candidates_from_files([action_file]) if action_file else [], action_count)
     styles = get_random_items(load_candidates_from_files([style_file]) if style_file else [], style_count)
-    artists = get_random_items(load_candidates_from_files(artist_files) if artist_files else [], 1)
+    artists = get_random_items(load_candidates_from_files(artist_files) if artist_files else [], artist_count)
     characters = get_random_items(load_candidates_from_files(character_files) if character_files else [], 1)
     dtr_candidates = get_random_items(load_dtr_from_huggingface() if dtr_enabled else [], 1)
 
-    number_of_characters = ", ".join(selected_categories) if selected_categories else random.choice(["1girl", "1boy"])
+    number_of_characters = ", ".join(selected_categories) if selected_categories else [])
 
     tags = {
         "number_of_characters": number_of_characters,
         "character_name": characters,
-        "artist_prompt": f"(artist:{artists})",
+        "artist_prompt": f"(artist:{', '.join(artists)})",
         "style": styles,
         "scene": get_random_items(SCENES, scene_count),
         "camera_angle": get_random_items(CAMERA_ANGLES, angle_count),
@@ -148,7 +148,7 @@ def gradio_interface():
             type="password"
         )
 
-        use_deepseek = gr.Checkbox(label="Use DeepSeek API")
+        use_deepseek = gr.Checkbox(label="Use DeepSeek API - 用DeepSeek别忘了勾选这个")
 
         with gr.Row():
             action_file = gr.File(label="Upload Action File (Optional)", file_types=[".txt"])
@@ -158,7 +158,7 @@ def gradio_interface():
             artist_files = gr.Files(label="Upload Artist Files (Multiple Allowed)", file_types=[".txt"])
             character_files = gr.Files(label="Upload Character Files (Multiple Allowed)", file_types=[".txt"])
 
-        dtr_enabled = gr.Checkbox(label="Enable DTR")
+        dtr_enabled = gr.Checkbox(label="Enable DTR - 当前不可用2025-01-12")
 
         selected_categories = gr.CheckboxGroup(
             ["1boy", "1girl", "furry", "mecha", "fantasy monster", "animal", "still life"],
@@ -166,16 +166,17 @@ def gradio_interface():
         )
 
         with gr.Row():
-            expression_count = gr.Slider(label="Number of Expressions", minimum=1, maximum=5, step=1, value=1)
-            item_count = gr.Slider(label="Number of Items", minimum=1, maximum=5, step=1, value=1)
-            detail_count = gr.Slider(label="Number of Other Details", minimum=1, maximum=5, step=1, value=1)
-            scene_count = gr.Slider(label="Number of Scenes", minimum=1, maximum=5, step=1, value=1)
+            expression_count = gr.Slider(label="Number of Expressions", minimum=0, maximum=10, step=1, value=1)
+            item_count = gr.Slider(label="Number of Items", minimum=0, maximum=10, step=1, value=1)
+            detail_count = gr.Slider(label="Number of Other Details", minimum=0, maximum=10, step=1, value=1)
+            scene_count = gr.Slider(label="Number of Scenes", minimum=0, maximum=10, step=1, value=1)
 
         with gr.Row():
-            angle_count = gr.Slider(label="Number of Camera Angles", minimum=1, maximum=5, step=1, value=1)
-            quality_count = gr.Slider(label="Number of Quality Prompts", minimum=1, maximum=5, step=1, value=1)
-            action_count = gr.Slider(label="Number of Actions", minimum=1, maximum=5, step=1, value=1)
-            style_count = gr.Slider(label="Number of Styles", minimum=1, maximum=5, step=1, value=1)
+            angle_count = gr.Slider(label="Number of Camera Angles", minimum=0, maximum=10, step=1, value=1)
+            quality_count = gr.Slider(label="Number of Quality Prompts", minimum=0, maximum=10, step=1, value=1)
+            action_count = gr.Slider(label="Number of Actions", minimum=1, maximum=10, step=1, value=1)
+            style_count = gr.Slider(label="Number of Styles", minimum=1, maximum=10, step=1, value=1)
+            artist_count = gr.Slider(label="Number of Artists", minimum=1, maximum=10, step=1, value=1)
 
         with gr.Row():
             tags_output = gr.Textbox(label="Generated Tags")
@@ -189,7 +190,7 @@ def gradio_interface():
             inputs=[
                 action_file, style_file, artist_files, character_files, dtr_enabled, api_key_input, selected_categories,
                 expression_count, item_count, detail_count, scene_count, angle_count, quality_count, action_count, style_count,
-                use_deepseek, deepseek_key_input
+                artist_count, use_deepseek, deepseek_key_input
             ],
             outputs=[tags_output, description_output, combined_output],
         )