truefoundry 0.5.10rc1__py3-none-any.whl → 0.5.11rc1__py3-none-any.whl

truefoundry/deploy/lib/model/entity.py

@@ -71,25 +71,24 @@ class PortMetadata(BaseModel):
 
 
 class DeploymentTransitionStatus(str, Enum):
-    INITIALIZED: str = "INITIALIZED"
-    BUILDING: str = "BUILDING"
-    DEPLOYING: str = "DEPLOYING"
-    BUILD_SUCCESS: str = "BUILD_SUCCESS"
-    DEPLOY_SUCCESS: str = "DEPLOY_SUCCESS"
-    DEPLOY_FAILED: str = "DEPLOY_FAILED"
-    BUILD_FAILED: str = "BUILD_FAILED"
-    CANCELLED: str = "CANCELLED"
-    COMPONENTS_DEPLOYING: str = "COMPONENTS_DEPLOYING"
-    FAILED: str = "FAILED"
-    REUSING_EXISTING_BUILD: str = "REUSING_EXISTING_BUILD"
-    REDEPLOY_STARTED: str = "REDEPLOY_STARTED"
-    PAUSED: str = "PAUSED"
-    ROLLOUT_STARTED: str = "ROLLOUT_STARTED"
-    SET_TRAFFIC: str = "SET_TRAFFIC"
-    DEPLOY_FAILED_WITH_RETRY: str = "DEPLOY_FAILED_WITH_RETRY"
-    WAITING: str = "WAITING"
-
-    _: str = ""
+    INITIALIZED = "INITIALIZED"
+    BUILDING = "BUILDING"
+    DEPLOYING = "DEPLOYING"
+    BUILD_SUCCESS = "BUILD_SUCCESS"
+    DEPLOY_SUCCESS = "DEPLOY_SUCCESS"
+    DEPLOY_FAILED = "DEPLOY_FAILED"
+    BUILD_FAILED = "BUILD_FAILED"
+    CANCELLED = "CANCELLED"
+    COMPONENTS_DEPLOYING = "COMPONENTS_DEPLOYING"
+    FAILED = "FAILED"
+    REUSING_EXISTING_BUILD = "REUSING_EXISTING_BUILD"
+    REDEPLOY_STARTED = "REDEPLOY_STARTED"
+    PAUSED = "PAUSED"
+    ROLLOUT_STARTED = "ROLLOUT_STARTED"
+    SET_TRAFFIC = "SET_TRAFFIC"
+    DEPLOY_FAILED_WITH_RETRY = "DEPLOY_FAILED_WITH_RETRY"
+    WAITING = "WAITING"
+    _ = ""
 
     @classmethod
     def is_failure_state(cls, state: DeploymentTransitionStatus) -> bool:
@@ -112,6 +111,9 @@ class DeploymentManifest(Base):
 
 
 class Deployment(Entity):
+    class Config:
+        extra = Extra.allow
+
     id: str = Field(repr=False)
     fqn: str
     version: int
@@ -123,7 +125,8 @@ class Deployment(Entity):
     metadata: Optional[
         Union[Dict[str, Any], List[Dict[str, Any]]]
     ]  # TODO (chiragjn): revisit the type of this field
-    currentStatus: Optional[DeploymentStatus]  # Server was not returning CurrentStatus
+    # Server was not returning CurrentStatus
+    currentStatus: Optional[DeploymentStatus]
     application_fqn: str
 
     def __init__(self, **kwargs) -> None:
@@ -161,9 +164,6 @@ class Deployment(Entity):
             "updated_at": self.updatedAt,
         }
 
-    class Config:
-        extra = Extra.allow
-
 
 class ApplicationWorkspace(Base):
     name: str
@@ -285,6 +285,19 @@ class DeleteResult(BaseModel):
     message: str
 
 
-class Manifest(Base):
+class ManifestLike(Base):
     type: str
     name: str
+
+
+class LogBody(Base):
+    time: float
+    log: str
+
+
+class SocketEvent(Base):
+    class Config:
+        smart_union = True
+
+    type: str
+    body: Union[LogBody, str, Any]

truefoundry/deploy/v2/lib/deploy.py

@@ -6,7 +6,7 @@ import socketio
 from rich.status import Status
 
 from truefoundry.common.utils import poll_for_function
