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

truefoundry/cli/__main__.py

@@ -71,7 +71,7 @@ def truefoundry_cli(ctx, json, debug):
     logger.add_cli_handler(level=log_level)
 
 
-def create_truefoundry_cli() -> click.MultiCommand:
+def create_truefoundry_cli() -> click.Group:
     """Generates CLI by combining all subcommands into a main CLI and returns in
 
     Returns:
@@ -105,7 +105,7 @@ def main():
     try:
         cli = create_truefoundry_cli()
     except Exception as e:
-        raise click.exceptions.UsageError(message=str(e)) from e
+        raise click.UsageError(message=str(e)) from e
     sys.exit(cli())
 
 

truefoundry/common/credential_provider.py

@@ -38,7 +38,7 @@ class EnvCredentialProvider(CredentialProvider):
             )
         self._host = resolve_tfy_host()
         self._auth_service = AuthServiceClient.from_tfy_host(tfy_host=self._host)
-        self._token: Token = Token(access_token=api_key, refresh_token=None)  # type: ignore[call-arg]
+        self._token: Token = Token(access_token=api_key, refresh_token=None)
 
     @staticmethod
     def can_provide() -> bool:

truefoundry/common/entities.py

@@ -62,7 +62,7 @@ class Token(BaseModel):
         return (exp - time.time()) < buffer_in_seconds
 
     def to_user_info(self) -> UserInfo:
-        return UserInfo(  # type: ignore[call-arg]
+        return UserInfo(
             user_id=self.decoded_value["username"],
             email=self.decoded_value["email"]
             if "email" in self.decoded_value
@@ -81,9 +81,7 @@ class CredentialsFileContent(BaseModel):
     host: NonEmptyStr
 
     def to_token(self) -> Token:
-        return Token(  # type: ignore[call-arg]
-            access_token=self.access_token, refresh_token=self.refresh_token
-        )
+        return Token(access_token=self.access_token, refresh_token=self.refresh_token)
 
 
 class TenantInfo(BaseModel):

truefoundry/common/servicefoundry_client.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
 import functools
+from typing import Callable, TypeVar
 
 import requests
 from packaging import version
+from typing_extensions import ParamSpec
 
 from truefoundry.common.constants import (
     SERVICEFOUNDRY_CLIENT_MAX_RETRIES,
@@ -24,10 +26,13 @@ from truefoundry.common.utils import (
 from truefoundry.logger import logger
 from truefoundry.version import __version__
 
+P = ParamSpec("P")
+R = TypeVar("R")
 
-def check_min_cli_version(fn):
+
+def check_min_cli_version(fn: Callable[P, R]) -> Callable[P, R]:
     @functools.wraps(fn)
-    def inner(*args, **kwargs):
+    def inner(*args: P.args, **kwargs: P.kwargs) -> R:
         client: "ServiceFoundryServiceClient" = args[0]
         client.check_min_cli_version()
         return fn(*args, **kwargs)

truefoundry/common/types.py

@@ -0,0 +1,7 @@
+from typing import Protocol
+
+
+class UploadCodePackageCallable(Protocol):
+    def __call__(
+        self, workspace_fqn: str, component_name: str, package_local_path: str
+    ) -> str: ...

truefoundry/common/utils.py

@@ -53,7 +53,7 @@ def get_tfy_servers_config(tfy_host: str) -> _TFYServersConfig:
     global _tfy_servers_config
     if _tfy_servers_config is None:
         if ENV_VARS.TFY_CLI_LOCAL_DEV_MODE:
-            _tfy_servers_config = _TFYServersConfig()  # type: ignore[call-arg]
+            _tfy_servers_config = _TFYServersConfig()
         else:
             _tfy_servers_config = _TFYServersConfig.from_tfy_host(tfy_host)
     return _tfy_servers_config

truefoundry/deploy/cli/commands/deploy_command.py

@@ -55,7 +55,7 @@ def _get_default_spec_file():
     help="Wait and tail the deployment progress",
 )
 @click.option(
-    "--force-deploy/--no-force-deploy",
+    "--force/--no-force",
     is_flag=True,
     show_default=True,
     default=False,
@@ -68,7 +68,7 @@ def deploy_command(
     file: str,
     workspace_fqn: Optional[str],
     wait: bool,
-    force_deploy: bool,
+    force: bool = False,
 ):
     if ctx.invoked_subcommand is not None:
         return
@@ -85,9 +85,7 @@ def deploy_command(
             application_definition = yaml.safe_load(f)
 
         application = Application.parse_obj(application_definition)
-        application.deploy(
-            workspace_fqn=workspace_fqn, wait=wait, force_deploy=force_deploy
-        )
+        application.deploy(workspace_fqn=workspace_fqn, wait=wait, force=force)
         sys.exit(0)
 
     click.echo(

truefoundry/deploy/lib/clients/servicefoundry_client.py

@@ -4,7 +4,7 @@ import json
 import os
 import time
 from datetime import datetime, timezone
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional
 from urllib.parse import urljoin
 
 import requests
@@ -50,9 +50,6 @@ DEPLOYMENT_LOGS_SUBSCRIBE_MESSAGE = "DEPLOYMENT_LOGS"
 BUILD_LOGS_SUBSCRIBE_MESSAGE = "BUILD_LOGS"
 MAX_RETRIES_WORKFLOW_TRIGGER = 3
 
-if TYPE_CHECKING:
-    from truefoundry.deploy.auto_gen.models import Application
-
 
 def _upload_packaged_code(metadata, package_file):
     file_size = os.stat(package_file).st_size
@@ -242,13 +239,13 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
         self,
         workspace_id: str,
         application: auto_gen_models.Workflow,
-        force_deploy: bool,
+        force: bool = False,
     ) -> Deployment:
         data = {
             "workspaceId": workspace_id,
             "name": application.name,
             "manifest": application.dict(exclude_none=True),
-            "forceDeploy": force_deploy,
+            "forceDeploy": force,
         }
         logger.debug(json.dumps(data))
         url = f"{self._api_server_url}/{VERSION_PREFIX}/deployment"

truefoundry/deploy/v2/lib/deploy.py

@@ -252,7 +252,7 @@ def deploy_component(
     component: Component,
     workspace_fqn: Optional[str] = None,
     wait: bool = True,
-    force_deploy: bool = False,
+    force: bool = False,
 ) -> Deployment:
     _warn_when_gpu_selected_without_cuda(component=component)
     workspace_fqn = _resolve_workspace_fqn(
@@ -274,7 +274,7 @@ def deploy_component(
     response = client.deploy_application(
         workspace_id=workspace_id,
         application=updated_component,
-        force_deploy=force_deploy,
+        force=force,
     )
     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 Callable, Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union
 
 import requirements
 from flytekit.configuration import (
@@ -19,6 +19,7 @@ from flytekit.tools.translator import TaskSpec as FlyteTaskSpec
 from flytekit.tools.translator import WorkflowSpec as FlyteWorkflowSpec
 from google.protobuf.json_format import MessageToDict
 
+from truefoundry.common.types import UploadCodePackageCallable
 from truefoundry.deploy.auto_gen import models as auto_gen_models
 from truefoundry.deploy.lib.clients.servicefoundry_client import (
     ServiceFoundryServiceClient,
@@ -39,7 +40,7 @@ from truefoundry.workflow.workflow import (
 def _handle_code_upload_for_workflow(
     workflow: auto_gen_models.Workflow,
     workspace_fqn: str,
-    upload_code_package: Callable[[str, str, str], str],
+    upload_code_package: UploadCodePackageCallable,
 ) -> auto_gen_models.Workflow:
     new_workflow = workflow.copy(deep=True)
     new_workflow.source = local_source_to_remote_source(
@@ -92,7 +93,7 @@ def _is_tfy_wf_present_in_task_python_build(
 
 
 def _is_dynamic_task(flyte_task: FlyteTaskSpec) -> bool:
-    envs: Dict[str:str] = flyte_task.template.container.env or {}
+    envs: Dict[str, str] = flyte_task.template.container.env or {}
     return SERIALIZED_CONTEXT_ENV_VAR in envs.keys()
 
 
@@ -273,7 +274,7 @@ def deploy_workflow(
     workflow: auto_gen_models.Workflow,
     workspace_fqn: str,
     wait: bool = True,
-    force_deploy: bool = False,
+    force: bool = False,
 ) -> Deployment:
     _generate_manifest_for_workflow(workflow)
     _validate_workspace_fqn(workflow, workspace_fqn)
@@ -296,7 +297,9 @@ def deploy_workflow(
     )
 
     deployment = client.deploy_application(
-        workspace_id=workspace_id, application=workflow
+        workspace_id=workspace_id,
+        application=workflow,
+        force=force,
     )
     logger.info(
         "🚀 Deployment started for application '%s'. Deployment FQN is '%s'.",

truefoundry/deploy/v2/lib/deployable_patched_models.py

@@ -12,13 +12,13 @@ class DeployablePatchedModelBase(BaseModel):
         extra = "forbid"
 
     def deploy(
-        self, workspace_fqn: str, wait: bool = True, force_deploy: bool = False
+        self, workspace_fqn: str, wait: bool = True, force: bool = False
     ) -> Deployment:
         return deploy_component(
             component=self,
             workspace_fqn=workspace_fqn,
             wait=wait,
-            force_deploy=force_deploy,
+            force=force,
         )
 
 
@@ -26,7 +26,7 @@ class Service(models.Service, DeployablePatchedModelBase):
     type: Literal["service"] = "service"
     resources: models.Resources = Field(default_factory=models.Resources)
     # This is being patched because cue export marks this as a "number"
-    replicas: Union[conint(ge=0, le=100), models.ServiceAutoscaling] = Field(
+    replicas: Union[conint(ge=0, le=100), models.ServiceAutoscaling] = Field(  # type: ignore[valid-type]
         1,
         description="+label=Replicas\n+usage=Replicas of service you want to run\n+icon=fa-clone\n+sort=3",
     )
@@ -70,7 +70,7 @@ class ApplicationSet(models.ApplicationSet, DeployablePatchedModelBase):
 
 class AsyncService(models.AsyncService, DeployablePatchedModelBase):
     type: Literal["async-service"] = "async-service"
-    replicas: Union[conint(ge=0, le=100), models.AsyncServiceAutoscaling] = 1
+    replicas: Union[conint(ge=0, le=100), models.AsyncServiceAutoscaling] = 1  # type: ignore[valid-type]
     resources: models.Resources = Field(default_factory=models.Resources)
 
 
@@ -81,7 +81,7 @@ class SSHServer(models.SSHServer, DeployablePatchedModelBase):
 
 class Application(models.Application, DeployablePatchedModelBase):
     def deploy(
-        self, workspace_fqn: str, wait: bool = True, force_deploy: bool = False
+        self, workspace_fqn: str, wait: bool = True, force: bool = False
     ) -> Deployment:
         if isinstance(self.__root__, models.Workflow):
             from truefoundry.deploy.v2.lib.deploy_workflow import deploy_workflow
@@ -90,14 +90,14 @@ class Application(models.Application, DeployablePatchedModelBase):
                 workflow=self.__root__,
                 workspace_fqn=workspace_fqn,
                 wait=wait,
-                force_deploy=force_deploy,
+                force=force,
             )
         else:
             return deploy_component(
                 component=self.__root__,
                 workspace_fqn=workspace_fqn,
                 wait=wait,
-                force_deploy=force_deploy,
+                force=force,
             )
 
 
@@ -107,7 +107,11 @@ class Workflow(models.Workflow, DeployablePatchedModelBase):
         default_factory=lambda: LocalSource(local_build=False)
     )
 
-    def deploy(self, workspace_fqn: str, wait: bool = True) -> Deployment:
+    def deploy(
+        self, workspace_fqn: str, wait: bool = True, force: bool = False
+    ) -> Deployment:
         from truefoundry.deploy.v2.lib.deploy_workflow import deploy_workflow
 
-        return deploy_workflow(workflow=self, workspace_fqn=workspace_fqn, wait=wait)
+        return deploy_workflow(
+            workflow=self, workspace_fqn=workspace_fqn, wait=wait, force=force
+        )

truefoundry/deploy/v2/lib/models.py

@@ -26,7 +26,7 @@ class BuildResponse(BaseModel):
 
 
 class AppDeploymentStatusResponse(BaseModel):
-    state: create_model(
+    state: create_model(  # type: ignore[valid-type]
         "State",
         isTerminalState=(bool, ...),
         type=(str, ...),

truefoundry/deploy/v2/lib/patched_models.py

@@ -518,7 +518,7 @@ class ArtifactsDownload(models.ArtifactsDownload, PatchedModelBase):
 
 class NvidiaGPU(models.NvidiaGPU, PatchedModelBase):
     type: Literal["nvidia_gpu"] = "nvidia_gpu"
-    name: Optional[Union[GPUType, constr(regex=r"^tpu-[a-z\d\-]+$")]] = None
+    name: Optional[Union[GPUType, constr(regex=r"^tpu-[a-z\d\-]+$")]] = None  # type: ignore[valid-type]
 
 
 class NvidiaMIGGPU(models.NvidiaMIGGPU, PatchedModelBase):

truefoundry/deploy/v2/lib/source.py

@@ -8,6 +8,7 @@ from typing import Callable, List, Optional
 import gitignorefile
 from tqdm import tqdm
 
+from truefoundry.common.types import UploadCodePackageCallable
 from truefoundry.common.warnings import TrueFoundryDeprecationWarning
 from truefoundry.deploy import builder
 from truefoundry.deploy.auto_gen import models
@@ -136,7 +137,7 @@ def local_source_to_remote_source(
     local_source: models.LocalSource,
     workspace_fqn: str,
     component_name: str,
-    upload_code_package: Callable[[str, str, str], str],
+    upload_code_package: UploadCodePackageCallable,
 ) -> RemoteSource:
     with tempfile.TemporaryDirectory() as local_dir:
         package_local_path = os.path.join(local_dir, "build.tar.gz")

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

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

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

@@ -24,7 +24,7 @@ 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=0nEwE0UkFagCO5ctGcqEThdmBT2fN8MVcr0ERItnsNQ,3483
+truefoundry/cli/__main__.py,sha256=oPtY1egJ21nN46me7E-xLfU0m_Zy5Oz2jj571os8Yxg,3465
 truefoundry/cli/config.py,sha256=tf8w4UfVzcC6eYkENvuuCPYt_V3sqVpO1bclORV9tAk,206
 truefoundry/cli/console.py,sha256=9-dMy4YPisCJQziRKTg8Qa0UJnOGl1soiUnJjsnLDvE,242
 truefoundry/cli/const.py,sha256=dVHPo1uAiDSSMXwXoT2mR5kNQjExT98QNVRz98Hz_Ts,510
@@ -34,14 +34,15 @@ truefoundry/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 truefoundry/common/auth_service_client.py,sha256=N3YxKlx63r6cPZqbgb2lqBOPI69ShB7D7RCIq4FSCjc,7949
 truefoundry/common/constants.py,sha256=WQjylPv7xTVYURv4zicJUHYL73Gv3c3i6Iw4oy9Lhg4,2744
 truefoundry/common/credential_file_manager.py,sha256=1yEk1Zm2xS4G0VDFwKSZ4w0VUrcPWQ1nJnoBaz9xyKA,4251
-truefoundry/common/credential_provider.py,sha256=R666i1ADKb2ldwEVh9lnaFcPaa4q3vAscIX3MX1UiFA,4097
-truefoundry/common/entities.py,sha256=8O-EGPk4PKqnyoFMKUTxISCU19rz0KBnfRDJU695DhY,3797
+truefoundry/common/credential_provider.py,sha256=_OhJ2XFlDaVsrUO-FyywxctcGGqDdC2pgcvwEKqQD0Q,4071
+truefoundry/common/entities.py,sha256=12olLKzRT092Jnze5busK68cwH8wwyL6ch77ohKOFPU,3723
 truefoundry/common/exceptions.py,sha256=jkU0N7hV_P-EhXeud4I5vuB9glXXZSWPf8LcH04mSbw,459
 truefoundry/common/request_utils.py,sha256=e9qrAQ1MutU7JALDKcucmNd0KQEVBqgW3yx0w1zeHIU,5700
-truefoundry/common/servicefoundry_client.py,sha256=295ZXOEM46lXZP59O04XFTDCsZLtz3MssXRDMk2x9hg,3169
+truefoundry/common/servicefoundry_client.py,sha256=2fYhdVPSvLXz5C5tosOq86JD8WM3IRUIy1VO9deDxZI,3340
 truefoundry/common/session.py,sha256=BiTJ2WEzLkTvzpqy67xX3fXgiKH_ltzzmQdFG7xUtwI,2904
 truefoundry/common/storage_provider_utils.py,sha256=yURhMw8k0FLFvaviRHDiifhvc6GnuQwGMC9Qd2uM440,10934
-truefoundry/common/utils.py,sha256=sZyg-vpShVXvnrwnINrdsyWJR3FHMUBiOB1CslYdQTo,6072
+truefoundry/common/types.py,sha256=BMJFCsR1lPJAw66IQBSvLyV4I6o_x5oj78gVsUa9si8,188
+truefoundry/common/utils.py,sha256=E1kKw_hqlVMgwyPkER2SvVLIoQ-B_4TQCuM5IJXvgig,6046
 truefoundry/common/warnings.py,sha256=rs6BHwk7imQYedo07iwh3TWEOywAR3Lqhj0AY4khByg,504
 truefoundry/deploy/__init__.py,sha256=e0EgG-fVJ6N9PNIlBINO6QtIMEehQgmz3ONPPjYlcSY,2596
 truefoundry/deploy/auto_gen/models.py,sha256=83OoBHcu3VP8Xe75vBNaQmPGjqxhsSkHAZZZD4mROOM,87620
@@ -61,7 +62,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=JW7_gUwM7sg7cNkK-28AdNdgFj26Oj2KjkqIO-CvZFg,4172
+truefoundry/deploy/cli/commands/deploy_command.py,sha256=8aTBvzPaT9xg6KPmpcpqJlmdj4yXzWUfAy6slcoPN74,4123
 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 +82,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=twgEUKSES8HWewMj-8xeD1O3AOz9kfhaaZA4D0BATxk,26444
+truefoundry/deploy/lib/clients/servicefoundry_client.py,sha256=TjReImI1lL2xRQvdFh_ldfuVeVP7bohyxIf53PxYvNs,26341
 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,12 +99,12 @@ 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=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
+truefoundry/deploy/v2/lib/deploy.py,sha256=aHYT3p5o_AejVudr-Zbau3wJpMRAzJ4FTlPCUsJ436M,12420
+truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=92aA8ji46-KjC3tu46KeJuvOFkajSU1WAdLKgqVOGh8,12869
+truefoundry/deploy/v2/lib/deployable_patched_models.py,sha256=hqfPxQvuA9rTjaxZY9YqV51hdNFT-0YBXyR-S859PTo,4060
+truefoundry/deploy/v2/lib/models.py,sha256=ogc1UYs1Z2nBdGSKCrde9sk8d0GxFKMkem99uqO5CmM,1148
+truefoundry/deploy/v2/lib/patched_models.py,sha256=v26Rm0BaV6RKr-TxKZ8O3gT-90JA91K4bnGSKgCrQ7o,16338
+truefoundry/deploy/v2/lib/source.py,sha256=zM8k3hJ2N5b8FgkVsYPhEvHPA4rt2rSqtLUMRcaGGiQ,9405
 truefoundry/logger.py,sha256=u-YCNjg5HBwE70uQcpjIG64Ghos-K2ulTWaxC03BSj4,714
 truefoundry/ml/__init__.py,sha256=ssUEIs8BixPWxynKoeSh-dkRl6AtLXG0PBGYnUR5Az8,2217
 truefoundry/ml/artifact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -354,11 +355,6 @@ truefoundry/pydantic_v1.py,sha256=jSuhGtz0Mbk1qYu8jJ1AcnIDK4oxUsdhALc4spqstmM,34
 truefoundry/version.py,sha256=bqiT4Q-VWrTC6P4qfK43mez-Ppf-smWfrl6DcwV7mrw,137
 truefoundry/workflow/__init__.py,sha256=XY83vqtLAclI82atZXyBtF9ZgLROXaaXO5p60XH5hJA,1493
 truefoundry/workflow/container_task.py,sha256=8arieePsX4__OnG337hOtCiNgJwtKJJCsZcmFmCBJtk,402
-truefoundry/workflow/example/deploy.sh,sha256=wfbPRrCi04WYRqCf4g-Xo12uWbcqPD6G_Tz0lV0jU_U,60
-truefoundry/workflow/example/hello_world_package/workflow.py,sha256=IkRKfPY5BcvLPo_PVuNbZKK9PPJ93LRkzb1a3RKQYOw,435
-truefoundry/workflow/example/package/test_workflow.py,sha256=TUcvYCGz4IbzF9bQJAfB-6Wd2wx-0RKcuIpUG0t6d8c,3972
-truefoundry/workflow/example/truefoundry.yaml,sha256=LlPrMADSPJsiXRoK76N_RVjX1bnZ3FH1u2jXrwLfR9I,226
-truefoundry/workflow/example/workflow.yaml,sha256=YtYdKXMuW_08gfEo21XSculj2MGI2lfEnGF8qCT8NKE,2858
 truefoundry/workflow/map_task.py,sha256=2m3qGXQ90k9LdS45q8dqCCECc3qr8t2m_LMCVd1mZ7g,1737
 truefoundry/workflow/python_task.py,sha256=SRXRLC4vdBqGjhkwuaY39LEWN6iPCpJAuW17URRdWTY,1128
 truefoundry/workflow/remote_filesystem/__init__.py,sha256=LQ95ViEjJ7Ts4JcCGOxMPs7NZmQdZ4bTiq6qXtsjUhE,206
@@ -367,7 +363,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.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,,
+truefoundry-0.5.8rc1.dist-info/METADATA,sha256=w78rupDdfwn-65YZwSnGEBgIqFfc3B-kWigUjyUWY6I,2887
+truefoundry-0.5.8rc1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+truefoundry-0.5.8rc1.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
+truefoundry-0.5.8rc1.dist-info/RECORD,,

truefoundry/workflow/example/deploy.sh

@@ -1 +0,0 @@
- tfy deploy --workspace_fqn tfy-ctl-euwe1-devtest:nikhil-ws

truefoundry/workflow/example/hello_world_package/workflow.py

@@ -1,20 +0,0 @@
-from truefoundry.workflow import PythonTaskConfig, TaskPythonBuild, task, workflow
-
-
-@task(
-    task_config=PythonTaskConfig(
-        image=TaskPythonBuild(
-            python_version="3.9",
-            pip_packages=["truefoundry[workflow]"],
-        ),
-        service_account="tfy-workflows-sa",
-    )
-)
-def say_hello() -> str:
-    return "Hello, World!"
-
-
-@workflow
-def hello_world_wf() -> str:
-    res = say_hello()
-    return res

truefoundry/workflow/example/package/test_workflow.py

@@ -1,151 +0,0 @@
-import os
-from functools import partial
-from pathlib import Path
-from typing import List, Optional, Tuple
-
-from truefoundry.deploy import Image, NvidiaGPU, Resources
-from truefoundry.workflow import (
-    ContainerTask,
-    ContainerTaskConfig,
-    FlyteDirectory,
-    PythonTaskConfig,
-    TaskPythonBuild,
-    conditional,
-    map_task,
-    task,
-    workflow,
-)
-
-cpu_task_config = PythonTaskConfig(
-    image=TaskPythonBuild(
-        python_version="3.9",
-        pip_packages=["truefoundry[workflow]==0.4.1"],
-    ),
-    resources=Resources(cpu_request=0.45),
-    service_account="tfy-workflows-sa",
-)
-
-
-# figure out naming
-@task(task_config=cpu_task_config)
-def should_train_tokenizer(tokenizer: str) -> bool:
-    print("Should train tokenizer")
-    return not bool(tokenizer)
-
-
-@task(
-    task_config=cpu_task_config,
-    # currently we will not support the caching, but keeping here for now
-    # cache=True,
-    # cache_version="1.0",
-)
-def train_tokenizer() -> str:
-    print("Training tokenizer")
-    return "trained_tokenizer"
-
-
-@task(
-    task_config=PythonTaskConfig(
-        image=TaskPythonBuild(
-            python_version="3.9",
-            pip_packages=["truefoundry[workflow]==0.4.1", "pynvml==11.5.0"],
-            cuda_version="11.5-cudnn8",
-        ),
-        env={
-            "NVIDIA_DRIVER_CAPABILITIES": "compute,utility",
-            "NVIDIA_VISIBLE_DEVICES": "all",
-        },
-        resources=Resources(cpu_request=0.45, devices=[NvidiaGPU(name="T4", count=1)]),
-        service_account="tfy-workflows-sa",
-    ),
-)
-def train_model(tokenizer: str) -> Tuple[FlyteDirectory, str]:
-    print("Training model")
-    import flytekit
-    # from pynvml import nvmlDeviceGetCount, nvmlInit
-
-    # nvmlInit()
-    # assert nvmlDeviceGetCount() > 0
-
-    working_dir = flytekit.current_context().working_directory
-    local_dir = Path(os.path.join(working_dir, "csv_files"))
-    local_dir.mkdir(exist_ok=True)
-
-    with open(os.path.join(local_dir, "model"), "w", encoding="utf-8") as f:
-        f.write(tokenizer)
-
-    return FlyteDirectory(path=str(local_dir)), "hello"
-
-
-@task(task_config=cpu_task_config)
-def get_validation_data() -> List[str]:
-    print("Getting validation data")
-    return ["foo", "bar", "baz"]
-
-
-@task(task_config=cpu_task_config)
-def validate_model(model: FlyteDirectory, tokenizer: str, validation_data: str) -> bool:
-    print(validation_data)
-    model_path = os.path.join(model, "model")
-    with open(model_path, "r", encoding="utf-8") as f:
-        return f.read() == tokenizer
-
-
-@task(task_config=cpu_task_config)
-def all_good(validations: List[bool]) -> bool:
-    print("Validations", validations)
-    return all(validations)
-
-
-echo = ContainerTask(
-    name="echo",
-    task_config=ContainerTaskConfig(
-        image=Image(
-            image_uri="docker.io/bash:4.1",
-            command=["echo", "hello"],
-        ),
-        service_account="tfy-workflows-sa",
-    ),
-)
-
-
-@task(task_config=cpu_task_config)
-def random(tokenizer: str) -> Tuple[FlyteDirectory, str]:
-    print(tokenizer)
-    return FlyteDirectory(path=""), "random"
-
-
-@workflow(
-    # execution_configs=[
-    #     ExecutionConfig(
-    #         schedule="*/10 * * * *",
-    #     )
-    # ]
-)
-def train(
-    tokenizer: str = "",
-    test_v2: str = "",
-    optional_var: Optional[str] = "",
-    default_v: Optional[str] = "hello1",
-    default_v2: str = "hello2",
-) -> bool:
-    stt = should_train_tokenizer(tokenizer=tokenizer)
-    model, t = (
-        conditional("train_tokenizer")
-        .if_(stt.is_true())
-        .then(train_model(tokenizer=tokenizer))
-        .else_()
-        .then(random(tokenizer=tokenizer))
-    )
-    validation_task = partial(validate_model, model=model, tokenizer=t)
-    validation_data = get_validation_data()
-    validations = map_task(
-        validation_task,
-        concurrency=2,
-    )(validation_data=validation_data)
-    echo()
-    return all_good(validations=validations)
-
-
-if __name__ == "__main__":
-    train()

truefoundry/workflow/example/truefoundry.yaml

@@ -1,9 +0,0 @@
-type: workflow
-name: my-test-workflow9
-source:
-  type: local
-  local_build: false
-  project_root_path: "./"
-workflow_file_path: package/test_workflow.py
-# workflow_file_path: hello_world_package/workflow.py
-flyte_entities: []

truefoundry/workflow/example/workflow.yaml

@@ -1,116 +0,0 @@
-type: workflow
-name: my-test-workflow5
-source:
-  type: remote
-  remote_uri: s3://tfy-mlfoundry-tfy-ctl-euwe1-devtest20221012173221749100000002/tfy-ctl-euwe1-devtest:nikhil-ws/my-test-workflow5/clyhb79w4013l01oyfq1iawd5/package.tar.gz
-workflow_file_path: hello_world_package/workflow.py
-docker_registry: docker.io/nikp-test
-flyte_entities:
-- template:
-    id:
-      resourceType: TASK
-      name: hello_world_package.workflow.say_hello
-    type: python-task
-    metadata:
-      runtime:
-        type: FLYTE_SDK
-        version: 1.12.2
-        flavor: python
-      retries: {}
-    interface:
-      inputs: {}
-      outputs:
-        variables:
-          o0:
-            type:
-              simple: STRING
-            description: o0
-    custom:
-      truefoundry:
-        type: python-task-config
-        image:
-          type: task-python-build
-          python_version: '3.9'
-          pip_packages:
-          - flytekit==1.10.3
-        resources:
-          cpu_request: 0.2
-          cpu_limit: 0.5
-          memory_request: 200
-          memory_limit: 500
-          ephemeral_storage_request: 1000
-          ephemeral_storage_limit: 2000
-    container:
-      image: ':'
-      args:
-      - pyflyte-execute
-      - --inputs
-      - '{{.input}}'
-      - --output-prefix
-      - '{{.outputPrefix}}'
-      - --raw-output-data-prefix
-      - '{{.rawOutputDataPrefix}}'
-      - --checkpoint-path
-      - '{{.checkpointOutputPrefix}}'
-      - --prev-checkpoint
-      - '{{.prevCheckpointPrefix}}'
-      - --resolver
-      - flytekit.core.python_auto_container.default_task_resolver
-      - --
-      - task-module
-      - hello_world_package.workflow
-      - task-name
-      - say_hello
-      resources: {}
-  description:
-    longDescription:
-      format: DESCRIPTION_FORMAT_RST
-- template:
-    id:
-      resourceType: WORKFLOW
-      name: hello_world_package.workflow.hello_world_wf
-    metadata: {}
-    interface:
-      inputs: {}
-      outputs:
-        variables:
-          o0:
-            type:
-              simple: STRING
-            description: o0
-    nodes:
-    - id: n0
-      metadata:
-        name: say_hello
-        retries: {}
-      taskNode:
-        referenceId:
-          resourceType: TASK
-          name: hello_world_package.workflow.say_hello
-        overrides: {}
-    outputs:
-    - var: o0
-      binding:
-        promise:
-          nodeId: n0
-          var: o0
-    metadataDefaults: {}
-  description:
-    longDescription:
-      format: DESCRIPTION_FORMAT_RST
-- id:
-    resourceType: LAUNCH_PLAN
-    name: hello_world_package.workflow.hello_world_wf
-  spec:
-    workflowId:
-      resourceType: WORKFLOW
-      name: hello_world_package.workflow.hello_world_wf
-    entityMetadata: {}
-    defaultInputs: {}
-    fixedInputs: {}
-    labels: {}
-    annotations: {}
-    rawOutputDataConfig: {}
-  closure:
-    expectedInputs: {}
-    expectedOutputs: {}