diff options
| -rw-r--r-- | gn3/api/gemma.py | 33 | ||||
| -rw-r--r-- | tests/integration/test_gemma.py | 55 |
2 files changed, 88 insertions, 0 deletions
diff --git a/gn3/api/gemma.py b/gn3/api/gemma.py index 2d1fedf..d141e18 100644 --- a/gn3/api/gemma.py +++ b/gn3/api/gemma.py @@ -400,11 +400,44 @@ covars; lmm defaults to 9! status=128, # use better message message="Metadata file non-existent!") + + +@gemma.route("/k-gwa-compute/covars/<token>", methods=["POST"]) +def compute_k_gwa_with_covars_only(token): + """Given a genofile, traitfile, snpsfile, and the token, compute the k-values +and return <hash-of-inputs>.json with a UNIQUE-ID of the job. The genofile, +traitfile, and snpsfile are extracted from a metadata.json file. No Loco no +covars; lmm defaults to 9! + + """ + working_dir = os.path.join(current_app.config.get("TMPDIR"), token) + _dict = jsonfile_to_dict(os.path.join(working_dir, "metadata.json")) + try: + genofile, phenofile, snpsfile, covarfile = [ + os.path.join(working_dir, _dict.get(x)) + for x in ["geno", "pheno", "snps", "covar"] + ] + if not do_paths_exist([genofile, phenofile, snpsfile]): + raise FileNotFoundError + gemma_kwargs = {"g": genofile, "p": phenofile, "a": snpsfile} + gemma_k_cmd = generate_gemma_cmd( gemma_cmd=current_app.config.get("GEMMA_" "WRAPPER_CMD"), output_dir=current_app.config.get('TMPDIR'), token=token, gemma_kwargs=gemma_kwargs) + gemma_kwargs["c"] = covarfile + gemma_kwargs["lmm"] = _dict.get("lmm", 9) + gemma_gwa_cmd = generate_gemma_cmd( + gemma_cmd=current_app.config.get("GEMMA_" + "WRAPPER_CMD"), + output_dir=current_app.config.get('TMPDIR'), + token=token, + gemma_kwargs=gemma_kwargs, + gemma_wrapper_kwargs={ + "input": os.path.join(working_dir, + gemma_k_cmd.get("output_file")) + }) return jsonify(unique_id=queue_cmd( conn=redis.Redis(), email=(request.get_json() or {}).get('email'), diff --git a/tests/integration/test_gemma.py b/tests/integration/test_gemma.py index 5b03cc4..2055829 100644 --- a/tests/integration/test_gemma.py +++ b/tests/integration/test_gemma.py @@ -452,3 +452,58 @@ class GemmaAPITest(unittest.TestCase): "status": "queued", "output_file": "hash-output.json" }) + + @mock.patch("gn3.api.gemma.queue_cmd") + @mock.patch("gn3.computations.gemma.get_hash_of_files") + @mock.patch("gn3.api.gemma.jsonfile_to_dict") + @mock.patch("gn3.api.gemma.do_paths_exist") + @mock.patch("gn3.api.gemma.redis.Redis") + def test_k_gwa_compute_with_covars_only(self, mock_redis, mock_path_exist, + mock_json, mock_hash, + mock_queue_cmd): + """Test /gemma/k-gwa-compute/covars/<token> + + """ + mock_path_exist.return_value, _redis_conn = True, mock.MagicMock() + mock_redis.return_value = _redis_conn + mock_queue_cmd.return_value = "my-unique-id" + mock_json.return_value = { + "geno": "genofile.txt", + "pheno": "phenofile.txt", + "snps": "snpfile.txt", + "covar": "covarfile.txt", + } + mock_hash.return_value = "hash" + response = self.app.post("/api/gemma/k-gwa-compute/covars/my-token") + mock_hash.assert_has_calls([ + mock.call([ + '/tmp/my-token/genofile.txt', '/tmp/my-token/phenofile.txt', + '/tmp/my-token/snpfile.txt' + ]), + mock.call([ + '/tmp/my-token/genofile.txt', '/tmp/my-token/phenofile.txt', + '/tmp/my-token/snpfile.txt', "/tmp/my-token/covarfile.txt" + ]) + ]) + mock_queue_cmd.assert_called_once_with( + conn=_redis_conn, + email=None, + job_queue='GN3::job-queue', + cmd=("gemma-wrapper --json -- " + "-g /tmp/my-token/genofile.txt " + "-p /tmp/my-token/phenofile.txt " + "-a /tmp/my-token/snpfile.txt " + "-gk > /tmp/my-token/hash-output.json " + "&& gemma-wrapper --json " + "--input /tmp/my-token/hash-output.json -- " + "-g /tmp/my-token/genofile.txt " + "-p /tmp/my-token/phenofile.txt " + "-a /tmp/my-token/snpfile.txt " + "-c /tmp/my-token/covarfile.txt -lmm 9 " + "-gk > /tmp/my-token/hash-output.json")) + self.assertEqual( + response.get_json(), { + "unique_id": "my-unique-id", + "status": "queued", + "output_file": "hash-output.json" + }) |