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

truefoundry/ml/autogen/client/api/mlfoundry_artifacts_api.py

@@ -20,12 +20,6 @@ from truefoundry.ml.autogen.client.exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError,
 )
-from truefoundry.ml.autogen.client.models.add_custom_metrics_to_model_version_request_dto import (
-    AddCustomMetricsToModelVersionRequestDto,
-)
-from truefoundry.ml.autogen.client.models.add_features_to_model_version_request_dto import (
-    AddFeaturesToModelVersionRequestDto,
-)
 from truefoundry.ml.autogen.client.models.artifact_response_dto import (
     ArtifactResponseDto,
 )
@@ -189,322 +183,6 @@ class MlfoundryArtifactsApi:
             api_client = ApiClient.get_default()
         self.api_client = api_client
 
-    @validate_arguments
-    def add_custom_metrics_to_model_version_post(
-        self,
-        add_custom_metrics_to_model_version_request_dto: AddCustomMetricsToModelVersionRequestDto,
-        **kwargs,
-    ) -> ModelVersionResponseDto:  # noqa: E501
-        """Add Custom Metrics To Model Version  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-
-        >>> thread = api.add_custom_metrics_to_model_version_post(add_custom_metrics_to_model_version_request_dto, async_req=True)
-        >>> result = thread.get()
-
-        :param add_custom_metrics_to_model_version_request_dto: (required)
-        :type add_custom_metrics_to_model_version_request_dto: AddCustomMetricsToModelVersionRequestDto
-        :param async_req: Whether to execute the request asynchronously.
-        :type async_req: bool, optional
-        :param _request_timeout: timeout setting for this request.
-               If one number provided, it will be total request
-               timeout. It can also be a pair (tuple) of
-               (connection, read) timeouts.
-        :return: Returns the result object.
-                 If the method is called asynchronously,
-                 returns the request thread.
-        :rtype: ModelVersionResponseDto
-        """
-        kwargs["_return_http_data_only"] = True
-        if "_preload_content" in kwargs:
-            message = "Error! Please call the add_custom_metrics_to_model_version_post_with_http_info method with `_preload_content` instead and obtain raw data from ApiResponse.raw_data"  # noqa: E501
-            raise ValueError(message)
-        return self.add_custom_metrics_to_model_version_post_with_http_info(
-            add_custom_metrics_to_model_version_request_dto, **kwargs
-        )  # noqa: E501
-
-    @validate_arguments
-    def add_custom_metrics_to_model_version_post_with_http_info(
-        self,
-        add_custom_metrics_to_model_version_request_dto: AddCustomMetricsToModelVersionRequestDto,
-        **kwargs,
-    ) -> ApiResponse:  # noqa: E501
-        """Add Custom Metrics To Model Version  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-
-        >>> thread = api.add_custom_metrics_to_model_version_post_with_http_info(add_custom_metrics_to_model_version_request_dto, async_req=True)
-        >>> result = thread.get()
-
-        :param add_custom_metrics_to_model_version_request_dto: (required)
-        :type add_custom_metrics_to_model_version_request_dto: AddCustomMetricsToModelVersionRequestDto
-        :param async_req: Whether to execute the request asynchronously.
-        :type async_req: bool, optional
-        :param _preload_content: if False, the ApiResponse.data will
-                                 be set to none and raw_data will store the
-                                 HTTP response body without reading/decoding.
-                                 Default is True.
-        :type _preload_content: bool, optional
-        :param _return_http_data_only: response data instead of ApiResponse
-                                       object with status code, headers, etc
-        :type _return_http_data_only: bool, optional
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :param _request_auth: set to override the auth_settings for an a single
-                              request; this effectively ignores the authentication
-                              in the spec for a single request.
-        :type _request_auth: dict, optional
-        :type _content_type: string, optional: force content-type for the request
-        :return: Returns the result object.
-                 If the method is called asynchronously,
-                 returns the request thread.
-        :rtype: tuple(ModelVersionResponseDto, status_code(int), headers(HTTPHeaderDict))
-        """
-
-        _params = locals()
-
-        _all_params = ["add_custom_metrics_to_model_version_request_dto"]
-        _all_params.extend(
-            [
-                "async_req",
-                "_return_http_data_only",
-                "_preload_content",
-                "_request_timeout",
-                "_request_auth",
-                "_content_type",
-                "_headers",
-            ]
-        )
-
-        # validate the arguments
-        for _key, _val in _params["kwargs"].items():
-            if _key not in _all_params:
-                raise ApiTypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_custom_metrics_to_model_version_post" % _key
-                )
-            _params[_key] = _val
-        del _params["kwargs"]
-
-        _collection_formats = {}
-
-        # process the path parameters
-        _path_params = {}
-
-        # process the query parameters
-        _query_params = []
-        # process the header parameters
-        _header_params = dict(_params.get("_headers", {}))
-        # process the form parameters
-        _form_params = []
-        _files = {}
-        # process the body parameter
-        _body_params = None
-        if _params["add_custom_metrics_to_model_version_request_dto"] is not None:
-            _body_params = _params["add_custom_metrics_to_model_version_request_dto"]
-
-        # set the HTTP header `Accept`
-        _header_params["Accept"] = self.api_client.select_header_accept(
-            ["application/json"]
-        )  # noqa: E501
-
-        # set the HTTP header `Content-Type`
-        _content_types_list = _params.get(
-            "_content_type",
-            self.api_client.select_header_content_type(["application/json"]),
-        )
-        if _content_types_list:
-            _header_params["Content-Type"] = _content_types_list
-
-        # authentication setting
-        _auth_settings = ["HTTPBearer", "APIKeyCookie"]  # noqa: E501
-
-        _response_types_map = {
-            "200": "ModelVersionResponseDto",
-            "422": "HTTPValidationError",
-        }
-
-        return self.api_client.call_api(
-            "/api/2.0/mlflow/mlfoundry-artifacts/model-versions/custom-metrics/add",
-            "POST",
-            _path_params,
-            _query_params,
-            _header_params,
-            body=_body_params,
-            post_params=_form_params,
-            files=_files,
-            response_types_map=_response_types_map,
-            auth_settings=_auth_settings,
-            async_req=_params.get("async_req"),
-            _return_http_data_only=_params.get("_return_http_data_only"),  # noqa: E501
-            _preload_content=_params.get("_preload_content", True),
-            _request_timeout=_params.get("_request_timeout"),
-            collection_formats=_collection_formats,
-            _request_auth=_params.get("_request_auth"),
-        )
-
-    @validate_arguments
-    def add_features_to_model_version_post(
-        self,
-        add_features_to_model_version_request_dto: AddFeaturesToModelVersionRequestDto,
-        **kwargs,
-    ) -> ModelVersionResponseDto:  # noqa: E501
-        """Add Features To Model Version  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-
-        >>> thread = api.add_features_to_model_version_post(add_features_to_model_version_request_dto, async_req=True)
-        >>> result = thread.get()
-
-        :param add_features_to_model_version_request_dto: (required)
-        :type add_features_to_model_version_request_dto: AddFeaturesToModelVersionRequestDto
-        :param async_req: Whether to execute the request asynchronously.
-        :type async_req: bool, optional
-        :param _request_timeout: timeout setting for this request.
-               If one number provided, it will be total request
-               timeout. It can also be a pair (tuple) of
-               (connection, read) timeouts.
-        :return: Returns the result object.
-                 If the method is called asynchronously,
-                 returns the request thread.
-        :rtype: ModelVersionResponseDto
-        """
-        kwargs["_return_http_data_only"] = True
-        if "_preload_content" in kwargs:
-            message = "Error! Please call the add_features_to_model_version_post_with_http_info method with `_preload_content` instead and obtain raw data from ApiResponse.raw_data"  # noqa: E501
-            raise ValueError(message)
-        return self.add_features_to_model_version_post_with_http_info(
-            add_features_to_model_version_request_dto, **kwargs
-        )  # noqa: E501
-
-    @validate_arguments
-    def add_features_to_model_version_post_with_http_info(
-        self,
-        add_features_to_model_version_request_dto: AddFeaturesToModelVersionRequestDto,
-        **kwargs,
-    ) -> ApiResponse:  # noqa: E501
-        """Add Features To Model Version  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-
-        >>> thread = api.add_features_to_model_version_post_with_http_info(add_features_to_model_version_request_dto, async_req=True)
-        >>> result = thread.get()
-
-        :param add_features_to_model_version_request_dto: (required)
-        :type add_features_to_model_version_request_dto: AddFeaturesToModelVersionRequestDto
-        :param async_req: Whether to execute the request asynchronously.
-        :type async_req: bool, optional
-        :param _preload_content: if False, the ApiResponse.data will
-                                 be set to none and raw_data will store the
-                                 HTTP response body without reading/decoding.
-                                 Default is True.
-        :type _preload_content: bool, optional
-        :param _return_http_data_only: response data instead of ApiResponse
-                                       object with status code, headers, etc
-        :type _return_http_data_only: bool, optional
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :param _request_auth: set to override the auth_settings for an a single
-                              request; this effectively ignores the authentication
-                              in the spec for a single request.
-        :type _request_auth: dict, optional
-        :type _content_type: string, optional: force content-type for the request
-        :return: Returns the result object.
-                 If the method is called asynchronously,
-                 returns the request thread.
-        :rtype: tuple(ModelVersionResponseDto, status_code(int), headers(HTTPHeaderDict))
-        """
-
-        _params = locals()
-
-        _all_params = ["add_features_to_model_version_request_dto"]
-        _all_params.extend(
-            [
-                "async_req",
-                "_return_http_data_only",
-                "_preload_content",
-                "_request_timeout",
-                "_request_auth",
-                "_content_type",
-                "_headers",
-            ]
-        )
-
-        # validate the arguments
-        for _key, _val in _params["kwargs"].items():
-            if _key not in _all_params:
-                raise ApiTypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_features_to_model_version_post" % _key
-                )
-            _params[_key] = _val
-        del _params["kwargs"]
-
-        _collection_formats = {}
-
-        # process the path parameters
-        _path_params = {}
-
-        # process the query parameters
-        _query_params = []
-        # process the header parameters
-        _header_params = dict(_params.get("_headers", {}))
-        # process the form parameters
-        _form_params = []
-        _files = {}
-        # process the body parameter
-        _body_params = None
-        if _params["add_features_to_model_version_request_dto"] is not None:
-            _body_params = _params["add_features_to_model_version_request_dto"]
-
-        # set the HTTP header `Accept`
-        _header_params["Accept"] = self.api_client.select_header_accept(
-            ["application/json"]
-        )  # noqa: E501
-
-        # set the HTTP header `Content-Type`
-        _content_types_list = _params.get(
-            "_content_type",
-            self.api_client.select_header_content_type(["application/json"]),
-        )
-        if _content_types_list:
-            _header_params["Content-Type"] = _content_types_list
-
-        # authentication setting
-        _auth_settings = ["HTTPBearer", "APIKeyCookie"]  # noqa: E501
-
-        _response_types_map = {
-            "200": "ModelVersionResponseDto",
-            "422": "HTTPValidationError",
-        }
-
-        return self.api_client.call_api(
-            "/api/2.0/mlflow/mlfoundry-artifacts/model-versions/features/add",
-            "POST",
-            _path_params,
-            _query_params,
-            _header_params,
-            body=_body_params,
-            post_params=_form_params,
-            files=_files,
-            response_types_map=_response_types_map,
-            auth_settings=_auth_settings,
-            async_req=_params.get("async_req"),
-            _return_http_data_only=_params.get("_return_http_data_only"),  # noqa: E501
-            _preload_content=_params.get("_preload_content", True),
-            _request_timeout=_params.get("_request_timeout"),
-            collection_formats=_collection_formats,
-            _request_auth=_params.get("_request_auth"),
-        )
-
     @validate_arguments
     def authorize_user_for_model_post(
         self,

truefoundry/ml/autogen/client/api_client.py

@@ -28,6 +28,7 @@ from truefoundry.ml.autogen.client import rest
 from truefoundry.ml.autogen.client.api_response import ApiResponse
 from truefoundry.ml.autogen.client.configuration import Configuration
 from truefoundry.ml.autogen.client.exceptions import ApiException, ApiValueError
+from truefoundry.pydantic_v1 import SecretStr
 
 
 class ApiClient:
@@ -288,6 +289,7 @@ class ApiClient:
         """Builds a JSON POST object.
 
         If obj is None, return None.
+        If obj is SecretStr, return obj.get_secret_value()
         If obj is str, int, long, float, bool, return directly.
         If obj is datetime.datetime, datetime.date
             convert to string in iso8601 format.
@@ -300,6 +302,8 @@ class ApiClient:
         """
         if obj is None:
             return None
+        elif isinstance(obj, SecretStr):
+            return obj.get_secret_value()
         elif isinstance(obj, self.PRIMITIVE_TYPES):
             return obj
         elif isinstance(obj, list):
@@ -317,7 +321,10 @@ class ApiClient:
             # and attributes which value is not None.
             # Convert attribute name to json key in
             # model definition for request.
-            obj_dict = obj.to_dict()
+            if hasattr(obj, "to_dict") and callable(obj.to_dict):
+                obj_dict = obj.to_dict()
+            else:
+                obj_dict = obj.__dict__
 
         return {
             key: self.sanitize_for_serialization(val) for key, val in obj_dict.items()

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

@@ -147,8 +147,6 @@ 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
-from truefoundry.ml.autogen.client.models.feature_value_type import FeatureValueType
 from truefoundry.ml.autogen.client.models.file_info_dto import FileInfoDto
 from truefoundry.ml.autogen.client.models.finalize_artifact_version_request_dto import (
     FinalizeArtifactVersionRequestDto,
@@ -284,7 +282,6 @@ from truefoundry.ml.autogen.client.models.mime_type import MimeType
 from truefoundry.ml.autogen.client.models.model_configuration import ModelConfiguration
 from truefoundry.ml.autogen.client.models.model_dto import ModelDto
 from truefoundry.ml.autogen.client.models.model_response_dto import ModelResponseDto
-from truefoundry.ml.autogen.client.models.model_schema_dto import ModelSchemaDto
 from truefoundry.ml.autogen.client.models.model_version_dto import ModelVersionDto
 from truefoundry.ml.autogen.client.models.model_version_manifest import (
     ModelVersionManifest,
@@ -309,7 +306,6 @@ from truefoundry.ml.autogen.client.models.openapi_spec import OpenapiSpec
 from truefoundry.ml.autogen.client.models.paddle_framework import PaddleFramework
 from truefoundry.ml.autogen.client.models.param_dto import ParamDto
 from truefoundry.ml.autogen.client.models.parameters import Parameters
-from truefoundry.ml.autogen.client.models.prediction_type import PredictionType
 from truefoundry.ml.autogen.client.models.py_torch_framework import PyTorchFramework
 from truefoundry.ml.autogen.client.models.resolve_agent_app_response_dto import (
     ResolveAgentAppResponseDto,

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

@@ -16,8 +16,8 @@ from __future__ import annotations
 import json
 import pprint
 import re  # noqa: F401
+from typing import Any, Dict, Optional
 
-from truefoundry.ml.autogen.client.models.feature_dto import FeatureDto
 from truefoundry.pydantic_v1 import BaseModel, Field, StrictStr, conlist
 
 
@@ -27,7 +27,7 @@ class AddFeaturesToModelVersionRequestDto(BaseModel):
     """
 
     id: StrictStr = Field(...)
-    features: conlist(FeatureDto) = Field(...)
+    features: Optional[conlist(Dict[str, Any])] = None
     __properties = ["id", "features"]
 
     class Config:
@@ -52,13 +52,6 @@ class AddFeaturesToModelVersionRequestDto(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 each item in features (list)
-        _items = []
-        if self.features:
-            for _item in self.features:
-                if _item:
-                    _items.append(_item.to_dict())
-            _dict["features"] = _items
         return _dict
 
     @classmethod
@@ -71,13 +64,6 @@ class AddFeaturesToModelVersionRequestDto(BaseModel):
             return AddFeaturesToModelVersionRequestDto.parse_obj(obj)
 
         _obj = AddFeaturesToModelVersionRequestDto.parse_obj(
-            {
-                "id": obj.get("id"),
-                "features": [
-                    FeatureDto.from_dict(_item) for _item in obj.get("features")
-                ]
-                if obj.get("features") is not None
-                else None,
-            }
+            {"id": obj.get("id"), "features": obj.get("features")}
         )
         return _obj

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

@@ -66,7 +66,7 @@ class Agent(BaseModel):
         if value is None:
             return value
 
-        if value not in ("agent"):
+        if value not in ("agent",):
             raise ValueError("must be one of enum values ('agent')")
         return value
 

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

@@ -49,7 +49,7 @@ class AgentApp(BaseModel):
         if value is None:
             return value
 
-        if value not in ("agent-app"):
+        if value not in ("agent-app",):
             raise ValueError("must be one of enum values ('agent-app')")
         return value
 

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

@@ -63,7 +63,7 @@ class AgentOpenAPITool(BaseModel):
         if value is None:
             return value
 
-        if value not in ("openapi-tool"):
+        if value not in ("openapi-tool",):
             raise ValueError("must be one of enum values ('openapi-tool')")
         return value
 

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

@@ -64,7 +64,7 @@ class AgentOpenAPIToolWithFQN(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("openapi-tool"):
+        if value not in ("openapi-tool",):
             raise ValueError("must be one of enum values ('openapi-tool')")
         return value
 

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

@@ -66,7 +66,7 @@ class AgentWithFQN(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("agent"):
+        if value not in ("agent",):
             raise ValueError("must be one of enum values ('agent')")
         return value
 

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

@@ -55,7 +55,7 @@ class ArtifactVersionManifest(BaseModel):
         if value is None:
             return value
 
-        if value not in ("artifact-version"):
+        if value not in ("artifact-version",):
             raise ValueError("must be one of enum values ('artifact-version')")
         return value
 

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

@@ -37,7 +37,7 @@ class AssistantMessage(BaseModel):
     @validator("role")
     def role_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("assistant"):
+        if value not in ("assistant",):
             raise ValueError("must be one of enum values ('assistant')")
         return value
 

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

@@ -39,7 +39,7 @@ class BlobStorageReference(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("blob-storage"):
+        if value not in ("blob-storage",):
             raise ValueError("must be one of enum values ('blob-storage')")
         return value
 

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

@@ -84,7 +84,7 @@ class ChatPrompt(BaseModel):
         if value is None:
             return value
 
-        if value not in ("chat_prompt"):
+        if value not in ("chat_prompt",):
             raise ValueError("must be one of enum values ('chat_prompt')")
         return value
 

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

@@ -37,7 +37,7 @@ class ExternalArtifactSource(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("external"):
+        if value not in ("external",):
             raise ValueError("must be one of enum values ('external')")
         return value
 

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

@@ -34,7 +34,7 @@ class FastAIFramework(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("fastai"):
+        if value not in ("fastai",):
             raise ValueError("must be one of enum values ('fastai')")
         return value
 

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

@@ -33,7 +33,7 @@ class GluonFramework(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("gluon"):
+        if value not in ("gluon",):
             raise ValueError("must be one of enum values ('gluon')")
         return value
 

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

@@ -33,7 +33,7 @@ class H2OFramework(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("h2o"):
+        if value not in ("h2o",):
             raise ValueError("must be one of enum values ('h2o')")
         return value
 

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

@@ -36,7 +36,7 @@ class ImageContentPart(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("image_url"):
+        if value not in ("image_url",):
             raise ValueError("must be one of enum values ('image_url')")
         return value
 

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

@@ -33,7 +33,7 @@ class KerasFramework(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("keras"):
+        if value not in ("keras",):
             raise ValueError("must be one of enum values ('keras')")
         return value
 

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

@@ -34,7 +34,7 @@ class LightGBMFramework(BaseModel):
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ("lightgbm"):
+        if value not in ("lightgbm",):
             raise ValueError("must be one of enum values ('lightgbm')")
         return value