@sjcrh/proteinpaint-server 2.142.0 → 2.143.0

package/routes/termdb.violin.js

@@ -27,31 +27,25 @@ function init({ genomes }) {
     let data;
     try {
       const g = genomes[q.genome];
-      if (!g)
-        throw "invalid genome name";
+      if (!g) throw "invalid genome name";
       const ds = g.datasets?.[q.dslabel];
-      if (!ds)
-        throw "invalid ds";
+      if (!ds) throw "invalid ds";
       data = await trigger_getViolinPlotData(q, ds);
     } catch (e) {
       data = { error: e?.message || e };
-      if (e instanceof Error && e.stack)
-        console.log(e);
+      if (e instanceof Error && e.stack) console.log(e);
     }
     res.send(data);
   };
 }
 async function trigger_getViolinPlotData(q, ds) {
-  if (typeof q.tw?.term != "object" || typeof q.tw?.q != "object")
-    throw "q.tw not of {term,q}";
+  if (typeof q.tw?.term != "object" || typeof q.tw?.q != "object") throw "q.tw not of {term,q}";
   const term = q.tw.term;
-  if (!q.tw.q.mode)
-    q.tw.q.mode = "continuous";
-  if (!isNumericTerm(term) && term.type !== "survival")
-    throw "term type is not numeric or survival";
+  if (!q.tw.q.mode) q.tw.q.mode = "continuous";
+  if (!isNumericTerm(term) && term.type !== "survival") throw "term type is not numeric or survival";
   const terms = [q.tw];
-  if (q.divideTw)
-    terms.push(q.divideTw);
+  if (q.overlayTw) terms.push(q.overlayTw);
+  if (q.divideTw) terms.push(q.divideTw);
   const data = await getData(
     {
       terms,
@@ -63,68 +57,72 @@ async function trigger_getViolinPlotData(q, ds) {
     ds
   );
   const sampleType = `All ${data.sampleType?.plural_name || "samples"}`;
-  if (data.error)
-    throw data.error;
-  if (q.divideTw && data.refs.byTermId[q.divideTw.$id]) {
-    data.refs.byTermId[q.divideTw.$id].orderedLabels = getOrderedLabels(
-      q.divideTw,
-      data.refs.byTermId[q.divideTw.$id]?.bins,
+  if (data.error) throw data.error;
+  if (q.overlayTw && data.refs.byTermId[q.overlayTw.$id]) {
+    data.refs.byTermId[q.overlayTw.$id].orderedLabels = getOrderedLabels(
+      q.overlayTw,
+      data.refs.byTermId[q.overlayTw.$id]?.bins,
       void 0,
-      q.divideTw.q
+      q.overlayTw.q
     );
   }
-  if (q.scale)
-    setScaleData(q, data, q.tw);
+  if (q.scale) setScaleData(q, data, q.tw);
   const valuesObject = divideValues(q, data, sampleType);
-  const result = setResponse(valuesObject, data, q, sampleType);
-  await getWilcoxonData(q.divideTw, result);
+  const result = setResponse(valuesObject, data, q);
+  if (q.overlayTw) await getWilcoxonData(result);
   await createCanvasImg(q, result, ds);
   return result;
 }
-async function getWilcoxonData(divideTw, result) {
-  if (!divideTw)
-    return;
-  const numPlots = result.plots.length;
-  if (numPlots < 2)
-    return;
-  const wilcoxInput = [];
-  for (let i = 0; i < numPlots; i++) {
-    const group1_id = result.plots[i].label;
-    const group1_values = result.plots[i].values;
-    for (let j = i + 1; j < numPlots; j++) {
-      const group2_id = result.plots[j].label;
-      const group2_values = result.plots[j].values;
-      wilcoxInput.push({ group1_id, group1_values, group2_id, group2_values });
+async function getWilcoxonData(result) {
+  for (const k of Object.keys(result.charts)) {
+    const chart = result.charts[k];
+    const numPlots = chart.plots.length;
+    if (numPlots < 2) continue;
+    const wilcoxInput = [];
+    for (let i = 0; i < numPlots; i++) {
+      const group1_id = chart.plots[i].label;
+      const group1_values = chart.plots[i].values;
+      for (let j = i + 1; j < numPlots; j++) {
+        const group2_id = chart.plots[j].label;
+        const group2_values = chart.plots[j].values;
+        wilcoxInput.push({ group1_id, group1_values, group2_id, group2_values });
+      }
     }
-  }
-  const wilcoxOutput = JSON.parse(await run_rust("wilcoxon", JSON.stringify(wilcoxInput)));
-  for (const test of wilcoxOutput) {
-    if (test.pvalue == null || test.pvalue == "null") {
-      result.pvalues.push([{ value: test.group1_id }, { value: test.group2_id }, { html: "NA" }]);
-    } else {
-      result.pvalues.push([{ value: test.group1_id }, { value: test.group2_id }, { html: test.pvalue.toPrecision(4) }]);
+    const wilcoxOutput = JSON.parse(await run_rust("wilcoxon", JSON.stringify(wilcoxInput)));
+    chart.pvalues = [];
+    for (const test of wilcoxOutput) {
+      if (test.pvalue == null || test.pvalue == "null") {
+        chart.pvalues.push([{ value: test.group1_id }, { value: test.group2_id }, { html: "NA" }]);
+      } else {
+        chart.pvalues.push([{ value: test.group1_id }, { value: test.group2_id }, { html: test.pvalue.toPrecision(4) }]);
+      }
     }
   }
 }
 function setScaleData(q, data, tw) {
-  if (!q.scale)
-    return;
+  if (!q.scale) return;
   const scale = Number(q.scale);
   for (const val of Object.values(data.samples)) {
-    if (!tw.$id || !val[tw.$id])
-      continue;
-    if (tw.term.values?.[val[tw.$id]?.value]?.uncomputable)
-      continue;
+    if (!tw.$id || !val[tw.$id]) continue;
+    if (tw.term.values?.[val[tw.$id]?.value]?.uncomputable) continue;
     val[tw.$id].key = val[tw.$id].key / scale;
     val[tw.$id].value = val[tw.$id].value / scale;
   }
 }
 function divideValues(q, data, sampleType) {
-  const overlayTerm = q.divideTw;
+  const overlayTerm = q.overlayTw;
+  const divideTerm = q.divideTw;
   const useLog = q.unit == "log";
-  const { absMax, absMin, key2values, uncomputableValues } = parseValues(q, data, sampleType, useLog, overlayTerm);
+  const { absMax, absMin, chart2plot2values, uncomputableValues } = parseValues(
+    q,
+    data,
+    sampleType,
+    useLog,
+    overlayTerm,
+    divideTerm
+  );
   return {
-    key2values,
+    chart2plot2values,
     min: absMin,
     max: absMax,
     uncomputableValues: sortObj(uncomputableValues)
@@ -133,106 +131,97 @@ function divideValues(q, data, sampleType) {
 function sortObj(object) {
   return Object.fromEntries(Object.entries(object).sort(([, a], [, b]) => a - b));
 }
-function sortKey2values(data, key2values, overlayTerm) {
+function sortPlot2Values(data, plot2values, overlayTerm) {
   const orderedLabels = overlayTerm?.$id ? data.refs.byTermId[overlayTerm.$id]?.keyOrder : void 0;
-  key2values = new Map(
-    [...key2values].sort(
+  plot2values = new Map(
+    [...plot2values].sort(
       orderedLabels ? (a, b) => orderedLabels.indexOf(a[0]) - orderedLabels.indexOf(b[0]) : overlayTerm?.term?.type === "categorical" ? (a, b) => b[1].length - a[1].length : overlayTerm?.term?.type === "condition" ? (a, b) => Number(a[0]) - Number(b[0]) : (a, b) => a.toString().replace(/[^a-zA-Z0-9<]/g, "").localeCompare(b.toString().replace(/[^a-zA-Z0-9<]/g, ""), void 0, { numeric: true })
     )
   );
-  return key2values;
+  return plot2values;
 }
-function setResponse(valuesObject, data, q, sampleType) {
-  const overlayTerm = q.divideTw;
-  const plots = [];
-  for (const [key, values] of sortKey2values(data, valuesObject.key2values, overlayTerm)) {
-    if (overlayTerm) {
+function setResponse(valuesObject, data, q) {
+  const charts = {};
+  const overlayTerm = q.overlayTw;
+  for (const [chart, plot2values] of valuesObject.chart2plot2values) {
+    const plots = [];
+    for (const [plot, values] of sortPlot2Values(data, plot2values, overlayTerm)) {
       plots.push({
-        label: overlayTerm?.term?.values?.[key]?.label || key,
+        label: overlayTerm?.term?.values?.[plot]?.label || plot,
         values,
-        seriesId: key,
+        seriesId: plot,
         plotValueCount: values?.length,
-        color: overlayTerm?.term?.values?.[key]?.color || null,
-        divideTwBins: isNumericTerm(overlayTerm.term) ? numericBins(overlayTerm, data) : null
-      });
-    } else {
-      plots.push({
-        label: sampleType,
-        values,
-        plotValueCount: values.length
+        color: overlayTerm?.term?.values?.[plot]?.color || null,
+        overlayTwBins: isNumericTerm(overlayTerm?.term) ? numericBins(overlayTerm, data) : null
       });
     }
+    charts[chart] = { chartId: chart, plots };
   }
   const result = {
     min: valuesObject.min,
     max: valuesObject.max,
-    plots,
-    pvalues: [],
+    charts,
     uncomputableValues: Object.keys(valuesObject.uncomputableValues).length > 0 ? valuesObject.uncomputableValues : null
   };
   return result;
 }
 async function createCanvasImg(q, result, ds) {
-  if (!q.radius)
-    q.radius = 5;
-  if (q.radius <= 0)
-    throw "q.radius is not a number";
-  else
-    q.radius = +q.radius;
-  if (!q.strokeWidth)
-    q.strokeWidth = 0.2;
+  if (!q.radius) q.radius = 5;
+  if (q.radius <= 0) throw "q.radius is not a number";
+  else q.radius = +q.radius;
+  if (!q.strokeWidth) q.strokeWidth = 0.2;
   const refSize = q.radius * 4;
-  const plot2Values = {};
-  for (const plot of result.plots)
-    plot2Values[plot.label] = plot.values;
-  const densities = await getDensities(plot2Values, result.min, result.max);
-  let axisScale;
-  const useLog = q.unit == "log";
-  if (useLog) {
-    axisScale = scaleLog().base(ds.cohort.termdb.logscaleBase2 ? 2 : 10).domain([result.min, result.max]).range(q.orientation === "horizontal" ? [0, q.svgw] : [q.svgw, 0]);
-  } else {
-    axisScale = scaleLinear().domain([result.min, result.max]).range(q.orientation === "horizontal" ? [0, q.svgw] : [q.svgw, 0]);
-  }
-  const [width, height] = q.orientation == "horizontal" ? [q.svgw * q.devicePixelRatio, refSize * q.devicePixelRatio] : [refSize * q.devicePixelRatio, q.svgw * q.devicePixelRatio];
-  const scaledRadius = q.radius / q.devicePixelRatio;
-  const arcEndAngle = scaledRadius * Math.PI;
-  for (const plot of result.plots) {
-    plot.density = densities[plot.label];
-    const noDensityRendered = plot.density.densityMax == 0;
-    const canvas = createCanvas(width, height);
-    const ctx = canvas.getContext("2d");
-    const symbolOpacity = noDensityRendered ? 1 : 0.6;
-    ctx.strokeStyle = `rgba(0,0,0,${symbolOpacity})`;
-    ctx.lineWidth = q.strokeWidth / q.devicePixelRatio;
-    ctx.globalAlpha = symbolOpacity;
-    ctx.fillStyle = "#ffe6e6";
-    if (q.devicePixelRatio != 1) {
-      ctx.scale(q.devicePixelRatio, q.devicePixelRatio);
+  for (const k of Object.keys(result.charts)) {
+    const chart = result.charts[k];
+    const plot2Values = {};
+    for (const plot of chart.plots) plot2Values[plot.label] = plot.values;
+    const densities = await getDensities(plot2Values, result.min, result.max);
+    let axisScale;
+    const useLog = q.unit == "log";
+    if (useLog) {
+      axisScale = scaleLog().base(ds.cohort.termdb.logscaleBase2 ? 2 : 10).domain([result.min, result.max]).range(q.orientation === "horizontal" ? [0, q.svgw] : [q.svgw, 0]);
+    } else {
+      axisScale = scaleLinear().domain([result.min, result.max]).range(q.orientation === "horizontal" ? [0, q.svgw] : [q.svgw, 0]);
+    }
+    const [width, height] = q.orientation == "horizontal" ? [q.svgw * q.devicePixelRatio, refSize * q.devicePixelRatio] : [refSize * q.devicePixelRatio, q.svgw * q.devicePixelRatio];
+    const scaledRadius = q.radius / q.devicePixelRatio;
+    const arcEndAngle = scaledRadius * Math.PI;
+    for (const plot of chart.plots) {
+      plot.density = densities[plot.label];
+      const noDensityRendered = plot.density.densityMax == 0;
+      const canvas = createCanvas(width, height);
+      const ctx = canvas.getContext("2d");
+      const symbolOpacity = noDensityRendered ? 1 : 0.6;
+      ctx.strokeStyle = `rgba(0,0,0,${symbolOpacity})`;
+      ctx.lineWidth = q.strokeWidth / q.devicePixelRatio;
+      ctx.globalAlpha = symbolOpacity;
+      ctx.fillStyle = "#ffe6e6";
+      if (q.devicePixelRatio != 1) {
+        ctx.scale(q.devicePixelRatio, q.devicePixelRatio);
+      }
+      if (q.datasymbol === "rug")
+        plot.values.forEach((i) => {
+          ctx.beginPath();
+          if (q.orientation == "horizontal") {
+            ctx.moveTo(+axisScale(i), 0);
+            ctx.lineTo(+axisScale(i), scaledRadius * 2);
+          } else {
+            ctx.moveTo(0, +axisScale(i));
+            ctx.lineTo(scaledRadius * 2, +axisScale(i));
+          }
+          ctx.stroke();
+        });
+      else if (q.datasymbol === "bean")
+        plot.values.forEach((i) => {
+          ctx.beginPath();
+          if (q.orientation === "horizontal") ctx.arc(+axisScale(i), q.radius, scaledRadius, 0, arcEndAngle);
+          else ctx.arc(q.radius, +axisScale(i), scaledRadius, 0, arcEndAngle);
+          ctx.fill();
+          ctx.stroke();
+        });
+      plot.src = canvas.toDataURL();
+      plot.summaryStats = summaryStats(plot.values).values;
     }
-    if (q.datasymbol === "rug")
-      plot.values.forEach((i) => {
-        ctx.beginPath();
-        if (q.orientation == "horizontal") {
-          ctx.moveTo(+axisScale(i), 0);
-          ctx.lineTo(+axisScale(i), scaledRadius * 2);
-        } else {
-          ctx.moveTo(0, +axisScale(i));
-          ctx.lineTo(scaledRadius * 2, +axisScale(i));
-        }
-        ctx.stroke();
-      });
-    else if (q.datasymbol === "bean")
-      plot.values.forEach((i) => {
-        ctx.beginPath();
-        if (q.orientation === "horizontal")
-          ctx.arc(+axisScale(i), q.radius, scaledRadius, 0, arcEndAngle);
-        else
-          ctx.arc(q.radius, +axisScale(i), scaledRadius, 0, arcEndAngle);
-        ctx.fill();
-        ctx.stroke();
-      });
-    plot.src = canvas.toDataURL();
-    plot.summaryStats = summaryStats(plot.values).values;
   }
 }
 async function getDensity(values) {
@@ -270,6 +259,6 @@ export {
   getDensities,
   getDensity,
   getWilcoxonData,
-  sortKey2values,
+  sortPlot2Values,
   trigger_getViolinPlotData
 };

package/routes/tileserver.js

@@ -24,26 +24,25 @@ function init({ genomes }) {
       const { type, sessionId, TileGroup, z, x, y } = req.params;
       const query = req.query;
       const wsiImage = query.wsi_image;
-      if (!wsiImage)
-        throw new Error("No wsi_image param provided");
+      if (!wsiImage) throw new Error("No wsi_image param provided");
       const dslabel = query.dslabel;
-      if (!dslabel)
-        throw new Error("No dslabel param provided");
+      if (!dslabel) throw new Error("No dslabel param provided");
       const g = genomes[query.genome];
-      if (!g)
-        throw new Error("Invalid genome name");
+      if (!g) throw new Error("Invalid genome name");
       const ds = g.datasets[query.dslabel];
-      if (!ds)
-        throw new Error("Invalid dataset name");
+      if (!ds) throw new Error("Invalid dataset name");
       const sampleId = query.sample_id;
-      if (!sampleId)
-        throw new Error("Invalid sample id");
+      const projectId = query.ai_project_id;
+      if (!sampleId && !projectId) throw new Error("Either sample_id or project_id must be provided");
       const mount = serverconfig.features?.tileserver?.mount;
-      if (!mount)
-        throw new Error("No mount available for TileServer");
-      const wsiImagePath = path.join(`${mount}/${ds.queries.WSImages.imageBySampleFolder}/${sampleId}`, wsiImage);
-      if (!wsiImage)
-        throw new Error("Invalid wsi_image");
+      if (!mount) throw new Error("No mount available for TileServer");
+      let wsiImagePath;
+      if (sampleId) {
+        wsiImagePath = path.join(`${mount}/${ds.queries.WSImages.imageBySampleFolder}/${sampleId}`, wsiImage);
+      } else {
+        wsiImagePath = path.join(`${mount}/${ds.queries.WSImages.aiToolImageFolder}/`, wsiImage);
+      }
+      if (!wsiImage) throw new Error("Invalid wsi_image");
       const shardManager = ShardManager.getInstance();
       const tileServer = await shardManager.shardingAlgorithmsMap?.get(TileServerShardingAlgorithm.TILE_SERVER_SHARDING_KEY)?.getShard(wsiImagePath);
       if (!tileServer) {

package/routes/wsimages.js

@@ -25,27 +25,22 @@ const api = {
 function init({ genomes }) {
   return async (req, res) => {
     try {
-      const query = req.query;
-      const g = genomes[query.genome];
-      if (!g)
-        throw new Error("Invalid genome name");
-      const ds = g.datasets[query.dslabel];
-      if (!ds)
-        throw new Error("Invalid dataset name");
-      const sampleId = query.sampleId;
-      if (!sampleId)
-        throw new Error("Invalid sampleId");
-      const wsimage = query.wsimage;
-      if (!wsimage)
-        throw new Error("Invalid wsimage");
+      const wSImagesRequest = req.query;
+      const g = genomes[wSImagesRequest.genome];
+      if (!g) throw new Error("Invalid genome name");
+      const ds = g.datasets[wSImagesRequest.dslabel];
+      if (!ds) throw new Error("Invalid dataset name");
+      const sampleId = wSImagesRequest.sampleId;
+      const wsimage = wSImagesRequest.wsimage;
+      const aiProjectId = wSImagesRequest.aiProjectId;
+      if (!sampleId && (!wsimage || !aiProjectId)) {
+        throw new Error("Invalid parameters: sampleId or both wsimage and aiProjectId must be provided");
+      }
       const cookieJar = new CookieJar();
       const setCookie = promisify(cookieJar.setCookie.bind(cookieJar));
       const getCookieString = promisify(cookieJar.getCookieString.bind(cookieJar));
-      const mount = serverconfig.features?.tileserver?.mount;
-      if (!mount)
-        throw new Error("No mount available for TileServer");
-      const wsiImagePath = path.join(`${mount}/${ds.queries.WSImages.imageBySampleFolder}/${sampleId}`, wsimage);
-      const session = await getSessionId(ds, sampleId, cookieJar, getCookieString, setCookie, wsiImagePath);
+      const wsiImagePath = await getWSImagePath(ds, wSImagesRequest);
+      const session = await getSessionId(ds, cookieJar, getCookieString, setCookie, wsiImagePath, aiProjectId);
       const getWsiImageResponse = await getWsiImageDimensions(
         session.imageSessionId,
         getCookieString,
@@ -67,26 +62,35 @@ function init({ genomes }) {
     }
   };
 }
-async function getSessionId(ds, sampleId, cookieJar, getCookieString, setCookie, wsimage) {
+async function getWSImagePath(ds, wSImagesRequest) {
+  const mount = serverconfig.features?.tileserver?.mount;
+  if (!mount) throw new Error("No mount available for TileServer");
+  if (wSImagesRequest.sampleId) {
+    return path.join(
+      `${mount}/${ds.queries.WSImages.imageBySampleFolder}/${wSImagesRequest.sampleId}`,
+      wSImagesRequest.wsimage
+    );
+  } else {
+    return path.join(`${mount}/${ds.queries.WSImages.aiToolImageFolder}/`, wSImagesRequest.wsimage);
+  }
+}
+async function getSessionId(ds, cookieJar, getCookieString, setCookie, wsimage, aiProjectId) {
   const sessionManager = SessionManager.getInstance();
   const invalidateResult = await sessionManager.syncAndInvalidateSessions(wsimage);
-  if (!invalidateResult)
-    throw new Error("Session invalidation failed");
+  if (!invalidateResult) throw new Error("Session invalidation failed");
   const session = await sessionManager.getSession(wsimage);
   if (session) {
     return session;
   }
   const tileServer = await sessionManager.getTileServerShard(wsimage);
-  if (!tileServer)
-    throw new Error("No TileServer shard available");
+  if (!tileServer) throw new Error("No TileServer shard available");
   await ky.get(`${tileServer.url}/tileserver/session_id`, {
     timeout: 5e4,
     hooks: getHooks(cookieJar, getCookieString, setCookie)
   });
   const cookieString = await getCookieString(`${tileServer.url}/tileserver/session_id`);
   const sessionId = cookieString.match(/session_id=([^;]*)/)?.[1];
-  if (!sessionId)
-    throw new Error("session_id not found");
+  if (!sessionId) throw new Error("session_id not found");
   const overlays = [];
   const data = qs.stringify({ slide_path: wsimage });
   await ky.put(`${tileServer.url}/tileserver/slide`, {
@@ -99,15 +103,12 @@ async function getSessionId(ds, sampleId, cookieJar, getCookieString, setCookie,
     hooks: getHooks(cookieJar, getCookieString, setCookie)
   });
   if (ds.queries.WSImages.getWSIPredictionOverlay) {
-    const predictionOverlay = await ds.queries.WSImages.getWSIPredictionOverlay(sampleId, wsimage);
+    const predictionOverlay = await ds.queries.WSImages.getWSIPredictionOverlay(wsimage);
     if (predictionOverlay) {
       const mount = serverconfig.features?.tileserver?.mount;
-      const annotationsFilePath = path.join(
-        `${mount}/${ds.queries.WSImages.imageBySampleFolder}/${sampleId}`,
-        predictionOverlay
-      );
+      const overlayFilePath = path.join(`${mount}/${ds.queries.WSImages.aiToolImageFolder}/`, predictionOverlay);
       const annotationsData = qs.stringify({
-        overlay_path: annotationsFilePath
+        overlay_path: overlayFilePath
       });
       const layerNumber = await ky.put(`${tileServer.url}/tileserver/overlay`, {
         body: annotationsData,
@@ -126,18 +127,18 @@ async function getSessionId(ds, sampleId, cookieJar, getCookieString, setCookie,
     }
   }
   if (ds.queries.WSImages.getWSIUncertaintyOverlay) {
-    const uncertaintyOverlay = await ds.queries.WSImages.getWSIUncertaintyOverlay(sampleId, wsimage);
+    const uncertaintyOverlay = await ds.queries.WSImages.getWSIUncertaintyOverlay(wsimage);
     if (uncertaintyOverlay) {
       const mount = serverconfig.features?.tileserver?.mount;
-      const annotationsFilePath = path.join(
-        `${mount}/${ds.queries.WSImages.imageBySampleFolder}/${sampleId}`,
+      const uncertaintyOverlayFilePath = path.join(
+        `${mount}/${ds.queries.WSImages.aiToolImageFolder}/`,
         uncertaintyOverlay
       );
-      const annotationsData = qs.stringify({
-        overlay_path: annotationsFilePath
+      const uncertaintyData = qs.stringify({
+        overlay_path: uncertaintyOverlayFilePath
       });
       const layerNumber = await ky.put(`${tileServer.url}/tileserver/overlay`, {
-        body: annotationsData,
+        body: uncertaintyData,
         timeout: 5e4,
         headers: {
           "Content-Type": "application/x-www-form-urlencoded",
@@ -154,18 +155,13 @@ async function getSessionId(ds, sampleId, cookieJar, getCookieString, setCookie,
   }
   const sessionData = await sessionManager.setSession(wsimage, sessionId, tileServer, overlays);
   if (ds.queries.WSImages.getWSIPredictionPatches) {
-    const predictionPatches = await ds.queries.WSImages.getWSIPredictionPatches(sampleId, wsimage);
-    if (!predictionPatches)
-      throw new Error("No prediction files found");
+    const predictionPatches = await ds.queries.WSImages.getWSIPredictionPatches(aiProjectId, wsimage);
+    if (!predictionPatches) throw new Error("No prediction files found");
     const mount = serverconfig.features?.tileserver?.mount;
-    if (!mount)
-      throw new Error("No mount available for TileServer");
+    if (!mount) throw new Error("No mount available for TileServer");
     if (predictionPatches.length > 0) {
       for (const predictionPatch of predictionPatches) {
-        const predictionFilePath = path.join(
-          `${mount}/${ds.queries.WSImages.imageBySampleFolder}/${sampleId}`,
-          predictionPatch
-        );
+        const predictionFilePath = path.join(`${mount}/${ds.queries.WSImages.aiToolImageFolder}/`, predictionPatch);
         const predictionsData = qs.stringify({
           overlay_path: predictionFilePath
         });

package/routes/wsisamples.js

@@ -18,11 +18,9 @@ function init({ genomes }) {
     try {
       const query = req.query;
       const g = genomes[query.genome];
-      if (!g)
-        throw new Error("Invalid genome name");
+      if (!g) throw new Error("Invalid genome name");
       const ds = g.datasets[query.dslabel];
-      if (!ds)
-        throw "Invalid dslabel";
+      if (!ds) throw "Invalid dslabel";
       const images = await ds.queries.WSImages.getSamples();
       const payload = {
         samples: images
@@ -39,8 +37,7 @@ function init({ genomes }) {
 }
 async function validate_query_getWSISamples(ds) {
   const q = ds.queries?.WSImages;
-  if (!q)
-    return;
+  if (!q) return;
   validateQuery(ds);
 }
 function validateQuery(ds) {