truefoundry 0.5.1rc7__py3-none-any.whl → 0.5.2__py3-none-any.whl

truefoundry/autodeploy/cli.py

@@ -31,8 +31,8 @@ from truefoundry.autodeploy.tools.ask import AskQuestion
 from truefoundry.autodeploy.tools.commit import CommitConfirmation
 from truefoundry.autodeploy.tools.docker_run import DockerRun, DockerRunLog
 from truefoundry.autodeploy.utils.client import get_git_binary
+from truefoundry.cli.const import COMMAND_CLS
 from truefoundry.deploy import Build, DockerFileBuild, Job, LocalSource, Port, Service
-from truefoundry.deploy.cli.const import COMMAND_CLS
 from truefoundry.deploy.lib.auth.servicefoundry_session import ServiceFoundrySession
 from truefoundry.deploy.lib.clients.servicefoundry_client import (
     ServiceFoundryServiceClient,

truefoundry/cli/__main__.py

@@ -1,9 +1,100 @@
+import logging
 import sys
 
 import rich_click as click
 
-from truefoundry.deploy.cli.cli import create_truefoundry_cli
+from truefoundry import logger
+from truefoundry.cli.config import CliConfig
+from truefoundry.cli.const import GROUP_CLS
+from truefoundry.cli.util import setup_rich_click
+from truefoundry.common.utils import is_debug_env_set, is_internal_env_set
+from truefoundry.deploy.cli.commands import (
+    get_apply_command,
+    get_build_command,
+    get_delete_command,
+    get_deploy_command,
+    get_deploy_init_command,
+    get_login_command,
+    get_logout_command,
+    get_patch_application_command,
+    get_patch_command,
+    get_terminate_command,
+    get_trigger_command,
+)
 from truefoundry.ml.cli.cli import get_ml_cli
+from truefoundry.version import __version__
+
+click.rich_click.USE_RICH_MARKUP = True
+
+CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])  # noqa: C408
+
+
+@click.group(
+    cls=GROUP_CLS, context_settings=CONTEXT_SETTINGS, invoke_without_command=True
+)
+@click.option(
+    "--json",
+    is_flag=True,
+    help="Output entities in json format instead of formatted tables",
+)
+@click.option(
+    "--debug",
+    is_flag=True,
+    default=is_debug_env_set,
+    help="Set logging level to Debug. Can also be set using environment variable. E.g. SFY_DEBUG=1",
+)
+@click.version_option(__version__)
+@click.pass_context
+def truefoundry_cli(ctx, json, debug):
+    """
+    TrueFoundry provides an easy way to deploy your Services, Jobs and Models.
+    \b
+
+    To start, login to your TrueFoundry account with [b]tfy login[/]
+
+    Then start deploying with [b]tfy deploy[/]
+
+    And more: [link=https://docs.truefoundry.com/docs]https://docs.truefoundry.com/docs[/]
+
+    """
+    setup_rich_click()
+    # TODO (chiragjn): Change this to -o json|yaml|table|pager
+    CliConfig.set("json", json)
+    if ctx.invoked_subcommand is None:
+        click.echo(ctx.get_help())
+    log_level = logging.INFO
+    # no info logs while outputting json
+    if json:
+        log_level = logging.ERROR
+    if debug:
+        log_level = logging.DEBUG
+    logger.add_cli_handler(level=log_level)
+
+
+def create_truefoundry_cli() -> click.MultiCommand:
+    """Generates CLI by combining all subcommands into a main CLI and returns in
+
+    Returns:
+        function: main CLI functions will all added sub-commands
+    """
+    cli = truefoundry_cli
+    cli.add_command(get_login_command())
+    cli.add_command(get_logout_command())
+    cli.add_command(get_apply_command())
+    cli.add_command(get_deploy_command())
+    cli.add_command(get_deploy_init_command())
+    cli.add_command(get_patch_application_command())
+    cli.add_command(get_delete_command())
+    cli.add_command(get_trigger_command())
+    cli.add_command(get_terminate_command())
+    cli.add_command(get_ml_cli())
+
+    if not (sys.platform.startswith("win32") or sys.platform.startswith("cygwin")):
+        cli.add_command(get_patch_command())
+
+    if is_internal_env_set():
+        cli.add_command(get_build_command())
+    return cli
 
 
 def main():
