cornflow 1.2.4__tar.gz → 1.3.0rc1__tar.gz

{cornflow-1.2.4/cornflow.egg-info → cornflow-1.3.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cornflow
-Version: 1.2.4
+Version: 1.3.0rc1
 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,7 +14,7 @@ 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.2.4
+Requires-Dist: cornflow-client==1.3.0rc1
 Requires-Dist: cryptography<=44.0.1
 Requires-Dist: disposable-email-domains>=0.0.86
 Requires-Dist: Flask==2.3.2

{cornflow-1.2.4 → cornflow-1.3.0rc1}/cornflow/cli/service.py

@@ -36,7 +36,12 @@ from cornflow.shared.const import (
     ADMIN_ROLE,
     SERVICE_ROLE,
     PLANNER_ROLE,
+    DATABRICKS_BACKEND,
+    AIRFLOW_BACKEND,
     SIGNUP_WITH_AUTH,
+    OID_PROVIDER_AWS,
+    OID_PROVIDER_AZURE,
+    OID_OTHER,
 )
 from cornflow.shared import db
 from cryptography.fernet import Fernet
@@ -83,13 +88,14 @@ def init_cornflow_service():
                 config["cornflow_service_email"],
                 config["cornflow_service_pwd"],
             )
-            _sync_with_airflow(
-                config["airflow_url"],
-                config["airflow_user"],
-                config["airflow_pwd"],
-                config["open_deployment"],
-                external_app=False,
-            )
+            if config["cornflow_backend"] == AIRFLOW_BACKEND:
+                _sync_with_airflow(
+                    config["airflow_url"],
+                    config["airflow_user"],
+                    config["airflow_pwd"],
+                    config["open_deployment"],
+                    external_app=False,
+                )
         _start_application(external_application, environment)
 
     elif external_application == 1:
@@ -115,14 +121,14 @@ def init_cornflow_service():
                 config["cornflow_service_email"],
                 config["cornflow_service_pwd"],
             )
-
-            _sync_with_airflow(
-                config["airflow_url"],
-                config["airflow_user"],
-                config["airflow_pwd"],
-                config["open_deployment"],
-                external_app=True,
-            )
+            if config["cornflow_backend"] == AIRFLOW_BACKEND:
+                _sync_with_airflow(
+                    config["airflow_url"],
+                    config["airflow_user"],
+                    config["airflow_pwd"],
+                    config["open_deployment"],
+                    external_app=True,
+                )
         _start_application(external_application, environment, external_app_module)
 
     else:
@@ -136,14 +142,36 @@ def _setup_environment_variables():
     environment = os.getenv("FLASK_ENV", "development")
     os.environ["FLASK_ENV"] = environment
 
-    # Airflow details
-    airflow_user = os.getenv("AIRFLOW_USER", "admin")
-    airflow_pwd = os.getenv("AIRFLOW_PWD", "admin")
-    airflow_url = os.getenv("AIRFLOW_URL", "http://webserver:8080")
-    os.environ["AIRFLOW_USER"] = airflow_user
-    os.environ["AIRFLOW_PWD"] = airflow_pwd
-    os.environ["AIRFLOW_URL"] = airflow_url
-
+    ###################################
+    # Global defaults and back-compat #
+    ###################################
+    # cornflow backend selection
+    cornflow_backend = os.getenv("CORNFLOW_BACKEND", str(AIRFLOW_BACKEND))
+    os.environ["CORNFLOW_BACKEND"] = cornflow_backend
+    cornflow_backend = int(cornflow_backend)
+    # Airflow global default conn
+    if cornflow_backend == AIRFLOW_BACKEND:
+        airflow_user = os.getenv("AIRFLOW_USER", "admin")
+        airflow_pwd = os.getenv("AIRFLOW_PWD", "admin")
+        airflow_url = os.getenv("AIRFLOW_URL", "http://webserver:8080")
+        os.environ["AIRFLOW_USER"] = airflow_user
+        os.environ["AIRFLOW_PWD"] = airflow_pwd
+        os.environ["AIRFLOW_URL"] = airflow_url
+    elif cornflow_backend == DATABRICKS_BACKEND:
+        databricks_url = os.getenv("DATABRICKS_HOST")
+        databricks_auth_secret = os.getenv("DATABRICKS_CLIENT_SECRET")
+        databricks_token_endpoint = os.getenv("DATABRICKS_TOKEN_ENDPOINT")
+        databricks_ep_clusters = os.getenv("DATABRICKS_EP_CLUSTERS")
+        databricks_client_id = os.getenv("DATABRICKS_CLIENT_ID")
+        databricks_health_path = os.getenv("DATABRICKS_HEALTH_PATH")
+        os.environ["DATABRICKS_HEALTH_PATH"] = databricks_health_path
+        os.environ["DATABRICKS_HOST"] = databricks_url
+        os.environ["DATABRICKS_CLIENT_SECRET"] = databricks_auth_secret
+        os.environ["DATABRICKS_TOKEN_ENDPOINT"] = databricks_token_endpoint
+        os.environ["DATABRICKS_EP_CLUSTERS"] = databricks_ep_clusters
+        os.environ["DATABRICKS_CLIENT_ID"] = databricks_client_id
+    else:
+        raise Exception("Selected backend not among valid options")
     # Cornflow app config
     os.environ.setdefault("cornflow_url", "http://cornflow:5000")
     os.environ["FLASK_APP"] = "cornflow.app"
