twinkle-toes commited on
Commit
0cdfdad
1 Parent(s): 1ba1f0c

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +4 -7
app.py CHANGED
@@ -105,13 +105,10 @@ class Validator:
105
  if self.validate_key("prompt_order", list) and len(self.obj["prompt_order"]) > 0 and isinstance(self.obj["prompt_order"][0], dict):
106
  if "character_id" in self.obj["prompt_order"][0]:
107
  for order in self.obj["prompt_order"]:
108
- if Validator.is_valid_prompt_order(order) and order["character_id"] == "100000" and all(lambda o: o["identifier"] in known_prompt_ids for o in order["order"]):
109
  seen_cid0 = True
110
- else:
111
- if not Validator.is_valid_prompt_order_list(self.obj["prompt_order"]):
112
- self.valid = False
113
- elif all(lambda o: o["identifier"] in known_prompt_ids for o in self.obj["prompt_order"]):
114
- seen_cid0 = True
115
  if not seen_cid0:
116
  self.valid = False
117
 
@@ -206,7 +203,7 @@ with gr.Blocks() as demo:
206
  gr.Markdown("Preset loaded and validated")
207
  prompt_map = {p["identifier"]: p for p in preset["prompts"]}
208
  gr.Markdown("# Preset")
209
- for order in (next(o for o in preset["prompt_order"] if o["character_id"] == "100000")["order"] if isinstance(preset["prompt_order"], list) else preset["prompt_order"]):
210
  prompt = prompt_map[order["identifier"]]
211
  render_prompt(prompt, order["enabled"])
212
  with gr.Accordion("# All prompts", open=False):
 
105
  if self.validate_key("prompt_order", list) and len(self.obj["prompt_order"]) > 0 and isinstance(self.obj["prompt_order"][0], dict):
106
  if "character_id" in self.obj["prompt_order"][0]:
107
  for order in self.obj["prompt_order"]:
108
+ if Validator.is_valid_prompt_order(order) and order["character_id"] == 100001 and all(lambda o: o["identifier"] in known_prompt_ids for o in order["order"]):
109
  seen_cid0 = True
110
+ elif Validator.is_valid_prompt_order_list(self.obj["prompt_order"]) and all(lambda o: o["identifier"] in known_prompt_ids for o in self.obj["prompt_order"]):
111
+ seen_cid0 = True
 
 
 
112
  if not seen_cid0:
113
  self.valid = False
114
 
 
203
  gr.Markdown("Preset loaded and validated")
204
  prompt_map = {p["identifier"]: p for p in preset["prompts"]}
205
  gr.Markdown("# Preset")
206
+ for order in (next(o for o in preset["prompt_order"] if o["character_id"] == 100001)["order"] if isinstance(preset["prompt_order"], list) else preset["prompt_order"]):
207
  prompt = prompt_map[order["identifier"]]
208
  render_prompt(prompt, order["enabled"])
209
  with gr.Accordion("# All prompts", open=False):