truefoundry 0.5.6rc1__py3-none-any.whl → 0.5.7rc1__py3-none-any.whl

truefoundry/deploy/cli/commands/deploy_command.py

@@ -54,10 +54,21 @@ def _get_default_spec_file():
     default=True,
     help="Wait and tail the deployment progress",
 )
+@click.option(
+    "--force-deploy/--no-force-deploy",
+    is_flag=True,
+    show_default=True,
+    default=False,
+    help="Force create a new deployment by canceling any ongoing deployments",
+)
 @click.pass_context
 @handle_exception_wrapper
 def deploy_command(
-    ctx: click.Context, file: str, workspace_fqn: Optional[str], wait: bool
+    ctx: click.Context,
+    file: str,
+    workspace_fqn: Optional[str],
+    wait: bool,
+    force_deploy: bool,
 ):
     if ctx.invoked_subcommand is not None:
         return
@@ -74,7 +85,9 @@ def deploy_command(
             application_definition = yaml.safe_load(f)
 
         application = Application.parse_obj(application_definition)
-        application.deploy(workspace_fqn=workspace_fqn, wait=wait)
+        application.deploy(
+            workspace_fqn=workspace_fqn, wait=wait, force_deploy=force_deploy
+        )
         sys.exit(0)
 
     click.echo(

truefoundry/deploy/lib/clients/servicefoundry_client.py

@@ -239,12 +239,16 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
 
     @check_min_cli_version
     def deploy_application(
-        self, workspace_id: str, application: auto_gen_models.Workflow
+        self,
+        workspace_id: str,
+        application: auto_gen_models.Workflow,
+        force_deploy: bool,
     ) -> Deployment:
         data = {
             "workspaceId": workspace_id,
             "name": application.name,
             "manifest": application.dict(exclude_none=True),
+            "forceDeploy": force_deploy,
         }
         logger.debug(json.dumps(data))
         url = f"{self._api_server_url}/{VERSION_PREFIX}/deployment"

truefoundry/deploy/v2/lib/deploy.py

@@ -249,7 +249,10 @@ or pass it explicitly using `--workspace-fqn` argument on CLI.
 
 
 def deploy_component(
-    component: Component, workspace_fqn: Optional[str] = None, wait: bool = True
+    component: Component,
+    workspace_fqn: Optional[str] = None,
+    wait: bool = True,
+    force_deploy: bool = False,
 ) -> Deployment:
     _warn_when_gpu_selected_without_cuda(component=component)
     workspace_fqn = _resolve_workspace_fqn(
@@ -269,7 +272,9 @@ def deploy_component(
         )
     client = ServiceFoundryServiceClient()
     response = client.deploy_application(
-        workspace_id=workspace_id, application=updated_component
+        workspace_id=workspace_id,
+        application=updated_component,
+        force_deploy=force_deploy,
     )
     logger.info(
         "🚀 Deployment started for application '%s'. Deployment FQN is '%s'.",

truefoundry/deploy/v2/lib/deploy_workflow.py

@@ -1,7 +1,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import Dict, List, Optional, Union
+from typing import Callable, Dict, List, Optional, Union
 
 import requirements
 from flytekit.configuration import (
@@ -37,13 +37,16 @@ from truefoundry.workflow.workflow import (
 
 
 def _handle_code_upload_for_workflow(
-    workflow: auto_gen_models.Workflow, workspace_fqn: str
+    workflow: auto_gen_models.Workflow,
+    workspace_fqn: str,
+    upload_code_package: Callable[[str, str, str], str],
 ) -> auto_gen_models.Workflow:
     new_workflow = workflow.copy(deep=True)
     new_workflow.source = local_source_to_remote_source(
         local_source=workflow.source,
         workspace_fqn=workspace_fqn,
         component_name=workflow.name,
+        upload_code_package=upload_code_package,
     )
     return new_workflow
 
@@ -270,6 +273,7 @@ def deploy_workflow(
     workflow: auto_gen_models.Workflow,
     workspace_fqn: str,
     wait: bool = True,
+    force_deploy: bool = False,
 ) -> Deployment:
     _generate_manifest_for_workflow(workflow)
     _validate_workspace_fqn(workflow, workspace_fqn)
@@ -283,12 +287,14 @@ def deploy_workflow(
     logger.info(
         f"Deploying workflow {workflow.name} to workspace {workspace_fqn} ({workspace_id})"
     )
+    client = ServiceFoundryServiceClient()
 
     workflow = _handle_code_upload_for_workflow(
-        workflow=workflow, workspace_fqn=workspace_fqn
+        workflow=workflow,
+        workspace_fqn=workspace_fqn,
+        upload_code_package=client.upload_code_package,
     )
 
-    client = ServiceFoundryServiceClient()
     deployment = client.deploy_application(
         workspace_id=workspace_id, application=workflow
     )

truefoundry/deploy/v2/lib/deployable_patched_models.py

@@ -11,8 +11,15 @@ class DeployablePatchedModelBase(BaseModel):
     class Config:
         extra = "forbid"
 
-    def deploy(self, workspace_fqn: str, wait: bool = True) -> Deployment:
-        return deploy_component(component=self, workspace_fqn=workspace_fqn, wait=wait)
+    def deploy(
+        self, workspace_fqn: str, wait: bool = True, force_deploy: bool = False
+    ) -> Deployment:
+        return deploy_component(
+            component=self,
+            workspace_fqn=workspace_fqn,
+            wait=wait,
+            force_deploy=force_deploy,
+        )
 
 
 class Service(models.Service, DeployablePatchedModelBase):
@@ -73,7 +80,9 @@ class SSHServer(models.SSHServer, DeployablePatchedModelBase):
 
 
 class Application(models.Application, DeployablePatchedModelBase):
-    def deploy(self, workspace_fqn: str, wait: bool = True) -> Deployment:
+    def deploy(
+        self, workspace_fqn: str, wait: bool = True, force_deploy: bool = False
+    ) -> Deployment:
         if isinstance(self.__root__, models.Workflow):
             from truefoundry.deploy.v2.lib.deploy_workflow import deploy_workflow
 
@@ -81,10 +90,14 @@ class Application(models.Application, DeployablePatchedModelBase):
                 workflow=self.__root__,
                 workspace_fqn=workspace_fqn,
                 wait=wait,
+                force_deploy=force_deploy,
             )
         else:
             return deploy_component(
-                component=self.__root__, workspace_fqn=workspace_fqn, wait=wait
+                component=self.__root__,
+                workspace_fqn=workspace_fqn,
+                wait=wait,
+                force_deploy=force_deploy,
             )
 
 

{truefoundry-0.5.6rc1.dist-info → truefoundry-0.5.7rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: truefoundry
-Version: 0.5.6rc1
+Version: 0.5.7rc1
 Summary: TrueFoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com

{truefoundry-0.5.6rc1.dist-info → truefoundry-0.5.7rc1.dist-info}/RECORD

@@ -61,7 +61,7 @@ truefoundry/deploy/cli/commands/apply_command.py,sha256=Y2e_C8HVpo8CssVod-3JRz-8
 truefoundry/deploy/cli/commands/build_command.py,sha256=zJBywMatbpUlXx5O2aqpEVmPeBIJ9RNnG9abSc8C8CE,1234
 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=YW4OG-5ZD1BZn82ckrNInNRHWxVOwaUjHhRTgfCEUCU,3890
+truefoundry/deploy/cli/commands/deploy_command.py,sha256=JW7_gUwM7sg7cNkK-28AdNdgFj26Oj2KjkqIO-CvZFg,4172
 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
@@ -81,7 +81,7 @@ truefoundry/deploy/io/output_callback.py,sha256=V2YwUFec4G4a67lM4r-x_64AqdOVNo_9
 truefoundry/deploy/io/rich_output_callback.py,sha256=TJLiRD-EnFVwgcepxR7WN0koKqW1X2DevETPhNPi_nU,829
 truefoundry/deploy/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/deploy/lib/clients/servicefoundry_client.py,sha256=5U-r9BGhpcyt1LtzxYIwKno6i9Qf-m27L40tPfeKMyI,26358
+truefoundry/deploy/lib/clients/servicefoundry_client.py,sha256=twgEUKSES8HWewMj-8xeD1O3AOz9kfhaaZA4D0BATxk,26444
 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=oMszpueXPUfTUuN_XdKwoRjQyqAgWHhZ-10cbprCVdM,9226
@@ -98,9 +98,9 @@ truefoundry/deploy/lib/win32.py,sha256=1RcvPTdlOAJ48rt8rCbE2Ufha2ztRqBAE9dueNXAr
 truefoundry/deploy/python_deploy_codegen.py,sha256=qJHH1BJQII9e6PhkcRFYiE_3De7_VMMm8nM4AX5Eq1o,6513
 truefoundry/deploy/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/v2/lib/__init__.py,sha256=WEiVMZXOVljzEE3tpGJil14liIn_PCDoACJ6b3tZ6sI,188
-truefoundry/deploy/v2/lib/deploy.py,sha256=bkVdVhxxyO0SMMOrpxc6CgIN0lLKf8aMWkXp1Yk298w,12356
-truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=6Y4PNhd5PCc_4TjpcIZPkr6FCm3BNIQ_SsJTvpUu7a0,12579
-truefoundry/deploy/v2/lib/deployable_patched_models.py,sha256=FmpZWpSbBTHe4yt0XMIPgdCNy_Rw1aXQCt8icv8TcWE,3701
+truefoundry/deploy/v2/lib/deploy.py,sha256=Uk4osyx7uGfYWgyzd6FlmDEnR6tnIjDdytIlCQAq9Xs,12441
+truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=NM6MDdJ7qeqr1HPM5dLLhwkshQ3OweKQOFjzRZ_2c5w,12797
+truefoundry/deploy/v2/lib/deployable_patched_models.py,sha256=6zLJmzRfKXoYa151lc_WUIUOc4wBtNthFfGS9IWMrQc,3990
 truefoundry/deploy/v2/lib/models.py,sha256=pSolLMTArDuYpeNsmeeS5DWliloN_iCDfZSpRllMHUg,1120
 truefoundry/deploy/v2/lib/patched_models.py,sha256=-YnzXSabKs8XDx2I5zYjSKj1lM2qf-L4huewtHSvnP4,16310
 truefoundry/deploy/v2/lib/source.py,sha256=wArU8AwSy7U9EUGLEMmB4Ke7ZwgZWmh8fFU-PACogIk,9347
@@ -367,7 +367,7 @@ truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py,sha256=xcT0wQmQl
 truefoundry/workflow/remote_filesystem/tfy_signed_url_fs.py,sha256=nSGPZu0Gyd_jz0KsEE-7w_BmnTD8CVF1S8cUJoxaCbc,13305
 truefoundry/workflow/task.py,sha256=34m55mALXx6ko9o5HkK6FDtMajdvJzBhOsHwDM2RcBA,1779
 truefoundry/workflow/workflow.py,sha256=WaTqUjhwfAXDWu4E5ehuwAxrCbDJkoAf1oWmR2E9Qy0,4575
-truefoundry-0.5.6rc1.dist-info/METADATA,sha256=gyC5cfqMcw0-catsE0shKVkzS4W68Ifj5WC-2LI8fBw,2887
-truefoundry-0.5.6rc1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-truefoundry-0.5.6rc1.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
-truefoundry-0.5.6rc1.dist-info/RECORD,,
+truefoundry-0.5.7rc1.dist-info/METADATA,sha256=x5GilnYFCgdiFnR85bO_VZSTstYfnHbumizGDELekAM,2887
+truefoundry-0.5.7rc1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+truefoundry-0.5.7rc1.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
+truefoundry-0.5.7rc1.dist-info/RECORD,,