@sjcrh/proteinpaint-server 2.111.0 → 2.112.0

package/utils/density.R

@@ -1,24 +1,31 @@
 library(jsonlite)
-# This script reads in a json string from stdin, calculates the densities of each plot and returns the densities as a json string
-# The input json string is a dictionary where each field maps to an array of numbers
-# The output json string is a dictionary  with the density for each plot. The density is represented like {x: [x density values], y: [y density values]}
-# In order to test it you can run this from the command line replacing the arrays with your own: 
-# echo '{"plotA": [1.2, 2, 3], "plotB": [4.5, 5, 6]}' | Rscript ./density.R
+# This script reads in a json string from stdin with the parameters, 
+# calculates the densities of each plot and returns the densities as a json string
+# The input json string contains plot2Values, a dictionary where each field maps to an array of numbers and the 
+# global min and max values of the x axis.
+# The output json string is a dictionary  with the density for each plot. The density is represented 
+# by a an object where {x: [x density values], y: [y density values]}
+# In order to test it you can run the following command from the command line replacing plot2Values and min and max
+# with your values: 
+# echo '{plot2Values: {"plotA": [1.2, 2, 3], "plotB": [4.5, 5, 6]}, min: 1.2, max:6}' | Rscript ./density.R
 
 con <- file("stdin", "r")
 json <- readLines(con)
 close(con)
 data <- fromJSON(json)
+plot2Values <- data$plot2Values
+min <- data$min
+max <- data$max
 densities <- list()
-for(plot in names(data)){
-    values = data[[plot]]
+for(plot in names(plot2Values)){
+    values = plot2Values[[plot]]
     # If the plot has less than 5 values or all the values are the same, we will return a flat line
     if(length(values) <= 5 | length(unique(values)) == 1){
         y = rep(0, length(values))
         densities[[plot]] <- list(x=values, y=y)
         next
     }
-    den = density(x = values, from=min(values), to=max(values))
+    den = density(x = values, from=min, to=max)
     x = den$x
     y = den$y
     result = list(x=x, y=y) #This is an object  with two keys x and y that are number arrays

package/routes/clearwsisession.js

@@ -1,51 +0,0 @@
-import { clearWSImagesSessionsPayload } from "#types/checkers";
-import SessionManager from "#src/wsisessions/SessionManager.js";
-import ky from "ky";
-import serverconfig from "#src/serverconfig.js";
-const api = {
-  endpoint: "clearwsisession",
-  methods: {
-    delete: {
-      ...clearWSImagesSessionsPayload,
-      init
-    }
-  }
-};
-function init() {
-  return async (req, res) => {
-    try {
-      if (serverconfig.redis) {
-        const sessionsString = req.query.sessions;
-        const sessionsArray = JSON.parse(sessionsString);
-        const sessions = new Map(sessionsArray);
-        const sessionManager = SessionManager.getInstance(serverconfig.redis.url);
-        for (const [key, value] of sessions.entries()) {
-          const sessionData = await sessionManager.getSession(key);
-          if (sessionData) {
-            const userSessionIds = sessionData.userSessionIds;
-            if (!userSessionIds.some((sessionId) => sessionId === value)) {
-              break;
-            }
-            const newSessions = userSessionIds.filter((sessionId) => sessionId !== value);
-            if (newSessions.length === 0) {
-              await ky.put(`${serverconfig.tileServerURL}/tileserver/reset/${sessionData.imageSessionId}`);
-              await sessionManager.deleteSession(key);
-            } else {
-              sessionData.userSessionIds = newSessions;
-              await sessionManager.setSession(key, sessionData);
-            }
-          }
-        }
-        res.send({ message: "Sessions cleared" });
-      } else {
-        res.status(404).send("Redis not configured");
-      }
-    } catch (e) {
-      console.log(e);
-      res.status(404).send("Error clearing sessions");
-    }
-  };
-}
-export {
-  api
-};