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

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +11 -9
app.py CHANGED
@@ -19,7 +19,8 @@ class Validator:
19
 
20
  def validate_key(self, key, ty):
21
  r = self.try_validate_key(key, ty)
22
- self.valid = r
 
23
  return r
24
 
25
  def validate_key_if_present(self, key, ty):
@@ -101,15 +102,16 @@ class Validator:
101
  continue
102
  known_prompt_ids.add(prompt["identifier"])
103
  seen_cid0 = False
104
- if self.try_validate_key("prompt_order", list):
105
- for order in self.obj["prompt_order"]:
106
- 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"]):
 
 
 
 
 
 
107
  seen_cid0 = True
108
- elif self.validate_key("prompt_order", dict):
109
- if not Validator.is_valid_prompt_order_list(self.obj["prompt_order"]):
110
- self.valid = False
111
- elif all(lambda o: o["identifier"] in known_prompt_ids for o in self.obj["prompt_order"]):
112
- seen_cid0 = True
113
  if not seen_cid0:
114
  self.valid = False
115
 
 
19
 
20
  def validate_key(self, key, ty):
21
  r = self.try_validate_key(key, ty)
22
+ if not r:
23
+ self.valid = False
24
  return r
25
 
26
  def validate_key_if_present(self, key, ty):
 
102
  continue
103
  known_prompt_ids.add(prompt["identifier"])
104
  seen_cid0 = 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"] == "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