@sjcrh/proteinpaint-server 2.133.0 → 2.133.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.133.0",
+  "version": "2.133.2",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",

package/routes/gdc.grin2.run.js

@@ -2,7 +2,6 @@ import { runGRIN2Payload } from "#types/checkers";
 import { stream_rust } from "@sjcrh/proteinpaint-rust";
 import serverconfig from "#src/serverconfig.js";
 import path from "path";
-import { formatElapsedTime } from "@sjcrh/proteinpaint-shared/time.js";
 import { run_python } from "@sjcrh/proteinpaint-python";
 const api = {
   endpoint: "gdc/runGRIN2",
@@ -155,7 +154,7 @@ function init({ genomes }) {
       }
       console.log("[GRIN2] Rust execution completed");
       const downloadTime = Date.now() - downloadStartTime;
-      const downloadTimeToPrint = formatElapsedTime(downloadTime);
+      const downloadTimeToPrint = Math.round(downloadTime / 1e3);
       console.log(`[GRIN2] Rust processing took ${downloadTimeToPrint}`);
       const rustResult = parseJsonlOutput(rustOutput);
       if (!rustResult) {
@@ -201,7 +200,7 @@ function init({ genomes }) {
       console.log("[GRIN2] python execution completed");
       console.log(`[GRIN2] Python stderr: ${pyResult.stderr}`);
       const grin2AnalysisTime = Date.now() - grin2AnalysisStart;
-      const grin2AnalysisTimeToPrint = formatElapsedTime(grin2AnalysisTime);
+      const grin2AnalysisTimeToPrint = Math.round(grin2AnalysisTime / 1e3);
       console.log(`[GRIN2] Python processing took ${grin2AnalysisTimeToPrint}`);
       let resultData;
       try {
@@ -210,7 +209,7 @@ function init({ genomes }) {
         const pngImg = resultData.png[0];
         const topGeneTable = resultData.topGeneTable || null;
         const analysisStats = parsedRustResult.summary || {};
-        const totalProcessTime = formatElapsedTime(downloadTime + grin2AnalysisTime);
+        const totalProcessTime = downloadTimeToPrint + grin2AnalysisTimeToPrint;
         console.log("[GRIN2] Total GRIN2 processing time:", totalProcessTime);
         return res.json({
           pngImg,