cornflow 2.0.0a11__py3-none-any.whl → 2.0.0a13__py3-none-any.whl

cornflow/tests/unit/test_permissions.py

@@ -43,7 +43,7 @@ class TestPermissionsViewRoleEndpoint(CustomTestCase):
                 follow_redirects=True,
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + self.token,
+                    "Authorization": f"Bearer {self.token}",
                 },
             )
 
@@ -58,7 +58,7 @@ class TestPermissionsViewRoleEndpoint(CustomTestCase):
                     follow_redirects=True,
                     headers={
                         "Content-Type": "application/json",
-                        "Authorization": "Bearer " + self.token,
+                        "Authorization": f"Bearer {self.token}",
                     },
                 )
 
@@ -103,7 +103,7 @@ class TestPermissionViewRolesDetailEndpoint(CustomTestCase):
             data=json.dumps(self.payload),
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         ).json["id"]
         view_id = 2
@@ -127,7 +127,7 @@ class TestPermissionViewRolesDetailEndpoint(CustomTestCase):
             data=json.dumps(self.payload),
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         ).json["id"]
         for role in ROLES_MAP:
@@ -151,7 +151,7 @@ class TestPermissionViewRolesDetailEndpoint(CustomTestCase):
                 data=json.dumps(self.payload),
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + self.token,
+                    "Authorization": f"Bearer {self.token}",
                 },
             ).json["id"]
 
@@ -160,7 +160,7 @@ class TestPermissionViewRolesDetailEndpoint(CustomTestCase):
                 follow_redirects=True,
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + self.token,
+                    "Authorization": f"Bearer {self.token}",
                 },
             )
             self.assertEqual(200, response.status_code)
@@ -174,7 +174,7 @@ class TestPermissionViewRolesDetailEndpoint(CustomTestCase):
             data=json.dumps(self.payload),
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         ).json["id"]
 
@@ -186,7 +186,7 @@ class TestPermissionViewRolesDetailEndpoint(CustomTestCase):
                     follow_redirects=True,
                     headers={
                         "Content-Type": "application/json",
-                        "Authorization": "Bearer " + self.token,
+                        "Authorization": f"Bearer {self.token}",
                     },
                 )
                 self.assertEqual(403, response.status_code)

cornflow/tests/unit/test_roles.py

@@ -1,6 +1,7 @@
 """
 Unit test for the role endpoints
 """
+
 import json
 import logging as log
 from cornflow.models import PermissionViewRoleModel, RoleModel
@@ -47,7 +48,7 @@ class TestRolesListEndpoint(CustomTestCase):
                 follow_redirects=True,
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + self.token,
+                    "Authorization": f"Bearer {self.token}",
                 },
             )
             self.assertEqual(200, response.status_code)
@@ -63,7 +64,7 @@ class TestRolesListEndpoint(CustomTestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
 
@@ -75,7 +76,7 @@ class TestRolesListEndpoint(CustomTestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
 
@@ -91,7 +92,7 @@ class TestRolesListEndpoint(CustomTestCase):
                     follow_redirects=True,
                     headers={
                         "Content-Type": "application/json",
-                        "Authorization": "Bearer " + self.token,
+                        "Authorization": f"Bearer {self.token}",
                     },
                 )
                 self.assertEqual(403, response.status_code)
@@ -157,7 +158,7 @@ class TestRolesDetailEndpoint(CustomTestCase):
                 follow_redirects=True,
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + self.token,
+                    "Authorization": f"Bearer {self.token}",
                 },
             )
 
@@ -191,7 +192,7 @@ class TestRolesDetailEndpoint(CustomTestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
 
@@ -203,7 +204,7 @@ class TestRolesDetailEndpoint(CustomTestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
 
@@ -246,7 +247,7 @@ class TestUserRolesListEndpoint(CustomTestCase):
                 follow_redirects=True,
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + self.token,
+                    "Authorization": f"Bearer {self.token}",
                 },
             )
             self.assertEqual(200, response.status_code)
