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

truefoundry/common/auth_service_client.py

@@ -51,7 +51,7 @@ class ServiceFoundryServerAuthServiceClient(AuthServiceClient):
         self._api_server_url = url
 
     def refresh_token(self, token: Token, host: Optional[str] = None) -> Token:
-        host_arg_str = f"--host {host}" if host else "--host HOST"
+        host_arg_str = host if host else "HOST"
         if not token.refresh_token:
             # TODO: Add a way to propagate error messages without traceback to the output interface side
             raise Exception(
@@ -128,7 +128,7 @@ class AuthServerServiceClient(AuthServiceClient):
         self._auth_server_url = url
 
     def refresh_token(self, token: Token, host: Optional[str] = None) -> Token:
-        host_arg_str = f"--host {host}" if host else "--host HOST"
+        host_arg_str = host if host else "HOST"
         if not token.refresh_token:
             # TODO: Add a way to propagate error messages without traceback to the output interface side
             raise Exception(

truefoundry/ml/__init__.py

@@ -19,10 +19,7 @@ from truefoundry.ml.log_types.artifacts.artifact import (
     BlobStorageDirectory,
 )
 from truefoundry.ml.log_types.artifacts.dataset import DataDirectory, DataDirectoryPath
-from truefoundry.ml.log_types.artifacts.model import (
-    ModelVersion,
-    infer_signature,
-)
+from truefoundry.ml.log_types.artifacts.model import ModelVersion
 from truefoundry.ml.logger import init_logger
 from truefoundry.ml.mlfoundry_api import get_client
 from truefoundry.ml.mlfoundry_run import MlFoundryRun
@@ -42,6 +39,7 @@ from truefoundry.ml.model_framework import (
     TensorFlowFramework,
     TransformersFramework,
     XGBoostFramework,
+    sklearn_infer_schema,
 )
 
 __all__ = [
@@ -80,7 +78,7 @@ __all__ = [
     "XGBoostFramework",
     "XGBoostModelSchema",
     "get_client",
-    "infer_signature",
+    "sklearn_infer_schema",
 ]
 
 init_logger()

truefoundry/ml/autogen/models/signature.py

@@ -1,13 +1,16 @@
 from dataclasses import dataclass, is_dataclass
-from typing import Any, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 import numpy as np
-import pandas as pd
+
+if TYPE_CHECKING:
+    import pandas as pd
+
 
 from .schema import ParamSchema, Schema, convert_dataclass_to_schema
 from .utils import infer_param_schema, infer_schema
 
-MlflowInferableDataset = Union[pd.DataFrame, np.ndarray, Dict[str, np.ndarray]]
+MlflowInferableDataset = Union["pd.DataFrame", "np.ndarray", Dict[str, "np.ndarray"]]
 
 
 class ModelSignature:

truefoundry/ml/autogen/models/utils.py

@@ -4,7 +4,12 @@ from collections import defaultdict
 from typing import Any, Dict, List, Optional, Union
 
 import numpy as np
-import pandas as pd
+
+try:
+    import pandas as pd
+except ImportError:
+    pd = None
+
 
 from .exceptions import MlflowException
 from .schema import (
@@ -330,7 +335,7 @@ def infer_schema(data: Any) -> Schema:  # noqa: C901
                 ]
             )
     # pandas.Series
-    elif isinstance(data, pd.Series):
+    elif pd and isinstance(data, pd.Series):
         name = getattr(data, "name", None)
         schema = Schema(
             [
@@ -342,7 +347,7 @@ def infer_schema(data: Any) -> Schema:  # noqa: C901
             ]
         )
     # pandas.DataFrame
-    elif isinstance(data, pd.DataFrame):
+    elif pd and isinstance(data, pd.DataFrame):
         schema = Schema(
             [
                 ColSpec(
@@ -473,13 +478,13 @@ def _is_none_or_nan(x):
 
 
 def _infer_required(col) -> bool:
-    if isinstance(col, (list, pd.Series)):
+    if pd and isinstance(col, (list, pd.Series)):
         return not any(_is_none_or_nan(x) for x in col)
     return not _is_none_or_nan(col)
 
 
-def _infer_pandas_column(col: pd.Series) -> DataType:
-    if not isinstance(col, pd.Series):
+def _infer_pandas_column(col: "pd.Series") -> DataType:
+    if pd and not isinstance(col, pd.Series):
         raise TypeError(f"Expected pandas.Series, got '{type(col)}'.")
     if len(col.values.shape) > 1:
         raise MlflowException(f"Expected 1d array, got array with shape {col.shape}")
@@ -496,7 +501,7 @@ def _infer_pandas_column(col: pd.Series) -> DataType:
             # For backwards compatibility, we fall back to string
             # if the provided array is of string type
             # This is for diviner test where df field is ('key2', 'key1', 'key0')
-            if pd.api.types.is_string_dtype(col):
+            if pd and pd.api.types.is_string_dtype(col):
                 return DataType.string
             raise MlflowException(
                 f"Failed to infer schema for pandas.Series {col}. Error: {e}"

truefoundry/ml/log_types/artifacts/model.py

@@ -31,6 +31,7 @@ from truefoundry.ml.autogen.client import (  # type: ignore[attr-defined]
     TrueFoundryArtifactSource,
     UpdateModelVersionRequestDto,
 )
+from truefoundry.ml.autogen.models import infer_signature as _infer_signature
 from truefoundry.ml.enums import ModelFramework
 from truefoundry.ml.exceptions import MlFoundryException
 from truefoundry.ml.log_types.artifacts.artifact import BlobStorageDirectory
@@ -611,9 +612,6 @@ def infer_signature(
     ] = None,
     params: Optional[Dict[str, Any]] = None,
 ):
-    # TODO: Importing this globally causes hard dependencies on some libraries like pandas
-    from truefoundry.ml.autogen.models import infer_signature as _infer_signature
-
     return _infer_signature(
         model_input=model_input, model_output=model_output, params=params
     )

truefoundry/ml/log_types/artifacts/utils.py

@@ -172,7 +172,7 @@ def _get_src_dest_pairs(
     dest_to_src_map: Dict[str, str],
 ) -> Sequence[Tuple[str, str]]:
     src_dest_pairs = [
-        (src_path, os.path.relpath(dest_abs_path, root_dir))
+        (src_path, to_unix_path(os.path.relpath(dest_abs_path, root_dir)))
         for dest_abs_path, src_path in dest_to_src_map.items()
     ]
     return src_dest_pairs

truefoundry/ml/model_framework.py

@@ -1,8 +1,20 @@
+import json
 import os
 import warnings
 from collections import OrderedDict
 from pickle import load as pickle_load
-from typing import Any, Callable, Dict, List, Literal, Optional, Type, Union, get_args
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    List,
+    Literal,
+    Optional,
+    Type,
+    Union,
+    get_args,
+)
 
 from truefoundry.common.utils import (
     get_python_version_major_minor,
@@ -10,6 +22,7 @@ from truefoundry.common.utils import (
 )
 from truefoundry.ml.autogen.client import SerializationFormat
 from truefoundry.ml.autogen.entities import artifacts as autogen_artifacts
+from truefoundry.ml.autogen.models import infer_signature
 from truefoundry.ml.enums import ModelFramework
 from truefoundry.ml.log_types.artifacts.utils import (
     get_single_file_path_if_only_one_in_directory,
@@ -17,6 +30,9 @@ from truefoundry.ml.log_types.artifacts.utils import (
 )
 from truefoundry.pydantic_v1 import BaseModel, Field
 
+if TYPE_CHECKING:
+    from sklearn.base import BaseEstimator
+
 # Map serialization format to corresponding pip packages
 SERIALIZATION_FORMAT_TO_PACKAGES_NAME_MAP = {
     SerializationFormat.JOBLIB: ["joblib"],
@@ -421,3 +437,37 @@ def auto_update_model_framework_details(
                     model_file_path=absolute_model_filepath
                 )
             )
+
+
+def sklearn_infer_schema(
+    model_input: Any,
+    model: "BaseEstimator",
+    infer_method_name: str = "predict",
+) -> autogen_artifacts.SklearnModelSchema:
+    """
+    Infer the schema of a Sklearn model.
+
+    Args:
+        model_input (Any): The input data to be used for schema inference.
+        model (Any): The Sklearn model instance.
+        infer_method_name (str): The name of the method to be used for schema inference.
+            Eg: predict (default), predict_proba
+    Returns:
+        SklearnModelSchema: The inferred schema of the Sklearn model.
+    """
+    if not hasattr(model, infer_method_name):
+        raise ValueError(
+            f"Model does not have the method '{infer_method_name}' to infer the schema."
+        )
+    model_infer_method = getattr(model, infer_method_name)
+    model_output = model_infer_method(model_input)
+
+    model_signature = infer_signature(
+        model_input=model_input, model_output=model_output
+    )
+    model_signature_json = model_signature.to_dict()
+    return autogen_artifacts.SklearnModelSchema(
+        infer_method_name=infer_method_name,
+        inputs=json.loads(model_signature_json["inputs"]),
+        outputs=json.loads(model_signature_json["outputs"]),
+    )

{truefoundry-0.5.1rc3.dist-info → truefoundry-0.5.1rc5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.5.1rc3
+Version: 0.5.1rc5
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com

{truefoundry-0.5.1rc3.dist-info → truefoundry-0.5.1rc5.dist-info}/RECORD

@@ -26,7 +26,7 @@ truefoundry/autodeploy/utils/pydantic_compat.py,sha256=hEAUy5kLjhPdzw7yGZ2iXGMXb
 truefoundry/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/cli/__main__.py,sha256=-NkhYlT3mC5MhtekueKAvCw-sWvguj0LJRpXWzvvFjc,727
 truefoundry/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/common/auth_service_client.py,sha256=tZOa0NdATnItsMeTnEnUeTZQIgUJtpU-nvLdWtB4Px8,7978
+truefoundry/common/auth_service_client.py,sha256=RRiGUqITxeVYwKZLc923zJP-61UAvFtVlMaG2HJBvXc,7940
 truefoundry/common/constants.py,sha256=OwT8CJxGDhnrfgXCiKG5d5pkGbrd1UGGY-y672Et07Y,2310
 truefoundry/common/credential_file_manager.py,sha256=1yEk1Zm2xS4G0VDFwKSZ4w0VUrcPWQ1nJnoBaz9xyKA,4251
 truefoundry/common/credential_provider.py,sha256=Aht7hFLsnyRgMR34dRbzln7dor0WYSeA8ej8ApNmnKM,4148
@@ -107,7 +107,7 @@ truefoundry/deploy/v2/lib/models.py,sha256=pSolLMTArDuYpeNsmeeS5DWliloN_iCDfZSpR
 truefoundry/deploy/v2/lib/patched_models.py,sha256=NTU8J_CwdvEuF9zNXwFyN3suOp_196Wrm75DDy5qcXE,14184
 truefoundry/deploy/v2/lib/source.py,sha256=VHKuFREiixUP40D3Mrz-TA70spu1M0RbCzl--qwlFaY,9263
 truefoundry/logger.py,sha256=u-YCNjg5HBwE70uQcpjIG64Ghos-K2ulTWaxC03BSj4,714
-truefoundry/ml/__init__.py,sha256=iTuqq6FuVozL0Vyz1B2Xb5PL2LNnXyALXM0S3ehQicQ,2039
+truefoundry/ml/__init__.py,sha256=VtP0B3DNFFV_1b4WHkAo_XRMvWHmyeEwDu984t4cy8s,2040
 truefoundry/ml/artifact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/ml/artifact/truefoundry_artifact_repo.py,sha256=FksxhUpRHb9pgWZmAB16DhXqkAL6UIAPA1S3RJUApQU,46201
 truefoundry/ml/autogen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -310,8 +310,8 @@ truefoundry/ml/autogen/entities/artifacts.py,sha256=x3DxHXPS5OpNb1vmuy6p44g2hymq
 truefoundry/ml/autogen/models/__init__.py,sha256=--TGRea9SQBWFfwtcl3ekb1XGfFTdEkQGSG8a2SJ60I,187
 truefoundry/ml/autogen/models/exceptions.py,sha256=q3n7FGBrg_hUy1UyoefhMnhcXUAaqXlLIGHoOVzn_d8,1390
 truefoundry/ml/autogen/models/schema.py,sha256=IhpO9qbygLqEamP3NIt3m90SseJXCOm1ZTqNbNbW-M0,55772
-truefoundry/ml/autogen/models/signature.py,sha256=EppDGjws10CTatxcTBTuT-b3jJX9lmR6ZX98eC6PB5w,4942
-truefoundry/ml/autogen/models/utils.py,sha256=Z52SnAF7UL7uluNtA_VXuB9iPju-q9bpTTFJnUh0ZTQ,24289
+truefoundry/ml/autogen/models/signature.py,sha256=rBjpxUIsEeWM0sIyYG5uCJB18DKHR4k5yZw8TzuoP48,4987
+truefoundry/ml/autogen/models/utils.py,sha256=c7RtSLXhOLcP8rjuUtfnMdaKVTZvvbsmw98gPAkAFrs,24371
 truefoundry/ml/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/ml/cli/cli.py,sha256=ckBcjUpqfhgrPE1okqT_G2iouOLt-0KjpLhHp2YdVFU,256
 truefoundry/ml/cli/commands/__init__.py,sha256=diDUiRUX4l6TtNLI4iF-ZblczkELM7FRViJ-8gGNJQY,82
@@ -333,8 +333,8 @@ truefoundry/ml/log_types/artifacts/artifact.py,sha256=6X4lO23DwM7yTgUOY4RRoYMrf9
 truefoundry/ml/log_types/artifacts/constants.py,sha256=qKxQ5mMvJE4j83BvGW3qNTKunxCiBg_EEjTdgbgJtyE,1036
 truefoundry/ml/log_types/artifacts/dataset.py,sha256=a4dxd2EN8p7Ci-cLGGiDOboN3t0395_XhWE1dmTw1Q4,13112
 truefoundry/ml/log_types/artifacts/general_artifact.py,sha256=B4XErLr-m6RmQWtxMTu3wlFRFcqSwPYp6J0OL4Ng6L0,3179
-truefoundry/ml/log_types/artifacts/model.py,sha256=d2Q-61yXpX1mjXX6t2sL0_xKz-DPA3Z8xYDxzMfUSiA,22820
-truefoundry/ml/log_types/artifacts/utils.py,sha256=yhIZYe3Y-J0rG0Wcwql_Qjxe9hlefFbXUfRFqg4E9cM,7502
+truefoundry/ml/log_types/artifacts/model.py,sha256=sOqMptIpr2YRv7VC6AntFDvDUg5eQLsS7jQ_4TUB5Ds,22724
+truefoundry/ml/log_types/artifacts/utils.py,sha256=8mmahc1b6wvrA_E795h9ynRfhYRIdci7LRGN8U6ySm8,7516
 truefoundry/ml/log_types/image/__init__.py,sha256=fcOq8yQnNj1rkLcPeIjLXBpdA1WIeiPsXOlAAvMxx7M,76
 truefoundry/ml/log_types/image/constants.py,sha256=wLtGEOA4T5fZHSlOXPuNDLX3lpbCtwlvGKPFk_1fah0,255
 truefoundry/ml/log_types/image/image.py,sha256=qQnAVgErAq4Jn6wXFFpaveOd52zcjUuomUCqNRxO2io,12478
@@ -346,7 +346,7 @@ truefoundry/ml/log_types/utils.py,sha256=xjJ21jdPScvFmw3TbVh5NCzbzJwaqiXJyiiT4xx
 truefoundry/ml/logger.py,sha256=VT-BF3BnBYTWVq87O58F0c8uXMu94gYzsiFlGY3_7Ao,458
 truefoundry/ml/mlfoundry_api.py,sha256=PefznXwBPBv8TD4RYid9aiE8WWEkZQAHoaAbvklFoRs,62364
 truefoundry/ml/mlfoundry_run.py,sha256=RLTZGz3htyxNmG1Xat9WevawEIjDoUCbWrSNql8WynI,44597
-truefoundry/ml/model_framework.py,sha256=2JTQ8m5oqy2FaIBqIEgPeDEfwNBfcQHTw-gdcMXF1pA,15033
+truefoundry/ml/model_framework.py,sha256=I04pbczUh6bBmxWI-fzWgpUSY_ab7Js2zDB6fX4zvYM,16458
 truefoundry/ml/run_utils.py,sha256=0W208wSLUrbdfk2pjNcZlkUi9bNxG2JORqoe-5rVqHI,2423
 truefoundry/ml/session.py,sha256=F83GTC5WwGBjnJ69Ct8MqMnlutYc56JCc6YhEY1Wl-A,5394
 truefoundry/ml/validation_utils.py,sha256=J5atNhcJLvKj64ralSV9Y5Fv1Rt4SE237ICdP9-7sP4,12149
@@ -367,7 +367,7 @@ truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py,sha256=5mBCIc-ON
 truefoundry/workflow/remote_filesystem/tfy_signed_url_fs.py,sha256=Hf6Dk6Fu6P7DqsK5ULgraf9DStjgigf-kjaRAMBW-RU,8680
 truefoundry/workflow/task.py,sha256=ToitYiKcNzFCtOVQwz1W8sRjbR97eVS7vQBdbgUQtKg,1779
 truefoundry/workflow/workflow.py,sha256=WaTqUjhwfAXDWu4E5ehuwAxrCbDJkoAf1oWmR2E9Qy0,4575
-truefoundry-0.5.1rc3.dist-info/METADATA,sha256=isGJJmi0DSlh57OQh5ukDKprSYhHxMt59RG1vsjSbhA,2887
-truefoundry-0.5.1rc3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-truefoundry-0.5.1rc3.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
-truefoundry-0.5.1rc3.dist-info/RECORD,,
+truefoundry-0.5.1rc5.dist-info/METADATA,sha256=t-aW1hCgehMk_D0ptXbHYE9auNrknNpupQpRsNS6Kws,2887
+truefoundry-0.5.1rc5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+truefoundry-0.5.1rc5.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
+truefoundry-0.5.1rc5.dist-info/RECORD,,