@@ -156,6 +184,10 @@ def _setup_environment_variables():
 
     # Platform auth config and service users
     auth = int(os.getenv("AUTH_TYPE", AUTH_DB))
+    if auth == AUTH_OID:
+        oid_provider = int(os.getenv("OID_PROVIDER", OID_PROVIDER_AWS))
+        os.environ["OID_PROVIDER"] = str(oid_provider)
+
     cornflow_admin_user = os.getenv("CORNFLOW_ADMIN_USER", "cornflow_admin")
     cornflow_admin_email = os.getenv(
         "CORNFLOW_ADMIN_EMAIL", "cornflow_admin@cornflow.com"
@@ -192,25 +224,42 @@ def _setup_environment_variables():
 
     external_application = int(os.getenv("EXTERNAL_APP", 0))
     external_app_module = os.getenv("EXTERNAL_APP_MODULE")
+    base_dict = {
+            "environment": environment,
+            "auth": auth,
+            "cornflow_db_conn": cornflow_db_conn,
+            "cornflow_admin_user": cornflow_admin_user,
+            "cornflow_admin_email": cornflow_admin_email,
+            "cornflow_admin_pwd": cornflow_admin_pwd,
+            "cornflow_service_user": cornflow_service_user,
+            "cornflow_service_email": cornflow_service_email,
+            "cornflow_service_pwd": cornflow_service_pwd,
+            "cornflow_logging": cornflow_logging,
+            "open_deployment": open_deployment,
+            "external_application": external_application,
+            "external_app_module": external_app_module,
+            "cornflow_backend": cornflow_backend,
+        }
+    if cornflow_backend == AIRFLOW_BACKEND:
+        base_dict["airflow_user"] = airflow_user
+        base_dict["airflow_pwd"] = airflow_pwd
+        base_dict["airflow_url"] = airflow_url
+    
+    elif cornflow_backend == DATABRICKS_BACKEND:
+        base_dict["databricks_url"] = databricks_url
+        base_dict["databricks_auth_secret"] = databricks_auth_secret
+        base_dict["databricks_token_endpoint"] = databricks_token_endpoint
+        base_dict["databricks_ep_clusters"] = databricks_ep_clusters
+        base_dict["databricks_client_id"] = databricks_client_id
+        base_dict["databricks_health_path"] = databricks_health_path
+        
+    else:
+        raise Exception("Selected backend not among valid options")
+
+    if auth == AUTH_OID:
+        base_dict["oid_provider"] = oid_provider
 
-    return {
-        "environment": environment,
-        "auth": auth,
-        "airflow_user": airflow_user,
-        "airflow_pwd": airflow_pwd,
-        "airflow_url": airflow_url,
-        "cornflow_db_conn": cornflow_db_conn,
-        "cornflow_admin_user": cornflow_admin_user,
-        "cornflow_admin_email": cornflow_admin_email,
-        "cornflow_admin_pwd": cornflow_admin_pwd,
-        "cornflow_service_user": cornflow_service_user,
-        "cornflow_service_email": cornflow_service_email,
-        "cornflow_service_pwd": cornflow_service_pwd,
-        "cornflow_logging": cornflow_logging,
-        "open_deployment": open_deployment,
-        "external_application": external_application,
-        "external_app_module": external_app_module,
-    }
+    return base_dict
 
 
 def _configure_logging(cornflow_logging):
@@ -378,4 +427,4 @@ def _register_key():
         os.system(add_key)
         return True
     else:
-        return False
+        return False

{cornflow-1.2.4 → cornflow-1.3.0rc1}/cornflow/commands/dag.py

@@ -10,7 +10,7 @@ def register_deployed_dags_command(
 
     # Internal modules imports
     from cornflow_client.airflow.api import Airflow
-    from cornflow.models import DeployedDAG
+    from cornflow.models import DeployedWorkflow
     from cornflow.shared import db
     from cornflow.shared.const import AIRFLOW_NOT_REACHABLE_MSG
 
@@ -28,7 +28,7 @@ def register_deployed_dags_command(
             current_app.logger.info(f"{AIRFLOW_NOT_REACHABLE_MSG}")
         return False
 
-    dags_registered = [dag.id for dag in DeployedDAG.get_all_objects()]
+    dags_registered = [dag.id for dag in DeployedWorkflow.get_all_objects()]
 
     response = af_client.get_model_dags()
     dag_list = response.json()["dags"]
@@ -40,7 +40,7 @@ def register_deployed_dags_command(
     }
 
     processed_dags = [
-        DeployedDAG(
+        DeployedWorkflow(
             {
                 "id": dag["dag_id"],
                 "description": dag["description"],
@@ -76,15 +76,15 @@ def register_deployed_dags_command(
 
 
 def register_deployed_dags_command_test(dags: list = None, verbose: bool = False):
-    from cornflow.models import DeployedDAG
+    from cornflow.models import DeployedWorkflow
     from flask import current_app
     from cornflow_client import get_pulp_jsonschema, get_empty_schema
 
     if dags is None:
-        dags = ["solve_model_dag", "gc", "timer"]
+        dags = ["solve_model_dag", "gc", "timer", "979073949072767"]
 
     deployed_dag = [
-        DeployedDAG(
+        DeployedWorkflow(
             {
                 "id": "solve_model_dag",
                 "description": None,
@@ -96,7 +96,7 @@ def register_deployed_dags_command_test(dags: list = None, verbose: bool = False
             }
         )
     ] + [
-        DeployedDAG(
+        DeployedWorkflow(
             {
                 "id": dag,
                 "description": None,

{cornflow-1.2.4 → cornflow-1.3.0rc1}/cornflow/commands/permissions.py

@@ -8,6 +8,7 @@ from cornflow.commands.auxiliar import (
 from cornflow.models import ViewModel, PermissionViewRoleModel
 from cornflow.shared import db
 from cornflow.shared.const import ALL_DEFAULT_ROLES, GET_ACTION
+import click
 from cornflow.shared.const import (
     BASE_PERMISSION_ASSIGNATION,
 )
@@ -235,7 +236,7 @@ def register_dag_permissions_command(
     from flask import current_app
     from sqlalchemy.exc import DBAPIError, IntegrityError
 
-    from cornflow.models import DeployedDAG, PermissionsDAG, UserModel
+    from cornflow.models import DeployedWorkflow, PermissionsDAG, UserModel
     from cornflow.shared import db
 
     if open_deployment is None:
@@ -253,9 +254,10 @@ def register_dag_permissions_command(
         current_app.logger.error(f"Unknown error on database commit: {e}")
 
     all_users = UserModel.get_all_users().all()
-    all_dags = DeployedDAG.get_all_objects().all()
+    all_dags = DeployedWorkflow.get_all_objects().all()
 
     if open_deployment == 1:
+
         permissions = [
             PermissionsDAG({"dag_id": dag.id, "user_id": user.id})
             for user in all_users
@@ -297,9 +299,11 @@ def register_dag_permissions_command(
             )
 
     if verbose:
+        click.echo(f"Workflow permissions registered")
         if len(permissions) > 1:
-            current_app.logger.info(f"DAG permissions registered: {len(permissions)}")
+            current_app.logger.info(
+                f"Workflow permissions registered: {len(permissions)}"
+            )
         else:
-            current_app.logger.info("No new DAG permissions")
+            current_app.logger.info("No new Workflow permissions")
 
-    pass

{cornflow-1.2.4 → cornflow-1.3.0rc1}/cornflow/config.py

@@ -2,6 +2,7 @@ import os
 from .shared.const import AUTH_DB, PLANNER_ROLE, AUTH_OID, SIGNUP_WITH_AUTH, SIGNUP_WITH_NO_AUTH
 from apispec import APISpec
 from apispec.ext.marshmallow import MarshmallowPlugin
+from cornflow.shared.const import AIRFLOW_BACKEND, DATABRICKS_BACKEND
 
 
 class DefaultConfig(object):
@@ -15,9 +16,7 @@ class DefaultConfig(object):
     SECRET_TOKEN_KEY = os.getenv("SECRET_KEY")
     SECRET_BI_KEY = os.getenv("SECRET_BI_KEY")
     SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URL", "sqlite:///cornflow.db")
-    AIRFLOW_URL = os.getenv("AIRFLOW_URL")
-    AIRFLOW_USER = os.getenv("AIRFLOW_USER")
-    AIRFLOW_PWD = os.getenv("AIRFLOW_PWD")
+
     AUTH_TYPE = int(os.getenv("AUTH_TYPE", AUTH_DB))
     DEFAULT_ROLE = int(os.getenv("DEFAULT_ROLE", PLANNER_ROLE))
     CORS_ORIGINS = os.getenv("CORS_ORIGINS", "*")
@@ -28,6 +27,21 @@ class DefaultConfig(object):
     SIGNUP_ACTIVATED = int(os.getenv("SIGNUP_ACTIVATED", SIGNUP_WITH_AUTH))
     CORNFLOW_SERVICE_USER = os.getenv("CORNFLOW_SERVICE_USER", "service_user")
 
+    # To change the tasks backend used by cornflow to solve the optimization models
+    CORNFLOW_BACKEND = int(os.getenv("CORNFLOW_BACKEND", AIRFLOW_BACKEND))
+
+    # AIRFLOW config
+    AIRFLOW_URL = os.getenv("AIRFLOW_URL")
+    AIRFLOW_USER = os.getenv("AIRFLOW_USER")
+    AIRFLOW_PWD = os.getenv("AIRFLOW_PWD")
+
+    # DATABRICKS config
+    DATABRICKS_URL = os.getenv("DATABRICKS_HOST")
+    DATABRICKS_AUTH_SECRET = os.getenv("DATABRICKS_CLIENT_SECRET")
+    DATABRICKS_TOKEN_ENDPOINT = os.getenv("DATABRICKS_TOKEN_ENDPOINT")
+    DATABRICKS_EP_CLUSTERS = os.getenv("DATABRICKS_EP_CLUSTERS")
+    DATABRICKS_CLIENT_ID = os.getenv("DATABRICKS_CLIENT_ID")
+    DATABRICKS_HEALTH_PATH = os.getenv("DATABRICKS_HEALTH_PATH", "default path")
     # If service user is allowed to log with username and password
     SERVICE_USER_ALLOW_PASSWORD_LOGIN = int(
         os.getenv("SERVICE_USER_ALLOW_PASSWORD_LOGIN", 1)
@@ -121,10 +135,15 @@ class Testing(DefaultConfig):
     LOG_LEVEL = int(os.getenv("LOG_LEVEL", 10))
     SIGNUP_ACTIVATED = SIGNUP_WITH_NO_AUTH
 
+class TestingDatabricks(Testing):
+    CORNFLOW_BACKEND = DATABRICKS_BACKEND
+
+
 class TestingOpenAuth(Testing):
     """
     Configuration class for testing some edge cases with Open Auth login
     """
+
     AUTH_TYPE = AUTH_OID
     OID_PROVIDER = "https://test-provider.example.com"
     OID_EXPECTED_AUDIENCE = "test-audience-id"
@@ -158,4 +177,5 @@ app_config = {
     "production": Production,
     "testing-oauth": TestingOpenAuth,
     "testing-root": TestingApplicationRoot,
+    "testing-databricks": TestingDatabricks,
 }

{cornflow-1.2.4 → cornflow-1.3.0rc1}/cornflow/endpoints/case.py

@@ -3,11 +3,9 @@ External endpoints to manage the cases: create new cases from raw data, from an
 or from an existing case, update the case info, patch its data, get all of them or one, move them and delete them.
 These endpoints have different access url, but manage the same data entities
 """
+
 # Import from libraries
-from cornflow_client.constants import (
-    INSTANCE_SCHEMA,
-    SOLUTION_SCHEMA
-)
+from cornflow_client.constants import INSTANCE_SCHEMA, SOLUTION_SCHEMA
 from flask import current_app
 from flask_apispec import marshal_with, use_kwargs, doc
 from flask_inflate import inflate
@@ -16,7 +14,7 @@ import jsonpatch
 
 # Import from internal modules
 from cornflow.endpoints.meta_resource import BaseMetaResource
-from cornflow.models import CaseModel, ExecutionModel, DeployedDAG, InstanceModel
+from cornflow.models import CaseModel, ExecutionModel, DeployedWorkflow, InstanceModel
 from cornflow.shared.authentication import Auth, authenticate
 from cornflow.shared.compress import compressed
 from cornflow.shared.const import VIEWER_ROLE, PLANNER_ROLE, ADMIN_ROLE
@@ -40,6 +38,7 @@ class CaseEndpoint(BaseMetaResource):
     """
     Endpoint used to create a new case or get all the cases and their related information
     """
+
     ROLES_WITH_ACCESS = [VIEWER_ROLE, PLANNER_ROLE, ADMIN_ROLE]
 
     def __init__(self):
@@ -79,15 +78,21 @@ class CaseEndpoint(BaseMetaResource):
 
         # We validate the instance data if it exists
         if kwargs.get("data") is not None:
-            data_schema = DeployedDAG.get_one_schema(config, schema, INSTANCE_SCHEMA)
+            data_schema = DeployedWorkflow.get_one_schema(
+                config, schema, INSTANCE_SCHEMA
+            )
             data_errors = json_schema_validate_as_string(data_schema, kwargs["data"])
             if data_errors:
                 raise InvalidData(payload=dict(jsonschema_errors=data_errors))
 
         # And the solution data if it exists
         if kwargs.get("solution") is not None:
-            solution_schema = DeployedDAG.get_one_schema(config, schema, SOLUTION_SCHEMA)
-            solution_errors = json_schema_validate_as_string(solution_schema, kwargs["solution"])
+            solution_schema = DeployedWorkflow.get_one_schema(
+                config, schema, SOLUTION_SCHEMA
+            )
+            solution_errors = json_schema_validate_as_string(
+                solution_schema, kwargs["solution"]
+            )
             if solution_errors:
                 raise InvalidData(payload=dict(jsonschema_errors=solution_errors))
 
@@ -102,6 +107,7 @@ class CaseFromInstanceExecutionEndpoint(BaseMetaResource):
     """
     Endpoint used to create a new case from an already existing instance and execution
     """
+
     ROLES_WITH_ACCESS = [PLANNER_ROLE, ADMIN_ROLE]
 
     def __init__(self):
@@ -129,7 +135,7 @@ class CaseFromInstanceExecutionEndpoint(BaseMetaResource):
                 error="You must provide a valid instance_id OR an execution_id",
                 status_code=400,
                 log_txt=f"Error while user {self.get_user()} tries to create case from instance and execution. "
-                        f"The instance id or execution id is not valid."
+                f"The instance id or execution id is not valid.",
             )
         user = self.get_user()
 
@@ -140,7 +146,7 @@ class CaseFromInstanceExecutionEndpoint(BaseMetaResource):
                 raise ObjectDoesNotExist(
                     err,
                     log_txt=f"Error while user {self.get_user()} tries to create case "
-                            f"from instance and execution. " + err
+                    f"from instance and execution. " + err,
                 )
             return dict(
                 data=instance.data, schema=instance.schema, checks=instance.checks
@@ -153,7 +159,7 @@ class CaseFromInstanceExecutionEndpoint(BaseMetaResource):
                 raise ObjectDoesNotExist(
                     err,
                     log_txt=f"Error while user {self.get_user()} tries to create "
-                            f"case from instance and execution. " + err
+                    f"case from instance and execution. " + err,
                 )
             data = get_instance_data(execution.instance_id)
             data["solution"] = execution.data
@@ -179,6 +185,7 @@ class CaseCopyEndpoint(BaseMetaResource):
     """
     Copies the case to a new case. Original case id goes in the url
     """
+
     ROLES_WITH_ACCESS = [PLANNER_ROLE, ADMIN_ROLE]
 
     def __init__(self):
@@ -214,7 +221,9 @@ class CaseCopyEndpoint(BaseMetaResource):
                 payload[key] = "Copy_" + data[key]
 
         response = self.post_list(payload)
-        current_app.logger.info(f"User {self.get_user()} copied case {idx} into {response[0].id}")
+        current_app.logger.info(
+            f"User {self.get_user()} copied case {idx} into {response[0].id}"
+        )
         return response
 
 
@@ -222,6 +231,7 @@ class CaseDetailsEndpoint(BaseMetaResource):
     """
     Endpoint used to get the information of a single case, edit it or delete it
     """
+
     ROLES_WITH_ACCESS = [VIEWER_ROLE, PLANNER_ROLE, ADMIN_ROLE]
 
     def __init__(self):
@@ -264,7 +274,8 @@ class CaseDetailsEndpoint(BaseMetaResource):
                 err = "The data entity does not exist on the database."
                 raise ObjectDoesNotExist(
                     err,
-                    log_txt=f"Error while user {self.get_user()} tries to edit case {idx}. " + err
+                    log_txt=f"Error while user {self.get_user()} tries to edit case {idx}. "
+                    + err,
                 )
             if parent_id is not None:
                 parent_case = self.data_model.get_one_object(
@@ -275,7 +286,7 @@ class CaseDetailsEndpoint(BaseMetaResource):
                     raise ObjectDoesNotExist(
                         err,
                         log_txt=f"Error while user {self.get_user()} tries to move "
-                                f"case {idx} to directory {idx}. " + err
+                        f"case {idx} to directory {idx}. " + err,
                     )
 
             case.move_to(parent_case)
@@ -302,6 +313,7 @@ class CaseDataEndpoint(CaseDetailsEndpoint):
     """
     Endpoint used to get the data of a given case
     """
+
     ROLES_WITH_ACCESS = [VIEWER_ROLE, PLANNER_ROLE, ADMIN_ROLE]
 
     @doc(description="Get data of a case", tags=["Cases"], inherit=False)
@@ -338,6 +350,7 @@ class CaseToInstance(BaseMetaResource):
     """
     Endpoint used to create a new instance or instance and execution from a stored case
     """
+
     ROLES_WITH_ACCESS = [PLANNER_ROLE, ADMIN_ROLE]
 
     def __init__(self):
@@ -383,13 +396,13 @@ class CaseToInstance(BaseMetaResource):
         config = current_app.config
 
         # Data validation
-        jsonschema = DeployedDAG.get_one_schema(config, schema, INSTANCE_SCHEMA)
+        jsonschema = DeployedWorkflow.get_one_schema(config, schema, INSTANCE_SCHEMA)
         data_errors = json_schema_validate_as_string(jsonschema, payload["data"])
         if data_errors:
             raise InvalidData(
                 payload=dict(jsonschema_errors=data_errors),
                 log_txt=f"Error while user {self.get_user()} tries to create instance from case {idx}. "
-                        f"Data do not match the jsonschema.",
+                f"Data do not match the jsonschema.",
             )
 
         response = self.post_list(payload)
@@ -403,6 +416,7 @@ class CaseCompare(BaseMetaResource):
     """
     Endpoint used to generate the json patch of two given cases
     """
+
     ROLES_WITH_ACCESS = [VIEWER_ROLE, PLANNER_ROLE, ADMIN_ROLE]
 
     def __init__(self):
@@ -435,7 +449,7 @@ class CaseCompare(BaseMetaResource):
                 "The case identifiers should be different.",
                 400,
                 log_txt=f"Error while user {self.get_user()} tries to compare cases. "
-                        f"The cases to compare have the same identifier."
+                f"The cases to compare have the same identifier.",
             )
         case_1 = self.model.get_one_object(user=self.get_user(), idx=idx1)
         case_2 = self.model.get_one_object(user=self.get_user(), idx=idx2)
@@ -444,19 +458,19 @@ class CaseCompare(BaseMetaResource):
             raise ObjectDoesNotExist(
                 "You don't have access to the first case or it doesn't exist",
                 log_txt=f"Error while user {self.get_user()} tries to compare cases {idx1} and {idx2}. "
-                        f"The user doesn't have access to case {idx1} or it does not exist."
+                f"The user doesn't have access to case {idx1} or it does not exist.",
             )
         elif case_2 is None:
             raise ObjectDoesNotExist(
                 "You don't have access to the second case or it doesn't exist",
                 log_txt=f"Error while user {self.get_user()} tries to compare cases {idx1} and {idx2}. "
-                        f"The user doesn't have access to case {idx2} or it does not exist."
+                f"The user doesn't have access to case {idx2} or it does not exist.",
             )
         elif case_1.schema != case_2.schema:
             raise InvalidData(
                 "The cases asked to compare do not share the same schema",
                 log_txt=f"Error while user {self.get_user()} tries to compare cases {idx1} and {idx2}. "
-                        f"The cases don't have the same schemas."
+                f"The cases don't have the same schemas.",
             )
 
         data = kwargs.get("data", True)
@@ -471,5 +485,7 @@ class CaseCompare(BaseMetaResource):
             ).patch
 
         payload["schema"] = case_1.schema
-        current_app.logger.info(f"User {self.get_user()} compared cases {idx1} and {idx2}")
+        current_app.logger.info(
+            f"User {self.get_user()} compared cases {idx1} and {idx2}"
+        )
         return payload, 200

{cornflow-1.2.4 → cornflow-1.3.0rc1}/cornflow/endpoints/dag.py

@@ -10,7 +10,7 @@ from flask_apispec import use_kwargs, doc, marshal_with
 
 # Import from internal modules
 from cornflow.endpoints.meta_resource import BaseMetaResource
-from cornflow.models import DeployedDAG, ExecutionModel, InstanceModel, CaseModel
+from cornflow.models import DeployedWorkflow, ExecutionModel, InstanceModel, CaseModel
 from cornflow.schemas import DeployedDAGSchema, DeployedDAGEditSchema
 from cornflow.schemas.case import CaseCheckRequest
 from cornflow.schemas.instance import InstanceCheckRequest
@@ -118,7 +118,7 @@ class DAGDetailEndpoint(BaseMetaResource):
         if solution_schema is not None:
             config = current_app.config
 
-            solution_schema = DeployedDAG.get_one_schema(
+            solution_schema = DeployedWorkflow.get_one_schema(
                 config, solution_schema, SOLUTION_SCHEMA
             )
             solution_errors = json_schema_validate_as_string(solution_schema, data)
@@ -215,7 +215,7 @@ class DAGEndpointManual(BaseMetaResource):
             solution_schema = "solve_model_dag"
         if solution_schema is not None:
             config = current_app.config
-            solution_schema = DeployedDAG.get_one_schema(
+            solution_schema = DeployedWorkflow.get_one_schema(
                 config, solution_schema, SOLUTION_SCHEMA
             )
             solution_errors = json_schema_validate_as_string(solution_schema, data)
@@ -246,7 +246,7 @@ class DeployedDAGEndpoint(BaseMetaResource):
 
     def __init__(self):
         super().__init__()
-        self.data_model = DeployedDAG
+        self.data_model = DeployedWorkflow
 
     @doc(
         description="Get list of deployed dags registered on the data base",
@@ -270,7 +270,7 @@ class DeployedDagDetailEndpoint(BaseMetaResource):
 
     def __init__(self):
         super().__init__()
-        self.data_model = DeployedDAG
+        self.data_model = DeployedWorkflow
 
     @doc(
         description="Endpoint to update the schemas of a deployed DAG",