merge master

trendscenter · Jun 6, 2024 · 10abc5f · 10abc5f
2 parents c02840d + 3a9d45c
commit 10abc5f
Show file tree

Hide file tree

Showing 44 changed files with 25,579 additions and 12,045 deletions.
diff --git a/coinstac-docs/package-lock.json b/coinstac-docs/package-lock.json
diff --git a/coinstac-docs/yarn.lock b/coinstac-docs/yarn.lock
@@ -2832,21 +2832,21 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
     http-errors "2.0.0"
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.1"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -3306,7 +3306,7 @@ content-disposition@0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@~1.0.4:
+content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -3321,10 +3321,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
 
 copy-text-to-clipboard@^3.2.0:
   version "3.2.0"
@@ -4038,16 +4038,16 @@ execa@^5.0.0:
     strip-final-newline "^2.0.0"
 
 express@^4.17.3:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -4245,9 +4245,9 @@ flux@~4.0.1:
     fbjs "^3.0.1"
 
 follow-redirects@^1.0.0, follow-redirects@^1.15.0:
-  version "1.15.4"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
-  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 fork-ts-checker-webpack-plugin@^6.5.0:
   version "6.5.3"
@@ -7061,10 +7061,10 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"
@@ -8468,9 +8468,9 @@ webpack-bundle-analyzer@^4.9.0:
     ws "^7.3.1"
 
 webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.3"

diff --git a/lerna.json b/lerna.json
@@ -1,4 +1,4 @@
 {
   "lerna": "2.0.0-beta.32",
-  "version": "6.8.2"
+  "version": "6.8.8"
 }
diff --git a/packages/coinstac-api-server/package-lock.json b/packages/coinstac-api-server/package-lock.json
diff --git a/packages/coinstac-api-server/package.json b/packages/coinstac-api-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coinstac-api-server",
-  "version": "6.8.1",
+  "version": "6.8.3",
   "description": "",
   "main": "src/index.js",
   "scripts": {

diff --git a/packages/coinstac-api-server/seed/data/coinstac-dpsvm.json b/packages/coinstac-api-server/seed/data/coinstac-dpsvm.json
@@ -3,80 +3,67 @@
     "name": "Differentially Private Support Vector Machines Demo",
     "id": "dpsvm",
     "version": "v1.0.0",
-    "repository": "https:\/\/github.com\/trendscenter/coinstac-dpsvm",
+    "repository": "https://github.com/trendscenter/coinstac-dpsvm",
     "description": "A test from single shot regresssion",
-    "testData": "tree\/master\/test\/input"
+    "testData": "tree/master/test/input"
   },
   "computation": {
     "type": "docker",
     "dockerImage": "coinstacteam/dpsvm",
-    "command": [
-      "python",
-      "\/computation\/scripts\/local.py"
-    ],
+    "command": ["python", "/computation/scripts/local.py"],
     "remote": {
       "type": "docker",
       "dockerImage": "coinstacteam/dpsvm",
-      "command": [
-        "python",
-        "\/computation\/scripts\/remote.py"
-      ]
+      "command": ["python", "/computation/scripts/remote.py"]
     },
     "input": {
-      "covariates":
-      {
+      "covariates": {
         "label": "Covariates",
         "type": "csv",
         "description": "Demographic or medical features (e.g., isControl, sex, age)",
         "items": ["boolean", "number", "string"],
         "order": 0,
         "source": "member"
       },
-      "data":
-      {
+      "data": {
         "label": "Measurements",
         "type": "freesurfer",
         "items": ["FreeSurfer"],
         "extensions": [["csv", "txt"]],
         "source": "owner"
       },
-      "label":
-      {
+      "label": {
         "label": "Label",
         "description": "The binary label to predict",
         "type": "string",
         "source": "owner",
         "order": 2
       },
-      "model_local":
-      {
+      "model_local": {
         "default": "SVM",
         "label": "Model_local",
         "description": "Binary classification model: SVM / LR",
         "type": "string",
         "source": "owner",
         "order": 3
       },
-      "is_private_local":
-      {
+      "is_private_local": {
         "default": true,
         "label": "Is_private_local",
         "description": "Private or public version of model",
         "type": "boolean",
         "source": "owner",
         "order": 4
       },
-      "perturb_method_local":
-      {
+      "perturb_method_local": {
         "default": "objective",
         "label": "Perturb_method_local",
         "description": "Perturbation method for conserving privacy: objective / output, not needed for public version",
         "type": "string",
         "source": "owner",
         "order": 5
       },
-      "lambda_local":
-      {
+      "lambda_local": {
         "default": 0.01,
         "label": "Lambda_local",
         "description": "Regularization parameter",
@@ -87,8 +74,7 @@
         "source": "owner",
         "order": 6
       },
-      "epsilon_local":
-      {
+      "epsilon_local": {
         "default": 1.0,
         "label": "Epsilon_local",
         "description": "Privacy parameter",
@@ -99,8 +85,7 @@
         "source": "owner",
         "order": 7
       },
-      "huberconst_local":
-      {
+      "huberconst_local": {
         "default": 0.5,
         "label": "Huberconst_local",
         "description": "Constant for huber loss",
@@ -111,35 +96,31 @@
         "source": "owner",
         "order": 8
       },
-      "model_owner":
-      {
+      "model_owner": {
         "default": "SVM",
         "label": "Model_owner",
         "description": "Binary classification model: SVM / LR",
         "type": "string",
         "source": "owner",
         "order": 9
       },
-      "is_private_owner":
-      {
+      "is_private_owner": {
         "default": true,
         "label": "Is_private_owner",
         "description": "Private or public version of model",
         "type": "boolean",
         "source": "owner",
         "order": 10
       },
-      "perturb_method_owner":
-      {
+      "perturb_method_owner": {
         "default": "objective",
         "label": "Perturb_method_owner",
         "description": "Perturbation method for conserving privacy: objective / output, not needed for public version",
         "type": "string",
         "source": "owner",
         "order": 11
       },
-      "lambda_owner":
-      {
+      "lambda_owner": {
         "default": 0.01,
         "label": "Lambda_owner",
         "description": "Regularization parameter",
@@ -150,8 +131,7 @@
         "source": "owner",
         "order": 12
       },
-      "epsilon_owner":
-      {
+      "epsilon_owner": {
         "default": 1.0,
         "label": "Epsilon_owner",
         "description": "Privacy parameter",
@@ -162,8 +142,7 @@
         "source": "owner",
         "order": 13
       },
-      "huberconst_owner":
-      {
+      "huberconst_owner": {
         "default": 0.5,
         "label": "Huberconst_owner",
         "description": "Constant for huber loss",
@@ -174,8 +153,7 @@
         "source": "owner",
         "order": 14
       },
-      "train_split":
-      {
+      "train_split": {
         "default": 0.8,
         "label": "Train Split",
         "description": "Percentage of data used for training at the owner site",