Run template rework

src/zenml/actions/pipeline_run/pipeline_run_action.py

@@ -29,12 +29,13 @@
     ActionRequest,
     ActionResponse,
     ActionUpdate,
+    PipelineDeploymentTriggerRequest,
     TriggerExecutionResponse,
 )
 from zenml.models.v2.base.base import BaseResponse
 from zenml.zen_server.auth import AuthContext
+from zenml.zen_server.deployment_execution.utils import trigger_deployment
 from zenml.zen_server.rbac.models import ResourceType
-from zenml.zen_server.template_execution.utils import run_template
 from zenml.zen_server.utils import server_config
 
 logger = get_logger(__name__)
@@ -45,7 +46,7 @@
 class PipelineRunActionConfiguration(ActionConfig):
     """Configuration class to configure a pipeline run action."""
 
-    template_id: UUID
+    deployment_id: UUID
     run_config: Optional[PipelineRunConfiguration] = None
 
 
@@ -95,11 +96,13 @@ def run(
 
         assert isinstance(config, PipelineRunActionConfiguration)
 
-        template = zen_store().get_run_template(config.template_id)
-        logger.debug("Running template:", template)
-        run_template(
-            template=template,
-            run_config=config.run_config,
+        deployment = zen_store().get_deployment(config.deployment_id)
+        logger.debug("Running deployment:", deployment)
+        trigger_deployment(
+            deployment=deployment,
+            trigger_request=PipelineDeploymentTriggerRequest(
+                run_configuration=config.run_config,
+            ),
             auth_context=auth_context,
             sync=True,
         )
@@ -118,10 +121,10 @@ def _validate_configuration(
         zen_store = GlobalConfiguration().zen_store
 
         try:
-            zen_store.get_run_template(template_id=config.template_id)
+            zen_store.get_deployment(deployment_id=config.deployment_id)
         except KeyError:
             raise ValueError(
-                f"No template found with id {config.template_id}."
+                f"No deployment found with id {config.deployment_id}."
             )
 
     def _validate_action_request(
@@ -185,21 +188,21 @@ def extract_resources(
         zen_store = GlobalConfiguration().zen_store
 
         try:
-            template = zen_store.get_run_template(
-                template_id=action_config.template_id, hydrate=hydrate
+            deployment = zen_store.get_deployment(
+                deployment_id=action_config.deployment_id, hydrate=hydrate
             )
         except KeyError:
             raise ValueError(
-                f"No template found with id {action_config.template_id}."
+                f"No deployment found with id {action_config.deployment_id}."
             )
 
         resources: Dict[ResourceType, BaseResponse[Any, Any, Any]] = {
-            ResourceType.RUN_TEMPLATE: template
+            ResourceType.PIPELINE_DEPLOYMENT: deployment
         }
 
-        if template.pipeline is not None:
+        if deployment.pipeline is not None:
             pipeline = zen_store.get_pipeline(
-                pipeline_id=template.pipeline.id, hydrate=hydrate
+                pipeline_id=deployment.pipeline.id, hydrate=hydrate
             )
             resources[ResourceType.PIPELINE] = pipeline
 

src/zenml/analytics/enums.py

@@ -52,6 +52,9 @@ class AnalyticsEvent(str, Enum):
     CREATED_RUN_TEMPLATE = "Run template created"
     EXECUTED_RUN_TEMPLATE = "Run templated executed"
 
+    # Deployments
+    EXECUTED_DEPLOYMENT = "Deployment executed"
+
     # Model Control Plane
     MODEL_DEPLOYED = "Model deployed"
     CREATED_MODEL = "Model created"

src/zenml/cli/pipeline.py

@@ -15,7 +15,8 @@
 
 import json
 import os
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, List, Optional, Union
+from uuid import UUID
 
 import click
 
@@ -335,7 +336,7 @@ def create_run_template(
     config_path: Optional[str] = None,
     stack_name_or_id: Optional[str] = None,
 ) -> None:
-    """Create a run template for a pipeline.
+    """DEPRECATED: Create a run template for a pipeline.
 
     Args:
         source: Importable source resolving to a pipeline instance.
@@ -344,6 +345,11 @@ def create_run_template(
         stack_name_or_id: Name or ID of the stack for which the template should
             be created.
     """
+    cli_utils.warning(
+        "The `zenml pipeline create-run-template` command is deprecated and "
+        "will be removed in a future version. Please use `zenml pipeline "
+        "deploy` instead."
+    )
     if not Client().root:
         cli_utils.warning(
             "You're running the `zenml pipeline create-run-template` command "
@@ -364,6 +370,157 @@ def create_run_template(
     cli_utils.declare(f"Created run template `{template.id}`.")
 
 
+@pipeline.command("deploy", help="Deploy a pipeline.")
+@click.argument("source")
+@click.option(
+    "--version",
+    "-v",
+    type=str,
+    required=False,
+    help="The version name of the deployment. If not provided, a version "
+    "name will be generated automatically.",
+)
+@click.option(
+    "--description",
+    "-d",
+    type=str,
+    required=False,
+    help="The description of the deployment.",
+)
+@click.option(
+    "--tags",
+    "-t",
+    type=str,
+    required=False,
+    multiple=True,
+    help="The tags to add to the deployment.",
+)
+@click.option(
+    "--config",
+    "-c",
+    "config_path",
+    type=click.Path(exists=True, dir_okay=False),
+    required=False,
+    help="Path to configuration file for the deployment.",
+)
+@click.option(
+    "--stack",
+    "-s",
+    "stack_name_or_id",
+    type=str,
+    required=False,
+    help="Name or ID of the stack to use for the deployment.",
+)
+def deploy_pipeline(
+    source: str,
+    version: Optional[str] = None,
+    description: Optional[str] = None,
+    tags: Optional[List[str]] = None,
+    config_path: Optional[str] = None,
+    stack_name_or_id: Optional[str] = None,
+) -> None:
+    """Deploy a pipeline.
+
+    Args:
+        source: Importable source resolving to a pipeline instance.
+        version: Version name of the deployment.
+        description: Description of the deployment.
+        tags: Tags to add to the deployment.
+        config_path: Path to configuration file for the deployment.
+        stack_name_or_id: Name or ID of the stack for which the deployment
+            should be created.
+    """
+    if not Client().root:
+        cli_utils.warning(
+            "You're running the `zenml pipeline deploy` command "
+            "without a ZenML repository. Your current working directory will "
+            "be used as the source root relative to which the registered step "
+            "classes will be resolved. To silence this warning, run `zenml "
+            "init` at your source code root."
+        )
+
+    with cli_utils.temporary_active_stack(stack_name_or_id=stack_name_or_id):
+        pipeline_instance = _import_pipeline(source=source)
+
+        pipeline_instance = pipeline_instance.with_options(
+            config_path=config_path
+        )
+        deployment = pipeline_instance.deploy(
+            version=version, description=description, tags=tags
+        )
+
+    cli_utils.declare(
+        f"Created pipeline deployment `{deployment.id}`. You can now trigger "
+        f"this deployment from the dashboard or by calling `zenml pipeline "
+        f"trigger-deployment --deployment {deployment.id}`"
+    )
+
+
+@pipeline.command("trigger-deployment", help="Trigger a deployment.")
+@click.option(
+    "--deployment",
+    "-d",
+    type=str,
+    required=False,
+    help="The ID of the deployment to trigger.",
+)
+@click.option(
+    "--pipeline",
+    "-p",
+    type=str,
+    required=False,
+    help="The name or ID of the pipeline to trigger.",
+)
+@click.option(
+    "--version",
+    "-v",
+    type=str,
+    required=False,
+    help="The version of the deployment to trigger.",
+)
+@click.option(
+    "--config",
+    "-c",
+    "config_path",
+    type=click.Path(exists=True, dir_okay=False),
+    required=False,
+    help="Path to configuration file for the run.",
+)
+@click.option(
+    "--stack",
+    "-s",
+    "stack_name_or_id",
+    type=str,
+    required=False,
+    help="Name or ID of the stack to use for the deployment.",
+)
+def trigger_deployment(
+    deployment_id: Optional[str] = None,
+    pipeline_name_or_id: Optional[str] = None,
+    version: Optional[str] = None,
+    config_path: Optional[str] = None,
+    stack_name_or_id: Optional[str] = None,
+) -> None:
+    """Trigger a deployment.
+
+    Args:
+        deployment_id: The ID of the deployment to trigger.
+        pipeline_name_or_id: The name or ID of the pipeline to trigger.
+        version: The version of the deployment to trigger.
+        config_path: Path to configuration file for the run.
+        stack_name_or_id: Name or ID of the stack for which the deployment
+            should be created.
+    """
+    run = Client().trigger_deployment(
+        deployment_id=UUID(deployment_id) if deployment_id else None,
+        pipeline_name_or_id=pipeline_name_or_id,
+        version=version,
+        config_path=config_path,
+        stack_name_or_id=stack_name_or_id,
+    )
+    cli_utils.declare(f"Triggered deployment run `{run.id}`.")
+
+
 @pipeline.command("list", help="List all registered pipelines.")
 @list_options(PipelineFilter)
 def list_pipelines(**kwargs: Any) -> None:
@@ -407,8 +564,8 @@ def delete_pipeline(
     if not yes:
         confirmation = cli_utils.confirmation(
             f"Are you sure you want to delete pipeline "
-            f"`{pipeline_name_or_id}`? This will change all "
-            "existing runs of this pipeline to become unlisted."
+            f"`{pipeline_name_or_id}`? This will delete all "
+            "runs and deployments of this pipeline."
         )
         if not confirmation:
             cli_utils.declare("Pipeline deletion canceled.")