@@ -13,7 +104,6 @@ def main():
     # If it is another kind of object, it will be printed and the system exit status will be one (i.e., failure).
     try:
         cli = create_truefoundry_cli()
-        cli.add_command(get_ml_cli())
     except Exception as e:
         raise click.exceptions.UsageError(message=str(e)) from e
     sys.exit(cli())

truefoundry/{deploy/cli → cli}/display_util.py

@@ -5,10 +5,15 @@ from rich import box
 from rich import print_json as _rich_print_json
 from rich.table import Table
 
-from truefoundry.deploy.cli.config import CliConfig
-from truefoundry.deploy.cli.console import console
-from truefoundry.deploy.cli.const import DISPLAY_DATETIME_FORMAT
-from truefoundry.deploy.json_util import json_default_encoder
+from truefoundry.cli.config import CliConfig
+from truefoundry.cli.console import console
+from truefoundry.cli.const import DISPLAY_DATETIME_FORMAT
+
+
+def json_default_encoder(o):
+    if isinstance(o, datetime.datetime):
+        return o.isoformat()
+    raise TypeError(f"Cannot json encode {type(o)}: {o}")
 
 
 def print_json(data, default=json_default_encoder):

truefoundry/{deploy/cli → cli}/util.py

@@ -10,12 +10,9 @@ from rich.padding import Padding
 from rich.panel import Panel
 from rich.table import Table
 
+from truefoundry.cli.console import console
 from truefoundry.common.exceptions import BadRequestException
-from truefoundry.deploy.cli.console import console
-from truefoundry.deploy.lib.exceptions import (
-    ConfigurationException,
-)
-from truefoundry.deploy.lib.util import is_debug_env_set
+from truefoundry.common.utils import is_debug_env_set
 
 
 def setup_rich_click():
@@ -45,12 +42,6 @@ def handle_exception(exception):
             title="Command Failed",
             border_style="red",
         )
-    elif isinstance(exception, ConfigurationException):
-        print_dict_as_table_panel(
-            {"Error": exception.message},
-            title="Command Failed",
-            border_style="red",
-        )
     else:
         print_dict_as_table_panel(
             {"Error": str(exception)},

truefoundry/common/constants.py

@@ -1,3 +1,4 @@
+import enum
 import os
 from pathlib import Path
 from typing import Optional
@@ -10,11 +11,18 @@ CREDENTIAL_FILEPATH = TFY_CONFIG_DIR / "credentials.json"
 # These keys are kept separately because we use them in error messages and some checks
 TFY_HOST_ENV_KEY = "TFY_HOST"
 TFY_API_KEY_ENV_KEY = "TFY_API_KEY"
+TFY_DEBUG_ENV_KEY = "TFY_DEBUG"
+TFY_INTERNAL_ENV_KEY = "TFY_INTERNAL"
 
 TFY_INTERNAL_SIGNED_URL_SERVER_HOST_ENV_KEY = "TFY_INTERNAL_SIGNED_URL_SERVER_HOST"
 TFY_INTERNAL_SIGNED_URL_SERVER_TOKEN_ENV_KEY = "TFY_INTERNAL_SIGNED_URL_SERVER_TOKEN"
 
 
+class PythonPackageManager(str, enum.Enum):
+    PIP = "pip"
+    UV = "uv"
+
+
 class TrueFoundrySdkEnv(BaseSettings):
     # Note: Every field in this class should have a default value
     # Never expect the user to set these values
@@ -46,6 +54,9 @@ class TrueFoundrySdkEnv(BaseSettings):
     # For local development, this enables futher configuration via _TFYServersConfig
     TFY_CLI_LOCAL_DEV_MODE: bool = False
 
+    TFY_PYTHON_BUILD_PACKAGE_MANAGER: PythonPackageManager = PythonPackageManager.PIP
+    TFY_PYTHON_BUILD_UV_IMAGE_URI: str = "ghcr.io/astral-sh/uv:latest"
+
 
 ENV_VARS = TrueFoundrySdkEnv()
 API_SERVER_RELATIVE_PATH = "api/svc"

truefoundry/common/utils.py

@@ -15,7 +15,9 @@ from truefoundry.common.constants import (
     API_SERVER_RELATIVE_PATH,
     ENV_VARS,
     MLFOUNDRY_SERVER_RELATIVE_PATH,
+    TFY_DEBUG_ENV_KEY,
     TFY_HOST_ENV_KEY,
+    TFY_INTERNAL_ENV_KEY,
 )
 from truefoundry.pydantic_v1 import BaseSettings
 
@@ -182,3 +184,11 @@ def list_pip_packages_installed(
                 InstalledPipPackage(package["name"], package["version"])
             )
     return relevant_package_names
+
+
+def is_debug_env_set() -> bool:
+    return bool(os.getenv(TFY_DEBUG_ENV_KEY))
+
+
+def is_internal_env_set() -> bool:
+    return bool(os.getenv(TFY_INTERNAL_ENV_KEY))

truefoundry/deploy/auto_gen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2024-11-04T08:35:21+00:00
+#   timestamp: 2024-12-16T11:59:07+00:00
 
 from __future__ import annotations
 
@@ -877,7 +877,7 @@ class Resources(BaseModel):
         None,
         description="+label=GPU Count\n+usage=Count of GPUs to provide to the application\nNote the exact count and max count available for a given GPU type depends on cloud provider and cluster type.",
     )
