truefoundry 0.5.1rc8__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

@@ -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/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/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

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/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/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/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/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/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/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/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/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/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/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/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/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/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/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):

truefoundry/ml/__init__.py

@@ -1,9 +1,10 @@
-from truefoundry.ml.autogen.client.models import (
-    LibraryName,
+from truefoundry.ml.autogen.client.models import (  # type: ignore[attr-defined]
+    InferMethodName,
     ModelVersionEnvironment,
     SklearnModelSchema,
     XGBoostModelSchema,
 )
+from truefoundry.ml.autogen.entities.artifacts import LibraryName
 from truefoundry.ml.enums import (
     DataSlice,
     FileFormat,
@@ -40,6 +41,7 @@ from truefoundry.ml.model_framework import (
     TransformersFramework,
     XGBoostFramework,
     sklearn_infer_schema,
+    xgboost_infer_schema,
 )
 
 __all__ = [
@@ -51,9 +53,11 @@ __all__ = [
     "DataSlice",
     "FastAIFramework",
     "FileFormat",
+    "get_client",
     "GluonFramework",
     "H2OFramework",
     "Image",
+    "InferMethodName",
     "KerasFramework",
     "LibraryName",
     "LightGBMFramework",
@@ -68,6 +72,7 @@ __all__ = [
     "PaddleFramework",
     "Plot",
     "PyTorchFramework",
+    "sklearn_infer_schema",
     "SklearnFramework",
     "SklearnModelSchema",
     "SpaCyFramework",
@@ -75,10 +80,9 @@ __all__ = [
     "TensorFlowFramework",
     "TransformersFramework",
     "ViewType",
+    "xgboost_infer_schema",
     "XGBoostFramework",
     "XGBoostModelSchema",
-    "get_client",
-    "sklearn_infer_schema",
 ]
 
 init_logger()

truefoundry/ml/cli/cli.py

@@ -1,11 +1,15 @@
 import rich_click as click
 
+from truefoundry.cli.const import GROUP_CLS
 from truefoundry.ml.cli.commands import download
 
 click.rich_click.USE_RICH_MARKUP = True
 
 
-@click.group()
+@click.group(
+    name="ml",
+    cls=GROUP_CLS,
+)
 def ml():
     """
     TrueFoundry ML CLI

truefoundry/ml/cli/commands/download.py

@@ -2,14 +2,23 @@ from typing import Optional
 
 import click
 
+from truefoundry.cli.const import COMMAND_CLS, GROUP_CLS
 from truefoundry.ml import get_client
 
 
-@click.group(help="Download files of artifact/model logged with Mlfoundry")
+@click.group(
+    name="download",
+    cls=GROUP_CLS,
+    help="Download artifact/model versions logged with TrueFoundry",
+)
 def download(): ...
 
 
-@download.command(short_help="Download files of logged model")
+@download.command(
+    name="model",
+    cls=COMMAND_CLS,
+    help="Download a model version logged with TrueFoundry",
+)
 @click.option(
     "--fqn",
     required=True,
@@ -48,7 +57,11 @@ def model(fqn: str, path: str, overwrite: bool, progress: Optional[bool] = None)
     print(f"Downloaded model files to {download_path}")
 
 
-@download.command(short_help="Download files of logged artifact")
+@download.command(
+    name="artifact",
+    cls=COMMAND_CLS,
+    short_help="Download a artifact version logged with TrueFoundry",
+)
 @click.option(
     "--fqn",
     required=True,

truefoundry/ml/cli/commands/model_init.py

@@ -3,10 +3,10 @@ from typing import Optional
 
 import rich_click as click
 
-from truefoundry.deploy.cli.console import console
-from truefoundry.deploy.cli.const import COMMAND_CLS
-from truefoundry.deploy.cli.util import handle_exception_wrapper
-from truefoundry.ml.autogen.client.models import ModelServer
+from truefoundry.cli.console import console
+from truefoundry.cli.const import COMMAND_CLS
+from truefoundry.cli.util import handle_exception_wrapper
+from truefoundry.ml.autogen.client import ModelServer  # type: ignore[attr-defined]
 from truefoundry.ml.cli.utils import (
     AppName,
     NonEmptyString,

truefoundry/ml/mlfoundry_api.py

@@ -18,7 +18,7 @@ from typing import (
 import coolname
 
 from truefoundry.common.utils import ContextualDirectoryManager, relogin_error_message
-from truefoundry.ml import ModelVersionEnvironment, constants
+from truefoundry.ml import constants
 from truefoundry.ml.autogen.client import (  # type: ignore[attr-defined]
     ArtifactDto,
     ArtifactType,
@@ -35,6 +35,7 @@ from truefoundry.ml.autogen.client import (  # type: ignore[attr-defined]
     MlfoundryArtifactsApi,
     ModelDto,
     ModelServer,
+    ModelVersionEnvironment,
     RunsApi,
     RunTagDto,
     SearchRunsRequestDto,

truefoundry/ml/mlfoundry_run.py

@@ -18,7 +18,7 @@ from urllib.parse import urljoin, urlsplit
 
 from truefoundry import version
 from truefoundry.common.utils import relogin_error_message
-from truefoundry.ml import ModelVersionEnvironment, constants
+from truefoundry.ml import constants
 from truefoundry.ml.autogen.client import (  # type: ignore[attr-defined]
     ArtifactType,
     DeleteRunRequest,
@@ -29,6 +29,7 @@ from truefoundry.ml.autogen.client import (  # type: ignore[attr-defined]
     MetricDto,
     MetricsApi,
     MlfoundryArtifactsApi,
+    ModelVersionEnvironment,
     ParamDto,
     RunDataDto,
     RunDto,

truefoundry/ml/model_framework.py

@@ -35,6 +35,7 @@ from truefoundry.pydantic_v1 import BaseModel, Field
 
 if TYPE_CHECKING:
     from sklearn.base import BaseEstimator
+    from xgboost import Booster, XGBModel
 
 # Map serialization format to corresponding pip packages
 SERIALIZATION_FORMAT_TO_PACKAGES_NAME_MAP = {
@@ -467,6 +468,24 @@ def auto_update_model_framework_details(
                 )
 
 
+def _infer_schema(
+    model_input: Any,
+    model: Union["BaseEstimator", "Booster", "XGBModel"],
+    infer_method_name: str = "predict",
+) -> Dict[str, Any]:
+    if not hasattr(model, infer_method_name):
+        raise ValueError(
+            f"Model does not have the method '{infer_method_name}' to infer the schema."
+        )
+    model_infer_method = getattr(model, infer_method_name)
+    model_output = model_infer_method(model_input)
+
+    model_signature = infer_signature(
+        model_input=model_input, model_output=model_output
+    )
+    return model_signature.to_dict()
+
+
 def sklearn_infer_schema(
     model_input: Any,
     model: "BaseEstimator",
@@ -483,19 +502,37 @@ def sklearn_infer_schema(
     Returns:
         SklearnModelSchema: The inferred schema of the Sklearn model.
     """
-    if not hasattr(model, infer_method_name):
-        raise ValueError(
-            f"Model does not have the method '{infer_method_name}' to infer the schema."
-        )
-    model_infer_method = getattr(model, infer_method_name)
-    model_output = model_infer_method(model_input)
-
-    model_signature = infer_signature(
-        model_input=model_input, model_output=model_output
+    model_signature_json = _infer_schema(
+        model_input=model_input, model=model, infer_method_name=infer_method_name
     )
-    model_signature_json = model_signature.to_dict()
     return autogen_artifacts.SklearnModelSchema(
         infer_method_name=infer_method_name,
         inputs=json.loads(model_signature_json["inputs"]),
         outputs=json.loads(model_signature_json["outputs"]),
     )
+
+
+def xgboost_infer_schema(
+    model_input: Any,
+    model: Union["Booster", "XGBModel"],
+    infer_method_name: str = "predict",
+) -> autogen_artifacts.XGBoostModelSchema:
+    """
+    Infer the schema of an XGBoost model.
+
+    Args:
+        model_input (Any): The input data to be used for schema inference.
+        model (Any): The XGBoost model instance.
+        infer_method_name (str): The name of the method to be used for schema inference.
+            Eg: predict (default), predict_proba
+    Returns:
+        XGBoostModelSchema: The inferred schema of the XGBoost model.
+    """
+    model_signature_json = _infer_schema(
+        model_input=model_input, model=model, infer_method_name=infer_method_name
+    )
+    return autogen_artifacts.XGBoostModelSchema(
+        infer_method_name=infer_method_name,
+        inputs=json.loads(model_signature_json["inputs"]),
+        outputs=json.loads(model_signature_json["outputs"]),
+    )

{truefoundry-0.5.1rc8.dist-info → truefoundry-0.5.2.dist-info}/METADATA

@@ -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.dist-info → truefoundry-0.5.2.dist-info}/RECORD

@@ -5,7 +5,7 @@ truefoundry/autodeploy/agents/base.py,sha256=woCry229x7WX0IZmBopW_e_NB76aCLQRLXZ
 truefoundry/autodeploy/agents/developer.py,sha256=Fh-EJDT3wPwCPYsrxRNtanyKMiZxhK73LHb-5Kpmh0A,4127
 truefoundry/autodeploy/agents/project_identifier.py,sha256=dm1A6MHNA-0Sc48y7dYpSA7e4uvw3Wi8AADSs-JcOZs,4505
 truefoundry/autodeploy/agents/tester.py,sha256=Hp1bul8Xd6qZPdUDUPqQwwHF7bsPQ5tK7x6gaBuX0NI,2403
-truefoundry/autodeploy/cli.py,sha256=GkUuiMqtg8U8qachhA3-YgQVUH1PxM6m6yjIwoXuHWg,14222
+truefoundry/autodeploy/cli.py,sha256=1VnDAP9ylM6l00v0Ko5KL6_Dr7bL_voeAPdbEvWvU3Y,14215
 truefoundry/autodeploy/constants.py,sha256=vTh2nA7cjqghqbW2rNh3FbtcIk2scdAWZuuQCmVBO80,1273
 truefoundry/autodeploy/exception.py,sha256=fa_ZyTDUKiMKG2Uayynk1yWcEMsuVluqk2GtV4tfTPU,158
 truefoundry/autodeploy/logger.py,sha256=tkV2UKcOTFl5nz0cn4eRbzxF-2CZd8b7MK9vnhaflYw,325
@@ -24,19 +24,24 @@ truefoundry/autodeploy/utils/client.py,sha256=PvbSkfgAjAogGjisinqmh4mP4svowxAC0I
 truefoundry/autodeploy/utils/diff.py,sha256=Ef8Y-VffDKel_-q-GxRam6gqiv8qTLMcqVg6iifXfcA,5358
 truefoundry/autodeploy/utils/pydantic_compat.py,sha256=hEAUy5kLjhPdzw7yGZ2iXGMXbbMVXVlGzIofmyHafXQ,412
 truefoundry/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/cli/__main__.py,sha256=-NkhYlT3mC5MhtekueKAvCw-sWvguj0LJRpXWzvvFjc,727
+truefoundry/cli/__main__.py,sha256=0nEwE0UkFagCO5ctGcqEThdmBT2fN8MVcr0ERItnsNQ,3483
+truefoundry/cli/config.py,sha256=tf8w4UfVzcC6eYkENvuuCPYt_V3sqVpO1bclORV9tAk,206
+truefoundry/cli/console.py,sha256=9-dMy4YPisCJQziRKTg8Qa0UJnOGl1soiUnJjsnLDvE,242
+truefoundry/cli/const.py,sha256=dVHPo1uAiDSSMXwXoT2mR5kNQjExT98QNVRz98Hz_Ts,510
+truefoundry/cli/display_util.py,sha256=vypx4FQImmDwl2QAj7GpjwlpvG3VFhqoNPvCkBzGqNg,3120
+truefoundry/cli/util.py,sha256=yA8sie7TBTOu-5QFf2zEFWYEKYcBCaV6o1gtctj1dtI,3390
 truefoundry/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/common/auth_service_client.py,sha256=RRiGUqITxeVYwKZLc923zJP-61UAvFtVlMaG2HJBvXc,7940
-truefoundry/common/constants.py,sha256=z96d99N_tP3om3EayB_MVOsJRmYVeNm4bBbYIW61Ta0,2556
+truefoundry/common/constants.py,sha256=Pxksh1MMjz9WAKV6wCcq1wu9uawzZGMe9RU9FrLOZbQ,2626
 truefoundry/common/credential_file_manager.py,sha256=1yEk1Zm2xS4G0VDFwKSZ4w0VUrcPWQ1nJnoBaz9xyKA,4251
 truefoundry/common/credential_provider.py,sha256=Aht7hFLsnyRgMR34dRbzln7dor0WYSeA8ej8ApNmnKM,4148
 truefoundry/common/entities.py,sha256=8O-EGPk4PKqnyoFMKUTxISCU19rz0KBnfRDJU695DhY,3797
 truefoundry/common/exceptions.py,sha256=ePpiQ_zmWe4e94gOgeMiyP_AZnKwjEBfyXsB5ScGYcI,329
 truefoundry/common/request_utils.py,sha256=5xw4YGUcMf71Ncal3OfFCa-PoWDIvG3hYGCDa4Da4OI,2854
 truefoundry/common/servicefoundry_client.py,sha256=2fxmgCM-ckFHpnm6n_mL-5Z8RWN_q-dYVvFC29bkYSg,3120
-truefoundry/common/utils.py,sha256=8z82WrfhrU5k2xtaOtUVKXom3B46X5HPp0OybTkUrFo,5883
+truefoundry/common/utils.py,sha256=H87mfvqSE9OSRRdX-G9m3_JvWLVtkNuLmsFsvJHMczc,6098
 truefoundry/deploy/__init__.py,sha256=p14_yIJw2bcaKW3c1DTaoM7UwfHvt2T_MfeFlZIz1g4,2359
-truefoundry/deploy/auto_gen/models.py,sha256=8848BDbq2hO8Y75LsBH3cS0vi8qEOKU5x6oBtVmYorE,82552
+truefoundry/deploy/auto_gen/models.py,sha256=3_GTdaYE95piMzhbM4SvMSQhP4UGWDGpJnLxERjYHGw,82555
 truefoundry/deploy/builder/__init__.py,sha256=1qjHMNBE1poRCZW0WrG46dFM1f1IlivD5352qzsioMU,4953
 truefoundry/deploy/builder/builders/__init__.py,sha256=tlFLXqyDaKLd4iZbo4Hcu_8gOmgtL6drnXpbmQ6x1P8,636
 truefoundry/deploy/builder/builders/dockerfile.py,sha256=AXXTziCkaqIhuM_bwyD1vT1znOwemN1TKgU7eyo-KuM,1522
@@ -48,54 +53,46 @@ truefoundry/deploy/builder/constants.py,sha256=amUkHoHvVKzGv0v_knfiioRuKiJM0V0xW
 truefoundry/deploy/builder/docker_service.py,sha256=OI8efqK0Gnoii8bcHihpA2StwHVzsMREfBk7NvMR4hY,3950
 truefoundry/deploy/builder/utils.py,sha256=D68-bqM0NQx-Elg-56mtkENyVyg9faZ9tgTmBuo1Sjs,1076
 truefoundry/deploy/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/deploy/cli/cli.py,sha256=BuAW-R98oz1wzPDg00fPgrK1UDoCfy0Tu6pWW9Ud1Ns,2887
 truefoundry/deploy/cli/commands/__init__.py,sha256=-i3ltscehEO0hy-Cf6gPLaiobfv8tZetPKaaCyR9B3M,1364
-truefoundry/deploy/cli/commands/apply_command.py,sha256=FdTeuyOPEoPSU6GP_aQGNOJV0S0rm7PkxrAlXiNvoX8,1864
-truefoundry/deploy/cli/commands/build_command.py,sha256=DQ7NARgkIgV4z0Zdnl3zMDKU_fSkN5-FkjCQypgmWpo,1255
-truefoundry/deploy/cli/commands/build_logs_command.py,sha256=WrPOlFec_wwuzdJmKZ8mjca-oFVvxgfblcqj2LlhWJA,2804
-truefoundry/deploy/cli/commands/create_command.py,sha256=ZjA4EP1jHYuVE1zx0kN-giBr3y0sEiXnu8xMsNyD2Rg,1850
-truefoundry/deploy/cli/commands/delete_command.py,sha256=4tyIameA1pVu9uZZNJPK6rqdV-cJogf51iCCrG-9noI,2390
-truefoundry/deploy/cli/commands/deploy_command.py,sha256=d2Yhgn-zTEIlFUR-IBYpt7-dsec__hsGd1no207u-Q8,4000
-truefoundry/deploy/cli/commands/deploy_init_command.py,sha256=4NnAfd_S_LGwvhRB8z-HEGKoJ2GN1NnKpx9ReDP_HCk,607
-truefoundry/deploy/cli/commands/get_command.py,sha256=w7h5C4bJpmHJ99rgiGg9J_X0xi8aZUeB6Q-SoZUV1tg,5979
-truefoundry/deploy/cli/commands/list_command.py,sha256=cFARY22L5xspBX7TWsx41IF4RiRMok7KBwv7hQRFXNs,4498
-truefoundry/deploy/cli/commands/login_command.py,sha256=WV4Ad8PJ2_yNfCJi1VWW2GNwU6khZ2sWZbKebxJ7oVM,1038
-truefoundry/deploy/cli/commands/logout_command.py,sha256=hgw6LhJtF3xJ6YyQ_VrBuUWY0WmT8tPYbOEOhMu1eXU,550
-truefoundry/deploy/cli/commands/logs_command.py,sha256=fQSY4o_B78WEJDD5qULWPFQJsCXLJLTr0RI1QjmX1WE,4154
-truefoundry/deploy/cli/commands/patch_application_command.py,sha256=M2PR2nk9ToUGwXP7i1DcGKCvPyKdH6BQpowXT2yXkj0,2457
-truefoundry/deploy/cli/commands/patch_command.py,sha256=bwZdBDmLq9tMOGh5Zq2HJZs2QhfxMRJNFRMxwXfBozY,1679
-truefoundry/deploy/cli/commands/redeploy_command.py,sha256=-wMQLeMcBdJsQBMgTv7rS6hCqH1EJsSKgPrAXU9HjxU,1032
-truefoundry/deploy/cli/commands/terminate_comand.py,sha256=G1XFUtSebhCB1EOb4bM5v7CaVZs4SYS9X4yLsOt6Ffs,1098
-truefoundry/deploy/cli/commands/trigger_command.py,sha256=Js6x7-TEuQQN1fTBoILTJiCt76TdH9qpAnkCnei6vYo,4730
-truefoundry/deploy/cli/config.py,sha256=tf8w4UfVzcC6eYkENvuuCPYt_V3sqVpO1bclORV9tAk,206
-truefoundry/deploy/cli/console.py,sha256=9-dMy4YPisCJQziRKTg8Qa0UJnOGl1soiUnJjsnLDvE,242
-truefoundry/deploy/cli/const.py,sha256=dVHPo1uAiDSSMXwXoT2mR5kNQjExT98QNVRz98Hz_Ts,510
-truefoundry/deploy/cli/display_util.py,sha256=gq8EBdpBMHUzYQp_hxOg9EOYi08FIHgOVFCqXqC2tuo,3044
-truefoundry/deploy/cli/util.py,sha256=bxbNEX3mbhtDpXw3b2GAnbxe0xvCF9N1sCMK6yatz0Q,3689
+truefoundry/deploy/cli/commands/apply_command.py,sha256=Y2e_C8HVpo8CssVod-3JRz-89qStC5JRaNzJ7O2mRlY,2039
+truefoundry/deploy/cli/commands/build_command.py,sha256=zJBywMatbpUlXx5O2aqpEVmPeBIJ9RNnG9abSc8C8CE,1234
+truefoundry/deploy/cli/commands/build_logs_command.py,sha256=DE_yprQQ6PrhOQo3xsYxGWQrXSopzSYDkt3hWB4n728,2790
+truefoundry/deploy/cli/commands/create_command.py,sha256=rCajvQvAfZU10nDZOYpRACbAATH1zj52ihTWrhnLLUc,1829
+truefoundry/deploy/cli/commands/delete_command.py,sha256=JMibxvt1rsZ8sODa0jI1e6vavjN8Pv04ttVFURSTKTw,2362
+truefoundry/deploy/cli/commands/deploy_command.py,sha256=B5taHuy2qRJEwco78kroMEAj6uf2_UMYatqb4Rn2-ko,3986
+truefoundry/deploy/cli/commands/deploy_init_command.py,sha256=g-jBfrEmhZ0TDWsyqPDn4K6q33EqJSGmBTt1eMYig-w,600
+truefoundry/deploy/cli/commands/get_command.py,sha256=HZQGWib-qrS0RdzctRDwDLfMGu0wqWkAM1u26cTZlsc,5944
+truefoundry/deploy/cli/commands/list_command.py,sha256=zKu_JWY35eMIzgSNFYtmwi2uezZ4k-8yk3C1Vqsvshc,4470
+truefoundry/deploy/cli/commands/login_command.py,sha256=EHZH3cDQdbVWMkuFxd7JfB0B0Dr89sUmt214ICBmspY,1024
+truefoundry/deploy/cli/commands/logout_command.py,sha256=u3kfrEp0ETbrz40KjD4GCC3XEZ5YRAlrca_Df4U_mk0,536
+truefoundry/deploy/cli/commands/logs_command.py,sha256=osl2z5VaIceB9sYa6GtwsuyAPZKcw-A0oVEt3g1f62Q,4140
+truefoundry/deploy/cli/commands/patch_application_command.py,sha256=YdTlkWGI2gCMoVAgPJtybjuvRFqZq9tp6TqbCpwgXUY,2443
+truefoundry/deploy/cli/commands/patch_command.py,sha256=wA95khMO9uVz8SaJlgYMUwaX7HagtchjyxXXATq83Bk,1665
+truefoundry/deploy/cli/commands/redeploy_command.py,sha256=JNeSK3itsirrKYJh3q-Cc10pCtYR9bojsvI8up6_0wI,1018
+truefoundry/deploy/cli/commands/terminate_comand.py,sha256=UKhOdbAej8ubX3q44vpLrOotAcvH4vHpRZJQrRf_AfM,1077
+truefoundry/deploy/cli/commands/trigger_command.py,sha256=_qSl-AShepZpbGUGTfLfJGd74VJJ_wd3eXYt2DfxIFo,4716
 truefoundry/deploy/core/__init__.py,sha256=j61bMWj4BkWihdssKMSFhieo7afJDtpc7qO7zk1rDB4,140
 truefoundry/deploy/core/login.py,sha256=N2VrW3nlBzoyoYulkipxwQvCpjBhi3sfsmhxK1ktWhg,236
 truefoundry/deploy/core/logout.py,sha256=TpWLq4_DsxYS5GX2OJQGDhekNOfiOLb-vO5khQueHXw,80
 truefoundry/deploy/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/io/output_callback.py,sha256=V2YwUFec4G4a67lM4r-x_64AqdOVNo_9sTdfQWLlvi0,604
 truefoundry/deploy/io/rich_output_callback.py,sha256=TJLiRD-EnFVwgcepxR7WN0koKqW1X2DevETPhNPi_nU,829
-truefoundry/deploy/json_util.py,sha256=x_-7YYQ4_HUIJ8ofOcclAp9JWhgTWjR9Th6Q0FuRqGk,175
 truefoundry/deploy/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/auth/servicefoundry_session.py,sha256=5TCYPunAygtn5mb0mp_VcWKEalKMKPbyWMWer-Vty2g,1916
 truefoundry/deploy/lib/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/deploy/lib/clients/servicefoundry_client.py,sha256=tkuPNbo9vDTgXPHD4p3d-t6HigBvKNfML1pTQXBwJfY,26170
-truefoundry/deploy/lib/const.py,sha256=repGJLuoMqtzeq5tCjjkN4bH187FVHVKI30BricOlvc,244
+truefoundry/deploy/lib/clients/servicefoundry_client.py,sha256=yhHsHo9T0mTbum7X2sOuNVf-am1AdtzyK0KBQkdC0io,26212
+truefoundry/deploy/lib/const.py,sha256=Wg0GDnfFu-g1fJr4lU80NH2ULw0R0dYjV7LnW-PbOeM,173
 truefoundry/deploy/lib/dao/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/dao/application.py,sha256=xUqF34abde71YZo9gkR-WvVJi1C6nBeGBNw4kL5FdIo,9226
-truefoundry/deploy/lib/dao/apply.py,sha256=sXnQY6RVzLVm1fX2BKuWHAoKlKISirrcByHEhY3x4zo,2570
+truefoundry/deploy/lib/dao/apply.py,sha256=Jadfa3DcbIRz-Bb4Tlixed179HLDnmDXOlrvSxfEgQ0,3021
 truefoundry/deploy/lib/dao/version.py,sha256=AtdW_4O1DPUKdfv2qy6iUJsZ_95vM6z0AqeEy3WDKs8,1130
-truefoundry/deploy/lib/dao/workspace.py,sha256=jm8UWytwVajVcrYyHSTCwWYDYl-RHuk0zAf9Caj4GzQ,2356
-truefoundry/deploy/lib/exceptions.py,sha256=ZT2o3mar3BYtnjKHn2wf4rBGEaFIgf-zkQmzDicg6Ps,236
+truefoundry/deploy/lib/dao/workspace.py,sha256=KZA8QrlOTecFLAi4Xt0qJ0hNwQL76UYsTKJgZbsA_5s,2349
 truefoundry/deploy/lib/logs_utils.py,sha256=SQxRv3jDDmgHdOUMhlMaAPGYskybnBUMpst7QU_i_sc,1469
 truefoundry/deploy/lib/messages.py,sha256=nhp0bCYf_XpUM68hTq5lBY-__vtEyV2uP7NgnJXJ_Vg,925
 truefoundry/deploy/lib/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/deploy/lib/model/entity.py,sha256=fq8hvdJQgQn4uZqxpKrzmaoJhQG53_EbDoDxUPPmOZ0,8387
+truefoundry/deploy/lib/model/entity.py,sha256=3YRdyvMYI1aUXUu2tB5b5lZWwpxKdAhjpT79gzTCZGo,8373
 truefoundry/deploy/lib/session.py,sha256=Vg6rCA315T0yS0xG4ayJ84Ia_9ZfibH8utOSwPBMAmw,4953
-truefoundry/deploy/lib/util.py,sha256=3TapV7yczkheC1MMMfmJDGGzTl2l6e4jCYd_Rr5aoQ8,1330
+truefoundry/deploy/lib/util.py,sha256=J7r8San2wKo48A7-BlH2-OKTlBO67zlPjLEhMsL8os0,1059
 truefoundry/deploy/lib/win32.py,sha256=1RcvPTdlOAJ48rt8rCbE2Ufha2ztRqBAE9dueNXArrY,5009
 truefoundry/deploy/python_deploy_codegen.py,sha256=qJHH1BJQII9e6PhkcRFYiE_3De7_VMMm8nM4AX5Eq1o,6513
 truefoundry/deploy/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -107,7 +104,7 @@ truefoundry/deploy/v2/lib/models.py,sha256=pSolLMTArDuYpeNsmeeS5DWliloN_iCDfZSpR
 truefoundry/deploy/v2/lib/patched_models.py,sha256=NTU8J_CwdvEuF9zNXwFyN3suOp_196Wrm75DDy5qcXE,14184
 truefoundry/deploy/v2/lib/source.py,sha256=VHKuFREiixUP40D3Mrz-TA70spu1M0RbCzl--qwlFaY,9263
 truefoundry/logger.py,sha256=u-YCNjg5HBwE70uQcpjIG64Ghos-K2ulTWaxC03BSj4,714
-truefoundry/ml/__init__.py,sha256=VtP0B3DNFFV_1b4WHkAo_XRMvWHmyeEwDu984t4cy8s,2040
+truefoundry/ml/__init__.py,sha256=ssUEIs8BixPWxynKoeSh-dkRl6AtLXG0PBGYnUR5Az8,2217
 truefoundry/ml/artifact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/ml/artifact/truefoundry_artifact_repo.py,sha256=FksxhUpRHb9pgWZmAB16DhXqkAL6UIAPA1S3RJUApQU,46201
 truefoundry/ml/autogen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -316,10 +313,10 @@ truefoundry/ml/autogen/models/schema.py,sha256=IhpO9qbygLqEamP3NIt3m90SseJXCOm1Z
 truefoundry/ml/autogen/models/signature.py,sha256=rBjpxUIsEeWM0sIyYG5uCJB18DKHR4k5yZw8TzuoP48,4987
 truefoundry/ml/autogen/models/utils.py,sha256=c7RtSLXhOLcP8rjuUtfnMdaKVTZvvbsmw98gPAkAFrs,24371
 truefoundry/ml/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/ml/cli/cli.py,sha256=ckBcjUpqfhgrPE1okqT_G2iouOLt-0KjpLhHp2YdVFU,256
+truefoundry/ml/cli/cli.py,sha256=MwpY7z_NEeJE_XIP7XbZELjNeu2vpMmohttHCKDRk54,335
 truefoundry/ml/cli/commands/__init__.py,sha256=diDUiRUX4l6TtNLI4iF-ZblczkELM7FRViJ-8gGNJQY,82
-truefoundry/ml/cli/commands/download.py,sha256=cbz9KijiLKXj4-twlig3xZLTVRNm4fnjwpy0leZr31w,2342
-truefoundry/ml/cli/commands/model_init.py,sha256=LzHYHDOT3MackBIRLi3t18zmrV0E3gCNFLmZSlwwTlk,2661
+truefoundry/ml/cli/commands/download.py,sha256=N9MhsEQ3U24v_OmnMZT8Q4SoAi38Sm7a21unrACOSDw,2573
+truefoundry/ml/cli/commands/model_init.py,sha256=9fHCernmQswjEhREzdrnKxwCCWkgmFrpL29H52Sd1gQ,2663
 truefoundry/ml/cli/utils.py,sha256=j6_mZ4Spn114mz3P4QQ8jx0tmorXIuyQnHXVUSDvZi4,1035
 truefoundry/ml/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/ml/clients/entities.py,sha256=sNP4DnAVdQoMfc06s0r3VTzKHTo7jmxAOuTlQOVmsMs,151
@@ -347,9 +344,9 @@ truefoundry/ml/log_types/plot.py,sha256=HuYvvRA5r8V0xAIuuqMME2IHb9d3SfGHUiuEkOP3
 truefoundry/ml/log_types/pydantic_base.py,sha256=eBlw_AEyAz4iJKDP4zgJOCFWcldwQqpf7FADW1jzIQY,272
 truefoundry/ml/log_types/utils.py,sha256=xjJ21jdPScvFmw3TbVh5NCzbzJwaqiXJyiiT4xxX1EI,335
 truefoundry/ml/logger.py,sha256=VT-BF3BnBYTWVq87O58F0c8uXMu94gYzsiFlGY3_7Ao,458
-truefoundry/ml/mlfoundry_api.py,sha256=PefznXwBPBv8TD4RYid9aiE8WWEkZQAHoaAbvklFoRs,62364
-truefoundry/ml/mlfoundry_run.py,sha256=RLTZGz3htyxNmG1Xat9WevawEIjDoUCbWrSNql8WynI,44597
-truefoundry/ml/model_framework.py,sha256=trqqzy1-BpW3bF4V7wETiOlRBdlcQi2Lk7MXORngmoU,17585
+truefoundry/ml/mlfoundry_api.py,sha256=avuGgjbRnQXk774Vd3Dx7n99bbrOkL9pob9DI-vNvWE,62368
+truefoundry/ml/mlfoundry_run.py,sha256=scHjdjojRGbE4ZZlByZTFrcBTamRbm_JGidaSX9Gi9o,44601
+truefoundry/ml/model_framework.py,sha256=xHmVFI3Xcd6z6BH9TyZY8kFiw3Fp70423_M_wTYxd5Y,18841
 truefoundry/ml/run_utils.py,sha256=0W208wSLUrbdfk2pjNcZlkUi9bNxG2JORqoe-5rVqHI,2423
 truefoundry/ml/session.py,sha256=F83GTC5WwGBjnJ69Ct8MqMnlutYc56JCc6YhEY1Wl-A,5394
 truefoundry/ml/validation_utils.py,sha256=J5atNhcJLvKj64ralSV9Y5Fv1Rt4SE237ICdP9-7sP4,12149
@@ -370,7 +367,7 @@ truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py,sha256=5mBCIc-ON
 truefoundry/workflow/remote_filesystem/tfy_signed_url_fs.py,sha256=Hf6Dk6Fu6P7DqsK5ULgraf9DStjgigf-kjaRAMBW-RU,8680
 truefoundry/workflow/task.py,sha256=ToitYiKcNzFCtOVQwz1W8sRjbR97eVS7vQBdbgUQtKg,1779
 truefoundry/workflow/workflow.py,sha256=WaTqUjhwfAXDWu4E5ehuwAxrCbDJkoAf1oWmR2E9Qy0,4575
-truefoundry-0.5.1rc8.dist-info/METADATA,sha256=0XwCMcuY2axlt1JUfIhogw1uNn0rRn0edV5HUigM6oc,2887
-truefoundry-0.5.1rc8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-truefoundry-0.5.1rc8.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
-truefoundry-0.5.1rc8.dist-info/RECORD,,
+truefoundry-0.5.2.dist-info/METADATA,sha256=6hHSeJgoWF54g-W-F9zKjBcHi1irRbByE2aTXb-3qPo,2884
+truefoundry-0.5.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+truefoundry-0.5.2.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
+truefoundry-0.5.2.dist-info/RECORD,,

truefoundry/deploy/cli/cli.py

@@ -1,96 +0,0 @@
-import logging
-import sys
-
-import rich_click as click
-
-from truefoundry import logger
-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.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.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
-
-
-@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)

truefoundry/deploy/json_util.py

@@ -1,7 +0,0 @@
-import datetime
-
-
-def json_default_encoder(o):
-    if isinstance(o, datetime.datetime):
-        return o.isoformat()
-    raise TypeError(f"Cannot json encode {type(o)}: {o}")

truefoundry/deploy/lib/exceptions.py

@@ -1,10 +0,0 @@
-from typing import Optional
-
-
-class ConfigurationException(Exception):
-    def __init__(self, message: Optional[str] = None):
-        super().__init__()
-        self.message = message
-
-    def __str__(self):
-        return self.message