Add kokiri service

.gitignore

@@ -10,18 +10,25 @@ package-lock.json
 !/.circleci/*
 !/.github
 !templates/
+!templates/web
 !templates/web/*
 !templates/web/config
 !templates/web/config/*
 !templates/web/deploy
+!templates/web/deploy/*
 !templates/web/deploy/web
 !templates/web/deploy/web/*
 !templates/api/
+!templates/api/*
 !templates/api/deploy
+!templates/api/deploy/*
 !templates/api/deploy/api
 !templates/api/deploy/api/*
+!templates/api/deploy/kokiri
+!templates/api/deploy/kokiri/*
 !.editorconfig
 !.gitattributes
+!.gitignore
 !.yo-rc.json
 !ISSUE_TEMPLATE.md
 !LICENSE

build.js

@@ -220,10 +220,9 @@ function spawn(cmd, args, opts) {
  * @param cmd the command to execute as a string
  * @return {*}
  */
-function npm(cwd, cmd) {
-  console.log(cwd, chalk.blue('running npm', cmd));
-  const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-  return spawn(npm, (cmd || 'install').split(' '), {cwd, env});
+function yarn(cwd, cmd) {
+  console.log(cwd, chalk.blue('running yarn', cmd));
+  return spawn('yarn', (cmd || 'install').split(' '), {cwd, env});
 }
 
 /**
@@ -667,13 +666,13 @@ function createWorkspace(p) {
 }
 
 function installWebDependencies(p) {
-  return npm(p.tmpDir, 'install');
+  return yarn(p.tmpDir, 'install --no-immutable');
 }
 
 function showWebDependencies(p) {
   // `npm ls` fails if some peerDependencies are not installed
   // since this function is for debug purposes only, we catch possible errors of `npm()` and resolve it with status code `0`.
-  return npm(p.tmpDir, 'list --depth=1')
+  return yarn(p.tmpDir, 'info --recursive --dependents')
     .catch(() => Promise.resolve(0)); // status code = 0
 }
 
@@ -692,7 +691,7 @@ function resolvePluginTypes(p) {
 }
 
 function buildWeb(p) {
-  const step = npm(p.tmpDir, `run dist`);
+  const step = yarn(p.tmpDir, `run dist`);
   // move to target directory
   return step.then(() => fs.renameAsync(`${p.tmpDir}/dist/bundles.tar.gz`, `./build/${p.label}.tar.gz`));
 }

package.json

@@ -25,7 +25,6 @@
     "bluebird": "3.7.2",
     "chalk": "3.0.0",
     "fs-extra": "^9.1.0",
-    "generator-phovea": "git+ssh://[email protected]:phovea/generator-phovea#develop",
     "lodash": ">=4.17.21",
     "yamljs": "0.3.0",
     "yargs-parser": ">=18.1.2",

phovea_product.json

@@ -3,46 +3,52 @@
     "type": "web",
     "label": "coral_frontend",
     "repo": "Caleydo/coral_public",
-    "branch": "develop",
+    "branch": "v4.0.0",
     "additional": [
       {
         "name": "coral",
         "repo": "Caleydo/coral",
-        "branch": "develop"
+        "branch": "comparison_2023"
       },
       {
         "name": "phovea_security_store_generated",
         "repo": "datavisyn/phovea_security_store_generated",
-        "branch": "develop"
+        "branch": "v15.0.0"
       },
       {
         "name": "tdp_core",
         "repo": "datavisyn/tdp_core",
-        "branch": "develop"
+        "branch": "v20.0.0"
       }
     ]
   },
   {
     "type": "api",
     "label": "coral_backend",
     "repo": "datavisyn/tdp_core",
-    "branch": "develop",
+    "branch": "v20.0.0",
     "additional": [
       {
         "name": "coral",
         "repo": "Caleydo/coral",
-        "branch": "develop"
+        "branch": "comparison_2023"
       },
       {
         "name": "phovea_security_store_generated",
         "repo": "datavisyn/phovea_security_store_generated",
-        "branch": "develop"
+        "branch": "v15.0.0"
       },
       {
         "name": "tdp_publicdb",
         "repo": "Caleydo/tdp_publicdb",
-        "branch": "develop"
+        "branch": "v14.0.0"
       }
     ]
+  },
+  {
+    "type": "api",
+    "label": "kokiri",
+    "repo": "jku-vds-lab/kokiri",
+    "branch": "main"
   }
 ]

templates/api/deploy/kokiri/Dockerfile

@@ -0,0 +1,19 @@
+FROM python:3.10-buster
+LABEL maintainer="[email protected]"
+
+WORKDIR /phovea
+
+ENV PYTHONUNBUFFERED=1
+ENV ENV=production
+ENV PHOVEA_CONFIG_PATH=/phovea/config.json
+
+# install dependencies last step such that everything before can be cached
+COPY requirements.txt .
+RUN apt-get update && pip install --no-cache-dir -r /phovea/requirements.txt
+
+COPY ./build/source ./
+COPY ./kokiri/data ./kokiri/data
+
+CMD ["python", "-m", "uvicorn", "kokiri.server:app", "--host", "0.0.0.0", "--port", "80"]
+
+EXPOSE 80