about summary refs log tree commit diff
path: root/gn3
diff options
context:
space:
mode:
authorMuriithi Frederick Muriuki2021-08-08 11:06:35 +0300
committerMuriithi Frederick Muriuki2021-08-08 11:06:35 +0300
commit0ec39e6c5058f4f06bfb5f763f51cd9dc176cb35 (patch)
tree2c9ea26f67e2a451343f4003fb67478baeb17ec2 /gn3
parenta73d1ce388012758ce3b0d789f008e4184e6a38e (diff)
parente0476d51603432f60b6412b65486166deabe9e08 (diff)
downloadgenenetwork3-0ec39e6c5058f4f06bfb5f763f51cd9dc176cb35.tar.gz
Merge branch 'main' of github.com:genenetwork/genenetwork3 into heatmap_decompose_db_retrieval
Diffstat (limited to 'gn3')
-rw-r--r--gn3/api/general.py3
-rw-r--r--gn3/db/traits.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/gn3/api/general.py b/gn3/api/general.py
index cebb2e3..86fb7b7 100644
--- a/gn3/api/general.py
+++ b/gn3/api/general.py
@@ -11,6 +11,9 @@ from gn3.commands import run_cmd
 
 general = Blueprint("general", __name__)
 
+@general.route("/version")
+def version():
+  return jsonify("1.0")
 
 @general.route("/metadata/upload/", methods=["POST"],
                strict_slashes=False)
diff --git a/gn3/db/traits.py b/gn3/db/traits.py
index 85cccfa..f66ead3 100644
--- a/gn3/db/traits.py
+++ b/gn3/db/traits.py
@@ -7,7 +7,7 @@ from gn3.db.datasets import retrieve_trait_dataset
 def get_trait_csv_sample_data(conn: Any,
                               trait_name: int, phenotype_id: int):
     """Fetch a trait and return it as a csv string"""
-    sql = ("SELECT  Strain.Id, PublishData.Id, Strain.Name, "
+    sql = ("SELECT DISTINCT Strain.Id, PublishData.Id, Strain.Name, "
            "PublishData.value, "
            "PublishSE.error, NStrain.count FROM "
            "(PublishData, Strain, PublishXRef, PublishFreeze) "