truefoundry 0.5.0rc3__py3-none-any.whl → 0.5.0rc5__py3-none-any.whl

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

@@ -18,11 +18,11 @@ import pprint
 import re  # noqa: F401
 from typing import TYPE_CHECKING, Any, List, Optional, Union
 
-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.truefoundry_model_source import (
-    TruefoundryModelSource,
+from truefoundry.ml.autogen.client.models.true_foundry_artifact_source import (
+    TrueFoundryArtifactSource,
 )
 from truefoundry.pydantic_v1 import (
     BaseModel,
@@ -31,20 +31,20 @@ from truefoundry.pydantic_v1 import (
     validator,
 )
 
-SOURCE_ANY_OF_SCHEMAS = ["ExternalModelSource", "TruefoundryModelSource"]
+SOURCE_ANY_OF_SCHEMAS = ["ExternalArtifactSource", "TrueFoundryArtifactSource"]
 
 
 class Source(BaseModel):
     """
-    +label=Model Source +usage=Source for the model version +uiType=Group
+    +label=Artifact Source +usage=Source for the Artifact version +uiType=Group
     """
 
-    # data type: TruefoundryModelSource
-    anyof_schema_1_validator: Optional[TruefoundryModelSource] = None
-    # data type: ExternalModelSource
-    anyof_schema_2_validator: Optional[ExternalModelSource] = None
+    # data type: TrueFoundryArtifactSource
+    anyof_schema_1_validator: Optional[TrueFoundryArtifactSource] = None
+    # data type: ExternalArtifactSource
+    anyof_schema_2_validator: Optional[ExternalArtifactSource] = None
     if TYPE_CHECKING:
-        actual_instance: Union[ExternalModelSource, TruefoundryModelSource]
+        actual_instance: Union[ExternalArtifactSource, TrueFoundryArtifactSource]
     else:
         actual_instance: Any
     any_of_schemas: List[str] = Field(SOURCE_ANY_OF_SCHEMAS, const=True)
@@ -70,18 +70,18 @@ class Source(BaseModel):
     def actual_instance_must_validate_anyof(cls, v):
         instance = Source.construct()
         error_messages = []
-        # validate data type: TruefoundryModelSource
-        if not isinstance(v, TruefoundryModelSource):
+        # validate data type: TrueFoundryArtifactSource
+        if not isinstance(v, TrueFoundryArtifactSource):
             error_messages.append(
-                f"Error! Input type `{type(v)}` is not `TruefoundryModelSource`"
+                f"Error! Input type `{type(v)}` is not `TrueFoundryArtifactSource`"
             )
         else:
             return v
 
-        # validate data type: ExternalModelSource
-        if not isinstance(v, ExternalModelSource):
+        # validate data type: ExternalArtifactSource
+        if not isinstance(v, ExternalArtifactSource):
             error_messages.append(
-                f"Error! Input type `{type(v)}` is not `ExternalModelSource`"
+                f"Error! Input type `{type(v)}` is not `ExternalArtifactSource`"
             )
         else:
             return v
@@ -89,7 +89,7 @@ class Source(BaseModel):
         if error_messages:
             # no match
             raise ValueError(
-                "No match found when setting the actual_instance in Source with anyOf schemas: ExternalModelSource, TruefoundryModelSource. Details: "
+                "No match found when setting the actual_instance in Source with anyOf schemas: ExternalArtifactSource, TrueFoundryArtifactSource. Details: "
                 + ", ".join(error_messages)
             )
         else:
@@ -104,15 +104,15 @@ class Source(BaseModel):
         """Returns the object represented by the json string"""
         instance = Source.construct()
         error_messages = []
-        # anyof_schema_1_validator: Optional[TruefoundryModelSource] = None
+        # anyof_schema_1_validator: Optional[TrueFoundryArtifactSource] = None
         try:
-            instance.actual_instance = TruefoundryModelSource.from_json(json_str)
+            instance.actual_instance = TrueFoundryArtifactSource.from_json(json_str)
             return instance
         except (ValidationError, ValueError) as e:
             error_messages.append(str(e))
-        # anyof_schema_2_validator: Optional[ExternalModelSource] = None
+        # anyof_schema_2_validator: Optional[ExternalArtifactSource] = None
         try:
-            instance.actual_instance = ExternalModelSource.from_json(json_str)
+            instance.actual_instance = ExternalArtifactSource.from_json(json_str)
             return instance
         except (ValidationError, ValueError) as e:
             error_messages.append(str(e))
@@ -120,7 +120,7 @@ class Source(BaseModel):
         if error_messages:
             # no match
             raise ValueError(
-                "No match found when deserializing the JSON string into Source with anyOf schemas: ExternalModelSource, TruefoundryModelSource. Details: "
+                "No match found when deserializing the JSON string into Source with anyOf schemas: ExternalArtifactSource, TrueFoundryArtifactSource. Details: "
                 + ", ".join(error_messages)
             )
         else:

truefoundry/ml/autogen/client/models/source1.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.external_artifact_source import (
+    ExternalArtifactSource,
+)
+from truefoundry.ml.autogen.client.models.true_foundry_artifact_source import (
+    TrueFoundryArtifactSource,
+)
+from truefoundry.pydantic_v1 import (
+    BaseModel,
+    Field,
+    ValidationError,
+    validator,
+)
+
+SOURCE1_ANY_OF_SCHEMAS = ["ExternalArtifactSource", "TrueFoundryArtifactSource"]
+
+
+class Source1(BaseModel):
+    """
+    +label=Model Source +usage=Source for the model version +uiType=Group
+    """
+
+    # data type: TrueFoundryArtifactSource
+    anyof_schema_1_validator: Optional[TrueFoundryArtifactSource] = None
+    # data type: ExternalArtifactSource
+    anyof_schema_2_validator: Optional[ExternalArtifactSource] = None
+    if TYPE_CHECKING:
+        actual_instance: Union[ExternalArtifactSource, TrueFoundryArtifactSource]
+    else:
+        actual_instance: Any
+    any_of_schemas: List[str] = Field(SOURCE1_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 = Source1.construct()
+        error_messages = []
+        # validate data type: TrueFoundryArtifactSource
+        if not isinstance(v, TrueFoundryArtifactSource):
+            error_messages.append(
+                f"Error! Input type `{type(v)}` is not `TrueFoundryArtifactSource`"
+            )
+        else:
+            return v
+
+        # validate data type: ExternalArtifactSource
+        if not isinstance(v, ExternalArtifactSource):
+            error_messages.append(
+                f"Error! Input type `{type(v)}` is not `ExternalArtifactSource`"
+            )
+        else:
+            return v
+
+        if error_messages:
+            # no match
+            raise ValueError(
+                "No match found when setting the actual_instance in Source1 with anyOf schemas: ExternalArtifactSource, TrueFoundryArtifactSource. Details: "
+                + ", ".join(error_messages)
+            )
+        else:
+            return v
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> Source1:
+        return cls.from_json(json.dumps(obj))
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Source1:
+        """Returns the object represented by the json string"""
+        instance = Source1.construct()
+        error_messages = []
+        # anyof_schema_1_validator: Optional[TrueFoundryArtifactSource] = None
+        try:
+            instance.actual_instance = TrueFoundryArtifactSource.from_json(json_str)
+            return instance
+        except (ValidationError, ValueError) as e:
+            error_messages.append(str(e))
+        # anyof_schema_2_validator: Optional[ExternalArtifactSource] = None
+        try:
+            instance.actual_instance = ExternalArtifactSource.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 Source1 with anyOf schemas: ExternalArtifactSource, TrueFoundryArtifactSource. 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/transformers_framework.py

@@ -39,7 +39,11 @@ class TransformersFramework(BaseModel):
         default=None,
         description="+label=Pipeline Tag +usage=Pipeline tag +docs=Pipeline tag for the framework",
     )
-    __properties = ["type", "library_name", "pipeline_tag"]
+    base_model: Optional[StrictStr] = Field(
+        default=None,
+        description="+label=Base Model +usage=Base model +docs=Base model Id. If this is a finetuned model, this points to the base model used for finetuning",
+    )
+    __properties = ["type", "library_name", "pipeline_tag", "base_model"]
 
     @validator("type")
     def type_validate_enum(cls, value):
@@ -86,6 +90,7 @@ class TransformersFramework(BaseModel):
                 "type": obj.get("type"),
                 "library_name": obj.get("library_name"),
                 "pipeline_tag": obj.get("pipeline_tag"),
+                "base_model": obj.get("base_model"),
             }
         )
         return _obj

