diff options
| author | BonfaceKilz | 2021-03-03 10:59:32 +0300 |
|---|---|---|
| committer | BonfaceKilz | 2021-03-08 21:09:58 +0300 |
| commit | b7a57dc5a97403906ee43e2fecac641611cf5ab8 (patch) | |
| tree | b7da01ae33f984f571dad31ed5b1e31ce4b920b3 /gn3/api | |
| parent | 9dff9888f81b7eec0e698466518ce4cb55b8bd8c (diff) | |
| download | genenetwork3-b7a57dc5a97403906ee43e2fecac641611cf5ab8.tar.gz | |
Replace APP_DEFAULTS dict with actual conf params
Diffstat (limited to 'gn3/api')
| -rw-r--r-- | gn3/api/gemma.py | 6 | ||||
| -rw-r--r-- | gn3/api/general.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gn3/api/gemma.py b/gn3/api/gemma.py index 7c76f2f..a351ab1 100644 --- a/gn3/api/gemma.py +++ b/gn3/api/gemma.py @@ -19,7 +19,7 @@ gemma = Blueprint("gemma", __name__) @gemma.route("/version") def get_version(): """Display the installed version of gemma-wrapper""" - gemma_cmd = current_app.config['APP_DEFAULTS'].get('GEMMA_WRAPPER_CMD') + gemma_cmd = current_app.config["GEMMA_WRAPPER_CMD"] return jsonify( run_cmd(f"{gemma_cmd} -v | head -n 1")) @@ -34,7 +34,7 @@ file output is returned. """ data = request.get_json() - app_defaults = current_app.config.get('APP_DEFAULTS') + app_defaults = current_app.config __hash = generate_hash_of_string( f"{data.get('genofile_name')}_" ''.join(data.get("values", ""))) @@ -52,7 +52,7 @@ file output is returned. if data.get("loco"): gemma_wrapper_kwargs["loco"] = f"--input {data.get('loco')}" k_computation_cmd = generate_gemma_computation_cmd( - gemma_cmd=app_defaults.get("GEMMA_WRAPPER_CMD") + "_haha", + gemma_cmd=app_defaults.get("GEMMA_WRAPPER_CMD"), gemma_wrapper_kwargs={"loco": f"--input {data.get('loco')}"}, gemma_kwargs=gemma_kwargs, output_file=(f"{app_defaults.get('TMPDIR')}/gn2/" diff --git a/gn3/api/general.py b/gn3/api/general.py index 91a113c..d05d6f4 100644 --- a/gn3/api/general.py +++ b/gn3/api/general.py @@ -25,7 +25,7 @@ week. If a TOKEN is not provided, generate a token for the new user. status = 201 results = extract_uploaded_file( gzipped_file=file_, - target_dir=current_app.config["APP_DEFAULTS"].get("TMPDIR"), + target_dir=current_app.config["TMPDIR"], token=token) if results.get("status") > 0: status = 500 |