-    shared_memory_size: Optional[conint(ge=64, le=32000)] = Field(
+    shared_memory_size: Optional[conint(ge=64, le=2000000)] = Field(
         None,
         description="+label=Shared Memory Size (MB)\n+usage=Define the shared memory requirements for your workload. Machine learning libraries like Pytorch can use Shared Memory\nfor inter-process communication. If you use this, we will mount a `tmpfs` backed volume at the `/dev/shm` directory.\nAny usage will also count against the workload's memory limit (`resources.memory_limit`) along with your workload's memory usage.\nIf the overall usage goes above `resources.memory_limit` the user process may get killed.\nShared Memory Size cannot be more than the defined Memory Limit for the workload.",
     )
@@ -913,7 +913,7 @@ class Rolling(BaseModel):
         description="+label=Max unavailable(%)\n+usage=Percentage of total replicas that can be brought down at one time.\nFor a value of 25 when replicas are set to 12 this would mean minimum (25% of 12) = 3 pods might be unavailable during the deployment.\nSetting this to a higher value can help in speeding up the deployment process.",
     )
     max_surge_percentage: conint(ge=0, le=100) = Field(
-        0,
+        25,
         description="+label=Max Surge(%)\n+usage=Percentage of total replicas of updated image that can be brought up over the total replicas count.\nFor a value of 25 when replicas are set to 12 this would mean (12+(25% of 12) = 15) pods might be running at one time.\nSetting this to a higher value can help in speeding up the deployment process.",
     )
 

truefoundry/deploy/builder/builders/tfy_notebook_buildpack/__init__.py

@@ -8,7 +8,7 @@ from truefoundry.deploy.builder.builders.tfy_notebook_buildpack.dockerfile_templ
     NotebookImageBuild,
     generate_dockerfile_content,
 )
-from truefoundry.deploy.builder.utils import has_pip_conf_secret
+from truefoundry.deploy.builder.utils import has_python_package_manager_conf_secret
 
 __all__ = ["generate_dockerfile_content", "build"]
 
@@ -38,7 +38,9 @@ def build(
     build_configuration: NotebookImageBuild,
     extra_opts: Optional[List[str]] = None,
 ):
