@sjcrh/proteinpaint-server 2.132.0 → 2.132.1-0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.132.0",
+  "version": "2.132.1-0",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",
@@ -63,9 +63,9 @@
     "@sjcrh/augen": "2.121.0",
     "@sjcrh/proteinpaint-python": "2.118.0",
     "@sjcrh/proteinpaint-r": "2.130.0",
-    "@sjcrh/proteinpaint-rust": "2.132.0",
+    "@sjcrh/proteinpaint-rust": "2.132.1-0",
     "@sjcrh/proteinpaint-shared": "2.132.0",
-    "@sjcrh/proteinpaint-types": "2.132.0",
+    "@sjcrh/proteinpaint-types": "2.132.1-0",
     "@types/express": "^5.0.0",
     "@types/express-session": "^1.18.1",
     "better-sqlite3": "^9.4.1",

package/routes/gdc.grin2.run.js

@@ -153,10 +153,11 @@ function init({ genomes }) {
         // The mutation string from Rust
       });
       console.log("[GRIN2] Executing R script...");
-      const rAnalysisTime = Date.now();
+      const grin2AnalysisStart = Date.now();
       const rResult = await run_R("gdcGRIN2.R", rInput, []);
       console.log("[GRIN2] R execution completed");
-      console.log(`[GRIN2] R analysis took ${formatElapsedTime(Date.now() - rAnalysisTime)}`);
+      const grin2AnalysisTime = formatElapsedTime(Date.now() - grin2AnalysisStart);
+      console.log(`[GRIN2] Rust processing took ${grin2AnalysisTime}`);
       let resultData;
       try {
         resultData = JSON.parse(rResult);
@@ -164,12 +165,18 @@ function init({ genomes }) {
         const pngImg = resultData.png[0];
         const topGeneTable = resultData.topGeneTable || null;
         const analysisStats = parsedRustResult.summary || {};
-        console.log("[GRIN2] Total GRIN2 processing time:", formatElapsedTime(Date.now() - downloadStartTime));
+        const totalProcessTime = formatElapsedTime(Date.now() - downloadStartTime);
+        console.log("[GRIN2] Total GRIN2 processing time:", totalProcessTime);
         return res.json({
           pngImg,
           topGeneTable,
           rustResult: parsedRustResult,
           analysisStats,
+          timing: {
+            rustProcessingTime: downloadTime,
+            grin2ProcessingTime: grin2AnalysisTime,
+            totalTime: totalProcessTime
+          },
           status: "success"
         });
       } catch (parseError) {

package/routes/termdb.categories.js

@@ -41,6 +41,7 @@ async function trigger_getcategories(q, res, tdb, ds, genome) {
   const $id = q.tw.$id;
   const arg = {
     filter: q.filter,
+    filter0: q.filter0,
     terms: [q.tw],
     currentGeneNames: q.currentGeneNames,
     // optional, from mds3 mayAddGetCategoryArgs()