Skip to content

Commit b552f80

Browse files
CamDavidsonPilonCamDavidsonPilon
committed
new build
1 parent 6703770 commit b552f80

File tree

10 files changed

+122
-114
lines changed

10 files changed

+122
-114
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.287eea68.js",
4+
"main.js": "/static/js/main.7406f992.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.287eea68.js.map": "/static/js/main.287eea68.js.map"
39+
"main.7406f992.js.map": "/static/js/main.7406f992.js.map"
4040
},
4141
"entrypoints": [
4242
"static/css/main.02152627.css",
43-
"static/js/main.287eea68.js"
43+
"static/js/main.7406f992.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.287eea68.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.7406f992.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>

‎pioreactorui/api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1722,7 +1722,7 @@ def get_experiment(experiment: str) -> ResponseReturnValue:
17221722
## CONFIG CONTROL
17231723

17241724

1725-
@api.route("/unit/<pioreactor_unit>/configuration", methods=["GET"])
1725+
@api.route("/units/<pioreactor_unit>/configuration", methods=["GET"])
17261726
def get_configuration_for_pioreactor_unit(pioreactor_unit: str) -> ResponseReturnValue:
17271727
"""get configuration for a pioreactor unit"""
17281728
try:

‎pioreactorui/structs.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,7 @@ class ArgsOptionsEnvs(Struct):
8787
options: dict[str, t.Any] = {}
8888
env: dict[str, str] = {}
8989
args: list[str] = []
90+
91+
92+
class ArgsOptionsEnvsConfig(ArgsOptionsEnvs):
93+
config: list[str] = []

‎pioreactorui/tasks.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ def initialized():
7373

7474

7575
@huey.task(priority=10)
76-
def pio_run(*args: str, env: dict[str, str] = {}) -> bool:
76+
def pio_run(config_overrides: tuple[str], *args: str, env: dict[str, str] = {}) -> bool:
7777
# for long running pio run jobs where we don't care about the output / status
78-
command = ("nohup", PIO_EXECUTABLE, "run") + args
78+
command = ("nohup", PIO_EXECUTABLE, "run") + config_overrides + args
7979

8080
env = {k: v for k, v in (env or {}).items() if k in ALLOWED_ENV}
8181
logger.info(f"Executing `{join(command)}`, {env=}")

‎pioreactorui/unit_api.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ def run_job(job: str) -> ResponseReturnValue:
267267
"EXPERIMENT": "test",
268268
"JOB_SOURCE": "user",
269269
}
270-
"args": ["arg1", "arg2"]
270+
"args": ["arg1", "arg2"],
271+
"config": ["stirring.config,pwm_hz,100"]
271272
}
272273
Ex:
273274
@@ -279,10 +280,13 @@ def run_job(job: str) -> ResponseReturnValue:
279280
if is_rate_limited(job):
280281
return jsonify({"error": "Too many requests, please try again later."}), 429
281282

282-
body = current_app.get_json(request.data, type=structs.ArgsOptionsEnvs)
283+
body = current_app.get_json(request.data, type=structs.ArgsOptionsEnvsConfig)
283284
args = body.args
284285
options = body.options
285286
env = body.env
287+
config = body.config
288+
289+
config_overrides: tuple[str, ...] = sum([("--config-override", x) for x in config], tuple())
286290

287291
commands: tuple[str, ...] = (job,)
288292
commands += tuple(args)
@@ -291,7 +295,7 @@ def run_job(job: str) -> ResponseReturnValue:
291295
if value is not None:
292296
commands += (str(value),)
293297

294-
task = tasks.pio_run(*commands, env=env)
298+
task = tasks.pio_run(config_overrides, *commands, env=env)
295299
return create_task_response(task)
296300

297301

‎static/js/main.287eea68.js‎

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

‎static/js/main.7406f992.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.287eea68.js.LICENSE.txt renamed to static/js/main.7406f992.js.LICENSE.txt

File renamed without changes.

static/js/main.287eea68.js.map renamed to static/js/main.7406f992.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)