monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WebHost: /api generate add missing hint_cost and forfeit_mode

This commit is contained in:
Fabian Dill 2021-11-03 22:38:29 +01:00
parent 5c25a08dc1
commit 6ea8d07c8f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WebHostLib/api/generate.py
View File

@ -16,7 +16,7 @@ def generate_api():
try: try:
options = {} options = {}
race = False race = False
meta_options_source = {}
if 'file' in request.files: if 'file' in request.files:
file = request.files['file'] file = request.files['file']
options = get_yaml_data(file) options = get_yaml_data(file)
@ -24,14 +24,20 @@ def generate_api():
return {"text": options}, 400 return {"text": options}, 400
if "race" in request.form: if "race" in request.form:
race = bool(0 if request.form["race"] in {"false"} else int(request.form["race"])) race = bool(0 if request.form["race"] in {"false"} else int(request.form["race"]))
meta_options_source = request.form
json_data = request.get_json() json_data = request.get_json()
if json_data: if json_data:
meta_options_source = json_data
if 'weights' in json_data: if 'weights' in json_data:
# example: options = {"player1weights" : {<weightsdata>}} # example: options = {"player1weights" : {<weightsdata>}}
options = json_data["weights"] options = json_data["weights"]
if "race" in json_data: if "race" in json_data:
race = bool(0 if json_data["race"] in {"false"} else int(json_data["race"])) race = bool(0 if json_data["race"] in {"false"} else int(json_data["race"]))
hint_cost = int(meta_options_source.get("hint_cost", 10))
forfeit_mode = meta_options_source.get("forfeit_mode", "goal")
if not options: if not options:
return {"text": "No options found. Expected file attachment or json weights." return {"text": "No options found. Expected file attachment or json weights."
}, 400 }, 400
@ -48,7 +54,7 @@ def generate_api():
gen = Generation( gen = Generation(
options=pickle.dumps({name: vars(options) for name, options in gen_options.items()}), options=pickle.dumps({name: vars(options) for name, options in gen_options.items()}),
# convert to json compatible # convert to json compatible
meta=json.dumps({"race": race}), state=STATE_QUEUED, meta=json.dumps({"race": race, "hint_cost": hint_cost, "forfeit_mode": forfeit_mode}), state=STATE_QUEUED,
owner=session["_id"]) owner=session["_id"])
commit() commit()
return {"text": f"Generation of seed {gen.id} started successfully.", return {"text": f"Generation of seed {gen.id} started successfully.",