-    mount_pip_conf_secret = has_pip_conf_secret(extra_opts) if extra_opts else False
+    mount_pip_conf_secret = (
+        has_python_package_manager_conf_secret(extra_opts) if extra_opts else False
+    )
     with TemporaryDirectory() as local_dir:
         docker_build_configuration = _convert_to_dockerfile_build_config(
             build_configuration,

truefoundry/deploy/builder/builders/tfy_python_buildpack/__init__.py

@@ -7,7 +7,7 @@ from truefoundry.deploy.builder.builders import dockerfile
 from truefoundry.deploy.builder.builders.tfy_python_buildpack.dockerfile_template import (
     generate_dockerfile_content,
 )
-from truefoundry.deploy.builder.utils import has_pip_conf_secret
+from truefoundry.deploy.builder.utils import has_python_package_manager_conf_secret
 
 __all__ = ["generate_dockerfile_content", "build"]
 
@@ -15,11 +15,11 @@ __all__ = ["generate_dockerfile_content", "build"]
 def _convert_to_dockerfile_build_config(
     build_configuration: PythonBuild,
     dockerfile_path: str,
-    mount_pip_conf_secret: bool = False,
+    mount_python_package_manager_conf_secret: bool = False,
 ) -> DockerFileBuild:
     dockerfile_content = generate_dockerfile_content(
         build_configuration=build_configuration,
-        mount_pip_conf_secret=mount_pip_conf_secret,
+        mount_python_package_manager_conf_secret=mount_python_package_manager_conf_secret,
     )
     with open(dockerfile_path, "w", encoding="utf8") as fp:
         fp.write(dockerfile_content)
@@ -36,12 +36,14 @@ def build(
     build_configuration: PythonBuild,
     extra_opts: Optional[List[str]] = None,
 ):
-    mount_pip_conf_secret = has_pip_conf_secret(extra_opts) if extra_opts else False
+    mount_python_package_manager_conf_secret = (
+        has_python_package_manager_conf_secret(extra_opts) if extra_opts else False
+    )
     with TemporaryDirectory() as local_dir:
         docker_build_configuration = _convert_to_dockerfile_build_config(
             build_configuration,
             dockerfile_path=os.path.join(local_dir, "Dockerfile"),
-            mount_pip_conf_secret=mount_pip_conf_secret,
+            mount_python_package_manager_conf_secret=mount_python_package_manager_conf_secret,
         )
         dockerfile.build(
             tag=tag,

truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py

@@ -1,13 +1,16 @@
 import os
+import shlex
 from typing import Dict, List, Optional
 
 from mako.template import Template
 
-from truefoundry.common.constants import ENV_VARS
+from truefoundry.common.constants import ENV_VARS, PythonPackageManager
 from truefoundry.deploy.auto_gen.models import PythonBuild
 from truefoundry.deploy.builder.constants import (
     PIP_CONF_BUILDKIT_SECRET_MOUNT,
     PIP_CONF_SECRET_MOUNT_AS_ENV,
+    UV_CONF_BUILDKIT_SECRET_MOUNT,
+    UV_CONF_SECRET_MOUNT_AS_ENV,
 )
 from truefoundry.deploy.v2.lib.patched_models import CUDAVersion
 
@@ -22,8 +25,8 @@ RUN ${apt_install_command}
 % if requirements_path is not None:
 COPY ${requirements_path} ${requirements_destination_path}
 % endif
-% if pip_install_command is not None:
-RUN ${pip_config_secret_mount} ${pip_install_command}
+% if python_packages_install_command is not None:
+RUN ${package_manager_config_secret_mount} ${python_packages_install_command}
 % endif
 COPY . /app
 WORKDIR /app
@@ -114,44 +117,91 @@ def generate_pip_install_command(
     mount_pip_conf_secret: bool = False,
 ) -> Optional[str]:
     upgrade_pip_command = "python -m pip install -U pip setuptools wheel"
-    final_pip_install_command = None
-    pip_install_base_command = "python -m pip install --use-pep517 --no-cache-dir"
+    envs = []
+    if mount_pip_conf_secret:
+        envs.append(PIP_CONF_SECRET_MOUNT_AS_ENV)
+
+    command = ["python", "-m", "pip", "install", "--use-pep517", "--no-cache-dir"]
+    args = []
     if requirements_path:
-        final_pip_install_command = f"{pip_install_base_command} -r {requirements_path}"
+        args.append("-r")
+        args.append(requirements_path)
 
     if pip_packages:
-        final_pip_install_command = (
-            final_pip_install_command or pip_install_base_command
-        )
-        final_pip_install_command += " " + " ".join(
-            f"'{package}'" for package in pip_packages
-        )
+        args.extend(pip_packages)
 
-    if not final_pip_install_command:
+    if not args:
         return None
 
-    if mount_pip_conf_secret:
-        final_pip_install_command = (
-            f"{PIP_CONF_SECRET_MOUNT_AS_ENV} {final_pip_install_command}"
-        )
+    final_pip_install_command = shlex.join(envs + command + args)
+    final_docker_run_command = " && ".join(
+        [upgrade_pip_command, final_pip_install_command]
+    )
+    return final_docker_run_command
 
-    return " && ".join([upgrade_pip_command, final_pip_install_command])
+
+def generate_uv_pip_install_command(
+    requirements_path: Optional[str],
+    pip_packages: Optional[List[str]],
+    mount_uv_conf_secret: bool = False,
+) -> Optional[str]:
+    upgrade_pip_command = "python -m pip install -U pip setuptools wheel"
+    uv_mount = f"--mount=from={ENV_VARS.TFY_PYTHON_BUILD_UV_IMAGE_URI},source=/uv,target=/usr/local/bin/uv"
+    envs = [
+        "UV_SYSTEM_PYTHON=true",
+        "UV_LINK_MODE=copy",
+        "UV_PYTHON_DOWNLOADS=never",
+        "UV_INDEX_STRATEGY=unsafe-best-match",
+    ]
+    if mount_uv_conf_secret:
+        envs.append(UV_CONF_SECRET_MOUNT_AS_ENV)
+
+    command = ["uv", "pip", "install", "--no-cache-dir"]
+
+    args = []
+
+    if requirements_path:
+        args.append("-r")
+        args.append(requirements_path)
+
+    if pip_packages:
+        args.extend(pip_packages)
+
+    if not args:
+        return None
+
+    uv_pip_install_command = shlex.join(envs + command + args)
+    shell_commands = " && ".join([upgrade_pip_command, uv_pip_install_command])
+    final_docker_run_command = " ".join([uv_mount, shell_commands])
+
+    return final_docker_run_command
 
 
 def generate_dockerfile_content(
     build_configuration: PythonBuild,
-    mount_pip_conf_secret: bool = False,
+    package_manager: str = ENV_VARS.TFY_PYTHON_BUILD_PACKAGE_MANAGER,
+    mount_python_package_manager_conf_secret: bool = False,
 ) -> str:
     # TODO (chiragjn): Handle recursive references to other requirements files e.g. `-r requirements-gpu.txt`
     requirements_path = resolve_requirements_txt_path(build_configuration)
     requirements_destination_path = (
         "/tmp/requirements.txt" if requirements_path else None
     )
-    pip_install_command = generate_pip_install_command(
-        requirements_path=requirements_destination_path,
-        pip_packages=build_configuration.pip_packages,
-        mount_pip_conf_secret=mount_pip_conf_secret,
-    )
+    if package_manager == PythonPackageManager.PIP.value:
+        python_packages_install_command = generate_pip_install_command(
+            requirements_path=requirements_destination_path,
+            pip_packages=build_configuration.pip_packages,
+            mount_pip_conf_secret=mount_python_package_manager_conf_secret,
+        )
+    elif package_manager == PythonPackageManager.UV.value:
+        python_packages_install_command = generate_uv_pip_install_command(
+            requirements_path=requirements_destination_path,
+            pip_packages=build_configuration.pip_packages,
+            mount_uv_conf_secret=mount_python_package_manager_conf_secret,
+        )
+    else:
+        raise ValueError(f"Unsupported package manager: {package_manager}")
+
     apt_install_command = generate_apt_install_command(
         apt_packages=build_configuration.apt_packages
     )
@@ -161,13 +211,22 @@ def generate_dockerfile_content(
         "apt_install_command": apt_install_command,
         "requirements_path": requirements_path,
         "requirements_destination_path": requirements_destination_path,
-        "pip_install_command": pip_install_command,
+        "python_packages_install_command": python_packages_install_command,
     }
 
-    if mount_pip_conf_secret:
-        template_args["pip_config_secret_mount"] = PIP_CONF_BUILDKIT_SECRET_MOUNT
+    if mount_python_package_manager_conf_secret:
+        if package_manager == PythonPackageManager.PIP.value:
+            template_args["package_manager_config_secret_mount"] = (
+                PIP_CONF_BUILDKIT_SECRET_MOUNT
+            )
+        elif package_manager == PythonPackageManager.UV.value:
+            template_args["package_manager_config_secret_mount"] = (
+                UV_CONF_BUILDKIT_SECRET_MOUNT
+            )
+        else:
+            raise ValueError(f"Unsupported package manager: {package_manager}")
     else:
-        template_args["pip_config_secret_mount"] = ""
+        template_args["package_manager_config_secret_mount"] = ""
 
     if build_configuration.cuda_version:
         template = CUDA_DOCKERFILE_TEMPLATE

truefoundry/deploy/builder/constants.py

@@ -5,3 +5,11 @@ PIP_CONF_BUILDKIT_SECRET_MOUNT = (
 PIP_CONF_SECRET_MOUNT_AS_ENV = (
     f"PIP_CONFIG_FILE=/run/secrets/{BUILDKIT_SECRET_MOUNT_PIP_CONF_ID}"
 )
+
+BUILDKIT_SECRET_MOUNT_UV_CONF_ID = "uv.toml"
+UV_CONF_BUILDKIT_SECRET_MOUNT = (
+    f"--mount=type=secret,id={BUILDKIT_SECRET_MOUNT_UV_CONF_ID}"
+)
+UV_CONF_SECRET_MOUNT_AS_ENV = (
+    f"UV_CONFIG_FILE=/run/secrets/{BUILDKIT_SECRET_MOUNT_UV_CONF_ID}"
+)

truefoundry/deploy/builder/utils.py

@@ -1,6 +1,9 @@
 from typing import List, Optional
 
-from truefoundry.deploy.builder.constants import BUILDKIT_SECRET_MOUNT_PIP_CONF_ID
+from truefoundry.deploy.builder.constants import (
+    BUILDKIT_SECRET_MOUNT_PIP_CONF_ID,
+    BUILDKIT_SECRET_MOUNT_UV_CONF_ID,
+)
 
 
 def _get_id_from_buildkit_secret_value(value: str) -> Optional[str]:
@@ -19,14 +22,16 @@ def _get_id_from_buildkit_secret_value(value: str) -> Optional[str]:
     return None
 
 
-def has_pip_conf_secret(docker_build_extra_args: List[str]) -> bool:
+def has_python_package_manager_conf_secret(docker_build_extra_args: List[str]) -> bool:
     args = [arg.strip() for arg in docker_build_extra_args]
     for i, arg in enumerate(docker_build_extra_args):
         if (
             arg == "--secret"
             and i + 1 < len(args)
-            and _get_id_from_buildkit_secret_value(args[i + 1])
-            == BUILDKIT_SECRET_MOUNT_PIP_CONF_ID
+            and (
+                _get_id_from_buildkit_secret_value(args[i + 1])
+                in (BUILDKIT_SECRET_MOUNT_PIP_CONF_ID, BUILDKIT_SECRET_MOUNT_UV_CONF_ID)
+            )
         ):
             return True
     return False

truefoundry/deploy/cli/commands/apply_command.py

@@ -2,9 +2,9 @@ from typing import List, Tuple
 
 import rich_click as click
 
-from truefoundry.deploy.cli.console import console
-from truefoundry.deploy.cli.const import GROUP_CLS
-from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.cli.console import console
+from truefoundry.cli.const import GROUP_CLS
+from truefoundry.cli.util import handle_exception_wrapper
 from truefoundry.deploy.lib.clients.servicefoundry_client import (
     ServiceFoundryServiceClient,
 )
@@ -30,13 +30,20 @@ from truefoundry.deploy.lib.model.entity import ApplyResult
     required=True,
     multiple=True,
 )
+@click.option(
+    "--dry-run",
+    "--dry_run",
+    is_flag=True,
+    show_default=True,
+    help="Simulate the process without actually applying the manifest",
+)
 @handle_exception_wrapper
-def apply_command(files: Tuple[str, ...]):
+def apply_command(files: Tuple[str, ...], dry_run: bool = False):
     apply_results: List[ApplyResult] = []
     client = ServiceFoundryServiceClient()
     for file in files:
         with console.status(PROMPT_APPLYING_MANIFEST.format(file), spinner="dots"):
-            for apply_result in apply_lib.apply_manifest_file(file, client):
+            for apply_result in apply_lib.apply_manifest_file(file, client, dry_run):
                 if apply_result.success:
                     console.print(f"[green]\u2714 {apply_result.message}[/]")
                 else:

truefoundry/deploy/cli/commands/build_command.py

@@ -2,10 +2,10 @@ import json
 
 import rich_click as click
 
+from truefoundry.cli.console import console
+from truefoundry.cli.const import GROUP_CLS
+from truefoundry.cli.util import handle_exception_wrapper
 from truefoundry.deploy import builder
-from truefoundry.deploy.cli.console import console
-from truefoundry.deploy.cli.const import GROUP_CLS
-from truefoundry.deploy.cli.util import handle_exception_wrapper
 from truefoundry.version import __version__
 
 

truefoundry/deploy/cli/commands/build_logs_command.py

@@ -2,8 +2,8 @@ from typing import Optional
 
 import rich_click as click
 
-from truefoundry.deploy.cli.const import COMMAND_CLS
-from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.cli.const import COMMAND_CLS
+from truefoundry.cli.util import handle_exception_wrapper
 from truefoundry.deploy.io.rich_output_callback import RichOutputCallBack
 from truefoundry.deploy.lib.clients.servicefoundry_client import (
     ServiceFoundryServiceClient,

truefoundry/deploy/cli/commands/create_command.py

@@ -2,9 +2,9 @@ from typing import Optional
 
 import rich_click as click
 
-from truefoundry.deploy.cli.const import COMMAND_CLS, GROUP_CLS
-from truefoundry.deploy.cli.display_util import print_obj
-from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.cli.const import COMMAND_CLS, GROUP_CLS
+from truefoundry.cli.display_util import print_obj
+from truefoundry.cli.util import handle_exception_wrapper
 from truefoundry.deploy.lib.dao import workspace as workspace_lib
 
 

truefoundry/deploy/cli/commands/delete_command.py

@@ -1,9 +1,9 @@
 import rich_click as click
 
-from truefoundry.deploy.cli.config import CliConfig
-from truefoundry.deploy.cli.const import COMMAND_CLS, GROUP_CLS
-from truefoundry.deploy.cli.display_util import print_json
-from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.cli.config import CliConfig
+from truefoundry.cli.const import COMMAND_CLS, GROUP_CLS
+from truefoundry.cli.display_util import print_json
+from truefoundry.cli.util import handle_exception_wrapper
 from truefoundry.deploy.io.rich_output_callback import RichOutputCallBack
 from truefoundry.deploy.lib.dao import application as application_lib
 from truefoundry.deploy.lib.dao import workspace as workspace_lib

truefoundry/deploy/cli/commands/deploy_command.py

@@ -9,8 +9,8 @@ from click.exceptions import ClickException
 
 from truefoundry.autodeploy.cli import cli as autodeploy_cli
 from truefoundry.autodeploy.exception import InvalidRequirementsException
-from truefoundry.deploy.cli.const import COMMAND_CLS, GROUP_CLS
-from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.cli.const import COMMAND_CLS, GROUP_CLS
+from truefoundry.cli.util import handle_exception_wrapper
 
 
 def _get_default_spec_file():

truefoundry/deploy/cli/commands/deploy_init_command.py

@@ -1,6 +1,6 @@
 import rich_click as click
 
-from truefoundry.deploy.cli.const import GROUP_CLS
+from truefoundry.cli.const import GROUP_CLS
 from truefoundry.ml.cli.commands.model_init import get_model_init_command
 
 

truefoundry/deploy/cli/commands/get_command.py

@@ -6,11 +6,11 @@ import rich_click as click
 import yaml
 from rich.pretty import pprint
 
-from truefoundry.deploy.cli.config import CliConfig
-from truefoundry.deploy.cli.console import console
-from truefoundry.deploy.cli.const import COMMAND_CLS, GROUP_CLS
-from truefoundry.deploy.cli.display_util import print_entity_obj, print_json
-from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.cli.config import CliConfig
+from truefoundry.cli.console import console
+from truefoundry.cli.const import COMMAND_CLS, GROUP_CLS
+from truefoundry.cli.display_util import print_entity_obj, print_json
+from truefoundry.cli.util import handle_exception_wrapper
 from truefoundry.deploy.lib.dao import application as application_lib
 from truefoundry.deploy.lib.dao import version as version_lib
 from truefoundry.deploy.lib.dao import workspace as workspace_lib