truefoundry 0.5.0rc2__py3-none-any.whl → 0.5.0rc4__py3-none-any.whl

truefoundry/deploy/auto_gen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2024-10-16T17:06:03+00:00
+#   timestamp: 2024-11-04T08:35:21+00:00
 
 from __future__ import annotations
 
@@ -315,7 +315,7 @@ class GitHelmRepo(BaseModel):
         regex=r"^(((https?|wss):\/\/)?(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*))$"
     ) = Field(
         ...,
-        description="+label=Git repository URL\n+sort=1\n+message=Needs to be a valid URL.\nTODO: Check this regex and add guidelines",
+        description="TODO: Check this regex and add guidelines\n+label=Git repository URL\n+sort=1\n+message=Needs to be a valid URL.",
     )
     revision: str = Field(
         ...,
@@ -1151,7 +1151,7 @@ class VolumeMount(BaseModel):
         ...,
         description="+label=Volume mount path\n+usage=Absolute file path where the volume will be mounted.\n+message=Please enter a valid mount path",
     )
-    sub_path: Optional[str] = Field(
+    sub_path: Optional[constr(regex=r"^(?:[^/\n]+/*)*[^/\n]+(\.[^/\n]+)?$")] = Field(
         None,
         description="+label=Sub Path\n+usage=Sub path within the volume to mount. Defaults to root of the volume.",
     )
@@ -1285,7 +1285,7 @@ class Codeserver(BaseWorkbenchInput):
 
 
 class ContainerTaskConfig(BaseModel):
-    type: constr(regex=r"^container-task-config$") = Field(
+    type: Literal["container-task-config"] = Field(
         ..., description="+value=container-task-config"
     )
     image: Union[Build, Image] = Field(
@@ -1301,7 +1301,9 @@ class ContainerTaskConfig(BaseModel):
         None,
         description="+usage=Configure data to be mounted to Workflow pod(s) as a volume.\n+sort=400",
     )
-    service_account: str = Field(..., description="+label=Service Account\n+sort=500")
+    service_account: Optional[str] = Field(
+        None, description="+label=Service Account\n+sort=500"
+    )
 
 
 class CoreNATSOutputConfig(BaseModel):
@@ -1559,7 +1561,7 @@ class PythonTaskConfig(BaseModel):
     +docs=Describes the configuration for the python function task
     """
 
-    type: constr(regex=r"^python-task-config$") = Field(
+    type: Literal["python-task-config"] = Field(
         ..., description="+value=python-task-config"
     )
     image: Union[TaskPythonBuild, TaskDockerFileBuild] = Field(
@@ -1575,7 +1577,9 @@ class PythonTaskConfig(BaseModel):
         None,
         description="+usage=Configure data to be mounted to Workflow pod(s) as a volume.\n+sort=400",
     )
-    service_account: str = Field(..., description="+label=Service Account\n+sort=500")
+    service_account: Optional[str] = Field(
+        None, description="+label=Service Account\n+sort=500"
+    )
 
 
 class SSHServer(BaseWorkbenchInput):
@@ -1722,7 +1726,7 @@ class Workflow(BaseModel):
     +docs=Describes the configuration for the worflow
     """
 
-    type: constr(regex=r"^workflow$") = Field(..., description="+value=workflow")
+    type: Literal["workflow"] = Field(..., description="+value=workflow")
     name: constr(regex=r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$") = Field(
         ...,
         description="+usage=Name of the workflow\n+sort=1\n+message=3 to 32 lower case characters long alphanumeric word, may contain - in between, cannot start with a number",

truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py

@@ -31,7 +31,7 @@ WORKDIR /app
 
 DOCKERFILE_TEMPLATE = Template(
     """
-FROM --platform=linux/amd64 ${python_image_repo}:${python_version}
+FROM ${python_image_repo}:${python_version}
 ENV PATH=/virtualenvs/venv/bin:$PATH
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends git && \
@@ -43,7 +43,7 @@ RUN apt update && \
 
 CUDA_DOCKERFILE_TEMPLATE = Template(
     """
-FROM --platform=linux/amd64 nvidia/cuda:${nvidia_cuda_image_tag}
+FROM nvidia/cuda:${nvidia_cuda_image_tag}
 ENV PATH=/virtualenvs/venv/bin:$PATH
 RUN echo "deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu $(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d = -f 2) main" >> /etc/apt/sources.list && \
     echo "deb-src https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu $(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d = -f 2) main" >> /etc/apt/sources.list && \

truefoundry/deploy/python_deploy_codegen.py

@@ -111,6 +111,7 @@ def convert_deployment_config_to_python(workspace_fqn: str, application_spec: di
     application_type = application_obj.type
     if (
         hasattr(application_obj, "image")
+        and hasattr(application_obj.image, "type")
         and application_obj.image.type == "build"
         and application_obj.image.build_source.type == "remote"
     ):

truefoundry/deploy/v2/lib/deploy_workflow.py

@@ -11,7 +11,10 @@ from flytekit.configuration import (
 )
 from flytekit.configuration import Image as FlytekitImage
 from flytekit.models.launch_plan import LaunchPlan as FlyteLaunchPlan
-from flytekit.tools.repo import serialize as serialize_workflow
+from flytekit.tools.repo import (
+    serialize_get_control_plane_entities as get_serialized_entities,
+)
+from flytekit.tools.repo import serialize_load_only as serialize_workflow
 from flytekit.tools.translator import TaskSpec as FlyteTaskSpec
 from flytekit.tools.translator import WorkflowSpec as FlyteWorkflowSpec
 from google.protobuf.json_format import MessageToDict
@@ -207,9 +210,12 @@ def _generate_manifest_for_workflow(
         project_root_path=source_absolute_path, filepath=workflow_file_absolute_path
     )
 
-    workflow_entities = serialize_workflow(
+    serialize_workflow(
         pkgs=[package_path], settings=settings, local_source_root=source_absolute_path
     )
+    workflow_entities = get_serialized_entities(
+        settings, local_source_root=source_absolute_path
+    )
     _validate_workflow_entities(workflow_entities, source_absolute_path)
 
     workflow.flyte_entities = []

truefoundry/ml/__init__.py

@@ -8,10 +8,13 @@ from truefoundry.ml.enums import (
 )
 from truefoundry.ml.exceptions import MlFoundryException
 from truefoundry.ml.log_types import Image, Plot
-from truefoundry.ml.log_types.artifacts.artifact import ArtifactPath, ArtifactVersion
+from truefoundry.ml.log_types.artifacts.artifact import (
+    ArtifactPath,
+    ArtifactVersion,
+    BlobStorageDirectory,
+)
 from truefoundry.ml.log_types.artifacts.dataset import DataDirectory, DataDirectoryPath
 from truefoundry.ml.log_types.artifacts.model import (
-    BlobStorageModelDirectory,
     ModelVersion,
 )
 from truefoundry.ml.logger import init_logger
@@ -38,7 +41,7 @@ from truefoundry.ml.model_framework import (
 __all__ = [
     "ArtifactPath",
     "ArtifactVersion",
-    "BlobStorageModelDirectory",
+    "BlobStorageDirectory",
     "DataDirectory",
     "DataDirectoryPath",
     "DataSlice",

truefoundry/ml/autogen/client/__init__.py

@@ -61,6 +61,9 @@ from truefoundry.ml.autogen.client.models.artifact_response_dto import (
 )
 from truefoundry.ml.autogen.client.models.artifact_type import ArtifactType
 from truefoundry.ml.autogen.client.models.artifact_version_dto import ArtifactVersionDto
+from truefoundry.ml.autogen.client.models.artifact_version_manifest import (
+    ArtifactVersionManifest,
+)
 from truefoundry.ml.autogen.client.models.artifact_version_response_dto import (
     ArtifactVersionResponseDto,
 )
@@ -169,8 +172,8 @@ from truefoundry.ml.autogen.client.models.experiment_response_dto import (
     ExperimentResponseDto,
 )
 from truefoundry.ml.autogen.client.models.experiment_tag_dto import ExperimentTagDto
-from truefoundry.ml.autogen.client.models.external_model_source import (
-    ExternalModelSource,
+from truefoundry.ml.autogen.client.models.external_artifact_source import (
+    ExternalArtifactSource,
 )
 from truefoundry.ml.autogen.client.models.fast_ai_framework import FastAIFramework
 from truefoundry.ml.autogen.client.models.feature_dto import FeatureDto
@@ -300,6 +303,7 @@ from truefoundry.ml.autogen.client.models.log_metric_request_dto import (
 from truefoundry.ml.autogen.client.models.log_param_request_dto import (
     LogParamRequestDto,
 )
+from truefoundry.ml.autogen.client.models.manifest import Manifest
 from truefoundry.ml.autogen.client.models.method import Method
 from truefoundry.ml.autogen.client.models.metric_collection_dto import (
     MetricCollectionDto,
@@ -362,6 +366,7 @@ from truefoundry.ml.autogen.client.models.set_tag_request_dto import SetTagReque
 from truefoundry.ml.autogen.client.models.signed_url_dto import SignedURLDto
 from truefoundry.ml.autogen.client.models.sklearn_framework import SklearnFramework
 from truefoundry.ml.autogen.client.models.source import Source
+from truefoundry.ml.autogen.client.models.source1 import Source1
 from truefoundry.ml.autogen.client.models.spa_cy_framework import SpaCyFramework
 from truefoundry.ml.autogen.client.models.stats_models_framework import (
     StatsModelsFramework,
@@ -387,8 +392,8 @@ from truefoundry.ml.autogen.client.models.trigger_job_run_config_request_dto imp
 from truefoundry.ml.autogen.client.models.trigger_job_run_config_response_dto import (
     TriggerJobRunConfigResponseDto,
 )
-from truefoundry.ml.autogen.client.models.truefoundry_model_source import (
-    TruefoundryModelSource,
+from truefoundry.ml.autogen.client.models.true_foundry_artifact_source import (
+    TrueFoundryArtifactSource,
 )
 from truefoundry.ml.autogen.client.models.update_artifact_version_request_dto import (
     UpdateArtifactVersionRequestDto,

truefoundry/ml/autogen/client/models/__init__.py

@@ -32,6 +32,9 @@ from truefoundry.ml.autogen.client.models.artifact_response_dto import (
 )
 from truefoundry.ml.autogen.client.models.artifact_type import ArtifactType
 from truefoundry.ml.autogen.client.models.artifact_version_dto import ArtifactVersionDto
+from truefoundry.ml.autogen.client.models.artifact_version_manifest import (
+    ArtifactVersionManifest,
+)
 from truefoundry.ml.autogen.client.models.artifact_version_response_dto import (
     ArtifactVersionResponseDto,
 )
@@ -140,8 +143,8 @@ from truefoundry.ml.autogen.client.models.experiment_response_dto import (
     ExperimentResponseDto,
 )
 from truefoundry.ml.autogen.client.models.experiment_tag_dto import ExperimentTagDto
-from truefoundry.ml.autogen.client.models.external_model_source import (
-    ExternalModelSource,
+from truefoundry.ml.autogen.client.models.external_artifact_source import (
+    ExternalArtifactSource,
 )
 from truefoundry.ml.autogen.client.models.fast_ai_framework import FastAIFramework
 from truefoundry.ml.autogen.client.models.feature_dto import FeatureDto
@@ -271,6 +274,7 @@ from truefoundry.ml.autogen.client.models.log_metric_request_dto import (
 from truefoundry.ml.autogen.client.models.log_param_request_dto import (
     LogParamRequestDto,
 )
+from truefoundry.ml.autogen.client.models.manifest import Manifest
 from truefoundry.ml.autogen.client.models.method import Method
 from truefoundry.ml.autogen.client.models.metric_collection_dto import (
     MetricCollectionDto,
@@ -333,6 +337,7 @@ from truefoundry.ml.autogen.client.models.set_tag_request_dto import SetTagReque
 from truefoundry.ml.autogen.client.models.signed_url_dto import SignedURLDto
 from truefoundry.ml.autogen.client.models.sklearn_framework import SklearnFramework
 from truefoundry.ml.autogen.client.models.source import Source
+from truefoundry.ml.autogen.client.models.source1 import Source1
 from truefoundry.ml.autogen.client.models.spa_cy_framework import SpaCyFramework
 from truefoundry.ml.autogen.client.models.stats_models_framework import (
     StatsModelsFramework,
@@ -358,8 +363,8 @@ from truefoundry.ml.autogen.client.models.trigger_job_run_config_request_dto imp
 from truefoundry.ml.autogen.client.models.trigger_job_run_config_response_dto import (
     TriggerJobRunConfigResponseDto,
 )
-from truefoundry.ml.autogen.client.models.truefoundry_model_source import (
-    TruefoundryModelSource,
+from truefoundry.ml.autogen.client.models.true_foundry_artifact_source import (
+    TrueFoundryArtifactSource,
 )
 from truefoundry.ml.autogen.client.models.update_artifact_version_request_dto import (
     UpdateArtifactVersionRequestDto,

truefoundry/ml/autogen/client/models/artifact_version_dto.py

@@ -26,9 +26,7 @@ from truefoundry.ml.autogen.client.models.artifact_version_status import (
     ArtifactVersionStatus,
 )
 from truefoundry.ml.autogen.client.models.internal_metadata import InternalMetadata
-from truefoundry.ml.autogen.client.models.model_version_manifest import (
-    ModelVersionManifest,
-)
+from truefoundry.ml.autogen.client.models.manifest import Manifest
 from truefoundry.ml.autogen.client.models.subject import Subject
 from truefoundry.pydantic_v1 import BaseModel, Field, StrictInt, StrictStr
 
@@ -59,7 +57,7 @@ class ArtifactVersionDto(BaseModel):
     artifact_name: Optional[StrictStr] = None
     internal_metadata: Optional[InternalMetadata] = None
     artifact_size: Optional[StrictInt] = None
-    manifest: Optional[ModelVersionManifest] = None
+    manifest: Optional[Manifest] = None
     serialization_format: ArtifactVersionSerializationFormat = Field(...)
     __properties = [
         "id",
@@ -158,7 +156,7 @@ class ArtifactVersionDto(BaseModel):
                 if obj.get("internal_metadata") is not None
                 else None,
                 "artifact_size": obj.get("artifact_size"),
-                "manifest": ModelVersionManifest.from_dict(obj.get("manifest"))
+                "manifest": Manifest.from_dict(obj.get("manifest"))
                 if obj.get("manifest") is not None
                 else None,
                 "serialization_format": obj.get("serialization_format"),

truefoundry/ml/autogen/client/models/artifact_version_manifest.py

@@ -0,0 +1,111 @@
+# coding: utf-8
+
+"""
+FastAPI
+
+No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 0.1.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+Do not edit the class manually.
+"""  # noqa: E501
+
+from __future__ import annotations
+
+import json
+import pprint
+import re  # noqa: F401
+from typing import Any, Dict, Optional
+
+from truefoundry.ml.autogen.client.models.source import Source
+from truefoundry.pydantic_v1 import (
+    BaseModel,
+    Field,
+    StrictStr,
+    conint,
+    constr,
+    validator,
+)
+
+
+class ArtifactVersionManifest(BaseModel):
+    """
+    Artifact Version manifest.  # noqa: E501
+    """
+
+    description: Optional[constr(strict=True, max_length=512)] = Field(
+        default=None,
+        description="+label=Description +docs=Description of the artifact version",
+    )
+    metadata: Dict[str, Any] = Field(
+        default=...,
+        description="+label=Metadata +docs=Metadata for the model version +usage=Metadata for the model version +uiType=JsonInput",
+    )
+    type: Optional[StrictStr] = "artifact-version"
+    source: Source = Field(...)
+    step: Optional[conint(strict=True, ge=0)] = Field(
+        default=0, description="+label=Step"
+    )
+    __properties = ["description", "metadata", "type", "source", "step"]
+
+    @validator("type")
+    def type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in ("artifact-version"):
+            raise ValueError("must be one of enum values ('artifact-version')")
+        return value
+
+    class Config:
+        """Pydantic configuration"""
+
+        allow_population_by_field_name = True
+        validate_assignment = True
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.dict(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> ArtifactVersionManifest:
+        """Create an instance of ArtifactVersionManifest from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self):
+        """Returns the dictionary representation of the model using alias"""
+        _dict = self.dict(by_alias=True, exclude={}, exclude_none=True)
+        # override the default output from truefoundry.pydantic_v1 by calling `to_dict()` of source
+        if self.source:
+            _dict["source"] = self.source.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> ArtifactVersionManifest:
+        """Create an instance of ArtifactVersionManifest from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return ArtifactVersionManifest.parse_obj(obj)
+
+        _obj = ArtifactVersionManifest.parse_obj(
+            {
+                "description": obj.get("description"),
+                "metadata": obj.get("metadata"),
+                "type": obj.get("type")
+                if obj.get("type") is not None
+                else "artifact-version",
+                "source": Source.from_dict(obj.get("source"))
+                if obj.get("source") is not None
+                else None,
+                "step": obj.get("step") if obj.get("step") is not None else 0,
+            }
+        )
+        return _obj

truefoundry/ml/autogen/client/models/{external_model_source.py → external_artifact_source.py}

@@ -20,7 +20,7 @@ import re  # noqa: F401
 from truefoundry.pydantic_v1 import BaseModel, Field, StrictStr, validator
 
 
-class ExternalModelSource(BaseModel):
+class ExternalArtifactSource(BaseModel):
     """
     +label=External  # noqa: E501
     """
@@ -30,7 +30,7 @@ class ExternalModelSource(BaseModel):
         description="+label=Type +usage=Type of the source +value=external +type=External",
     )
     uri: StrictStr = Field(
-        default=..., description="+label=URI +usage=URI of the model source"
+        default=..., description="+label=URI +usage=URI of the Artifact source"
     )
     __properties = ["type", "uri"]
 
@@ -56,8 +56,8 @@ class ExternalModelSource(BaseModel):
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> ExternalModelSource:
-        """Create an instance of ExternalModelSource from a JSON string"""
+    def from_json(cls, json_str: str) -> ExternalArtifactSource:
+        """Create an instance of ExternalArtifactSource from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self):
@@ -66,15 +66,15 @@ class ExternalModelSource(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> ExternalModelSource:
-        """Create an instance of ExternalModelSource from a dict"""
+    def from_dict(cls, obj: dict) -> ExternalArtifactSource:
+        """Create an instance of ExternalArtifactSource from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return ExternalModelSource.parse_obj(obj)
+            return ExternalArtifactSource.parse_obj(obj)
 
-        _obj = ExternalModelSource.parse_obj(
+        _obj = ExternalArtifactSource.parse_obj(
             {"type": obj.get("type"), "uri": obj.get("uri")}
         )
         return _obj

truefoundry/ml/autogen/client/models/finalize_artifact_version_request_dto.py

@@ -19,9 +19,7 @@ import re  # noqa: F401
 from typing import Any, Dict, Optional
 
 from truefoundry.ml.autogen.client.models.internal_metadata import InternalMetadata
-from truefoundry.ml.autogen.client.models.model_version_manifest import (
-    ModelVersionManifest,
-)
+from truefoundry.ml.autogen.client.models.manifest import Manifest
 from truefoundry.pydantic_v1 import BaseModel, Field, StrictInt, StrictStr
 
 
@@ -38,7 +36,7 @@ class FinalizeArtifactVersionRequestDto(BaseModel):
     data_path: Optional[StrictStr] = None
     step: Optional[StrictInt] = None
     artifact_size: Optional[StrictInt] = None
-    manifest: Optional[ModelVersionManifest] = None
+    manifest: Optional[Manifest] = None
     __properties = [
         "id",
         "run_uuid",
@@ -104,7 +102,7 @@ class FinalizeArtifactVersionRequestDto(BaseModel):
                 "data_path": obj.get("data_path"),
                 "step": obj.get("step"),
                 "artifact_size": obj.get("artifact_size"),
-                "manifest": ModelVersionManifest.from_dict(obj.get("manifest"))
+                "manifest": Manifest.from_dict(obj.get("manifest"))
                 if obj.get("manifest") is not None
                 else None,
             }

truefoundry/ml/autogen/client/models/manifest.py

@@ -0,0 +1,154 @@
+# coding: utf-8
+
+"""
+FastAPI
+
+No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 0.1.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+Do not edit the class manually.
+"""  # noqa: E501
+
+from __future__ import annotations
+
+import json
+import pprint
+import re  # noqa: F401
+from typing import TYPE_CHECKING, Any, List, Optional, Union
+
+from truefoundry.ml.autogen.client.models.artifact_version_manifest import (
+    ArtifactVersionManifest,
+)
+from truefoundry.ml.autogen.client.models.model_version_manifest import (
+    ModelVersionManifest,
+)
+from truefoundry.pydantic_v1 import (
+    BaseModel,
+    Field,
+    ValidationError,
+    validator,
+)
+
+MANIFEST_ANY_OF_SCHEMAS = ["ArtifactVersionManifest", "ModelVersionManifest"]
+
+
+class Manifest(BaseModel):
+    """
+    Manifest
+    """
+
+    # data type: ModelVersionManifest
+    anyof_schema_1_validator: Optional[ModelVersionManifest] = None
+    # data type: ArtifactVersionManifest
+    anyof_schema_2_validator: Optional[ArtifactVersionManifest] = None
+    if TYPE_CHECKING:
+        actual_instance: Union[ArtifactVersionManifest, ModelVersionManifest]
+    else:
+        actual_instance: Any
+    any_of_schemas: List[str] = Field(MANIFEST_ANY_OF_SCHEMAS, const=True)
+
+    class Config:
+        validate_assignment = True
+
+    def __init__(self, *args, **kwargs) -> None:
+        if args:
+            if len(args) > 1:
+                raise ValueError(
+                    "If a position argument is used, only 1 is allowed to set `actual_instance`"
+                )
+            if kwargs:
+                raise ValueError(
+                    "If a position argument is used, keyword arguments cannot be used."
+                )
+            super().__init__(actual_instance=args[0])
+        else:
+            super().__init__(**kwargs)
+
+    @validator("actual_instance")
+    def actual_instance_must_validate_anyof(cls, v):
+        instance = Manifest.construct()
+        error_messages = []
+        # validate data type: ModelVersionManifest
+        if not isinstance(v, ModelVersionManifest):
+            error_messages.append(
+                f"Error! Input type `{type(v)}` is not `ModelVersionManifest`"
+            )
+        else:
+            return v
+
+        # validate data type: ArtifactVersionManifest
+        if not isinstance(v, ArtifactVersionManifest):
+            error_messages.append(
+                f"Error! Input type `{type(v)}` is not `ArtifactVersionManifest`"
+            )
+        else:
+            return v
+
+        if error_messages:
+            # no match
+            raise ValueError(
+                "No match found when setting the actual_instance in Manifest with anyOf schemas: ArtifactVersionManifest, ModelVersionManifest. Details: "
+                + ", ".join(error_messages)
+            )
+        else:
+            return v
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> Manifest:
+        return cls.from_json(json.dumps(obj))
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Manifest:
+        """Returns the object represented by the json string"""
+        instance = Manifest.construct()
+        error_messages = []
+        # anyof_schema_1_validator: Optional[ModelVersionManifest] = None
+        try:
+            instance.actual_instance = ModelVersionManifest.from_json(json_str)
+            return instance
+        except (ValidationError, ValueError) as e:
+            error_messages.append(str(e))
+        # anyof_schema_2_validator: Optional[ArtifactVersionManifest] = None
+        try:
+            instance.actual_instance = ArtifactVersionManifest.from_json(json_str)
+            return instance
+        except (ValidationError, ValueError) as e:
+            error_messages.append(str(e))
+
+        if error_messages:
+            # no match
+            raise ValueError(
+                "No match found when deserializing the JSON string into Manifest with anyOf schemas: ArtifactVersionManifest, ModelVersionManifest. Details: "
+                + ", ".join(error_messages)
+            )
+        else:
+            return instance
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        if self.actual_instance is None:
+            return "null"
+
+        to_json = getattr(self.actual_instance, "to_json", None)
+        if callable(to_json):
+            return self.actual_instance.to_json()
+        else:
+            return json.dumps(self.actual_instance)
+
+    def to_dict(self) -> dict:
+        """Returns the dict representation of the actual instance"""
+        if self.actual_instance is None:
+            return "null"
+
+        to_json = getattr(self.actual_instance, "to_json", None)
+        if callable(to_json):
+            return self.actual_instance.to_dict()
+        else:
+            # primitive type
+            return self.actual_instance
+
+    def to_str(self) -> str:
+        """Returns the string representation of the actual instance"""
+        return pprint.pformat(self.dict())

truefoundry/ml/autogen/client/models/model_version_manifest.py

@@ -19,7 +19,7 @@ import re  # noqa: F401
 from typing import Any, Dict, Optional
 
 from truefoundry.ml.autogen.client.models.framework import Framework
-from truefoundry.ml.autogen.client.models.source import Source
+from truefoundry.ml.autogen.client.models.source1 import Source1
 from truefoundry.pydantic_v1 import (
     BaseModel,
     Field,
@@ -44,7 +44,7 @@ class ModelVersionManifest(BaseModel):
         description="+label=Metadata +docs=Metadata for the model version +usage=Metadata for the model version +uiType=JsonInput",
     )
     type: Optional[StrictStr] = "model-version"
-    source: Source = Field(...)
+    source: Source1 = Field(...)
     framework: Optional[Framework] = None
     step: Optional[conint(strict=True, ge=0)] = Field(
         default=0, description="+label=Step"
@@ -107,7 +107,7 @@ class ModelVersionManifest(BaseModel):
                 "type": obj.get("type")
                 if obj.get("type") is not None
                 else "model-version",
-                "source": Source.from_dict(obj.get("source"))
+                "source": Source1.from_dict(obj.get("source"))
                 if obj.get("source") is not None
                 else None,
                 "framework": Framework.from_dict(obj.get("framework"))