@sjcrh/proteinpaint-server 2.83.0 → 2.85.0

package/routes/termdb.singleSampleMutation.js

@@ -2,18 +2,14 @@ import fs from "fs";
 import path from "path";
 import { read_file } from "#src/utils.js";
 import serverconfig from "#src/serverconfig.js";
+import { termdbSingleSampleMutationPayload } from "#types";
 import { gdcValidate_query_singleSampleMutation } from "#src/mds3.gdc.js";
 const api = {
   endpoint: "termdb/singleSampleMutation",
   methods: {
     get: {
-      init,
-      request: {
-        typeId: "TermdbSingleSampleMutationRequest"
-      },
-      response: {
-        typeId: "TermdbSingleSampleMutationResponse"
-      }
+      ...termdbSingleSampleMutationPayload,
+      init
     }
   }
 };

package/routes/termdb.singlecellDEgenes.js

@@ -1,15 +1,15 @@
+import { termdbSingleCellDEgenesPayload } from "#types";
 import { gdc_validate_query_singleCell_DEgenes } from "#src/mds3.gdc.js";
 const api = {
   endpoint: "termdb/singlecellDEgenes",
   methods: {
-    all: {
-      init,
-      request: {
-        typeId: "TermdbSinglecellDEgenesRequest"
-      },
-      response: {
-        typeId: "TermdbSinglecellDEgenesResponse"
-      }
+    get: {
+      ...termdbSingleCellDEgenesPayload,
+      init
+    },
+    post: {
+      ...termdbSingleCellDEgenesPayload,
+      init
     }
   }
 };

package/routes/termdb.singlecellData.js

@@ -1,17 +1,13 @@
+import { termdbSingleCellDataPayload } from "#types";
 const api = {
   endpoint: "termdb/singlecellData",
   methods: {
     get: {
-      init,
-      request: {
-        typeId: "TermdbSinglecellDataRequest"
-      },
-      response: {
-        typeId: "TermdbSinglecellDataResponse"
-      }
+      ...termdbSingleCellDataPayload,
+      init
     },
     post: {
-      alternativeFor: "get",
+      ...termdbSingleCellDataPayload,
       init
     }
   }

package/routes/termdb.singlecellSamples.js

@@ -4,20 +4,20 @@ import { read_file } from "#src/utils.js";
 import run_R from "#src/run_R.js";
 import { run_rust } from "@sjcrh/proteinpaint-rust";
 import serverconfig from "#src/serverconfig.js";
+import { termdbSingleCellSamplesPayload } from "#types";
 import { validate_query_singleCell_DEgenes } from "./termdb.singlecellDEgenes.ts";
 import { gdc_validate_query_singleCell_samples, gdc_validate_query_singleCell_data } from "#src/mds3.gdc.js";
 import ky from "ky";
 const api = {
   endpoint: "termdb/singlecellSamples",
   methods: {
-    all: {
-      init,
-      request: {
-        typeId: "TermdbSinglecellsamplesRequest"
-      },
-      response: {
-        typeId: "TermdbSinglecellsamplesResponse"
-      }
+    get: {
+      ...termdbSingleCellSamplesPayload,
+      init
+    },
+    post: {
+      ...termdbSingleCellSamplesPayload,
+      init
     }
   }
 };

package/routes/{termdb.gettermchildren.js → termdb.termchildren.js}

@@ -1,35 +1,14 @@
+import { termChildrenPayload } from "#types";
 import { copy_term, get_ds_tdb } from "#src/termdb.js";
 const api = {
   endpoint: "termdb/termchildren",
   methods: {
     get: {
-      init,
-      request: {
-        typeId: "gettermchildrenRequest"
-      },
-      response: {
-        typeId: "gettermchildrenResponse"
-      },
-      examples: [
-        {
-          request: {
-            body: {
-              genome: "hg38-test",
-              dslabel: "TermdbTest",
-              embedder: "localhost",
-              get_children: 1,
-              cohortValues: "ABC",
-              tid: "GO:0000001"
-            }
-          },
-          response: {
-            header: { status: 200 }
-          }
-        }
-      ]
+      ...termChildrenPayload,
+      init
     },
     post: {
-      alternativeFor: "get",
+      ...termChildrenPayload,
       init
     }
   }
@@ -46,7 +25,8 @@ function init({ genomes }) {
         throw "invalid dataset name";
       if (!tdb)
         throw "invalid termdb object";
-      await trigger_children(q, res, tdb);
+      const result = await trigger_children(q, tdb);
+      res.send(result);
     } catch (e) {
       res.send({ error: e instanceof Error ? e.message : e });
       if (e instanceof Error && e.stack)
@@ -54,13 +34,13 @@ function init({ genomes }) {
     }
   };
 }
-async function trigger_children(q, res, tdb) {
+async function trigger_children(q, tdb) {
   if (!q.tid)
     throw "no parent term id";
   const cohortValues = q.cohortValues ? q.cohortValues : "";
   const treeFilter = q.treeFilter ? q.treeFilter : "";
   const terms = await tdb.q.getTermChildren(q.tid, cohortValues, treeFilter);
-  res.send({ lst: terms.map(copy_term) });
+  return { lst: terms.map(copy_term) };
 }
 export {
   api

package/routes/termdb.termsbyids.js

@@ -1,18 +1,14 @@
+import { termsByIdsPayload } from "#types";
 import { copy_term } from "#src/termdb.js";
 const api = {
   endpoint: "termdb/termsbyids",
   methods: {
     get: {
-      init,
-      request: {
-        typeId: "gettermsbyidsRequest"
-      },
-      response: {
-        typeId: "gettermsbyidsResponse"
-      }
+      ...termsByIdsPayload,
+      init
     },
     post: {
-      alternativeFor: "get",
+      ...termsByIdsPayload,
       init
     }
   }
@@ -30,7 +26,8 @@ function init({ genomes }) {
       const tdb = ds.cohort.termdb;
       if (!tdb)
         throw "invalid termdb object";
-      await trigger_gettermsbyid(q, res, tdb);
+      const results = await trigger_gettermsbyid(q, tdb);
+      res.send(results);
     } catch (e) {
       res.send({ error: e instanceof Error ? e.message : e });
       if (e instanceof Error && e.stack)
@@ -38,10 +35,8 @@ function init({ genomes }) {
     }
   };
 }
-async function trigger_gettermsbyid(q, res, tdb) {
-  const terms = {
-    terms: {}
-  };
+async function trigger_gettermsbyid(q, tdb) {
+  const terms = {};
   for (const id of q.ids) {
     const term = tdb.q.termjsonByOneid(id);
     if (term) {
@@ -52,9 +47,7 @@ async function trigger_gettermsbyid(q, res, tdb) {
     }
     terms[id] = term ? copy_term(term) : void 0;
   }
-  res.send({
-    terms
-  });
+  return { terms };
 }
 export {
   api

package/routes/{termdb.getTopTermsByType.js → termdb.topTermsByType.js}

@@ -1,17 +1,17 @@
+import { termdbTopTermsByTypePayload } from "#types";
 import { run_rust } from "@sjcrh/proteinpaint-rust";
 import { get_samples } from "#src/termdb.sql.js";
 import { TermTypes } from "#shared/terms.js";
 const api = {
   endpoint: "termdb/getTopTermsByType",
   methods: {
-    all: {
-      init,
-      request: {
-        typeId: "TermdbTopTermsByTypeRequest"
-      },
-      response: {
-        typeId: "TermdbTopTermsByTypeResponse"
-      }
+    get: {
+      ...termdbTopTermsByTypePayload,
+      init
+    },
+    post: {
+      ...termdbTopTermsByTypePayload,
+      init
     }
   }
 };
@@ -28,7 +28,6 @@ function init({ genomes }) {
         throw "invalid dslabel";
       if (!ds.queries[type])
         throw "not supported on dataset";
-      const t = Date.now();
       const terms = await ds.queries[type].getTopTerms(q);
       res.send({ terms });
     } catch (e) {
@@ -96,7 +95,7 @@ async function computeTopTerms(file, samples, type) {
   return varMetabolite;
 }
 function gdcValidateQuery(ds, genome, type) {
-  ds.queries[type].getTopTerms = async (q) => {
+  ds.queries[type].getTopTerms = async () => {
     return [];
   };
 }

package/routes/termdb.topVariablyExpressedGenes.js

@@ -1,3 +1,4 @@
+import { termdbTopVariablyExpressedGenesPayload } from "#types";
 import { run_rust } from "@sjcrh/proteinpaint-rust";
 import serverconfig from "#src/serverconfig.js";
 import { get_samples } from "#src/termdb.sql.js";
@@ -7,14 +8,13 @@ import { joinUrl } from "#src/helpers.ts";
 const api = {
   endpoint: "termdb/topVariablyExpressedGenes",
   methods: {
-    all: {
-      init,
-      request: {
-        typeId: "TermdbTopVariablyExpressedGenesRequest"
-      },
-      response: {
-        typeId: "TermdbTopVariablyExpressedGenesResponse"
-      }
+    get: {
+      ...termdbTopVariablyExpressedGenesPayload,
+      init
+    },
+    post: {
+      ...termdbTopVariablyExpressedGenesPayload,
+      init
     }
   }
 };

package/routes/termdb.violin.js

@@ -1,53 +1,15 @@
+import { violinPayload } from "#types";
 import { trigger_getViolinPlotData } from "#src/termdb.violin.js";
 const api = {
   endpoint: "termdb/violin",
   methods: {
-    all: {
-      init,
-      request: {
-        typeId: "getViolinRequest"
-      },
-      response: {
-        typeId: "getViolinResponse"
-      },
-      examples: [
-        {
-          request: {
-            body: {
-              genome: "hg38-test",
-              dslabel: "TermdbTest",
-              embedder: "localhost",
-              devicePixelRatio: 2.200000047683716,
-              maxThickness: 150,
-              screenThickness: 1218,
-              filter: {
-                type: "tvslst",
-                in: true,
-                join: "",
-                lst: [
-                  {
-                    tag: "cohortFilter",
-                    type: "tvs",
-                    tvs: { term: { id: "subcohort", type: "categorical" }, values: [{ key: "ABC", label: "ABC" }] }
-                  }
-                ]
-              },
-              svgw: 227.27272234672367,
-              orientation: "horizontal",
-              datasymbol: "bean",
-              radius: 5,
-              strokeWidth: 0.2,
-              axisHeight: 60,
-              rightMargin: 50,
-              unit: "abs",
-              termid: "agedx"
-            }
-          },
-          response: {
-            header: { status: 200 }
-          }
-        }
-      ]
+    get: {
+      ...violinPayload,
+      init
+    },
+    post: {
+      ...violinPayload,
+      init
     }
   }
 };

package/routes/tileserver.js

@@ -1,20 +1,15 @@
+import { tilePayload } from "#types";
 import ky from "ky";
 import serverconfig from "#src/serverconfig.js";
-const routePath = "tileserver";
 const api = {
-  endpoint: `${routePath}/layer/slide/:sampleId/zoomify/:TileGroup/:z-:x-:y@1x.jpg`,
+  endpoint: `tileserver/layer/slide/:sampleId/zoomify/:TileGroup/:z-:x-:y@1x.jpg`,
   methods: {
     get: {
-      init,
-      request: {
-        typeId: "any"
-      },
-      response: {
-        typeId: "any"
-      }
+      ...tilePayload,
+      init
     },
     post: {
-      alternativeFor: "get",
+      ...tilePayload,
       init
     }
   }

package/routes/wsimages.js

@@ -4,21 +4,17 @@ import path from "path";
 import serverconfig from "#src/serverconfig.js";
 import { CookieJar } from "tough-cookie";
 import { promisify } from "util";
+import { wsImagesPayload } from "#types";
 const routePath = "wsimages";
 const api = {
   endpoint: `${routePath}`,
   methods: {
     get: {
-      init,
-      request: {
-        typeId: "GetWSImagesRequest"
-      },
-      response: {
-        typeId: "GetWSImagesResponse"
-      }
+      ...wsImagesPayload,
+      init
     },
     post: {
-      alternativeFor: "get",
+      ...wsImagesPayload,
       init
     }
   }
@@ -101,7 +97,12 @@ function init({ genomes }) {
           ]
         }
       }).json();
-      res.status(200).json({ sessionId, slide_dimensions: getWsiImageResponse.slide_dimensions });
+      const payload = {
+        status: "ok",
+        sessionId,
+        slide_dimensions: getWsiImageResponse.slide_dimensions
+      };
+      res.status(200).json(payload);
     } catch (e) {
       console.log(e);
       res.send({