vantage6-algorithm-store 4.3.2__tar.gz → 4.3.4__tar.gz

{vantage6-algorithm-store-4.3.2 → vantage6-algorithm-store-4.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6-algorithm-store
-Version: 4.3.2
+Version: 4.3.4
 Summary: Vantage6 algorithm store
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

{vantage6-algorithm-store-4.3.2 → vantage6-algorithm-store-4.3.4}/vantage6/algorithm/store/_version.py

@@ -7,7 +7,7 @@ with open(os.path.join(here, "__build__")) as fp:
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 3, 2, "final", __build__, 0)
+version_info = (4, 3, 4, "final", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

{vantage6-algorithm-store-4.3.2 → vantage6-algorithm-store-4.3.4}/vantage6/algorithm/store/default_roles.py

@@ -54,7 +54,7 @@ def get_default_roles() -> list[dict]:
     ]
     REVIEWER_ROLE = {
         "name": DefaultRole.REVIEWER,
-        "description": "Can view, edit and delete algorithms, and create and edit users",
+        "description": "Can view, edit and delete algorithms",
         "rules": REVIEWER_RULES,
     }
     # 4. Store manager role
@@ -67,7 +67,7 @@ def get_default_roles() -> list[dict]:
     ]
     STORE_MANAGER = {
         "name": DefaultRole.STORE_MANAGER,
-        "description": "Can view and delete algorithms.",
+        "description": "Can manage algorithms, and create and edit users.",
         "rules": STORE_MANAGER,
     }
     # 4. Developer role

{vantage6-algorithm-store-4.3.2 → vantage6-algorithm-store-4.3.4}/vantage6/algorithm/store/model/vantage6_server.py

@@ -38,5 +38,17 @@ class Vantage6Server(Base):
         Vanatge6Server | None
             Vanatge6Server object if found, None otherwise
         """
+
+        def _get_by_url(url):
+            return session.query(Vantage6Server).filter_by(url=url).first()
+
         session = DatabaseSessionManager.get_session()
-        return session.query(Vantage6Server).filter_by(url=url).first()
+        server = _get_by_url(url)
+        if not server:
+            if url.startswith("https") and url.endswith("443"):
+                url = url[:-4]
+                server = _get_by_url(url)
+            elif url.startswith("http") and url.endswith("80"):
+                url = url[:-3]
+                server = _get_by_url(url)
+        return server

{vantage6-algorithm-store-4.3.2 → vantage6-algorithm-store-4.3.4}/vantage6/algorithm/store/resource/__init__.py

@@ -59,14 +59,17 @@ def authenticate_with_server(*args, **kwargs):
         return {"msg": msg}, HTTPStatus.BAD_REQUEST
 
     # check if server is whitelisted
-    server = Vantage6Server.get_by_url(request.headers["Server-Url"])
+    server_url = request.headers["Server-Url"]
+    server = Vantage6Server.get_by_url(server_url)
     if not server:
-        msg = "Server you are trying to authenticate with is not " "whitelisted"
+        msg = (
+            f"Server '{server_url}' you are trying to authenticate with is not "
+            "whitelisted"
+        )
         log.warning(msg)
         return {"msg": msg}, HTTPStatus.UNAUTHORIZED
 
     # check if token is valid
-
     url = f"{request.headers['Server-Url']}/token/user/validate"
     # if we are looking for a localhost server, we probably have to
     # check host.docker.internal (Windows) or 172.17.0.1 (Linux)

{vantage6-algorithm-store-4.3.2 → vantage6-algorithm-store-4.3.4}/vantage6/algorithm/store/resource/schema/output_schema.py

@@ -111,6 +111,12 @@ class Vantage6ServerOutputSchema(HATEOASModelSchema):
     class Meta:
         model = Vantage6Server
 
+    users = fields.Function(
+        lambda obj: create_one_to_many_link(
+            obj, link_to="user", link_from="v6_server_id"
+        )
+    )
+
 
 class RoleOutputSchema(HATEOASModelSchema):
     rules = fields.Function(
@@ -139,6 +145,7 @@ class UserOutputSchema(HATEOASModelSchema):
             obj, link_to="algorithm", link_from="user_id"
         )
     )
+    server = fields.Nested("Vantage6ServerOutputSchema", exclude=["users"])
 
 
 class ReviewOutputSchema(HATEOASModelSchema):

{vantage6-algorithm-store-4.3.2 → vantage6-algorithm-store-4.3.4}/vantage6_algorithm_store.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6-algorithm-store
-Version: 4.3.2
+Version: 4.3.4
 Summary: Vantage6 algorithm store
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

{vantage6-algorithm-store-4.3.2 → vantage6-algorithm-store-4.3.4}/vantage6_algorithm_store.egg-info/requires.txt

@@ -10,8 +10,8 @@ requests==2.31.0
 schema==0.7.5
 SQLAlchemy==1.4.46
 werkzeug==3.0.1
-vantage6==4.3.2
-vantage6-common==4.3.2
+vantage6==4.3.4
+vantage6-common==4.3.4
 
 [dev]
 coverage==6.4.4