cornflow 1.1.5__py3-none-any.whl → 2.0.0a6__py3-none-any.whl

cornflow/cli/service.py

@@ -16,7 +16,7 @@ from cornflow.commands import (
     update_schemas_command,
     update_dag_registry_command,
 )
-from cornflow.shared.const import AUTH_DB, ADMIN_ROLE, SERVICE_ROLE
+from cornflow.shared.const import AUTH_DB, ADMIN_ROLE, DATABRICKS_BACKEND, SERVICE_ROLE, AIRFLOW_BACKEND
 from cornflow.shared import db
 from cryptography.fernet import Fernet
 from flask_migrate import Migrate, upgrade
@@ -37,14 +37,32 @@ def init_cornflow_service():
     ###################################
     # Global defaults and back-compat #
     ###################################
+    # cornflow backend selection
+    cornflow_backend = os.getenv("CORNFLOW_BACKEND", AIRFLOW_BACKEND)
+    os.environ["CORNFLOW_BACKEND"] = cornflow_backend
+    cornflow_backend = int(cornflow_backend)
     # Airflow global default conn
-    airflow_user = os.getenv("AIRFLOW_USER", "admin")
-    airflow_pwd = os.getenv("AIRFLOW_PWD", "admin")
-    airflow_url = os.getenv("AIRFLOW_URL", "http://webserver:8080")
-    cornflow_url = os.environ.setdefault("cornflow_url", "http://cornflow:5000")
-    os.environ["AIRFLOW_USER"] = airflow_user
-    os.environ["AIRFLOW_PWD"] = airflow_pwd
-    os.environ["AIRFLOW_URL"] = airflow_url
+    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")
+        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")
+
     os.environ["FLASK_APP"] = "cornflow.app"
     os.environ["SECRET_KEY"] = os.getenv("FERNET_KEY", Fernet.generate_key().decode())
 
@@ -150,11 +168,17 @@ def init_cornflow_service():
                     SERVICE_ROLE,
                     verbose=True,
                 )
-            register_deployed_dags_command(
-                airflow_url, airflow_user, airflow_pwd, verbose=True
-            )
-            register_dag_permissions_command(open_deployment, verbose=True)
-            update_schemas_command(airflow_url, airflow_user, airflow_pwd, verbose=True)
+
+            if cornflow_backend == AIRFLOW_BACKEND:
+                register_deployed_dags_command(
+                    airflow_url, airflow_user, airflow_pwd, verbose=True
+                )
+                register_dag_permissions_command(open_deployment, verbose=True)
+                update_schemas_command(
+                    airflow_url, airflow_user, airflow_pwd, verbose=True
+                )
+            else:
+                register_dag_permissions_command(open_deployment, verbose=True)
 
         # execute gunicorn application
         os.system(
@@ -207,14 +231,22 @@ def init_cornflow_service():
                     SERVICE_ROLE,
                     verbose=True,
                 )
