cornflow 1.2.3a5__py3-none-any.whl → 1.3.0rc1__py3-none-any.whl

cornflow/tests/const.py

@@ -15,6 +15,7 @@ INSTANCE_URL = PREFIX + "/instance/"
 INSTANCE_MPS = _get_file("./data/test_mps.mps")
 INSTANCE_GC_20 = _get_file("./data/gc_20_7.json")
 INSTANCE_FILE_FAIL = _get_file("./unit/test_instances.py")
+EDIT_EXECUTION_SOLUTION = _get_file("./data/edit_execution_solution.json")
 
 EXECUTION_PATH = _get_file("./data/new_execution.json")
 CUSTOM_CONFIG_PATH = _get_file("./data/new_execution_custom_config.json")

cornflow/tests/integration/test_commands.py

@@ -1,7 +1,7 @@
 from flask import current_app
 
 from cornflow.commands.dag import register_deployed_dags_command
-from cornflow.models import DeployedDAG
+from cornflow.models import DeployedWorkflow
 from cornflow.tests.const import PUBLIC_DAGS
 from cornflow.tests.custom_liveServer import CustomTestCaseLive
 
@@ -15,7 +15,7 @@ class TestCornflowCommands(CustomTestCaseLive):
         register_deployed_dags_command(
             config["AIRFLOW_URL"], config["AIRFLOW_USER"], config["AIRFLOW_PWD"], False
         )
-        dags = DeployedDAG.get_all_objects()
+        dags = DeployedWorkflow.get_all_objects()
 
         for dag in PUBLIC_DAGS:
             self.assertIn(dag, [d.id for d in dags])

cornflow/tests/integration/test_cornflowclient.py

@@ -1,6 +1,7 @@
 """
 
 """
+
 # Full imports
 import json
 import pulp
@@ -279,7 +280,7 @@ class TestCornflowClientOpen(TestCornflowClientBasic):
     def test_server_alive(self):
         data = self.client.is_alive()
         cf_status = data["cornflow_status"]
-        af_status = data["airflow_status"]
+        af_status = data["backend_status"]
         self.assertEqual(str, type(cf_status))
         self.assertEqual(str, type(af_status))
         self.assertEqual(cf_status, STATUS_HEALTHY)

cornflow/tests/unit/test_apiview.py

@@ -13,7 +13,7 @@ TestApiViewListEndpoint
 """
 
 # Import from internal modules
-from cornflow.endpoints import ApiViewListEndpoint, resources, alarms_resources
+from cornflow.endpoints import ApiViewListEndpoint, alarms_resources, get_resources
 from cornflow.models import ViewModel
 from cornflow.shared.const import ROLES_MAP
 from cornflow.tests.const import APIVIEW_URL
@@ -42,6 +42,8 @@ class TestApiViewListEndpoint(CustomTestCase):
         """
         super().setUp()
         self.roles_with_access = ApiViewListEndpoint.ROLES_WITH_ACCESS
