New v2

app.py

@@ -81,7 +81,6 @@ def parse_json_parameters(json_str):
             if key not in params:
                 raise ValueError(f"Missing required key: {key}")
         
-        # Parse resolution
         width, height = map(int, params['resolution'].split(' x '))
         
         return {
@@ -220,19 +219,15 @@ def generate(
         pipe.scheduler = backup_scheduler
         utils.free_memory()
 
-# Initialize an empty list to store the generation history
 generation_history = []
 
-# Function to update the history list
 def update_history_list():
     return [item["image"] for item in generation_history]
 
-# Function to handle image click in history
 def handle_image_click(evt: gr.SelectData):
     selected = generation_history[evt.index]
     return selected["image"], json.dumps(selected["metadata"], indent=2)
 
-# Modify the generate function to add results to the history
 def generate_and_update_history(*args, **kwargs):
     images, metadata = generate(*args, **kwargs)
     timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -242,27 +237,24 @@ def generate_and_update_history(*args, **kwargs):
         "image": images[0],
         "metadata": metadata
     })
-    if len(generation_history) > 10:  # Limit history to 10 items
+    if len(generation_history) > 10:
         generation_history.pop()
     return images[0], json.dumps(metadata, indent=2), update_history_list()
 
-# Load the character list
 with open('characterfull.txt', 'r') as f:
     characters = [line.strip() for line in f.readlines()]
 
-# Function to get a random character
 def get_random_character():
     return random.choice(characters)
 
-# Function to add quality tags
 def add_quality_tags(prompt, negative_prompt):
-    positive_tags = "score_9, score_8_up, score_7_up, score_6_up, dramatic lighting, "
-    negative_tags = "worst quality, low quality, text, censored, deformed, bad hand, blurry, (watermark), mutated hands, monochrome, "
+    positive_tags = "score_9, score_8_up, score_7_up, score_6_up, dramatic lighting"
+    negative_tags = "worst quality, low quality, text, censored, deformed, bad hand, blurry, (watermark), mutated hands, monochrome"
     
-    updated_prompt = positive_tags + prompt
-    updated_negative_prompt = negative_tags + negative_prompt
+    new_prompt = f"{positive_tags}, {prompt}" if prompt else positive_tags
+    new_negative_prompt = f"{negative_tags}, {negative_prompt}" if negative_prompt else negative_tags
     
-    return updated_prompt, updated_negative_prompt
+    return new_prompt, new_negative_prompt
 
 if torch.cuda.is_available():
     pipe = load_pipeline(MODEL)
@@ -306,8 +298,7 @@ with gr.Blocks(css="style.css") as demo:
             placeholder="Enter a negative prompt",
             value=""
         )
-
-aspect_ratio_selector = gr.Radio(
+        aspect_ratio_selector = gr.Radio(
             label="Aspect Ratio",
             choices=config.aspect_ratios,
             value="1024 x 1024",
@@ -374,6 +365,7 @@ aspect_ratio_selector = gr.Radio(
                     step=1,
                     value=28,
                 )
+                
     with gr.Accordion(label="Generation Parameters", open=False):
         gr_metadata = gr.JSON(label="Metadata", show_label=False)
         json_input = gr.TextArea(label="Edit/Paste JSON Parameters", placeholder="Paste or edit JSON parameters here")