vantage6-algorithm-store 5.0.0b4__tar.gz → 5.0.0rc2__tar.gz

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vantage6-algorithm-store
-Version: 5.0.0b4
+Version: 5.0.0rc2
 Summary: Vantage6 algorithm store
 Author: Vantage6 Team
 Maintainer-email: Frank Martin <f.martin@iknl.nl>, Bart van Beusekom <b.vanbeusekom@iknl.nl>
@@ -18,8 +18,8 @@ Requires-Dist: python-keycloak==5.5.0
 Requires-Dist: requests==2.32.4
 Requires-Dist: schema==0.7.5
 Requires-Dist: sqlalchemy==2.0.37
-Requires-Dist: vantage6-common==5.0.0b4
-Requires-Dist: vantage6==5.0.0b4
+Requires-Dist: vantage6-common==5.0.0rc2
+Requires-Dist: vantage6==5.0.0rc2
 Provides-Extra: dev
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: coverage==7.10.2; extra == 'dev'
@@ -49,5 +49,5 @@ the **[main Vantage6 README](https://github.com/vantage6/vantage6/blob/main/READ
 
 Vantage6 is a Privacy Enhancing Technology (PET) Operations platform that enables
 federated learning and multi-party computation. For more information, visit
-[vantage6.ai](https://vantage6.ai) or join our
-[Discord community](https://discord.gg/yAyFf6Y).
+[vantage6.ai](https://vantage6.ai) or view our
+[documentation](https://docs.vantage6.ai).

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/README.md

@@ -21,5 +21,5 @@ the **[main Vantage6 README](https://github.com/vantage6/vantage6/blob/main/READ
 
 Vantage6 is a Privacy Enhancing Technology (PET) Operations platform that enables
 federated learning and multi-party computation. For more information, visit
-[vantage6.ai](https://vantage6.ai) or join our
-[Discord community](https://discord.gg/yAyFf6Y).
+[vantage6.ai](https://vantage6.ai) or view our
+[documentation](https://docs.vantage6.ai).

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/dev_store.sh

@@ -12,8 +12,17 @@ if [ -z "$VANTAGE6_STORE_CONFIG_LOCATION" ]; then
 fi
 
 
+# Run from repo root so module imports don't shadow stdlib modules.
+cd /vantage6
 
-uwsgi \
+python -m vantage6.algorithm.store.init_db "${VANTAGE6_STORE_CONFIG_LOCATION}"
+status=$?
+if [ "$status" -ne 0 ]; then
+    echo "ERROR: failed to initialize algorithm store database" >&2
+    exit "$status"
+fi
+
+exec uwsgi \
     --py-autoreload 1 \
     --reload-mercy 1 \
     --gevent 100 \

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "vantage6-algorithm-store"
-version = "5.0.0b4"
+version = "5.0.0rc2"
 description = "Vantage6 algorithm store"
 readme = "README.md"
 license = {text = "MIT"}
@@ -30,8 +30,8 @@ dependencies = [
     "requests==2.32.4",
     "schema==0.7.5",
     "sqlalchemy==2.0.37",
-    "vantage6-common==5.0.0b4",
-    "vantage6==5.0.0b4",
+    "vantage6-common==5.0.0rc2",
+    "vantage6==5.0.0rc2",
 ]
 
 [project.optional-dependencies]

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/server.sh

@@ -10,8 +10,11 @@ if [ -z "$VANTAGE6_CONFIG_LOCATION" ]; then
 fi
 
 
+# initialize the database
+python /vantage6/vantage6-algorithm-store/vantage6/algorithm/store/init_db.py "${VANTAGE6_CONFIG_LOCATION}"
 
-uwsgi \
+# start the algorithm store
+exec uwsgi \
     --http :80 \
     --gevent 100 \
     --http-websockets \

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/tests_store/test___init__.py

@@ -47,7 +47,7 @@ class TestAlgorithmStoreApp(TestResources):
 
     @patch("vantage6.algorithm.store.AlgorithmStoreApp._add_default_roles")
     @patch("vantage6.algorithm.store.AlgorithmStoreApp._add_keycloak_id_to_super_user")
-    def test_store_startup(self, mock_add_keycloak_id, mock_add_default_roles):
+    def test_store_db_initialized(self, mock_add_keycloak_id, mock_add_default_roles):
         """Test that the store is started correctly"""
 
         # ensure root role is present - this role will be assigned to the root user
@@ -59,7 +59,7 @@ class TestAlgorithmStoreApp(TestResources):
             "username": "superuser",
         }
 
-        self.backend.start()
+        self.backend.ensure_db_initialized()
 
         mock_add_default_roles.assert_called_once()
         mock_add_keycloak_id.assert_called_once()

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/vantage6/algorithm/store/__init__.py

@@ -235,30 +235,24 @@ class AlgorithmStoreApp(Vantage6App):
         ):
             algorithm.approve()
 
-    def start(self) -> None:
+    def ensure_db_initialized(self) -> None:
         """
-        Start the service.
-
-        Before service is really started, some database settings are checked and
-        (re)set where appropriate.
+        Ensure the database contains default roles and the configured root user.
         """
         self._add_default_roles(get_default_roles(), db)
 
         # add root user from config file if they do not exist
-        if root_user := self.ctx.config.get("root_user", {}):
-            root_username = root_user.get("username")
-            root_organization = root_user.get("organization_id")
+        if root_user_config := self.ctx.config.get("root_user", {}):
+            root_username = root_user_config.get("username")
+            root_organization = root_user_config.get("organization_id")
             if root_username:
-                # if the user does not exist already, add it
                 root_user = db.User.get_by_username(root_username)
                 if not root_user:
                     log.warning(
                         "Creating root user. Please note that it cannot be verified at "
                         "this point that the user exists at the given vantage6 HQ."
                     )
-
                     root = db.Role.get_by_name(DefaultRole.ROOT.value)
-
                     root_user = db.User(
                         username=root_username,
                         organization_id=root_organization,
@@ -296,7 +290,6 @@ class AlgorithmStoreApp(Vantage6App):
                 "No root user found in the configuration file, nor are users defined in"
                 " the database. This means no-one can alter resources on this store."
             )
-        return self
 
 
 def run_store(config: str, system_folders: bool = True) -> AlgorithmStoreApp:
@@ -319,4 +312,4 @@ def run_store(config: str, system_folders: bool = True) -> AlgorithmStoreApp:
         config, system_folders, in_container=True
     )
     Database().connect(uri=ctx.get_database_uri(), allow_drop_all=False)
-    return AlgorithmStoreApp(ctx).start()
+    return AlgorithmStoreApp(ctx)

vantage6_algorithm_store-5.0.0rc2/vantage6/algorithm/store/init_db.py

@@ -0,0 +1,43 @@
+"""
+One-shot database initialization for the algorithm store.
+
+This script can be run before uWSGI starts to ensure that:
+- default roles exist and are up to date
+- the configured root user exists
+
+By doing this in a separate script, we can avoid that multiple processes try to
+create the same database objects concurrently.
+
+It reuses the same context and database setup as run_store.
+"""
+
+import os
+import sys
+
+from vantage6.cli.context.algorithm_store import AlgorithmStoreContext
+
+from vantage6.algorithm.store import (
+    AlgorithmStoreApp,
+    Database,
+)
+
+
+def main() -> None:
+    if len(sys.argv) >= 2:
+        config_file = sys.argv[1]
+    else:
+        config_file = os.environ.get(
+            "VANTAGE6_STORE_CONFIG_LOCATION", "/mnt/config.yaml"
+        )
+
+    ctx = AlgorithmStoreContext.from_external_config_file(
+        config_file, system_folders=False, in_container=True
+    )
+    Database().connect(uri=ctx.get_database_uri(), allow_drop_all=False)
+
+    app = AlgorithmStoreApp(ctx)
+    app.ensure_db_initialized()
+
+
+if __name__ == "__main__":
+    main()

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/vantage6/algorithm/store/templates/mail/algorithm_review_finalized.html

@@ -2,7 +2,7 @@
 	HTML Email Starter Kit
 	Documentation: https://github.com/timothylong/html-email-starter-kit
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="UTF-8" />
@@ -184,19 +184,6 @@
                   >vantage6.ai</a
                 >
               </td>
-              <td
-                style="
-                  padding-top: 20px;
-                  padding-bottom: 20px;
-                  text-align: center;
-                "
-              >
-                <a
-                  style="color: #0f497b; font-weight: bold"
-                  href="https://discord.gg/yAyFf6Y"
-                  >Join our Discord channel</a
-                >
-              </td>
               <td
                 style="
                   padding-top: 20px;

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/vantage6/algorithm/store/templates/mail/new_algorithm.html

@@ -2,7 +2,7 @@
 	HTML Email Starter Kit
 	Documentation: https://github.com/timothylong/html-email-starter-kit
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="UTF-8" />
@@ -190,19 +190,6 @@
                   >vantage6.ai</a
                 >
               </td>
-              <td
-                style="
-                  padding-top: 20px;
-                  padding-bottom: 20px;
-                  text-align: center;
-                "
-              >
-                <a
-                  style="color: #0f497b; font-weight: bold"
-                  href="https://discord.gg/yAyFf6Y"
-                  >Join our Discord channel</a
-                >
-              </td>
               <td
                 style="
                   padding-top: 20px;

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/vantage6/algorithm/store/templates/mail/new_review.html

@@ -2,7 +2,7 @@
 	HTML Email Starter Kit
 	Documentation: https://github.com/timothylong/html-email-starter-kit
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="UTF-8" />
@@ -190,19 +190,6 @@
                   >vantage6.ai</a
                 >
               </td>
-              <td
-                style="
-                  padding-top: 20px;
-                  padding-bottom: 20px;
-                  text-align: center;
-                "
-              >
-                <a
-                  style="color: #0f497b; font-weight: bold"
-                  href="https://discord.gg/yAyFf6Y"
-                  >Join our Discord channel</a
-                >
-              </td>
               <td
                 style="
                   padding-top: 20px;

{vantage6_algorithm_store-5.0.0b4 → vantage6_algorithm_store-5.0.0rc2}/vantage6/algorithm/store/templates/mail/review_no_longer_required.html

@@ -2,7 +2,7 @@
 	HTML Email Starter Kit
 	Documentation: https://github.com/timothylong/html-email-starter-kit
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="UTF-8" />
@@ -186,19 +186,6 @@
                   >vantage6.ai</a
                 >
               </td>
-              <td
-                style="
-                  padding-top: 20px;
-                  padding-bottom: 20px;
-                  text-align: center;
-                "
-              >
-                <a
-                  style="color: #0f497b; font-weight: bold"
-                  href="https://discord.gg/yAyFf6Y"
-                  >Join our Discord channel</a
-                >
-              </td>
               <td
                 style="
                   padding-top: 20px;