cornflow 1.3.8rc4__tar.gz → 1.3.9__tar.gz

{cornflow-1.3.8rc4/cornflow.egg-info → cornflow-1.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cornflow
-Version: 1.3.8rc4
+Version: 1.3.9
 Summary: cornflow is an open source multi-solver optimization server with a REST API built using flask.
 Home-page: https://github.com/baobabsoluciones/cornflow
 Author: baobab soluciones
@@ -14,8 +14,8 @@ Requires-Dist: alembic==1.9.2
 Requires-Dist: apispec==6.3.0
 Requires-Dist: cachetools==5.3.3
 Requires-Dist: click==8.1.7
-Requires-Dist: cornflow-client==1.3.8rc4
-Requires-Dist: cryptography==48.0.1
+Requires-Dist: cornflow-client==1.3.9
+Requires-Dist: cryptography==50.0.2
 Requires-Dist: disposable-email-domains==0.0.162
 Requires-Dist: Flask==2.3.2
 Requires-Dist: flask-apispec==0.11.4
@@ -35,13 +35,13 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: marshmallow==3.26.2
 Requires-Dist: PuLP==2.9.0
 Requires-Dist: psycopg2==2.9.9
-Requires-Dist: PyJWT==2.13.0
+Requires-Dist: PyJWT==2.15.1
 Requires-Dist: pytups==0.86.2
-Requires-Dist: requests==2.32.4
+Requires-Dist: requests==2.33.0
 Requires-Dist: SQLAlchemy==1.3.21
 Requires-Dist: webargs==8.3.0
 Requires-Dist: Werkzeug==3.0.6
-Requires-Dist: setuptools==78.1.1
+Requires-Dist: setuptools==83.0.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{cornflow-1.3.8rc4 → cornflow-1.3.9}/cornflow/commands/permissions.py

@@ -256,7 +256,7 @@ def register_dag_permissions_command(
     all_users = UserModel.get_all_users().all()
     all_dags = DeployedWorkflow.get_all_objects().all()
 
-    if open_deployment == 1:
+    if int(open_deployment) == 1:
 
         permissions = [
             PermissionsDAG({"dag_id": dag.id, "user_id": user.id})
@@ -270,10 +270,11 @@ def register_dag_permissions_command(
             PermissionsDAG({"dag_id": dag.id, "user_id": user.id})
             for user in all_users
             for dag in all_dags
-            if (dag.id, user.id) not in existing_permissions and user.is_service_user()
+            if (dag.id, user.id) not in existing_permissions
+            and (user.is_service_user() or user.is_admin())
         ]
 
-    if len(permissions) > 1:
+    if len(permissions) > 0:
         db.session.bulk_save_objects(permissions)
 
     try:
@@ -300,7 +301,7 @@ def register_dag_permissions_command(
 
     if verbose:
         click.echo(f"Workflow permissions registered")
-        if len(permissions) > 1:
+        if len(permissions) > 0:
             current_app.logger.info(
                 f"Workflow permissions registered: {len(permissions)}"
             )

{cornflow-1.3.8rc4 → cornflow-1.3.9}/cornflow/endpoints/dag.py

@@ -265,7 +265,11 @@ class DeployedDAGEndpoint(BaseMetaResource):
     @marshal_with(DeployedDAGSchema)
     @use_kwargs(DeployedDAGSchema)
     def post(self, **kwargs):
-        return self.post_list(kwargs)
+        from cornflow.commands.permissions import register_dag_permissions_command
+
+        response = self.post_list(kwargs)
+        register_dag_permissions_command()
+        return response
 
 
 class DeployedDagDetailEndpoint(BaseMetaResource):
@@ -282,5 +286,9 @@ class DeployedDagDetailEndpoint(BaseMetaResource):
     @authenticate(auth_class=Auth())
     @use_kwargs(DeployedDAGEditSchema, location="json")
     def put(self, idx, **req_data):
+        from cornflow.commands.permissions import register_dag_permissions_command
+
         current_app.logger.info(f"Schemas saved for DAG {idx}")
-        return self.put_detail(data=req_data, idx=idx, track_user=False)
+        response = self.put_detail(data=req_data, idx=idx, track_user=False)
+        register_dag_permissions_command()
+        return response

{cornflow-1.3.8rc4 → cornflow-1.3.9}/cornflow/shared/const.py

@@ -7,7 +7,7 @@ AIRFLOW_BACKEND = 1
 DATABRICKS_BACKEND = 2
 
 
-CORNFLOW_VERSION = "1.3.8rc4"
+CORNFLOW_VERSION = "1.3.9"
 INTERNAL_TOKEN_ISSUER = "cornflow"
 
 # endpoints responses for health check

{cornflow-1.3.8rc4 → cornflow-1.3.9}/cornflow/tests/unit/test_commands.py

@@ -392,22 +392,39 @@ class TestCommands(TestCase):
         Verifies:
 
         - Successful permission assignment
-        - Restricted access for admin users
-        - Proper service user permissions
+        - Service and admin users receive all DAG permissions
+        - Base users receive none
         """
         register_deployed_dags_command_test()
         self.test_service_user_command()
         self.test_admin_user_command()
+        self.test_base_user_command()
         self.runner.invoke(register_dag_permissions, ["-o", 0])
 
         service = UserModel.get_one_user_by_email("testemail@test.org")
         admin = UserModel.get_one_user_by_email("admin@test.org")
+        base = UserModel.get_one_user_by_email("base@test.org")
 
         service_permissions = PermissionsDAG.get_user_dag_permissions(service.id)
         admin_permissions = PermissionsDAG.get_user_dag_permissions(admin.id)
+        base_permissions = PermissionsDAG.get_user_dag_permissions(base.id)
 
         self.assertEqual(4, len(service_permissions))
-        self.assertEqual(0, len(admin_permissions))
+        self.assertEqual(4, len(admin_permissions))
+        self.assertEqual(0, len(base_permissions))
+
+    def test_dag_permissions_command_single_missing(self):
+        """
+        Test that a single DAG without permissions is picked up by the command.
+        """
+        register_deployed_dags_command_test(dags=["solve_model_dag"])
+        self.test_service_user_command()
+        self.runner.invoke(register_dag_permissions, ["-o", 0])
+
+        service = UserModel.get_one_user_by_email("testemail@test.org")
+        service_permissions = PermissionsDAG.get_user_dag_permissions(service.id)
+
+        self.assertEqual(1, len(service_permissions))
 
     def test_argument_parsing_correct(self):
         """

{cornflow-1.3.8rc4 → cornflow-1.3.9}/cornflow/tests/unit/test_dags.py

@@ -464,3 +464,58 @@ class TestDeployedDAG(TestCase):
             "'id': ['Missing data for required field.']",
             response.json.get("error", ""),
         )
+
+    def test_post_and_put_create_permissions(self):
+        self.app.config["OPEN_DEPLOYMENT"] = 0
+        planner = dict(
+            username="aPlanner", email="planner@test.org", password="Testpassword1!"
+        )
+        planner_id = self.client.post(
+            SIGNUP_URL,
+            data=json.dumps(planner),
+            follow_redirects=True,
+            headers={"Content-Type": "application/json"},
+        ).json["id"]
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
+
+        payload = {
+            "id": "new_dag",
+            "instance_schema": {},
+            "solution_schema": {},
+            "instance_checks_schema": {},
+            "solution_checks_schema": {},
+            "config_schema": {},
+            "kpis_schema": {},
+        }
+        response = self.client.post(
+            DEPLOYED_DAG_URL,
+            data=json.dumps(payload),
+            follow_redirects=True,
+            headers=headers,
+        )
+        self.assertEqual(response.status_code, 201)
+        self.assertTrue(PermissionsDAG.check_if_has_permissions(self.admin["id"], "new_dag"))
+        self.assertFalse(PermissionsDAG.check_if_has_permissions(planner_id, "new_dag"))
+
+        PermissionsDAG.query.filter_by(dag_id="solve_model_dag").delete()
+        db.session.commit()
+        self.assertFalse(
+            PermissionsDAG.check_if_has_permissions(self.admin["id"], "solve_model_dag")
+        )
+        payload.pop("id")
+        response = self.client.put(
+            DEPLOYED_DAG_URL + "solve_model_dag/",
+            data=json.dumps(payload),
+            follow_redirects=True,
+            headers=headers,
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(
+            PermissionsDAG.check_if_has_permissions(self.admin["id"], "solve_model_dag")
+        )
+        self.assertFalse(
+            PermissionsDAG.check_if_has_permissions(planner_id, "solve_model_dag")
+        )

{cornflow-1.3.8rc4 → cornflow-1.3.9/cornflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cornflow
-Version: 1.3.8rc4
+Version: 1.3.9
 Summary: cornflow is an open source multi-solver optimization server with a REST API built using flask.
 Home-page: https://github.com/baobabsoluciones/cornflow
 Author: baobab soluciones
@@ -14,8 +14,8 @@ Requires-Dist: alembic==1.9.2
 Requires-Dist: apispec==6.3.0
 Requires-Dist: cachetools==5.3.3
 Requires-Dist: click==8.1.7
-Requires-Dist: cornflow-client==1.3.8rc4
-Requires-Dist: cryptography==48.0.1
+Requires-Dist: cornflow-client==1.3.9
+Requires-Dist: cryptography==50.0.2
 Requires-Dist: disposable-email-domains==0.0.162
 Requires-Dist: Flask==2.3.2
 Requires-Dist: flask-apispec==0.11.4
@@ -35,13 +35,13 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: marshmallow==3.26.2
 Requires-Dist: PuLP==2.9.0
 Requires-Dist: psycopg2==2.9.9
-Requires-Dist: PyJWT==2.13.0
+Requires-Dist: PyJWT==2.15.1
 Requires-Dist: pytups==0.86.2
-Requires-Dist: requests==2.32.4
+Requires-Dist: requests==2.33.0
 Requires-Dist: SQLAlchemy==1.3.21
 Requires-Dist: webargs==8.3.0
 Requires-Dist: Werkzeug==3.0.6
-Requires-Dist: setuptools==78.1.1
+Requires-Dist: setuptools==83.0.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{cornflow-1.3.8rc4 → cornflow-1.3.9}/cornflow.egg-info/requires.txt

@@ -2,8 +2,8 @@ alembic==1.9.2
 apispec==6.3.0
 cachetools==5.3.3
 click==8.1.7
-cornflow-client==1.3.8rc4
-cryptography==48.0.1
+cornflow-client==1.3.9
+cryptography==50.0.2
 disposable-email-domains==0.0.162
 Flask==2.3.2
 flask-apispec==0.11.4
@@ -21,13 +21,13 @@ ldap3==2.9.1
 marshmallow==3.26.2
 PuLP==2.9.0
 psycopg2==2.9.9
-PyJWT==2.13.0
+PyJWT==2.15.1
 pytups==0.86.2
-requests==2.32.4
+requests==2.33.0
 SQLAlchemy==1.3.21
 webargs==8.3.0
 Werkzeug==3.0.6
-setuptools==78.1.1
+setuptools==83.0.0
 
 [:python_version < "3.11"]
 greenlet==2.0.2

{cornflow-1.3.8rc4 → cornflow-1.3.9}/requirements.txt

@@ -2,8 +2,8 @@ alembic==1.9.2
 apispec==6.3.0
 cachetools==5.3.3
 click==8.1.7
-cornflow-client==1.3.8rc4
-cryptography==48.0.1
+cornflow-client==1.3.9
+cryptography==50.0.2
 disposable-email-domains==0.0.162
 Flask==2.3.2
 flask-apispec==0.11.4
@@ -23,10 +23,10 @@ ldap3==2.9.1
 marshmallow==3.26.2
 PuLP==2.9.0
 psycopg2==2.9.9
-PyJWT==2.13.0
+PyJWT==2.15.1
 pytups==0.86.2
-requests==2.32.4
+requests==2.33.0
 SQLAlchemy==1.3.21
 webargs==8.3.0
 Werkzeug==3.0.6
-setuptools==78.1.1
+setuptools==83.0.0

{cornflow-1.3.8rc4 → cornflow-1.3.9}/setup.py

@@ -9,7 +9,7 @@ with open("requirements.txt", "r") as fh:
 
 setuptools.setup(
     name="cornflow",
-    version="1.3.8rc4",
+    version="1.3.9",
     author="baobab soluciones",
     author_email="cornflow@baobabsoluciones.es",
     description="cornflow is an open source multi-solver optimization server with a REST API built using flask.",