From 54f138802bed2040531b3da3df0b30895d881bc8 Mon Sep 17 00:00:00 2001 From: Pjotr Date: Thu, 8 Oct 2026 06:53:15 +0000 Subject: * src/routes/publications.rs: add GET /publications/{pubmed_id}/traits. Lists the published traits (across groups) a publication reports. Datasets the caller may not view are left out, using the same check as GET /traits/{dataset} (traits.rs is_authorised is now pub(crate)). * src/db.rs (TraitInfo, trait_info_sql): TraitInfo gains `dataset`, `abbreviation` (Phenotype.Post_publication_abbreviation, else Pre) and `url` (the GeneNetwork show_trait page). The three TraitInfo queries now share one SELECT. New get_group_traits_by_abbreviation and get_publication_traits. * src/routes/groups.rs (group_traits): add ?abbreviation= filter. * src/db.rs (Group), src/routes/groups.rs (groups): groups carry `family` and `species`; add family, species and q filters. * src/routes/search.rs (search): add `page` (gn3's page unsorted, a page of the ranked list with `sort`); declare `pubmed_id`; hits gain `abbreviation` next to `locus` (get_publish_annotations). * src/db.rs (LRS_PER_LOD): LOD = LRS / 4.604, the divisor the benchmark's RDF data uses (was 4.61). * tests, test/python, test/data/benchmark_search.json, README.md: cover all of the above; tests/benchmark.rs now also answers rows 11, 16, 25, 30, 34 and 37 of small_benchmark.csv, and compares LOD exactly. Co-Authored-By: Claude Sonnet 5.5 --- test/python/test_groups.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'test/python/test_groups.py') diff --git a/test/python/test_groups.py b/test/python/test_groups.py index dc38b33..0c55a8f 100644 --- a/test/python/test_groups.py +++ b/test/python/test_groups.py @@ -37,6 +37,45 @@ class GroupsTest(ServerTestCase): names = {record["name"] for record in groups} self.assertIn("BXD", names) + def test_groups_filters_by_family_species_and_text(self): + # Every group has `family` and `species`; /groups takes `family`, + # `species` and `q` filters (case-insensitive, combined with AND). + if not database_reachable(): + self.skipTest("no database on 127.0.0.1:3306") + token = auth_token() + if not token: + self.skipTest("no token (see docs/gn-auth.md)") + + def groups(path): + conn = http.client.HTTPConnection(HOST, int(PORT), timeout=10) + try: + conn.request("GET", path, headers={"Authorization": f"Bearer {token}"}) + response = conn.getresponse() + body = response.read() + self.assertEqual(response.status, 200, path) + return json.loads(body) + finally: + conn.close() + + bxd = next(g for g in groups("/groups") if g["name"] == "BXD") + self.assertEqual(bxd["species"], "mouse") + self.assertTrue(bxd["family"].startswith("Reference Populations")) + + reference = {g["name"] for g in groups("/groups?family=reference%20populations")} + for expected in ("AKXD", "AXBXA", "BXD", "BXH", "CC", "CXB", "HXBBXH", "LXS", "MDP"): + self.assertIn(expected, reference) + self.assertNotIn("HSNIH-Palmer", reference) + + rat = groups("/groups?species=RAT") + self.assertTrue(rat) + self.assertTrue(all(g["species"] == "rat" for g in rat)) + + self.assertIn("BXD-NIA-AD", {g["name"] for g in groups("/groups?q=alzheimer")}) + + rat_reference = {g["name"] for g in groups("/groups?species=rat&family=reference")} + self.assertIn("HXBBXH", rat_reference) + self.assertNotIn("BXD", rat_reference) + if __name__ == "__main__": unittest.main() -- cgit 1.4.1