truefoundry/ml/autogen/client/models/{truefoundry_model_source.py → true_foundry_artifact_source.py}

@@ -20,9 +20,9 @@ import re  # noqa: F401
 from truefoundry.pydantic_v1 import BaseModel, Field, StrictStr, validator
 
 
-class TruefoundryModelSource(BaseModel):
+class TrueFoundryArtifactSource(BaseModel):
     """
-    +usage=Source for the Model +label=Upload  # noqa: E501
+    +usage=Source for the Artifact or Model +label=Upload  # noqa: E501
     """
 
     type: StrictStr = Field(
@@ -31,7 +31,7 @@ class TruefoundryModelSource(BaseModel):
     )
     uri: StrictStr = Field(
         default=...,
-        description='+label=URI +uiType=UploadInput +uiProps={"hideClear":true}',
+        description='+label=URI +uiType=ModelUploadInput +uiProps={"hideClear":true}',
     )
     __properties = ["type", "uri"]
 
@@ -57,8 +57,8 @@ class TruefoundryModelSource(BaseModel):
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> TruefoundryModelSource:
-        """Create an instance of TruefoundryModelSource from a JSON string"""
+    def from_json(cls, json_str: str) -> TrueFoundryArtifactSource:
+        """Create an instance of TrueFoundryArtifactSource from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self):
@@ -67,15 +67,15 @@ class TruefoundryModelSource(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> TruefoundryModelSource:
-        """Create an instance of TruefoundryModelSource from a dict"""
+    def from_dict(cls, obj: dict) -> TrueFoundryArtifactSource:
+        """Create an instance of TrueFoundryArtifactSource from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return TruefoundryModelSource.parse_obj(obj)
+            return TrueFoundryArtifactSource.parse_obj(obj)
 