-            register_deployed_dags_command(
-                airflow_url, airflow_user, airflow_pwd, verbose=True
-            )
-            register_dag_permissions_command(open_deployment, verbose=True)
-            update_schemas_command(airflow_url, airflow_user, airflow_pwd, verbose=True)
-            update_dag_registry_command(
-                airflow_url, airflow_user, airflow_pwd, verbose=True
-            )
+
+            click.echo(f"Selected backend is: {cornflow_backend}")
+            if cornflow_backend == AIRFLOW_BACKEND:
+                register_deployed_dags_command(
+                    airflow_url, airflow_user, airflow_pwd, verbose=True
+                )
+
+                register_dag_permissions_command(open_deployment, verbose=True)
+                update_schemas_command(
+                    airflow_url, airflow_user, airflow_pwd, verbose=True
+                )
+                update_dag_registry_command(
+                    airflow_url, airflow_user, airflow_pwd, verbose=True
+                )
+            else:
+                register_dag_permissions_command(open_deployment, verbose=True)
 
         os.system(
             f"/usr/local/bin/gunicorn -c python:cornflow.gunicorn "

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 DeployedOrch
     from cornflow.shared import db
 
     af_client = Airflow(url, user, pwd)
@@ -27,7 +27,7 @@ def register_deployed_dags_command(
             current_app.logger.info("Airflow is not reachable")
         return False
 
-    dags_registered = [dag.id for dag in DeployedDAG.get_all_objects()]
+    dags_registered = [dag.id for dag in DeployedOrch.get_all_objects()]
 
     response = af_client.get_model_dags()
     dag_list = response.json()["dags"]
@@ -39,7 +39,7 @@ def register_deployed_dags_command(
     }
 
     processed_dags = [
-        DeployedDAG(
+        DeployedOrch(
             {
                 "id": dag["dag_id"],
                 "description": dag["description"],
@@ -75,7 +75,7 @@ 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 DeployedOrch
     from flask import current_app
     from cornflow_client import get_pulp_jsonschema, get_empty_schema
 
@@ -83,7 +83,7 @@ def register_deployed_dags_command_test(dags: list = None, verbose: bool = False
         dags = ["solve_model_dag", "gc", "timer"]
 
     deployed_dag = [
-        DeployedDAG(
+        DeployedOrch(
             {
                 "id": "solve_model_dag",
                 "description": None,
@@ -95,7 +95,7 @@ def register_deployed_dags_command_test(dags: list = None, verbose: bool = False
             }
         )
     ] + [
-        DeployedDAG(
+        DeployedOrch(
             {
                 "id": dag,
                 "description": None,

cornflow/commands/permissions.py

@@ -1,6 +1,6 @@
 import sys
 from importlib import import_module
-
+import click
 from cornflow.shared.const import (
     BASE_PERMISSION_ASSIGNATION,
     EXTRA_PERMISSION_ASSIGNATION,
@@ -124,11 +124,11 @@ def register_base_permissions_command(external_app: str = None, verbose: bool =
 def register_dag_permissions_command(
     open_deployment: int = None, verbose: bool = False
 ):
-
+    click.echo(f"Checkpoint 1")
     from flask import current_app
     from sqlalchemy.exc import DBAPIError, IntegrityError
 
-    from cornflow.models import DeployedDAG, PermissionsDAG, UserModel
+    from cornflow.models import DeployedOrch, PermissionsDAG, UserModel
     from cornflow.shared import db
 
     if open_deployment is None:
@@ -138,7 +138,7 @@ def register_dag_permissions_command(
         (permission.dag_id, permission.user_id)
         for permission in PermissionsDAG.get_all_objects()
     ]
-
+    click.echo(f"Checkpoint 2")
     try:
         db.session.commit()
     except DBAPIError as e:
@@ -146,15 +146,17 @@ 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 = DeployedOrch.get_all_objects().all()
 
     if open_deployment == 1:
+        click.echo(f"Checkpoint 3")
         permissions = [
             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
         ]
+        click.echo(f"Checkpoint 4")
 
     else:
         permissions = [
@@ -163,10 +165,10 @@ def register_dag_permissions_command(
             for dag in all_dags
             if (dag.id, user.id) not in existing_permissions and user.is_service_user()
         ]
-
+        click.echo(f"Checkpoint 5")
     if len(permissions) > 1:
         db.session.bulk_save_objects(permissions)
-
+    click.echo(f"Checkpoint 6")
     try:
         db.session.commit()
     except IntegrityError as e:
@@ -175,7 +177,7 @@ def register_dag_permissions_command(
     except DBAPIError as e:
         db.session.rollback()
         current_app.logger.error(f"Unknown error on dag permissions register: {e}")
-
+    click.echo(f"Checkpoint 7")
     if "postgres" in str(db.session.get_bind()):
         db.engine.execute(
             "SELECT setval(pg_get_serial_sequence('permission_dag', 'id'), MAX(id)) FROM permission_dag;"
@@ -188,11 +190,11 @@ def register_dag_permissions_command(
             current_app.logger.error(
                 f"Unknown error on dag permissions sequence updating: {e}"
             )
-
+    click.echo(f"Checkpoint 7")
     if verbose:
         if len(permissions) > 1:
             current_app.logger.info(f"DAG permissions registered: {permissions}")
         else:
             current_app.logger.info("No new DAG permissions")
-
+    click.echo(f"Checkpoint 8")
     pass

cornflow/config.py

@@ -15,9 +15,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 +26,21 @@ class DefaultConfig(object):
     SIGNUP_ACTIVATED = int(os.getenv("SIGNUP_ACTIVATED", 1))
     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")
+
     # If service user is allow to log with username and password
     SERVICE_USER_ALLOW_PASSWORD_LOGIN = int(
         os.getenv("SERVICE_USER_ALLOW_PASSWORD_LOGIN", 1)

cornflow/endpoints/__init__.py

@@ -29,7 +29,7 @@ from .data_check import (
     DataCheckCaseEndpoint,
 )
 from .example_data import ExampleDataListEndpoint, ExampleDataDetailEndpoint
-from .execution import (
+from .execution_databricks import (
     ExecutionEndpoint,
     ExecutionDetailsEndpoint,
     ExecutionStatusEndpoint,

cornflow/endpoints/case.py

@@ -16,7 +16,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, DeployedOrch, 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
@@ -79,14 +79,14 @@ 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 = DeployedOrch.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_schema = DeployedOrch.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))
@@ -383,7 +383,7 @@ class CaseToInstance(BaseMetaResource):
         config = current_app.config
 
         # Data validation
-        jsonschema = DeployedDAG.get_one_schema(config, schema, INSTANCE_SCHEMA)
+        jsonschema = DeployedOrch.get_one_schema(config, schema, INSTANCE_SCHEMA)
         data_errors = json_schema_validate_as_string(jsonschema, payload["data"])
         if data_errors:
             raise InvalidData(

cornflow/endpoints/dag.py

@@ -9,7 +9,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 DeployedOrch, ExecutionModel, InstanceModel, CaseModel
 from cornflow.schemas import DeployedDAGSchema, DeployedDAGEditSchema
 from cornflow.schemas.case import CaseCheckRequest
 from cornflow.schemas.instance import InstanceCheckRequest
@@ -111,7 +111,7 @@ class DAGDetailEndpoint(BaseMetaResource):
         if solution_schema is not None:
             config = current_app.config
 
-            solution_schema = DeployedDAG.get_one_schema(config, solution_schema, SOLUTION_SCHEMA)
+            solution_schema = DeployedOrch.get_one_schema(config, solution_schema, SOLUTION_SCHEMA)
             solution_errors = json_schema_validate_as_string(solution_schema, data)
 
             if solution_errors:
@@ -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(config, solution_schema, SOLUTION_SCHEMA)
+            solution_schema = DeployedOrch.get_one_schema(config, solution_schema, SOLUTION_SCHEMA)
             solution_errors = json_schema_validate_as_string(solution_schema, data)
 
             if solution_errors:
@@ -244,7 +244,7 @@ class DeployedDAGEndpoint(BaseMetaResource):
 
     def __init__(self):
         super().__init__()
-        self.data_model = DeployedDAG
+        self.data_model = DeployedOrch
 
     @doc(
         description="Get list of deployed dags registered on the data base",
@@ -268,7 +268,7 @@ class DeployedDagDetailEndpoint(BaseMetaResource):
 
     def __init__(self):
         super().__init__()
-        self.data_model = DeployedDAG
+        self.data_model = DeployedOrch
 
     @doc(
         description="Endpoint to update the schemas of a deployed DAG",

cornflow/endpoints/data_check.py

@@ -10,7 +10,7 @@ from flask_apispec import marshal_with, doc
 
 # Import from internal modules
 from cornflow.endpoints.meta_resource import BaseMetaResource
-from cornflow.models import InstanceModel, ExecutionModel, CaseModel, DeployedDAG
+from cornflow.models import InstanceModel, ExecutionModel, CaseModel, DeployedOrch
 from cornflow.schemas.execution import ExecutionDetailsEndpointResponse
 from cornflow.shared.authentication import Auth, authenticate
 from cornflow.shared.const import (
@@ -95,7 +95,7 @@ class DataCheckExecutionEndpoint(BaseMetaResource):
                 log_txt=f"Error while user {self.get_user()} tries to run data checks on execution {idx}. " + err
             )
         # ask airflow if dag_name exists
-        schema_info = af_client.get_dag_info(schema)
+        schema_info = af_client.get_orch_info(schema)
 
         info = schema_info.json()
         if info["is_paused"]:
@@ -112,8 +112,8 @@ class DataCheckExecutionEndpoint(BaseMetaResource):
             )
 
         try:
-            response = af_client.run_dag(
-                execution.id, dag_name=schema, checks_only=True
+            response = af_client.run_workflow(
+                execution.id, orch_name=schema, checks_only=True
             )
         except AirflowError as err:
             error = "Airflow responded with an error: {}".format(err)
@@ -208,7 +208,7 @@ class DataCheckInstanceEndpoint(BaseMetaResource):
 
             )
         # ask airflow if dag_name exists
-        schema_info = af_client.get_dag_info(schema)
+        schema_info = af_client.get_orch_info(schema)
 
         info = schema_info.json()
         if info["is_paused"]:
@@ -226,8 +226,8 @@ class DataCheckInstanceEndpoint(BaseMetaResource):
             )
 
         try:
-            response = af_client.run_dag(
-                execution.id, dag_name=schema, checks_only=True
+            response = af_client.run_workflow(
+                execution.id, orch_name=schema, checks_only=True
             )
         except AirflowError as err:
             error = "Airflow responded with an error: {}".format(err)
@@ -309,7 +309,7 @@ class DataCheckCaseEndpoint(BaseMetaResource):
             if schema == "pulp":
                 validation_schema = "solve_model_dag"
 
-            data_jsonschema = DeployedDAG.get_one_schema(config, validation_schema, INSTANCE_SCHEMA)
+            data_jsonschema = DeployedOrch.get_one_schema(config, validation_schema, INSTANCE_SCHEMA)
             validation_errors = json_schema_validate_as_string(data_jsonschema, instance_payload["data"])
 
             if validation_errors:
@@ -334,7 +334,7 @@ class DataCheckCaseEndpoint(BaseMetaResource):
 
             payload["data"] = case.solution
 
-            data_jsonschema = DeployedDAG.get_one_schema(config, validation_schema, SOLUTION_SCHEMA)
+            data_jsonschema = DeployedOrch.get_one_schema(config, validation_schema, SOLUTION_SCHEMA)
             validation_errors = json_schema_validate_as_string(data_jsonschema, payload["data"])
 
             if validation_errors:
@@ -369,7 +369,7 @@ class DataCheckCaseEndpoint(BaseMetaResource):
                 log_txt=f"Error while user {self.get_user()} tries to run data checks on case {idx}. " + err
             )
         # ask airflow if dag_name exists
-        schema_info = af_client.get_dag_info(schema)
+        schema_info = af_client.get_orch_info(schema)
 
         info = schema_info.json()
         if info["is_paused"]:
@@ -386,8 +386,8 @@ class DataCheckCaseEndpoint(BaseMetaResource):
             )
 
         try:
-            response = af_client.run_dag(
-                execution.id, dag_name=schema, checks_only=True, case_id=idx
+            response = af_client.run_workflow(
+                execution.id, orch_name=schema, checks_only=True, case_id=idx
             )
 
         except AirflowError as err:

cornflow/endpoints/example_data.py

@@ -47,7 +47,7 @@ class ExampleDataListEndpoint(BaseMetaResource):
                 raise AirflowError(error="Airflow is not accessible")
 
             # try airflow and see if dag_name exists
-            af_client.get_dag_info(dag_name)
+            af_client.get_orch_info(dag_name)
 
             current_app.logger.info("User gets example data from {}".format(dag_name))
 
@@ -90,7 +90,7 @@ class ExampleDataDetailEndpoint(BaseMetaResource):
                 raise AirflowError(error="Airflow is not accessible")
 
             # try airflow and see if dag_name exists
-            af_client.get_dag_info(dag_name)
+            af_client.get_orch_info(dag_name)
 
             current_app.logger.info("User gets example data from {}".format(dag_name))
 

cornflow/endpoints/execution.py

@@ -12,7 +12,7 @@ from flask_apispec import marshal_with, use_kwargs, doc
 
 # Import from internal modules
 from cornflow.endpoints.meta_resource import BaseMetaResource
-from cornflow.models import InstanceModel, DeployedDAG, ExecutionModel
+from cornflow.models import InstanceModel, DeployedOrch, ExecutionModel
 from cornflow.schemas.execution import (
     ExecutionDetailsEndpointResponse,
     ExecutionDetailsEndpointWithIndicatorsResponse,
@@ -106,7 +106,7 @@ class ExecutionEndpoint(BaseMetaResource):
                 continue
 
             try:
-                response = af_client.get_dag_run_status(
+                response = af_client.get_run_status(
                     dag_name=execution.schema, dag_run_id=dag_run_id
                 )
             except AirflowError as err:
@@ -175,10 +175,10 @@ class ExecutionEndpoint(BaseMetaResource):
             )
         # ask airflow if dag_name exists
         schema = execution.schema
-        schema_info = af_client.get_dag_info(schema)
+        schema_info = af_client.get_orch_info(schema)
 
         # Validate config before running the dag
-        config_schema = DeployedDAG.get_one_schema(config, schema, CONFIG_SCHEMA)
+        config_schema = DeployedOrch.get_one_schema(config, schema, CONFIG_SCHEMA)
         new_config, config_errors = json_schema_extend_and_validate_as_string(
             config_schema, kwargs["config"]
         )
@@ -198,7 +198,7 @@ class ExecutionEndpoint(BaseMetaResource):
             execution.update_config(new_config)
 
         # Validate instance data before running the dag
-        instance_schema = DeployedDAG.get_one_schema(config, schema, INSTANCE_SCHEMA)
+        instance_schema = DeployedOrch.get_one_schema(config, schema, INSTANCE_SCHEMA)
         instance_errors = json_schema_validate_as_string(instance_schema, instance.data)
         if instance_errors:
             execution.update_state(
@@ -214,7 +214,7 @@ class ExecutionEndpoint(BaseMetaResource):
             )
         # Validate solution data before running the dag (if it exists)
         if kwargs.get("data") is not None:
-            solution_schema = DeployedDAG.get_one_schema(
+            solution_schema = DeployedOrch.get_one_schema(
                 config, schema, SOLUTION_SCHEMA
             )
             solution_errors = json_schema_validate_as_string(
@@ -245,7 +245,7 @@ class ExecutionEndpoint(BaseMetaResource):
             )
 
         try:
-            response = af_client.run_dag(execution.id, dag_name=schema)
+            response = af_client.run_workflow(execution.id, orch_name=schema)
         except AirflowError as err:
             error = "Airflow responded with an error: {}".format(err)
             current_app.logger.error(error)
@@ -325,7 +325,7 @@ class ExecutionRelaunchEndpoint(BaseMetaResource):
             }, 201
 
         # Validate config before running the dag
-        config_schema = DeployedDAG.get_one_schema(
+        config_schema = DeployedOrch.get_one_schema(
             config, kwargs["schema"], CONFIG_SCHEMA
         )
         config_errors = json_schema_validate_as_string(config_schema, kwargs["config"])
@@ -353,7 +353,7 @@ class ExecutionRelaunchEndpoint(BaseMetaResource):
             )
         # ask airflow if dag_name exists
         schema = execution.schema
-        schema_info = af_client.get_dag_info(schema)
+        schema_info = af_client.get_orch_info(schema)
 
         info = schema_info.json()
         if info["is_paused"]:
@@ -371,7 +371,7 @@ class ExecutionRelaunchEndpoint(BaseMetaResource):
             )
 
         try:
-            response = af_client.run_dag(execution.id, dag_name=schema)
+            response = af_client.run_workflow(execution.id, orch_name=schema)
         except AirflowError as err:
             error = "Airflow responded with an error: {}".format(err)
             current_app.logger.error(error)
@@ -445,7 +445,7 @@ class ExecutionDetailsEndpoint(ExecutionDetailsEndpointBase):
         schema = ExecutionModel.get_one_object(user=self.get_user(), idx=idx).schema
 
         if data.get("data") is not None and schema is not None:
-            data_jsonschema = DeployedDAG.get_one_schema(
+            data_jsonschema = DeployedOrch.get_one_schema(
                 config, schema, SOLUTION_SCHEMA
             )
             validation_errors = json_schema_validate_as_string(
@@ -573,7 +573,7 @@ class ExecutionStatusEndpoint(BaseMetaResource):
 
         try:
             # TODO: get the dag_name from somewhere!
-            response = af_client.get_dag_run_status(
+            response = af_client.get_run_status(
                 dag_name=execution.schema, dag_run_id=dag_run_id
             )
         except AirflowError as err: