truefoundry 0.5.1rc8__tar.gz → 0.5.2__tar.gz

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.5.1rc8
+Version: 0.5.2
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.5.1rc8"
+version = "0.5.2"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
 readme = "README.md"
@@ -75,6 +75,7 @@ shap =  [
     { version = ">=0.40.0", python = "<3.12" },
     { version = ">=0.45.0", python = ">=3.12" },
 ]
+xgboost = "^2.1.3"
 
 
 [tool.poetry-dynamic-versioning]

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8/truefoundry/deploy/cli/cli.py → truefoundry-0.5.2/truefoundry/cli/__main__.py

@@ -4,6 +4,10 @@ import sys
 import rich_click as click
 
 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,
@@ -17,40 +21,11 @@ from truefoundry.deploy.cli.commands import (
     get_terminate_command,
     get_trigger_command,
 )
-from truefoundry.deploy.cli.config import CliConfig
-from truefoundry.deploy.cli.const import GROUP_CLS
-from truefoundry.deploy.cli.util import setup_rich_click
-from truefoundry.deploy.lib.util import is_debug_env_set, is_internal_env_set
+from truefoundry.ml.cli.cli import get_ml_cli
 from truefoundry.version import __version__
 
 click.rich_click.USE_RICH_MARKUP = True
 
-
-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())
-
-    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
-
-
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])  # noqa: C408
 
 
@@ -94,3 +69,45 @@ def truefoundry_cli(ctx, json, debug):
     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():
+    # Exit the interpreter by raising SystemExit(status).
+    # If the status is omitted or None, it defaults to zero (i.e., success).
+    # If the status is an integer, it will be used as the system exit status.
+    # 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()
+    except Exception as e:
+        raise click.exceptions.UsageError(message=str(e)) from e
+    sys.exit(cli())
+
+
+if __name__ == "__main__":
+    main()

{truefoundry-0.5.1rc8/truefoundry/deploy → truefoundry-0.5.2/truefoundry}/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-0.5.1rc8/truefoundry/deploy → truefoundry-0.5.2/truefoundry}/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-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/common/constants.py

@@ -11,6 +11,8 @@ 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"

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8 → truefoundry-0.5.2}/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-0.5.1rc8 → truefoundry-0.5.2}/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

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/cli/commands/list_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_entity_list, 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_entity_list, 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 version as version_lib

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/cli/commands/login_command.py

@@ -1,11 +1,11 @@
 import rich_click as click
 