-from truefoundry.deploy.auto_gen import models as auto_gen_models
+from truefoundry.deploy._autogen import models as autogen_models
 from truefoundry.deploy.builder.docker_service import env_has_docker
 from truefoundry.deploy.lib.clients.servicefoundry_client import (
     ServiceFoundryServiceClient,
@@ -28,8 +28,8 @@ Component = TypeVar("Component", bound=BaseModel)
 def _handle_if_local_source(component: Component, workspace_fqn: str) -> Component:
     if (
         hasattr(component, "image")
-        and isinstance(component.image, auto_gen_models.Build)
-        and isinstance(component.image.build_source, auto_gen_models.LocalSource)
+        and isinstance(component.image, autogen_models.Build)
+        and isinstance(component.image.build_source, autogen_models.LocalSource)
     ):
         new_component = component.copy(deep=True)
 
@@ -180,13 +180,13 @@ def _deploy_wait_handler(  # noqa: C901
 def _warn_when_gpu_selected_without_cuda(component: Component):
     is_python_build_without_cuda = (
         hasattr(component, "image")
-        and isinstance(component.image, auto_gen_models.Build)
-        and isinstance(component.image.build_spec, auto_gen_models.PythonBuild)
+        and isinstance(component.image, autogen_models.Build)
+        and isinstance(component.image.build_spec, autogen_models.PythonBuild)
         and not component.image.build_spec.cuda_version
     )
     uses_gpu = (
         hasattr(component, "resources")
-        and isinstance(component, auto_gen_models.Resources)
+        and isinstance(component, autogen_models.Resources)
         and component.resources.gpu_count > 0
     )
     if is_python_build_without_cuda and uses_gpu:
@@ -260,7 +260,7 @@ def deploy_component(
     )
     component.workspace_fqn = workspace_fqn
     workspace_id = get_workspace_by_fqn(workspace_fqn).id
-    if isinstance(component, auto_gen_models.ApplicationSet):
+    if isinstance(component, autogen_models.ApplicationSet):
         updated_component = component.copy(deep=True)
         for i in range(len(updated_component.components)):
             updated_component.components[i] = _handle_if_local_source(

truefoundry/deploy/v2/lib/deploy_workflow.py

@@ -20,7 +20,7 @@ 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._autogen import models as autogen_models
 from truefoundry.deploy.lib.clients.servicefoundry_client import (
     ServiceFoundryServiceClient,
 )
@@ -38,10 +38,10 @@ from truefoundry.workflow.workflow import (
 
 
 def _handle_code_upload_for_workflow(
-    workflow: auto_gen_models.Workflow,
+    workflow: autogen_models.Workflow,
     workspace_fqn: str,
     upload_code_package: UploadCodePackageCallable,
-) -> auto_gen_models.Workflow:
+) -> autogen_models.Workflow:
     new_workflow = workflow.copy(deep=True)
     new_workflow.source = local_source_to_remote_source(
         local_source=workflow.source,
@@ -151,7 +151,7 @@ def _validate_workflow_entities(  # noqa: C901
             if not is_tfy_wf_present_in_task_python_build:
                 tasks_without_truefoundry_worflow_package.append(task.template.id.name)
         try:
-            auto_gen_models.FlyteTaskCustom.validate(task.template.custom)
+            autogen_models.FlyteTaskCustom.validate(task.template.custom)
         except ValidationError:
             raise ValueError(
                 error_message_to_use_truefoundry_decorators.format(
@@ -193,7 +193,7 @@ def _get_relative_package_path_from_filepath(
 
 
 def _generate_manifest_for_workflow(
-    workflow: auto_gen_models.Workflow,
+    workflow: autogen_models.Workflow,
 ):
     settings = SerializationSettings(
         # We are adding these defaults to avoid validation errors in flyte objects
@@ -248,7 +248,7 @@ def _generate_manifest_for_workflow(
             and message_dict["template"].get("custom")
             and message_dict["template"]["custom"].get("truefoundry")
         ):
-            parsed_model = auto_gen_models.FlyteTaskCustom.parse_obj(
+            parsed_model = autogen_models.FlyteTaskCustom.parse_obj(
                 message_dict["template"]["custom"]
             )
             message_dict["template"]["custom"]["truefoundry"] = parsed_model.truefoundry
@@ -256,11 +256,11 @@ def _generate_manifest_for_workflow(
         workflow.flyte_entities.append(message_dict)
 
     # this step is just to verify if pydantic model is still valid after adding flyte_entities
-    auto_gen_models.Workflow.validate({**workflow.dict()})
+    autogen_models.Workflow.validate({**workflow.dict()})
 
 
 def _validate_workspace_fqn(
-    workflow: auto_gen_models.Workflow,
+    workflow: autogen_models.Workflow,
     workspace_fqn: Optional[str] = None,
 ):
     if not workspace_fqn:
@@ -271,7 +271,7 @@ def _validate_workspace_fqn(
 
 
 def deploy_workflow(
-    workflow: auto_gen_models.Workflow,
+    workflow: autogen_models.Workflow,
     workspace_fqn: str,
     wait: bool = True,
     force: bool = False,

truefoundry/deploy/v2/lib/deployable_patched_models.py

@@ -1,6 +1,6 @@
 from typing import Literal, Union
 
-from truefoundry.deploy.auto_gen import models
+from truefoundry.deploy._autogen import models
 from truefoundry.deploy.lib.model.entity import Deployment
 from truefoundry.deploy.v2.lib.deploy import deploy_component
 from truefoundry.deploy.v2.lib.patched_models import LocalSource

truefoundry/deploy/v2/lib/patched_models.py

@@ -6,7 +6,7 @@ from collections.abc import Mapping
 from typing import Literal, Optional, Union
 
 from truefoundry.common.warnings import TrueFoundryDeprecationWarning
-from truefoundry.deploy.auto_gen import models
+from truefoundry.deploy._autogen import models
 from truefoundry.pydantic_v1 import (
     BaseModel,
     Field,
@@ -72,7 +72,6 @@ resources:
 ---------
 """
 
-
 AUTO_DISCOVERED_REQUIREMENTS_TXT_WARNING_MESSAGE_TEMPLATE = """\
 Using automatically discovered {requirements_txt_path} as the requirements file.
 This auto discovery behavior is deprecated and will be removed in a future release.
@@ -163,6 +162,7 @@ class GPUType(str, enum.Enum):
     L4 = "L4"
     H100_80GB = "H100_80GB"
     H100_94GB = "H100_94GB"
+    H200 = "H200"
 
 
 class TPUType(str, enum.Enum):
@@ -252,7 +252,7 @@ class BasicAuthCreds(models.BasicAuthCreds, PatchedModelBase):
     type: Literal["basic_auth"] = "basic_auth"
 
 
-class JwtAuthCreds(models.JwtAuthCreds, PatchedModelBase):
+class JwtAuthConfig(models.JwtAuthConfig, PatchedModelBase):
     type: Literal["jwt_auth"] = "jwt_auth"
 
 
@@ -508,10 +508,6 @@ class TrueFoundryArtifactSource(models.TrueFoundryArtifactSource, PatchedModelBa
     type: Literal["truefoundry-artifact"] = "truefoundry-artifact"
 
 
-# Deprecated alias, kept for backward compatibility
-TruefoundryArtifactSource = TrueFoundryArtifactSource
-
-
 class ArtifactsDownload(models.ArtifactsDownload, PatchedModelBase):
     pass
 
@@ -563,3 +559,7 @@ class TaskDockerFileBuild(models.TaskDockerFileBuild, PatchedModelBase):
 
 class TaskPythonBuild(models.TaskPythonBuild, PatchedModelBase):
     type: Literal["task-python-build"] = "task-python-build"
+
+
+# Deprecated aliases, kept for backward compatibility
+TruefoundryArtifactSource = TrueFoundryArtifactSource

truefoundry/deploy/v2/lib/source.py

@@ -11,7 +11,7 @@ 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
+from truefoundry.deploy._autogen import models
 from truefoundry.deploy.builder.docker_service import (
     pull_docker_image,
     push_docker_image,

truefoundry/ml/__init__.py

@@ -1,10 +1,10 @@
-from truefoundry.ml.autogen.client.models import (  # type: ignore[attr-defined]
+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._autogen.entities.artifacts import LibraryName
 from truefoundry.ml.enums import (
     DataSlice,
     FileFormat,