@@ -261,7 +262,7 @@ class TestUserRolesListEndpoint(CustomTestCase):
                     follow_redirects=True,
                     headers={
                         "Content-Type": "application/json",
-                        "Authorization": "Bearer " + self.token,
+                        "Authorization": f"Bearer {self.token}",
                     },
                 )
                 self.assertEqual(403, response.status_code)
@@ -431,7 +432,7 @@ class TestRolesModelMethods(CustomTestCase):
         self.payload = {"name": "test_role"}
 
     def test_user_role_delete_cascade(self):
-        payload = {"user_id": self.user}
+        payload = {"user_id": self.user.id}
         self.token = self.create_user_with_role(ADMIN_ROLE)
         self.cascade_delete(
             self.url,
@@ -472,3 +473,40 @@ class TestRolesModelMethods(CustomTestCase):
         self.token = self.create_user_with_role(ADMIN_ROLE)
         idx = self.create_new_row(self.url, self.model, self.payload)
         self.str_method(idx, "<Role test_role>")
+
+    def test_get_all_objects(self):
+        """
+        Tests the get_all_objects method
+        """
+        # We expect 4 roles to be present (from ROLES_MAP constant)
+        instances = RoleModel.get_all_objects().all()
+        self.assertEqual(len(instances), 4)
+
+        # Check that all the roles from ROLES_MAP are present
+        role_names = [role.name for role in instances]
+        expected_names = list(ROLES_MAP.values())
+        self.assertCountEqual(role_names, expected_names)
+
+        # Test offset parameter - should get all except the first role
+        instances = RoleModel.get_all_objects(offset=1).all()
+        self.assertEqual(len(instances), 3)
+
+        # Get the names of all roles except the first one
+        remaining_roles = [role.name for role in instances]
+        # The first role is skipped due to offset=1
+        first_role = RoleModel.get_all_objects().first().name
+        self.assertNotIn(first_role, remaining_roles)
+
+        # Test offset and limit parameters
+        instances = RoleModel.get_all_objects(offset=1, limit=1).all()
+        self.assertEqual(len(instances), 1)
+
+        # Verify that we get the second role when using offset=1 and limit=1
+        second_role = RoleModel.get_all_objects().all()[1]
+        self.assertEqual(instances[0].id, second_role.id)
+        self.assertEqual(instances[0].name, second_role.name)
+
+        # Test filtering by name
+        instances = RoleModel.get_all_objects(limit=1, name="admin").all()
+        self.assertEqual(len(instances), 1)
+        self.assertEqual(instances[0].name, "admin")

cornflow/tests/unit/test_schemas.py

@@ -189,7 +189,7 @@ class TestNewSchemaEndpointOpen(CustomTestCase):
 
     def test_get_all_schemas(self):
         schemas = self.get_one_row(self.url, {}, 200, False, keys_to_check=["name"])
-        dags = [{"name": dag} for dag in ["solve_model_dag", "gc", "timer"]]
+        dags = [{"name": dag} for dag in ["solve_model_dag", "gc", "timer", "979073949072767"]]
 
         self.assertEqual(dags, schemas)
 

cornflow/tests/unit/test_tables.py

@@ -81,7 +81,7 @@ class TestTablesListEndpoint(TestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
         self.assertEqual(response.status_code, 200)
@@ -111,7 +111,7 @@ class TestTablesListEndpoint(TestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
             query_string=dict(limit=3),
         )
@@ -187,7 +187,7 @@ class TestTablesDetailEndpoint(TestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
 
@@ -204,7 +204,7 @@ class TestTablesDetailEndpoint(TestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
         self.assertEqual(response.status_code, 400)
@@ -216,7 +216,7 @@ class TestTablesDetailEndpoint(TestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
         self.assertEqual(response.status_code, 404)
@@ -270,7 +270,7 @@ class TestTablesEndpointAdmin(TestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
         self.assertEqual(response.status_code, 403)
@@ -284,7 +284,7 @@ class TestTablesEndpointAdmin(TestCase):
             follow_redirects=True,
             headers={
                 "Content-Type": "application/json",
-                "Authorization": "Bearer " + self.token,
+                "Authorization": f"Bearer {self.token}",
             },
         )
 

cornflow/tests/unit/test_token.py

@@ -1,6 +1,7 @@
 """
 Unit test for the token endpoint
 """
+
 import json
 
 from flask import current_app
@@ -87,15 +88,28 @@ class TestUnexpiringToken(CustomTestCase):
     def test_token_unexpiring(self):
         auth = BIAuth()
 
+        # Generate token dynamically
         token = auth.generate_token(1)
 
+        # Verify that the token decodes correctly
         response = auth.decode_token(token)
-        self.assertEqual(response, {"user_id": 1})
-
-        token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE3MDM1OTI1OTIsInN1YiI6MX0.Plvmi02FMfZOTn6bxArELEmDeyuP-2X794c5VtAFgCg"
 
-        response = auth.decode_token(token)
-        self.assertEqual(response, {"user_id": 1})
+        self.assertIn("iat", response)
+        self.assertIn("iss", response)
+        self.assertIn("sub", response)
+        self.assertEqual("testname", response["sub"])
+        # Don't use hardcoded token, generate another dynamic one
+        user = UserModel.get_one_user(1)
+        self.assertIsNotNone(user)
+
+        # Verify that another generated token also works
+        token2 = auth.generate_token(1)
+        response2 = auth.decode_token(token2)
+
+        self.assertIn("iat", response2)
+        self.assertIn("iss", response2)
+        self.assertIn("sub", response2)
+        self.assertEqual("testname", response2["sub"])
 
     def test_user_not_valid(self):
         auth = BIAuth()

cornflow/tests/unit/test_users.py

@@ -1,8 +1,22 @@
+"""
+Unit tests for the user endpoints.
+
+This module contains tests for the user-related functionalities, including:
+- User authentication and authorization
+- User role management
+- Password handling and rotation
+- User profile operations
+
+All tests follow a consistent pattern of setting up test data,
+executing operations, and verifying results against expected outcomes.
+"""
+
 import json
+from datetime import datetime, timedelta, timezone
 
 from flask import current_app
 from flask_testing import TestCase
-from datetime import datetime, timedelta
+
 from cornflow.app import create_app
 from cornflow.commands.access import access_init_command
 from cornflow.commands.dag import register_deployed_dags_command_test
@@ -15,9 +29,8 @@ from cornflow.models import (
     UserModel,
     UserRoleModel,
 )
-
-from cornflow.shared.const import ADMIN_ROLE, PLANNER_ROLE, SERVICE_ROLE, VIEWER_ROLE
 from cornflow.shared import db
+from cornflow.shared.const import ADMIN_ROLE, SERVICE_ROLE, PLANNER_ROLE, VIEWER_ROLE
 from cornflow.tests.const import (
     CASE_PATH,
     CASE_URL,
@@ -363,15 +376,18 @@ class TestUserEndpoint(TestCase):
 
     def test_change_password_rotation(self):
         current_app.config["PWD_ROTATION_TIME"] = 1  # in days
-        payload = {"pwd_last_change": (datetime.utcnow() - timedelta(days=2)).strftime("%Y-%m-%dT%H:%M:%SZ")}
-        self.modify_info(self.planner, self.planner, payload)
+        payload = {"pwd_last_change": (datetime.now(timezone.utc) - timedelta(days=2))}
+
+        planner = UserModel.get_one_user(self.planner["id"])
+        planner.update(payload)
+
         response = self.log_in(self.planner)
         self.assertEqual(True, response.json["change_password"])
 
         payload = {"password": "Newtestpassword1!"}
         self.modify_info(self.planner, self.planner, payload)
         self.planner.update(payload)
-        print(self.planner)
+
         response = self.log_in(self.planner)
         self.assertEqual(False, response.json["change_password"])
 

cornflow/tests/unit/tools.py

@@ -1,13 +1,78 @@
-from unittest.mock import Mock
+from unittest.mock import Mock, patch
+from flask import Flask
+import json
+import os
+
+from cornflow.shared.const import DATABRICKS_TERMINATE_STATE, DATABRICKS_FINISH_TO_STATE_MAP
+
+
+def create_test_app():
+    app = Flask(__name__)
+    app.config["CORNFLOW_BACKEND"] = 2
+    return app
 
 
 def patch_af_client(af_client_class):
-    af_client_mock = Mock()
-    responses_mock = Mock()
-    responses_mock.json.return_value = {"is_paused": False, "dag_run_id": "12345", "state": "success"}
-    af_client_mock.is_alive.return_value = True
-    af_client_mock.get_orch_info.return_value = responses_mock
-    af_client_mock.run_workflow.return_value = responses_mock
-    af_client_mock.get_run_status.return_value = responses_mock
-    af_client_mock.set_dag_run_to_fail.return_value = None
-    af_client_class.from_config.return_value = af_client_mock
+    with patch(
+        "cornflow.endpoints.execution.current_app.config"
+    ) as mock_config:
+        mock_config.__getitem__.side_effect = lambda key: (
+            1 if key == "CORNFLOW_BACKEND" else {}
+        )
+        af_client_mock = Mock()
+        responses_mock = Mock()
+        responses_mock.json.return_value = {
+            "is_paused": False,
+            "dag_run_id": "12345",
+            "state": "success",
+        }
+        af_client_mock.is_alive.return_value = True
+        af_client_mock.get_orch_info.return_value = responses_mock
+        af_client_mock.run_workflow.return_value = responses_mock
+        af_client_mock.get_run_status.return_value = responses_mock
+        af_client_mock.set_dag_run_to_fail.return_value = None
+        af_client_class.from_config.return_value = af_client_mock
+
+
+def patch_db_client(db_client_class):
+    mock_config = {"CORNFLOW_BACKEND": 2}
+
+    with patch(
+        "cornflow.endpoints.execution.current_app.config", mock_config
+    ):
+        db_client_mock = Mock()
+        responses_mock = Mock()
+        responses_mock.json.return_value = {
+            "status": {"state": "SUCCESS", "termination_details": {"code": "SUCCESS"}}
+        }
+        response_run_workflow = Mock()
+        response_run_workflow.json.return_value = {
+            "run_id": 350148078719367,
+            "number_in_job": 350148078719367,
+        }
+        response_get_orch_info = Mock()
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        test_data_dir = os.path.join(os.path.dirname(current_dir), "data")
+        with open(
+            os.path.join(test_data_dir, "patch_databricks_get_orch_info.json")
+        ) as f:
+            response_get_orch_info.json.return_value = json.load(f)
+        response_get_run_status = Mock()
+        with open(
+            os.path.join(test_data_dir, "patch_databricks_get_run_status.json")
+        ) as f:
+            response_get_run_status.json.return_value = json.load(f)
+        state = response_get_run_status.json.return_value["status"]["state"]
+        if state == DATABRICKS_TERMINATE_STATE:
+            if (
+                    response_get_run_status.json.return_value["status"]["termination_details"]["code"]
+                    in DATABRICKS_FINISH_TO_STATE_MAP.keys()
+            ):
+                response_get_run_status = response_get_run_status.json.return_value["status"]["termination_details"]["code"]
+            else:
+                response_get_run_status = "OTHER_FINISH_ERROR"
+        db_client_mock.is_alive.return_value = True
+        db_client_mock.get_orch_info.return_value = response_get_orch_info
+        db_client_mock.run_workflow.return_value = response_run_workflow
+        db_client_mock.get_run_status.return_value = response_get_run_status
+        db_client_class.from_config.return_value = db_client_mock

{cornflow-2.0.0a11.dist-info → cornflow-2.0.0a13.dist-info}/METADATA

@@ -1,7 +1,7 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: cornflow
-Version: 2.0.0a11
-Summary: Cornflow is an open source multi-solver optimization server with a REST API built using flask.
+Version: 2.0.0a13
+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
 Author-email: cornflow@baobabsoluciones.es
@@ -12,9 +12,10 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.9
 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==2.0.0a10
-Requires-Dist: cryptography<=42.0.5
+Requires-Dist: cornflow-client==2.0.0a13
+Requires-Dist: cryptography<=44.0.1
 Requires-Dist: databricks-sdk==0.29.0
 Requires-Dist: disposable-email-domains>=0.0.86
 Requires-Dist: Flask==2.3.2
@@ -29,7 +30,7 @@ Requires-Dist: Flask-SQLAlchemy==2.5.1
 Requires-Dist: gevent==23.9.1
 Requires-Dist: greenlet<=2.0.2; python_version < "3.11"
 Requires-Dist: greenlet==3.0.3; python_version >= "3.11"
-Requires-Dist: gunicorn<=22.0.0
+Requires-Dist: gunicorn<=23.0.0
 Requires-Dist: jsonpatch<=1.33
 Requires-Dist: ldap3<=2.9.1
 Requires-Dist: marshmallow<=3.20.2
@@ -50,7 +51,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Cornflow
+cornflow
 =========
 
 .. image:: https://github.com/baobabsoluciones/cornflow/workflows/build/badge.svg?style=svg
@@ -70,13 +71,13 @@ Cornflow
 
 .. image:: https://img.shields.io/badge/License-Apache2.0-blue
 
-Cornflow is an open source multi-solver optimization server with a REST API built using `flask <https://flask.palletsprojects.com>`_, `airflow <https://airflow.apache.org/>`_ and `pulp <https://coin-or.github.io/pulp/>`_.
+cornflow is an open source multi-solver optimization server with a REST API built using `flask <https://flask.palletsprojects.com>`_, `airflow <https://airflow.apache.org/>`_ and `pulp <https://coin-or.github.io/pulp/>`_.
 
-While most deployment servers are based on the solving technique (MIP, CP, NLP, etc.), Cornflow focuses on the optimization problems themselves. However, it does not impose any constraint on the type of problem and solution method to use.
+While most deployment servers are based on the solving technique (MIP, CP, NLP, etc.), cornflow focuses on the optimization problems themselves. However, it does not impose any constraint on the type of problem and solution method to use.
 
-With Cornflow you can deploy a Traveling Salesman Problem solver next to a Knapsack solver or a Nurse Rostering Problem solver. As long as you describe the input and output data, you can upload any solution method for any problem and then use it with any data you want.
+With cornflow you can deploy a Traveling Salesman Problem solver next to a Knapsack solver or a Nurse Rostering Problem solver. As long as you describe the input and output data, you can upload any solution method for any problem and then use it with any data you want.
 
-Cornflow helps you formalize your problem by proposing development guidelines. It also provides a range of functionalities around your deployed solution method, namely:
+cornflow helps you formalize your problem by proposing development guidelines. It also provides a range of functionalities around your deployed solution method, namely:
 
 * storage of users, instances, solutions and solution logs.
 * deployment and maintenance of models, solvers and algorithms.
@@ -92,9 +93,9 @@ Cornflow helps you formalize your problem by proposing development guidelines. I
 Installation instructions
 -------------------------------
 
-Cornflow is tested with Ubuntu 20.04, python >= 3.8 and git.
+cornflow is tested with Ubuntu 20.04, python >= 3.8 and git.
 
-Download the Cornflow project and install requirements::
+Download the cornflow project and install requirements::
 
     python3 -m venv venv
     venv/bin/pip3 install cornflow
@@ -110,7 +111,7 @@ initialize the sqlite database::
     flask create_admin_user  -u cornflow -e cornflow_admin@admin.com -p cornflow_admin_password
 
 
-activate the virtual environment and run Cornflow::
+activate the virtual environment and run cornflow::
 
     source venv/bin/activate
     export FLASK_APP=cornflow.app
@@ -121,7 +122,7 @@ activate the virtual environment and run Cornflow::
     export AIRFLOW_PWD=airflow_pwd
     flask run
 
-**Cornflow needs a running installation of Airflow to operate and more configuration**. Check `the installation docs <https://baobabsoluciones.github.io/cornflow/main/install.html>`_ for more details on installing airflow, configuring the application and initializing the database.
+**cornflow needs a running installation of Airflow to operate and more configuration**. Check `the installation docs <https://baobabsoluciones.github.io/cornflow/main/install.html>`_ for more details on installing airflow, configuring the application and initializing the database.
 
 Using cornflow to solve a PuLP model
 ---------------------------------------