truefoundry 0.9.0rc1__tar.gz → 0.9.1__tar.gz

{truefoundry-0.9.0rc1 → truefoundry-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.9.0rc1
+Version: 0.9.1
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1

{truefoundry-0.9.0rc1 → truefoundry-0.9.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truefoundry"
-version = "0.9.0rc1"  # This is a placeholder version, it will be replaced when releasing
+version = "0.9.1"  # This is a placeholder version, it will be replaced when releasing
 requires-python = ">=3.8.1,<3.14"
 description = "TrueFoundry CLI"
 authors = [{ name = "TrueFoundry Team", email = "abhishek@truefoundry.com" }]

{truefoundry-0.9.0rc1 → truefoundry-0.9.1}/truefoundry/deploy/cli/commands/deploy_command.py

@@ -48,7 +48,8 @@ def _get_default_spec_file():
 )
 @click.option(
     "--wait/--no-wait",
-    "--wait/--no_wait",
+    # The leading space is intentional. See: https://github.com/pallets/click/blob/2d610e36a429bfebf0adb0ca90cdc0585f296369/docs/options.md?plain=1#L295
+    " /--no_wait",
     is_flag=True,
     show_default=True,
     default=True,

{truefoundry-0.9.0rc1 → truefoundry-0.9.1}/truefoundry/deploy/cli/commands/patch_application_command.py

@@ -39,7 +39,8 @@ from truefoundry.deploy.lib.dao import application as application_lib
 )
 @click.option(
     "--wait/--no-wait",
-    "--wait/--no_wait",
+    # The leading space is intentional. See: https://github.com/pallets/click/blob/2d610e36a429bfebf0adb0ca90cdc0585f296369/docs/options.md?plain=1#L295
+    " /--no_wait",
     is_flag=True,
     show_default=True,
     default=True,

{truefoundry-0.9.0rc1 → truefoundry-0.9.1}/truefoundry/deploy/v2/lib/deployable_patched_models.py

@@ -79,7 +79,46 @@ class SSHServer(models.SSHServer, DeployablePatchedModelBase):
     resources: models.Resources = Field(default_factory=models.Resources)
 
 
+class Workflow(models.Workflow, DeployablePatchedModelBase):
+    type: Literal["workflow"] = "workflow"
+    source: Union[models.RemoteSource, models.LocalSource] = Field(
+        default_factory=lambda: LocalSource(local_build=False)
+    )
+
+    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, force=force
+        )
+
+
 class Application(models.Application, DeployablePatchedModelBase):
+    # We need a discriminator field to the root model to simplify the Validation errors
+    # Unfortunately cue export cannot add discriminator in OAS
+    # Even if we add it manually in OAS, `datamodel-code-generator` has bugs when discriminator field is enum type in member models.
+    # It will change the members to be incorrect like this
+    # class Service(BaseModel):
+    #     type: Literal["Service"] = Field("Service")  # notice the capital casing
+    # This is why we add it manually here
+
+    __root__: Union[
+        models.Service,
+        models.AsyncService,
+        models.Job,
+        models.Notebook,
+        models.Codeserver,
+        models.SSHServer,
+        models.RStudio,
+        models.Helm,
+        models.Volume,
+        models.ApplicationSet,
+        models.Workflow,
+        models.SparkJob,
+    ] = Field(..., description="", discriminator="type")
+
     def deploy(
         self, workspace_fqn: str, wait: bool = True, force: bool = False
     ) -> Deployment:
@@ -99,19 +138,3 @@ class Application(models.Application, DeployablePatchedModelBase):
                 wait=wait,
                 force=force,
             )
-
-
-class Workflow(models.Workflow, DeployablePatchedModelBase):
-    type: Literal["workflow"] = "workflow"
-    source: Union[models.RemoteSource, models.LocalSource] = Field(
-        default_factory=lambda: LocalSource(local_build=False)
-    )
-
-    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, force=force
-        )

{truefoundry-0.9.0rc1 → truefoundry-0.9.1}/truefoundry/workflow/__init__.py

@@ -9,6 +9,7 @@ except ImportError:
 
 from flytekit import conditional
 from flytekit.types.directory import FlyteDirectory
+from flytekit.types.error.error import FlyteError
 from flytekit.types.file import FlyteFile
 
 from truefoundry.common.constants import ENV_VARS
@@ -39,6 +40,7 @@ __all__ = [
     "PythonTaskConfig",
     "ExecutionConfig",
     "FlyteFile",
+    "FlyteError",
 ]