-        _obj = TruefoundryModelSource.parse_obj(
+        _obj = TrueFoundryArtifactSource.parse_obj(
             {"type": obj.get("type"), "uri": obj.get("uri")}
         )
         return _obj

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

@@ -18,6 +18,9 @@ import pprint
 import re  # noqa: F401
 from typing import Any, Dict, Optional
 
+from truefoundry.ml.autogen.client.models.artifact_version_manifest import (
+    ArtifactVersionManifest,
+)
 from truefoundry.pydantic_v1 import BaseModel, Field, StrictStr
 
 
@@ -29,7 +32,8 @@ class UpdateArtifactVersionRequestDto(BaseModel):
     id: StrictStr = Field(...)
     description: Optional[StrictStr] = None
     artifact_metadata: Optional[Dict[str, Any]] = None
-    __properties = ["id", "description", "artifact_metadata"]
+    manifest: Optional[ArtifactVersionManifest] = None
+    __properties = ["id", "description", "artifact_metadata", "manifest"]
 
     class Config:
         """Pydantic configuration"""
@@ -53,6 +57,9 @@ class UpdateArtifactVersionRequestDto(BaseModel):
     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 manifest
+        if self.manifest:
+            _dict["manifest"] = self.manifest.to_dict()
         return _dict
 
     @classmethod
@@ -69,6 +76,9 @@ class UpdateArtifactVersionRequestDto(BaseModel):
                 "id": obj.get("id"),
                 "description": obj.get("description"),
                 "artifact_metadata": obj.get("artifact_metadata"),
+                "manifest": ArtifactVersionManifest.from_dict(obj.get("manifest"))
+                if obj.get("manifest") is not None
+                else None,
             }
         )
         return _obj

