Skip to content

Commit 3167767

Browse files
CamDavidsonPilonCamDavidsonPilon
committed
overrides
1 parent 189d715 commit 3167767

File tree

9 files changed

+120
-115
lines changed

9 files changed

+120
-115
lines changed

‎asset-manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.02152627.css",
4-
"main.js": "/static/js/main.5d2e0a9c.js",
4+
"main.js": "/static/js/main.baa11349.js",
55
"static/media/roboto-all-500-normal.woff": "/static/media/roboto-all-500-normal.0ab669b7a0d19b178f57.woff",
66
"static/media/roboto-all-700-normal.woff": "/static/media/roboto-all-700-normal.a457fde362a540fcadff.woff",
77
"static/media/roboto-all-400-normal.woff": "/static/media/roboto-all-400-normal.c5d001fa922fa66a147f.woff",
@@ -36,10 +36,10 @@
3636
"static/media/roboto-greek-ext-700-normal.woff2": "/static/media/roboto-greek-ext-700-normal.bd9854c751441ccc1a70.woff2",
3737
"index.html": "/index.html",
3838
"main.02152627.css.map": "/static/css/main.02152627.css.map",
39-
"main.5d2e0a9c.js.map": "/static/js/main.5d2e0a9c.js.map"
39+
"main.baa11349.js.map": "/static/js/main.baa11349.js.map"
4040
},
4141
"entrypoints": [
4242
"static/css/main.02152627.css",
43-
"static/js/main.5d2e0a9c.js"
43+
"static/js/main.baa11349.js"
4444
]
4545
}

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.5d2e0a9c.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.baa11349.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>

‎pioreactorui/api.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,11 @@ def run_job_on_unit_in_experiment(
179179
},
180180
"env": {},
181181
"args": ["arg1", "arg2"]
182+
"config_overrides": []
183+
182184
}
183185
"""
184-
json = current_app.get_json(request.data, type=structs.ArgsOptionsEnvs)
186+
json = current_app.get_json(request.data, type=structs.ArgsOptionsEnvsConfigOverrides)
185187

186188
if pioreactor_unit == UNIVERSAL_IDENTIFIER:
187189
# make sure the worker is active, too
@@ -231,6 +233,7 @@ def run_job_on_unit_in_experiment(
231233
{
232234
"args": json.args,
233235
"options": json.options,
236+
"config_overrides": json.config_overrides,
234237
"env": (
235238
json.env
236239
| {"EXPERIMENT": experiment}

‎pioreactorui/structs.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@ class ArgsOptionsEnvs(Struct):
8989
args: list[str] = []
9090

9191

92-
class ArgsOptionsEnvsConfig(ArgsOptionsEnvs):
93-
config: list[str] = []
92+
class ArgsOptionsEnvsConfigOverrides(ArgsOptionsEnvs):
93+
config_overrides: list[str] = []

‎pioreactorui/unit_api.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,15 @@ def run_job(job: str) -> ResponseReturnValue:
280280
if is_rate_limited(job):
281281
return jsonify({"error": "Too many requests, please try again later."}), 429
282282

283-
body = current_app.get_json(request.data, type=structs.ArgsOptionsEnvsConfig)
283+
body = current_app.get_json(request.data, type=structs.ArgsOptionsEnvsConfigOverrides)
284284
args = body.args
285285
options = body.options
286286
env = body.env
287-
config = body.config
287+
config_overrides = body.config_overrides
288288

289-
config_overrides: tuple[str, ...] = sum([("--config-override", x) for x in config], tuple())
289+
config_overrides_as_flags: tuple[str, ...] = sum(
290+
[("--config-override", x) for x in config_overrides], tuple()
291+
)
290292

291293
commands: tuple[str, ...] = (job,)
292294
commands += tuple(args)
@@ -295,7 +297,7 @@ def run_job(job: str) -> ResponseReturnValue:
295297
if value is not None:
296298
commands += (str(value),)
297299

298-
task = tasks.pio_run(config_overrides, *commands, env=env)
300+
task = tasks.pio_run(config_overrides_as_flags, *commands, env=env)
299301
return create_task_response(task)
300302

301303

‎static/js/main.5d2e0a9c.js‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎static/js/main.baa11349.js‎

Lines changed: 103 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/js/main.5d2e0a9c.js.LICENSE.txt renamed to static/js/main.baa11349.js.LICENSE.txt

File renamed without changes.

static/js/main.5d2e0a9c.js.map renamed to static/js/main.baa11349.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)