From 34eab8a50ce185aaf786fd7138a3bd0b7c5b0576 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Fri, 9 Feb 2024 05:29:08 +0300 Subject: Retrive and display generic bundle errors Implement the first QC check for generic errors e.g. missing files in bundle, etc. Display retrieved errors on UI. --- qc_app/upload/rqtl2.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'qc_app/upload') diff --git a/qc_app/upload/rqtl2.py b/qc_app/upload/rqtl2.py index b96d9f0..c20bd8f 100644 --- a/qc_app/upload/rqtl2.py +++ b/qc_app/upload/rqtl2.py @@ -175,12 +175,15 @@ def upload_rqtl2_bundle(species_id: int, population_id: int): jobs.jobsnamespace(), jobid, [sys.executable, "-m", "scripts.qc_on_rqtl2_bundle", - app.config["SQL_URI"], app.config["REDIS_URL"], - jobs.jobsnamespace(), jobid, "--redisexpiry", - str(redis_ttl_seconds)], + app.config["SQL_URI"], app.config["REDIS_URL"], + jobs.jobsnamespace(), jobid, "--redisexpiry", + str(redis_ttl_seconds)], "rqtl2-bundle-qc-job", redis_ttl_seconds, - {}), + {"job-metadata": json.dumps({ + "speciesid": species_id, + "populationid": population_id, + "rqtl2-bundle-file": str(the_file.absolute())})}), redisuri, f"{app.config['UPLOAD_FOLDER']}/job_errors") return redirect(url_for( @@ -200,6 +203,8 @@ def rqtl2_bundle_qc_status(jobid: UUID): if jobstatus == "error": return render_template("rqtl2/rqtl2-qc-job-error.html", job=thejob, + errorsgeneric=json.loads( + thejob.get("errors-generic", "[]")), messages=logmessages) if jobstatus == "success": return render_template("rqtl2/rqtl2-qc-job-results.html", -- cgit v1.2.3