@sjcrh/proteinpaint-server 2.58.0 → 2.59.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.58.0",
+  "version": "2.59.0",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",
@@ -61,7 +61,7 @@
   },
   "dependencies": {
     "@sjcrh/augen": "2.46.0",
-    "@sjcrh/proteinpaint-rust": "2.58.0",
+    "@sjcrh/proteinpaint-rust": "2.59.0",
     "better-sqlite3": "^9.4.1",
     "body-parser": "^1.15.2",
     "canvas": "~2.11.2",

package/routes/termdb.categories.js

@@ -19,14 +19,7 @@ const api = {
               dslabel: "TermdbTest",
               embedder: "localhost",
               getcategories: 1,
-              tid: "diaggrp",
-              term1_q: {
-                isAtomic: true,
-                hiddenValues: {},
-                type: "values",
-                groupsetting: { disabled: true },
-                mode: "discrete"
-              },
+              term: { id: "diaggrp" },
               filter: {
                 type: "tvslst",
                 in: true,
@@ -85,22 +78,8 @@ function init({ genomes }) {
   };
 }
 async function trigger_getcategories(q, res, tdb, ds, genome) {
-  if (!q.tid)
-    throw ".tid missing";
-  let term;
-  if (q.type == "geneVariant") {
-    term = { id: q.name, name: q.name, type: "geneVariant", isleaf: true };
-    if (q.gene) {
-      term.gene = q.gene;
-    } else {
-      term.chr = q.chr;
-      term.start = q.start;
-      term.stop = q.stop;
-    }
-  } else {
-    term = tdb.q.termjsonByOneid(q.tid);
-  }
-  const tw = q.type == "geneVariant" ? { $id: q.gene || q.name || q.tid, term, q: { isAtomic: true } } : { $id: q.tid, id: q.tid, term, q: q.term1_q || getDefaultQ(term, q) };
+  const $id = Math.random().toString();
+  const tw = { $id, term: q.term, q: q.term1_q || getDefaultQ(q.term, q) };
   const arg = {
     filter: q.filter,
     terms: [tw],
@@ -113,7 +92,7 @@ async function trigger_getcategories(q, res, tdb, ds, genome) {
   if (data.error)
     throw data.error;
   const lst = [];
-  if (q.type == "geneVariant") {
+  if (q.term.type == "geneVariant") {
     const samples = data.samples;
     const dtClassMap = /* @__PURE__ */ new Map();
     if (ds.assayAvailability?.byDt) {
@@ -125,7 +104,7 @@ async function trigger_getcategories(q, res, tdb, ds, genome) {
     }
     const sampleCountedFor = /* @__PURE__ */ new Set();
     for (const [sampleId, sampleData] of Object.entries(samples)) {
-      const key = tw.$id;
+      const key = $id;
       const values = sampleData[key].values;
       sampleCountedFor.clear();
       for (const value of values) {
@@ -163,7 +142,7 @@ async function trigger_getcategories(q, res, tdb, ds, genome) {
   } else {
     const key2count = /* @__PURE__ */ new Map();
     for (const sid in data.samples) {
-      const v = data.samples[sid][q.tid];
+      const v = data.samples[sid][$id];
       if (!v)
         continue;
       if (!("key" in v))
@@ -174,14 +153,14 @@ async function trigger_getcategories(q, res, tdb, ds, genome) {
       lst.push({
         samplecount: count,
         key,
-        label: data.refs?.byTermId?.[q.tid]?.events?.find((e) => e.event === key).label || term?.values?.[key]?.label || key
+        label: data.refs?.byTermId?.[$id]?.events?.find((e) => e.event === key).label || q.term?.values?.[key]?.label || key
       });
     }
   }
   const orderedLabels = getOrderedLabels(
-    term,
-    data.refs?.byTermId?.[q.tid]?.bins || [],
-    data.refs?.byTermId?.[q.tid]?.events,
+    q.term,
+    data.refs?.byTermId?.[$id]?.bins || [],
+    data.refs?.byTermId?.[$id]?.events,
     q.term1_q
   );
   if (orderedLabels.length) {

package/routes/termdb.cluster.js

@@ -6,6 +6,7 @@ import { gdc_validate_query_geneExpression } from "#src/mds3.gdc.js";
 import { mayLimitSamples } from "#src/mds3.filter.js";
 import { dtgeneexpression } from "#shared/common.js";
 import { clusterMethodLst, distanceMethodLst } from "#shared/clustering.js";
+import { getResult as getResultGene } from "#src/gene.js";
 const api = {
   endpoint: "termdb/cluster",
   methods: {
@@ -136,7 +137,7 @@ async function validate_query_geneExpression(ds, genome) {
   const q = ds.queries.geneExpression;
   if (!q)
     return;
-  q.gene2density = {};
+  q.gene2bins = {};
   if (q.src == "gdcapi") {
     gdc_validate_query_geneExpression(ds, genome);
     return;
@@ -191,13 +192,13 @@ async function validateNative(q, ds, genome) {
       if (!g.gene)
         continue;
       if (!g.chr) {
-        const lst = genome.genedb.getjsonbyname.all(g.gene);
-        if (lst.length == 0)
-          continue;
-        const j = JSON.parse(lst.find((i) => i.isdefault).genemodel || lst[0].genemodel);
-        g.start = j.start;
-        g.stop = j.stop;
-        g.chr = j.chr;
+        const re = getResultGene(genome, { input: g.gene, deep: 1 });
+        if (!re.gmlst || re.gmlst.length == 0)
+          throw "unknown gene";
+        const i = re.gmlst.find((i2) => i2.isdefault) || re.gmlst[0];
+        g.start = i.start;
+        g.stop = i.stop;
+        g.chr = i.chr;
       }
       const s2v = {};
       await utils.get_lines_bigfile({

package/routes/termdb.getdescrstats.js

@@ -1,5 +1,5 @@
-import { get_rows_by_one_key } from "../src/termdb.sql.js";
 import Summarystats from "../shared/descriptive.stats.js";
+import { getData } from "#src/termdb.matrix.js";
 const api = {
   endpoint: "termdb/descrstats",
   methods: {
@@ -64,7 +64,7 @@ function init({ genomes }) {
       const tdb = ds.cohort.termdb;
       if (!tdb)
         throw "invalid termdb object";
-      await trigger_getdescrstats(q, res, ds);
+      await trigger_getdescrstats(q, res, ds, g);
     } catch (e) {
       res.send({ error: e?.message || e });
       if (e instanceof Error && e.stack)
@@ -72,20 +72,16 @@ function init({ genomes }) {
     }
   };
 }
-async function trigger_getdescrstats(q, res, ds) {
-  const term = ds.cohort.termdb.q.termjsonByOneid(q.tid);
-  if (!term)
-    throw "invalid termid";
-  if (term.type != "float" && term.type != "integer")
-    throw "not numerical term";
-  const rows = await get_rows_by_one_key({
-    ds,
-    key: q.tid,
-    filter: q.filter
-  });
+async function trigger_getdescrstats(q, res, ds, genome) {
+  const terms = [q.tw];
+  const data = await getData({ filter: q.filter, terms }, ds, genome);
+  if (data.error)
+    throw data.error;
   const values = [];
-  for (const { value } of rows) {
-    if (term.values?.[value]?.uncomputable) {
+  for (const key in data.samples) {
+    const sample = data.samples[key];
+    const value = sample[q.tw.$id].value;
+    if (q.tw.values?.[value]?.uncomputable) {
       continue;
     }
     if (q.settings?.violin?.unit === "log") {
@@ -93,7 +89,7 @@ async function trigger_getdescrstats(q, res, ds) {
         continue;
       }
     }
-    values.push(value);
+    values.push(parseFloat(value));
   }
   res.send(Summarystats(values));
 }