From b7a57dc5a97403906ee43e2fecac641611cf5ab8 Mon Sep 17 00:00:00 2001
From: BonfaceKilz
Date: Wed, 3 Mar 2021 10:59:32 +0300
Subject: Replace APP_DEFAULTS dict with actual conf params

---
 gn3/api/gemma.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gn3/api/gemma.py')

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/"
-- 
cgit v1.2.3