-from truefoundry.common.constants import TFY_HOST_ENV_KEY
-from truefoundry.deploy.cli.const import COMMAND_CLS
-from truefoundry.deploy.cli.util import (
+from truefoundry.cli.const import COMMAND_CLS
+from truefoundry.cli.util import (
     _prompt_if_no_value_and_supported,
     handle_exception_wrapper,
 )
+from truefoundry.common.constants import TFY_HOST_ENV_KEY
 from truefoundry.deploy.io.rich_output_callback import RichOutputCallBack
 from truefoundry.deploy.lib.session import login
 

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/cli/commands/logout_command.py

@@ -1,7 +1,7 @@
 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.session import logout
 

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/cli/commands/logs_command.py

@@ -4,8 +4,8 @@ from typing import Optional
 import rich_click as click
 from dateutil.tz import tzlocal
 
-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-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/cli/commands/patch_application_command.py

@@ -3,8 +3,8 @@ import json
 import rich_click as click
 import yaml
 
-from truefoundry.deploy.cli.const import GROUP_CLS
-from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.cli.const import GROUP_CLS
+from truefoundry.cli.util import handle_exception_wrapper
 from truefoundry.deploy.lib.dao import application as application_lib
 
 

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/cli/commands/patch_command.py

@@ -3,8 +3,8 @@ from typing import Optional
 
 import rich_click as click
 
-from truefoundry.deploy.cli.const import GROUP_CLS
-from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.cli.const import GROUP_CLS
+from truefoundry.cli.util import handle_exception_wrapper
 from truefoundry.deploy.io.rich_output_callback import RichOutputCallBack
 
 

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/cli/commands/redeploy_command.py

@@ -1,7 +1,7 @@
 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.lib.dao import application as application_lib
 
 

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/cli/commands/terminate_comand.py

@@ -1,8 +1,8 @@
 import rich_click as click
 
-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.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.lib.dao import application as application_lib
 
 

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/cli/commands/trigger_command.py

@@ -3,8 +3,8 @@ from typing import Optional, Sequence
 import rich_click as click
 from click import ClickException
 
-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
 from truefoundry.deploy.lib.dao import application
 
 

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/lib/clients/servicefoundry_client.py

@@ -680,9 +680,9 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
         return parse_obj_as(List[Deployment], response)
 
     @check_min_cli_version
-    def apply(self, manifest: Dict[str, Any]):
+    def apply(self, manifest: Dict[str, Any], dry_run: bool = False):
         url = f"{self._api_server_url}/{VERSION_PREFIX}/apply"
-        body = {"manifest": manifest}
+        body = {"manifest": manifest, "dryRun": dry_run}
         response = session_with_retries().put(
             url, headers=self._get_header(), json=body
         )

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/lib/const.py

@@ -2,6 +2,3 @@ from truefoundry.deploy.io.rich_output_callback import RichOutputCallBack
 
 ENTITY_JSON_DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
 RICH_OUTPUT_CALLBACK = RichOutputCallBack()
-
-TFY_DEBUG_ENV_KEY = "TFY_DEBUG"
-TFY_INTERNAL_ENV_KEY = "TFY_INTERNAL"

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/lib/dao/apply.py

@@ -15,6 +15,7 @@ def _apply_manifest(
     client: Optional[ServiceFoundryServiceClient] = None,
     filename: Optional[str] = None,
     index: Optional[int] = None,
+    dry_run: bool = False,
 ) -> ApplyResult:
     client = client or ServiceFoundryServiceClient()
 
@@ -32,29 +33,38 @@ def _apply_manifest(
             message=f"Failed to apply manifest{file_metadata}. Error: {ex}",
         )
 
+    prefix = "[Dry Run] " if dry_run else ""
+    suffix = " (No changes were applied)" if dry_run else ""
     try:
-        client.apply(manifest.dict())
+        client.apply(manifest.dict(), dry_run)
+
         return ApplyResult(
             success=True,
-            message=f"Successfully configured manifest {manifest.name} of type {manifest.type}",
+            message=(
+                f"{prefix}Successfully configured manifest {manifest.name} of type {manifest.type}.{suffix}"
+            ),
         )
     except Exception as ex:
         return ApplyResult(
             success=False,
-            message=f"Failed to apply manifest {manifest.name} of type {manifest.type}. Error: {ex}",
+            message=(
+                f"{prefix}Failed to apply manifest {manifest.name} of type {manifest.type}. Error: {ex}.{suffix}"
+            ),
         )
 
 
 def apply_manifest(
     manifest: Dict[str, Any],
     client: Optional[ServiceFoundryServiceClient] = None,
+    dry_run: bool = False,
 ) -> ApplyResult:
-    return _apply_manifest(manifest=manifest, client=client)
+    return _apply_manifest(manifest=manifest, client=client, dry_run=dry_run)
 
 
 def apply_manifest_file(
     filepath: str,
     client: Optional[ServiceFoundryServiceClient] = None,
+    dry_run: bool = False,
 ) -> Iterator[ApplyResult]:
     client = client or ServiceFoundryServiceClient()
     filename = Path(filepath).name
@@ -67,14 +77,19 @@ def apply_manifest_file(
             message=f"Failed to read file {filepath} as a valid YAML file. Error: {ex}",
         )
     else:
+        prefix = "[Dry Run] " if dry_run else ""
         for index, manifest in enumerate(manifests_it):
             if not isinstance(manifest, dict):
                 yield ApplyResult(
                     success=False,
-                    message=f"Failed to apply manifest at index {index} from file {filename}. Error: A manifest must be a dict, got type {type(manifest)}",
+                    message=f"{prefix}Failed to apply manifest at index {index} from file {filename}. Error: A manifest must be a dict, got type {type(manifest)}",
                 )
                 continue
 
             yield _apply_manifest(
-                manifest=manifest, client=client, filename=filename, index=index
+                manifest=manifest,
+                client=client,
+                filename=filename,
+                index=index,
+                dry_run=dry_run,
             )

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/lib/dao/workspace.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from truefoundry.deploy.cli.console import console
+from truefoundry.cli.console import console
 from truefoundry.deploy.lib.clients.servicefoundry_client import (
     ServiceFoundryServiceClient,
 )

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/lib/model/entity.py

@@ -220,7 +220,7 @@ class JobRun(Base):
     status: str
 
     def list_row_data(self) -> Dict[str, Any]:
-        from truefoundry.deploy.cli.display_util import display_time_passed
+        from truefoundry.cli.display_util import display_time_passed
 
         triggered_at = (
             (datetime.datetime.now().timestamp() * 1000) - self.createdAt
@@ -238,7 +238,7 @@ class JobRun(Base):
         }
 
     def get_data(self) -> Dict[str, Any]:
-        from truefoundry.deploy.cli.display_util import display_time_passed
+        from truefoundry.cli.display_util import display_time_passed
 
         created_at = datetime.datetime.fromtimestamp(self.createdAt // 1000)
         end_time = ""

{truefoundry-0.5.1rc8 → truefoundry-0.5.2}/truefoundry/deploy/lib/util.py

@@ -1,20 +1,6 @@
-import os
 import re
 from typing import Union
 
-from truefoundry.deploy.lib.const import (
-    TFY_DEBUG_ENV_KEY,
-    TFY_INTERNAL_ENV_KEY,
-)
-
-
-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))
-
 
 def get_application_fqn_from_deployment_fqn(deployment_fqn: str) -> str:
     if not re.search(r":\d+$", deployment_fqn):