Revert "Revert "truss push: Make published deployments the default (#2178)"…"

This reverts commit 550e85e.

Author: daanielww

smoketests/test_chains.py

@@ -181,7 +181,7 @@ def test_itest_chain_publish(prepare) -> None:
     tmpdir, truss_rc_path, remote = prepare
 
     chain_src = CHAINS_ROOT / "tests" / "itest_chain" / "itest_chain.py"
-    command = f"truss chains push {chain_src} --publish --name=itest_publish --no-wait"
+    command = f"truss chains push {chain_src} --name=itest_publish --no-wait"
 
     stdout, stderr = run_command(truss_rc_path, command)
     if stderr:

truss-chains/tests/test_chain_upload_end_to_end.py

@@ -146,7 +146,6 @@ def test_push_chain_with_all_parameters_including_disable_chain_download(
             "--name",
             "custom_chain_name",
             "--disable-chain-download",
-            "--publish",
             "--no-promote",
             "--environment",
             "test_env",

truss-chains/truss_chains/deployment/deployment_client.py

@@ -230,7 +230,7 @@ def push(
         if has_engine_builder_chainlets and not options.publish:
             raise public_types.ChainsDeploymentError(
                 "This chain contains engine builder chainlets. Development models are "
-                "not supportd, push with `--publish`."
+                "not supportd, push as a published deployment."
             )
         return _create_baseten_chain(
             options,
@@ -614,7 +614,7 @@ def __init__(
         dev_version = b10_core.get_dev_version(self._remote_provider.api, model_name)
         if not dev_version:
             raise b10_errors.RemoteError(
-                "No development model found. Run `truss push` then try again."
+                "No development model found. Run `truss push --watch` then try again."
             )
 
     def _patch(self) -> None:

truss/cli/chains_commands.py

@@ -152,8 +152,8 @@ def _create_chains_table(service) -> Tuple[rich.table.Table, List[str]]:
 )
 @click.option(
     "--publish/--no-publish",
-    default=False,
-    help="Create chainlets as published deployments.",
+    default=None,  # Use None to detect if explicitly passed
+    help="[DEPRECATED] Published deployments are now the default. Use --watch for development deployments.",
 )
 @click.option(
     "--promote/--no-promote",
@@ -166,7 +166,7 @@ def _create_chains_table(service) -> Tuple[rich.table.Table, List[str]]:
     required=False,
     help=(
         "Deploy the chain as a published deployment to the specified environment."
-        "If specified, --publish is implied and the supplied value of --promote will be ignored."
+        "If specified, publish is implied and the supplied value of --promote will be ignored."
     ),
 )
 @click.option(
@@ -180,8 +180,7 @@ def _create_chains_table(service) -> Tuple[rich.table.Table, List[str]]:
     help=(
         "Watches the chains source code and applies live patches. Using this option "
         "will wait for the chain to be deployed (i.e. `--wait` flag is applied), "
-        "before starting to watch for changes. This option required the deployment "
-        "to be a development deployment (i.e. `--no-promote` and `--no-publish`."
+        "before starting to watch for changes."
     ),
 )
 @click.option(
@@ -227,8 +226,7 @@ def _create_chains_table(service) -> Tuple[rich.table.Table, List[str]]:
     type=str,
     required=False,
     help=(
-        "Name of the deployment created by the publish. Can only be used "
-        "in combination with '--publish' or '--promote'."
+        "Name of the deployment created by the publish. Can be used with '--promote' as well."
     ),
 )
 @click.option(
@@ -245,7 +243,7 @@ def push_chain(
     source: Path,
     entrypoint: Optional[str],
     name: Optional[str],
-    publish: bool,
+    publish: Optional[bool],
     promote: bool,
     wait: bool,
     watch: bool,
@@ -279,11 +277,37 @@ def push_chain(
             raise ValueError(
                 "When using `--watch`, the deployment cannot be published or promoted."
             )
+        if environment:
+            raise ValueError(
+                "Cannot use --watch with --environment. Watch mode requires a development deployment."
+            )
+        # --watch implies development deployment
+        publish = False
         if not wait:
             console.print(
                 "'--watch' is used. Will wait for deployment before watching files."
             )
             wait = True
+    else:
+        if publish is True:
+            console.print(
+                "[DEPRECATED] The --publish flag is deprecated. Published deployments are now the default.",
+                style="yellow",
+            )
+        elif publish is False:
+            console.print(
+                "[DEPRECATED] The --no-publish flag is deprecated. Use --watch for development deployments.",
+                style="yellow",
+            )
+            # Keep publish=False for backwards compatibility
+
+        # Default to published
+        if publish is None:
+            publish = True
+            console.print(
+                "Deploying as a published deployment. Use --watch for a development deployment.",
+                style="green",
+            )
 
     if promote and environment:
         promote_warning = (

truss/cli/cli.py

@@ -7,6 +7,7 @@
 from typing import Optional, cast
 
 import rich_click as click
+from rich import console as rich_console
 from rich import progress
 
 import truss
@@ -35,7 +36,7 @@
     get_dev_version_from_versions,
 )
 from truss.remote.baseten.remote import BasetenRemote
-from truss.remote.baseten.service import BasetenService
+from truss.remote.baseten.service import BasetenService, URLConfig
 from truss.remote.remote_factory import USER_TRUSSRC_PATH, RemoteFactory
 from truss.trt_llm.config_checks import (
     has_no_tags_trt_llm_builder,
@@ -89,6 +90,32 @@ def _get_truss_from_directory(
     return load(truss_dir, config_path=config_path)
 
 
+def _start_watch_mode(
+    target_directory: str,
+    model_name: str,
+    remote_provider: BasetenRemote,
+    resolved_model: dict,
+    resolved_versions: list,
+    console: "rich_console.Console",
+    error_console: "rich_console.Console",
+) -> None:
+    if not os.path.isfile(target_directory):
+        remote_provider.sync_truss_to_dev_version_with_model(
+            resolved_model, resolved_versions, target_directory, console, error_console
+        )
+    else:
+        # These imports are delayed, to handle pydantic v1 envs gracefully.
+        from truss_chains.deployment import deployment_client
+
+        deployment_client.watch_model(
+            source=Path(target_directory),
+            model_name=model_name,
+            remote_provider=remote_provider,
+            console=console,
+            error_console=error_console,
+        )
+
+
 ### Top-level & utility commands. ######################################################
 
 
@@ -430,6 +457,7 @@ def run_python(script, target_directory):
     required=False,
     default=False,
     help=(
+        "[DEPRECATED] Published deployments are now the default."
         "Push the truss as a published deployment. If no production "
         "deployment exists, promote the truss to production "
         "after deploy completes."
@@ -452,7 +480,7 @@ def run_python(script, target_directory):
     required=False,
     help=(
         "Push the truss as a published deployment to the specified environment."
-        "If specified, --publish is implied and the supplied value of --promote will be ignored."
+        "If specified, publish is implied and the supplied value of --promote will be ignored."
     ),
 )
 @click.option(
@@ -485,8 +513,8 @@ def run_python(script, target_directory):
     type=str,
     required=False,
     help=(
-        "Name of the deployment created by the push. Can only be "
-        "used in combination with --publish or --promote."
+        "Name of the deployment created by the push. Cannot be "
+        "used with --watch (development deployments)."
     ),
 )
 @click.option(
@@ -544,6 +572,18 @@ def run_python(script, target_directory):
     required=False,
     help="JSON string of metadata key-value pairs.",
 )
+@click.option(
+    "--watch",
+    "watch_after_push",
+    is_flag=True,
+    required=False,
+    default=False,
+    help=(
+        "Deploy as a development model and watch for changes. "
+        "Waits for deployment to complete, then starts watching for code changes "
+        "to apply live patches. Cannot be used with --promote, --environment, or --tail."
+    ),
+)
 @common.common_options()
 def push(
     target_directory: str,
@@ -565,13 +605,44 @@ def push(
     deploy_timeout_minutes: Optional[int] = None,
     provided_team_name: Optional[str] = None,
     metadata: Optional[str] = None,
+    watch_after_push: bool = False,
 ) -> None:
     """
     Pushes a truss to a TrussRemote.
 
     TARGET_DIRECTORY: A Truss directory. If none, use current directory.
 
     """
+
+    if publish:
+        console.print(
+            "[DEPRECATED] The --publish flag is deprecated. Published deployments are now the default.",
+            style="yellow",
+        )
+
+    # Handle --watch flag: deploys as development and then watches
+    if watch_after_push:
+        if promote:
+            raise click.UsageError(
+                "Cannot use --watch with --promote. Watch mode runs a development deployment."
+            )
+        if environment:
+            raise click.UsageError(
+                "Cannot use --watch with --environment. Watch mode runs a development deployment."
+            )
+        if tail:
+            raise click.UsageError("Cannot use --watch with --tail.")
+        # Development deployment for watch mode
+        publish = False
+        wait = True
+    else:
+        # Default is now published deployment
+        publish = True
+        console.print(
+            "Deploying as a published deployment. Use --watch for a development deployment.",
+            style="green",
+        )
+
     tr = _get_truss_from_directory(target_directory=target_directory, config=config)
 
     if tr.spec.config.resources.instance_type:
@@ -586,7 +657,7 @@ def push(
         and not promote
     ):
         raise click.UsageError(
-            "Truss with gRPC transport cannot be used as a development deployment. Please rerun the command with --publish or --promote."
+            "Truss with gRPC transport cannot be used as a development deployment. Remove --watch to deploy as a published model."
         )
 
     if not remote:
@@ -609,7 +680,7 @@ def push(
         effective_team_name = provided_team_name or RemoteFactory.get_remote_team(
             remote
         )
-        _, team_id = resolve_model_team_name(
+        team_name, team_id = resolve_model_team_name(
             remote_provider=remote_provider,
             provided_team_name=effective_team_name,
             existing_model_name=model_name,
@@ -662,7 +733,7 @@ def push(
     # trt-llm engine builder checks
     if uses_trt_llm_builder(tr):
         if not publish:
-            live_reload_disabled_text = "Development mode is currently not supported for trusses using TRT-LLM build flow, push as a published model using --publish"
+            live_reload_disabled_text = "Development mode is currently not supported for trusses using TRT-LLM build flow. Remove --watch to deploy as a published model."
             console.print(live_reload_disabled_text, style="red")
             sys.exit(1)
 
@@ -720,8 +791,7 @@ def push(
 | iterate quickly during the deployment process.                                        |
 |                                                                                       |
 | When you are ready to publish your deployed model as a new deployment,                |
-| pass '--publish' to the 'truss push' command. To monitor changes to your model and    |
-| rapidly iterate, run the 'truss watch' command.                                       |
+| run 'truss push' without --watch.                                                     |
 |                                                                                       |
 |---------------------------------------------------------------------------------------|
 """
@@ -741,8 +811,6 @@ def push(
     if wait:
         start_time = time.time()
         with console.status("[bold green]Deploying...") as status:
-            # Poll for the deployment status until we have reached. Either ACTIVE,
-            # or a non-deploying status (in which case the deployment has failed).
             for deployment_status in service.poll_deployment_status():
                 if (
                     timeout_seconds is not None
@@ -757,7 +825,7 @@ def push(
 
                 if deployment_status == ACTIVE_STATUS:
                     console.print("Deployment succeeded.", style="bold green")
-                    return
+                    break
 
                 if deployment_status not in DEPLOYING_STATUSES:
                     console.print(
@@ -766,6 +834,27 @@ def push(
                     )
                     sys.exit(1)
 
+        # If --watch was used, start watching after deploy success
+        if watch_after_push:
+            if not isinstance(remote_provider, BasetenRemote):
+                raise click.UsageError(
+                    f"Watch mode is not supported for remote provider type: {type(remote_provider).__name__}"
+                )
+            bt_remote = cast(BasetenRemote, remote_provider)
+            console.print("Starting watch mode...", style="bold blue")
+            resolved_model, versions = resolve_model_for_watch(
+                bt_remote, model_name, provided_team_name=team_name
+            )
+            _start_watch_mode(
+                target_directory=target_directory,
+                model_name=model_name,
+                remote_provider=bt_remote,
+                resolved_model=resolved_model,
+                resolved_versions=versions,
+                console=console,
+                error_console=error_console,
+            )
+
     elif tail and isinstance(service, BasetenService):
         bt_remote = cast(BasetenRemote, remote_provider)
         log_watcher = ModelDeploymentLogWatcher(
@@ -862,31 +951,29 @@ def watch(
     # Verify dev version exists
     dev_version = get_dev_version_from_versions(versions)
     if not dev_version:
-        console.print("❌ No development model found. Run `truss push` then try again.")
+        console.print(
+            "❌ No development model found. Run `truss push --watch` then try again."
+        )
         sys.exit(1)
 
     # Use model_id to get service (no additional resolution needed)
-    service = remote_provider.get_service(model_identifier=ModelId(model_id))
+    dev_version_id = dev_version["id"]
+    logs_url = URLConfig.model_logs_url(
+        remote_provider.remote_url, model_id, dev_version_id
+    )
     console.print(
-        f"🪵  View logs for your deployment at {common.format_link(service.logs_url)}"
+        f"🪵  View logs for your development model at {common.format_link(logs_url)}"
     )
 
-    if not os.path.isfile(target_directory):
-        # Pass the resolved model to avoid re-resolution
-        remote_provider.sync_truss_to_dev_version_with_model(
-            resolved_model, versions, target_directory, console, error_console
-        )
-    else:
-        # These imports are delayed, to handle pydantic v1 envs gracefully.
-        from truss_chains.deployment import deployment_client
-
-        deployment_client.watch_model(
-            source=Path(target_directory),
-            model_name=model_name,
-            remote_provider=remote_provider,
-            console=console,
-            error_console=error_console,
-        )
+    _start_watch_mode(
+        target_directory=target_directory,
+        model_name=model_name,
+        remote_provider=remote_provider,
+        resolved_model=resolved_model,
+        resolved_versions=versions,
+        console=console,
+        error_console=error_console,
+    )
 
 
 ### Image commands. ####################################################################