truefoundry/ml/autogen/client_README.md

@@ -166,6 +166,7 @@ Class | Method | HTTP request | Description
  - [ArtifactResponseDto](truefoundry/ml/autogen/client/docs/ArtifactResponseDto.md)
  - [ArtifactType](truefoundry/ml/autogen/client/docs/ArtifactType.md)
  - [ArtifactVersionDto](truefoundry/ml/autogen/client/docs/ArtifactVersionDto.md)
+ - [ArtifactVersionManifest](truefoundry/ml/autogen/client/docs/ArtifactVersionManifest.md)
  - [ArtifactVersionResponseDto](truefoundry/ml/autogen/client/docs/ArtifactVersionResponseDto.md)
  - [ArtifactVersionSerializationFormat](truefoundry/ml/autogen/client/docs/ArtifactVersionSerializationFormat.md)
  - [ArtifactVersionStatus](truefoundry/ml/autogen/client/docs/ArtifactVersionStatus.md)
@@ -210,7 +211,7 @@ Class | Method | HTTP request | Description
  - [ExperimentIdRequestDto](truefoundry/ml/autogen/client/docs/ExperimentIdRequestDto.md)
  - [ExperimentResponseDto](truefoundry/ml/autogen/client/docs/ExperimentResponseDto.md)
  - [ExperimentTagDto](truefoundry/ml/autogen/client/docs/ExperimentTagDto.md)
- - [ExternalModelSource](truefoundry/ml/autogen/client/docs/ExternalModelSource.md)
+ - [ExternalArtifactSource](truefoundry/ml/autogen/client/docs/ExternalArtifactSource.md)
  - [FastAIFramework](truefoundry/ml/autogen/client/docs/FastAIFramework.md)
  - [FeatureDto](truefoundry/ml/autogen/client/docs/FeatureDto.md)
  - [FeatureValueType](truefoundry/ml/autogen/client/docs/FeatureValueType.md)
@@ -263,6 +264,7 @@ Class | Method | HTTP request | Description
  - [LogBatchRequestDto](truefoundry/ml/autogen/client/docs/LogBatchRequestDto.md)
  - [LogMetricRequestDto](truefoundry/ml/autogen/client/docs/LogMetricRequestDto.md)
  - [LogParamRequestDto](truefoundry/ml/autogen/client/docs/LogParamRequestDto.md)
+ - [Manifest](truefoundry/ml/autogen/client/docs/Manifest.md)
  - [Method](truefoundry/ml/autogen/client/docs/Method.md)
  - [MetricCollectionDto](truefoundry/ml/autogen/client/docs/MetricCollectionDto.md)
  - [MetricDto](truefoundry/ml/autogen/client/docs/MetricDto.md)
@@ -301,6 +303,7 @@ Class | Method | HTTP request | Description
  - [SignedURLDto](truefoundry/ml/autogen/client/docs/SignedURLDto.md)
  - [SklearnFramework](truefoundry/ml/autogen/client/docs/SklearnFramework.md)
  - [Source](truefoundry/ml/autogen/client/docs/Source.md)
+ - [Source1](truefoundry/ml/autogen/client/docs/Source1.md)
  - [SpaCyFramework](truefoundry/ml/autogen/client/docs/SpaCyFramework.md)
  - [StatsModelsFramework](truefoundry/ml/autogen/client/docs/StatsModelsFramework.md)
  - [Stop](truefoundry/ml/autogen/client/docs/Stop.md)
@@ -314,7 +317,7 @@ Class | Method | HTTP request | Description
  - [TransformersFramework](truefoundry/ml/autogen/client/docs/TransformersFramework.md)
  - [TriggerJobRunConfigRequestDto](truefoundry/ml/autogen/client/docs/TriggerJobRunConfigRequestDto.md)
  - [TriggerJobRunConfigResponseDto](truefoundry/ml/autogen/client/docs/TriggerJobRunConfigResponseDto.md)