+        # Get resources within application context
+        resources = get_resources()
         self.payload = [
             {
                 "name": view["endpoint"],
@@ -127,6 +129,8 @@ class TestApiViewModel(CustomTestCase):
         """
         super().setUp()
         self.roles_with_access = ApiViewListEndpoint.ROLES_WITH_ACCESS
+        # Get resources within application context
+        resources = get_resources()
         self.payload = [
             {
                 "name": view["endpoint"],
@@ -141,6 +145,8 @@ class TestApiViewModel(CustomTestCase):
         """
         Test that the get_all_objects method works properly
         """
+        # Get resources within application context
+        resources = get_resources()
         expected_count = len(resources) + len(alarms_resources)
         # Test getting all objects
         all_instances = ViewModel.get_all_objects().all()

cornflow/tests/unit/test_cases.py

@@ -41,7 +41,7 @@ import zlib
 
 
 # Import from internal modules
-from cornflow.models import CaseModel, ExecutionModel, InstanceModel, UserModel
+from cornflow.models import CaseModel, ExecutionModel, InstanceModel
 from cornflow.shared.const import DATA_DOES_NOT_EXIST_MSG
 from cornflow.shared.utils import hash_json_256
 from cornflow.tests.const import (

cornflow/tests/unit/test_cli.py

@@ -33,7 +33,7 @@ from cornflow.models import (
 from cornflow.models import UserModel
 from cornflow.shared import db
 from cornflow.shared.exceptions import NoPermission, ObjectDoesNotExist
-from cornflow.endpoints import resources, alarms_resources
+from cornflow.endpoints import alarms_resources, get_resources
 
 
 class CLITests(TestCase):
@@ -278,6 +278,7 @@ class CLITests(TestCase):
         - Correct number of views created
         - Database state after initialization
         """
+        resources = get_resources()
         runner = CliRunner()
         result = runner.invoke(cli, ["views", "init", "-v"])
         self.assertEqual(result.exit_code, 0)
@@ -315,6 +316,7 @@ class CLITests(TestCase):
         - Correct number of actions, roles, views, and permissions
         - Database state after initialization
         """
+        resources = get_resources()
         runner = CliRunner()
         result = runner.invoke(cli, ["permissions", "init", "-v"])
         self.assertEqual(result.exit_code, 0)
@@ -325,7 +327,7 @@ class CLITests(TestCase):
         self.assertEqual(len(actions), 5)
         self.assertEqual(len(roles), 4)
         self.assertEqual(len(views), (len(resources) + len(alarms_resources)))
-        self.assertEqual(len(permissions), 562)
+        self.assertEqual(len(permissions), 583)
 
     def test_permissions_base_command(self):
         """
@@ -337,6 +339,7 @@ class CLITests(TestCase):
         - Correct setup of all permission components
         - Database state consistency
         """
+        resources = get_resources()
         runner = CliRunner()
         runner.invoke(cli, ["actions", "init", "-v"])
         runner.invoke(cli, ["roles", "init", "-v"])
@@ -350,7 +353,7 @@ class CLITests(TestCase):
         self.assertEqual(len(actions), 5)
         self.assertEqual(len(roles), 4)
         self.assertEqual(len(views), (len(resources) + len(alarms_resources)))
-        self.assertEqual(len(permissions), 562)
+        self.assertEqual(len(permissions), 583)
 
     def test_service_entrypoint(self):
         """

cornflow/tests/unit/test_commands.py

@@ -31,7 +31,7 @@ from cornflow.app import (
     register_views,
 )
 from cornflow.commands.dag import register_deployed_dags_command_test
-from cornflow.endpoints import resources, alarms_resources
+from cornflow.endpoints import alarms_resources, get_resources
 from cornflow.models import (
     ActionModel,
     PermissionViewRoleModel,
@@ -39,7 +39,7 @@ from cornflow.models import (
     ViewModel,
 )
 from cornflow.models import (
-    DeployedDAG,
+    DeployedWorkflow,
     PermissionsDAG,
     UserModel,
 )
@@ -98,6 +98,7 @@ class TestCommands(TestCase):
             "email": "testemail@test.org",
             "password": "Testpassword1!",
         }
+        resources = get_resources()
         self.resources = resources + alarms_resources
         self.runner = self.create_app().test_cli_runner()
         self.runner.invoke(register_roles, ["-v"])
@@ -356,7 +357,7 @@ class TestCommands(TestCase):
         - Presence of required DAGs
         """
         register_deployed_dags_command_test(verbose=True)
-        dags = DeployedDAG.get_all_objects()
+        dags = DeployedWorkflow.get_all_objects()
         for dag in ["solve_model_dag", "gc", "timer"]:
             self.assertIn(dag, [d.id for d in dags])
 
@@ -381,8 +382,8 @@ class TestCommands(TestCase):
         service_permissions = PermissionsDAG.get_user_dag_permissions(service.id)
         admin_permissions = PermissionsDAG.get_user_dag_permissions(admin.id)
 
-        self.assertEqual(3, len(service_permissions))
-        self.assertEqual(3, len(admin_permissions))
+        self.assertEqual(4, len(service_permissions))
+        self.assertEqual(4, len(admin_permissions))
 
     def test_dag_permissions_command_no_open(self):
         """
@@ -405,7 +406,7 @@ class TestCommands(TestCase):
         service_permissions = PermissionsDAG.get_user_dag_permissions(service.id)
         admin_permissions = PermissionsDAG.get_user_dag_permissions(admin.id)
 
-        self.assertEqual(3, len(service_permissions))
+        self.assertEqual(4, len(service_permissions))
         self.assertEqual(0, len(admin_permissions))
 
     def test_argument_parsing_correct(self):

cornflow/tests/unit/test_dags.py

@@ -24,7 +24,7 @@ from cornflow.commands.access import access_init_command
 from cornflow.commands.dag import register_deployed_dags_command_test
 from cornflow.commands.permissions import register_dag_permissions_command
 from cornflow.shared.const import ADMIN_ROLE, SERVICE_ROLE
-from cornflow.models import DeployedDAG, PermissionsDAG, UserModel, UserRoleModel
+from cornflow.models import DeployedWorkflow, PermissionsDAG, UserModel, UserRoleModel
 from cornflow.shared.const import EXEC_STATE_CORRECT, EXEC_STATE_MANUAL
 from cornflow.shared import db
 from cornflow.tests.const import (
@@ -38,7 +38,7 @@ from cornflow.tests.const import (
     USER_URL,
     EXECUTION_URL,
 )
-from cornflow.tests.unit.test_executions import TestExecutionsDetailEndpointMock
+from cornflow.tests.base_test_execution import TestExecutionsDetailEndpointMock
 from cornflow_client import get_pulp_jsonschema, get_empty_schema
 
 
@@ -350,7 +350,7 @@ class TestDeployedDAG(TestCase):
         """
         before = PermissionsDAG.get_user_dag_permissions(self.admin["id"])
         self.assertIsNotNone(before)
-        dag = DeployedDAG.query.get("solve_model_dag")
+        dag = DeployedWorkflow.query.get("solve_model_dag")
         dag.delete()
         after = PermissionsDAG.get_user_dag_permissions(self.admin["id"])
         self.assertNotEqual(before, after)

cornflow/tests/unit/test_example_data.py

@@ -35,7 +35,7 @@ class TestExampleDataEndpoint(CustomTestCase):
     def patch_af_client(self, Airflow_mock):
         af_client = Airflow_mock.return_value
         af_client.is_alive.return_value = True
-        af_client.get_dag_info.return_value = {}
+        af_client.get_workflow_info.return_value = {}
         af_client.get_one_variable.return_value = {
             "value": json.dumps(self.example),
             "key": self.schema_name,