about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi <fredmanglis@gmail.com>2026-10-01 11:24:51 -0500
committerFrederick Muriuki Muriithi <fredmanglis@gmail.com>2026-10-01 12:38:06 -0500
commit76a840ea6535b75e094e4bc5bb8d86bb7b244c48 (patch)
tree420fa09cd02c5d317f041f446b6f20be993d591c
parente0f15dc9352a588bdab0a7bdcc848efce696690a (diff)
downloadgn-uploader-76a840ea6535b75e094e4bc5bb8d86bb7b244c48.tar.gz
Fetch genotype dataset by species and population only.
-rw-r--r--uploader/genotypes/models.py24
-rw-r--r--uploader/genotypes/views.py5
2 files changed, 26 insertions, 3 deletions
diff --git a/uploader/genotypes/models.py b/uploader/genotypes/models.py
index 92ac76c..f3e6798 100644
--- a/uploader/genotypes/models.py
+++ b/uploader/genotypes/models.py
@@ -9,7 +9,7 @@ from MySQLdb.cursors import Cursor, DictCursor
 
 from gn_libs.mysqldb import debug_query
 
-from uploader.dataerrors import NotFoundError
+from uploader.dataerrors import NotFoundError, TooManyResultsError
 
 logger = logging.getLogger(__name__)
 
@@ -133,6 +133,28 @@ def genotype_records(
             _num_records)
 
 
+def genotype_dataset_by_population(
+        conn: mdb.Connection,
+        species_id: int,
+        population_id: int
+) -> dict:
+    """Retrieve all of a population's phenotype studies."""
+    with conn.cursor(cursorclass=DictCursor) as cursor:
+        cursor.execute(
+            "SELECT gf.* FROM Species AS s INNER JOIN InbredSet AS iset "
+            "ON s.Id=iset.SpeciesId INNER JOIN GenoFreeze AS gf "
+            "ON iset.Id=gf.InbredSetId "
+            "WHERE s.Id=%s AND iset.Id=%s",
+            (species_id, population_id))
+        result = cursor.fetchall()
+        if bool(result):
+            if len(result) == 1:
+                return dict(result[0])
+            raise TooManyResultsError(
+                f"Expected only a single dataset. Got {len(result)}")
+        raise NotFoundError("Could not find dataset.")
+
+
 def genotype_dataset(
         conn: mdb.Connection,
         species_id: int,
diff --git a/uploader/genotypes/views.py b/uploader/genotypes/views.py
index 264be87..89cf3d3 100644
--- a/uploader/genotypes/views.py
+++ b/uploader/genotypes/views.py
@@ -31,7 +31,8 @@ from .models import (genotype_markers,
                      genotype_records,
                      genotype_dataset,
                      save_new_dataset,
-                     genocode_by_population)
+                     genocode_by_population,
+                     genotype_dataset_by_population)
 
 logger = logging.getLogger(__name__)
 genotypesbp = Blueprint("genotypes", __name__)
@@ -83,7 +84,7 @@ def index(species: dict, population: dict, **kwargs):# pylint: disable=[unused-a
                 species=species,
                 population=population,
                 genocode=genocode_by_population(conn, population["Id"]),
-                dataset=genotype_dataset(
+                dataset=genotype_dataset_by_population(
                     conn, species["SpeciesId"], population["Id"]),
                 genotype_records=_genotype_records,
                 samples=_samples,