- - [TruefoundryModelSource](truefoundry/ml/autogen/client/docs/TruefoundryModelSource.md)
+ - [TrueFoundryArtifactSource](truefoundry/ml/autogen/client/docs/TrueFoundryArtifactSource.md)
  - [UpdateArtifactVersionRequestDto](truefoundry/ml/autogen/client/docs/UpdateArtifactVersionRequestDto.md)
  - [UpdateDatasetRequestDto](truefoundry/ml/autogen/client/docs/UpdateDatasetRequestDto.md)
  - [UpdateExperimentRequestDto](truefoundry/ml/autogen/client/docs/UpdateExperimentRequestDto.md)

truefoundry/ml/autogen/entities/artifacts.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  artifacts.json
-#   timestamp: 2024-10-30T07:36:31+00:00
+#   timestamp: 2024-11-22T19:31:48+00:00
 
 from __future__ import annotations
 
@@ -89,7 +89,7 @@ class BlobStorageReference(BaseModel):
     )
 
 
-class ExternalModelSource(BaseModel):
+class ExternalArtifactSource(BaseModel):
     """
     +label=External
     """
@@ -98,7 +98,7 @@ class ExternalModelSource(BaseModel):
         ...,
         description="+label=Type\n+usage=Type of the source\n+value=external\n+type=External",
     )
-    uri: str = Field(..., description="+label=URI\n+usage=URI of the model source")
+    uri: str = Field(..., description="+label=URI\n+usage=URI of the Artifact source")
 
 
 class FastAIFramework(BaseModel):
@@ -365,9 +365,9 @@ class TransformersFramework(BaseModel):
     )
 
 
-class TruefoundryModelSource(BaseModel):
+class TrueFoundryArtifactSource(BaseModel):
     """
-    +usage=Source for the Model
+    +usage=Source for the Artifact or Model
     +label=Upload
     """
 
@@ -442,6 +442,18 @@ class AgentOpenAPIToolWithFQN(AgentOpenAPITool):
     fqn: str
 
 
+class ArtifactVersion(BaseArtifactVersion):
+    type: Literal["artifact-version"] = Field(
+        ...,
+        description='+label=Type\n+usage=Artifact Version\n+value="artifact-version"',
+    )
+    source: Union[TrueFoundryArtifactSource, ExternalArtifactSource] = Field(
+        ...,
+        description="+label=Artifact Source\n+usage=Source for the Artifact version\n+uiType=Group",
+    )
+    step: conint(ge=0) = Field(0, description="+label=Step")
+
+
 class AssistantMessage(BaseModel):
     """
     +usage=Assistant message
@@ -497,7 +509,7 @@ class ModelVersion(BaseArtifactVersion):
     type: Literal["model-version"] = Field(
         ..., description='+label=Type\n+usage=Model Version\n+value="model-version"'
     )
-    source: Union[TruefoundryModelSource, ExternalModelSource] = Field(
+    source: Union[TrueFoundryArtifactSource, ExternalArtifactSource] = Field(
         ...,
         description="+label=Model Source\n+usage=Source for the model version\n+uiType=Group",
     )
@@ -522,6 +534,10 @@ class ModelVersion(BaseArtifactVersion):
         None, description="+label=Framework\n+usage=Framework for the model version"
     )
     step: conint(ge=0) = Field(0, description="+label=Step")
+    model_schema: Optional[Dict[str, Any]] = Field(
+        None,
+        description="+label=Model Schema\n+usage=Schema of the model\n+uiType=Hidden",
+    )
 
 
 class AgentApp(BaseModel):
@@ -531,5 +547,7 @@ class AgentApp(BaseModel):
     root_agent: constr(min_length=1)
 
 
-class ArtifactsVersion(BaseModel):
-    __root__: Union[ChatPrompt, AgentOpenAPITool, Agent, AgentApp, ModelVersion]
+class VersionedArtifactType(BaseModel):
+    __root__: Union[
+        ChatPrompt, AgentOpenAPITool, Agent, AgentApp, ModelVersion, ArtifactVersion
+    ]