scooter7 commited on
Commit
37eb9e5
·
verified ·
1 Parent(s): 7fca79d

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +54 -5
app.py CHANGED
@@ -122,7 +122,26 @@ def generate(
122
  inference_steps: int = 4,
123
  randomize_seed: bool = False,
124
  use_resolution_binning: bool = True,
125
- **color_ratios # Collect color ratios dynamically
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
126
  ):
127
  seed = int(randomize_seed_fn(seed, randomize_seed))
128
  generator = torch.Generator().manual_seed(seed)
@@ -131,7 +150,18 @@ def generate(
131
  negative_prompt = None # type: ignore
132
 
133
  # Process color selections and their ratios
134
- color_selections = {color: {"selected": color_ratios.get(f"{color.lower()}_selected", False), "ratio": color_ratios.get(f"{color.lower()}_ratio", 0)} for color in color_attributes}
 
 
 
 
 
 
 
 
 
 
 
135
 
136
  # Apply style and modify prompt based on color selections
137
  prompt, negative_prompt = apply_style(style, prompt, color_selections)
@@ -260,7 +290,7 @@ with gr.Blocks() as demo:
260
  api_name=False,
261
  )
262
 
263
- gr.on(
264
  triggers=[
265
  prompt.submit,
266
  negative_prompt.submit,
@@ -277,8 +307,27 @@ with gr.Blocks() as demo:
277
  height,
278
  inference_steps,
279
  randomize_seed,
280
- *[color_checkboxes[color] for color in color_attributes],
281
- *[color_sliders[color] for color in color_attributes]
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
282
  ],
283
  outputs=[result, seed],
284
  api_name="run",
 
122
  inference_steps: int = 4,
123
  randomize_seed: bool = False,
124
  use_resolution_binning: bool = True,
125
+ purple_selected: bool = False,
126
+ purple_ratio: float = 0.0,
127
+ green_selected: bool = False,
128
+ green_ratio: float = 0.0,
129
+ maroon_selected: bool = False,
130
+ maroon_ratio: float = 0.0,
131
+ orange_selected: bool = False,
132
+ orange_ratio: float = 0.0,
133
+ yellow_selected: bool = False,
134
+ yellow_ratio: float = 0.0,
135
+ red_selected: bool = False,
136
+ red_ratio: float = 0.0,
137
+ blue_selected: bool = False,
138
+ blue_ratio: float = 0.0,
139
+ pink_selected: bool = False,
140
+ pink_ratio: float = 0.0,
141
+ silver_selected: bool = False,
142
+ silver_ratio: float = 0.0,
143
+ beige_selected: bool = False,
144
+ beige_ratio: float = 0.0,
145
  ):
146
  seed = int(randomize_seed_fn(seed, randomize_seed))
147
  generator = torch.Generator().manual_seed(seed)
 
150
  negative_prompt = None # type: ignore
151
 
152
  # Process color selections and their ratios
153
+ color_selections = {
154
+ "Purple": {"selected": purple_selected, "ratio": purple_ratio},
155
+ "Green": {"selected": green_selected, "ratio": green_ratio},
156
+ "Maroon": {"selected": maroon_selected, "ratio": maroon_ratio},
157
+ "Orange": {"selected": orange_selected, "ratio": orange_ratio},
158
+ "Yellow": {"selected": yellow_selected, "ratio": yellow_ratio},
159
+ "Red": {"selected": red_selected, "ratio": red_ratio},
160
+ "Blue": {"selected": blue_selected, "ratio": blue_ratio},
161
+ "Pink": {"selected": pink_selected, "ratio": pink_ratio},
162
+ "Silver": {"selected": silver_selected, "ratio": silver_ratio},
163
+ "Beige": {"selected": beige_selected, "ratio": beige_ratio},
164
+ }
165
 
166
  # Apply style and modify prompt based on color selections
167
  prompt, negative_prompt = apply_style(style, prompt, color_selections)
 
290
  api_name=False,
291
  )
292
 
293
+ gr.on(
294
  triggers=[
295
  prompt.submit,
296
  negative_prompt.submit,
 
307
  height,
308
  inference_steps,
309
  randomize_seed,
310
+ # Color configurations
311
+ color_checkboxes["Purple"],
312
+ color_sliders["Purple"],
313
+ color_checkboxes["Green"],
314
+ color_sliders["Green"],
315
+ color_checkboxes["Maroon"],
316
+ color_sliders["Maroon"],
317
+ color_checkboxes["Orange"],
318
+ color_sliders["Orange"],
319
+ color_checkboxes["Yellow"],
320
+ color_sliders["Yellow"],
321
+ color_checkboxes["Red"],
322
+ color_sliders["Red"],
323
+ color_checkboxes["Blue"],
324
+ color_sliders["Blue"],
325
+ color_checkboxes["Pink"],
326
+ color_sliders["Pink"],
327
+ color_checkboxes["Silver"],
328
+ color_sliders["Silver"],
329
+ color_checkboxes["Beige"],
330
+ color_sliders["Beige"],
331
  ],
332
  outputs=[result, seed],
333
  api_name="run",