fiddler-client 1.7.0.dev2__py3-none-any.whl → 1.7.0.dev4__py3-none-any.whl

fiddler/_version.py

@@ -1 +1 @@
-__version__ = '1.7.0.dev2'
+__version__ = '1.7.0.dev4'

fiddler/core_objects.py

@@ -6,6 +6,7 @@ import functools
 import json
 import logging
 import textwrap
+import warnings
 from dataclasses import asdict, dataclass
 from pathlib import Path
 from typing import (
@@ -26,7 +27,6 @@ import pandas as pd
 import pandas.api.types
 import pyarrow as pa
 from deprecated import deprecated
-import warnings
 
 from ._version import __version__
 from .utils.exceptions import MalformedSchemaException
@@ -1292,7 +1292,7 @@ class ModelInfo:
         explanation method if unspecified (typically Fiddler Shapley).
         Must be one of the built-in explanation types (ie an `fdl.core_objects.ExplanationMethod`) or be specified as
         a custom explanation type via `custom_explanation_names` (and in `package.py`).
-    :param custom_explanation_names: 
+    :param custom_explanation_names:
     [Optional] List of (string) names that
         can be passed to the explanation_name argument of the optional
         user-defined explain_custom method of the model object defined in
@@ -1342,7 +1342,6 @@ class ModelInfo:
         tree_shap_enabled: Optional[bool] = False,
         custom_features: Optional[List[CustomFeature]] = None,
         is_binary_ranking_model: Optional[bool] = None,
-        
         **kwargs,
     ):
         self.display_name = display_name
@@ -1370,26 +1369,26 @@ class ModelInfo:
         # warning for parameters deprecated in version 1.7
         if mlflow_params is not None:
             self.warn_deprecated_parameter(
-                param_name='mlflow_params', 
-                from_version='1.7')
+                param_name='mlflow_params', from_version='1.7'
+            )
         if display_name is not None:
             self.warn_deprecated_parameter(
-                param_name='display_name', 
-                from_version='1.7')
+                param_name='display_name', from_version='1.7'
+            )
         if model_deployment_params is not None:
             self.warn_deprecated_parameter(
-                param_name='model_deployment_params', 
-                from_version='1.7')
-        
+                param_name='model_deployment_params', from_version='1.7'
+            )
+
         # artifact_status is set by Model Service
         # POST /v2/models sets  artifact_status to NO_MODEL
         # POST /v2/<model-id>/deploy-artifacts/... sets USER_UPLOADED
         # POST /v2/<model-id>/deploy-surrogate sets SURROGATE
         if artifact_status is not None:
             self.warn_deprecated_parameter(
-                param_name='artifact_status', 
-                from_version='1.7')
-            
+                param_name='artifact_status', from_version='1.7'
+            )
+
         if custom_explanation_names is None:
             custom_explanation_names = []
 
@@ -1519,11 +1518,11 @@ class ModelInfo:
                             f"Custom features '{feature.name}' is defined based on column '{feature.columns}' which was not found."
                         )
 
-    def warn_deprecated_parameter(self, param_name:str, from_version:str) -> None:
+    def warn_deprecated_parameter(self, param_name: str, from_version: str) -> None:
         warnings.warn(
-                f'WARNING: {param_name} is deprecated in {from_version}. It will be removed from 2.0.0 version.', DeprecationWarning
-            )
-
+            f'WARNING: {param_name} is deprecated in {from_version}. It will be removed from 2.0.0 version.',
+            DeprecationWarning,
+        )
 
     def to_dict(self):
         """Dumps to basic python objects (easy for JSON serialization)"""
@@ -1968,14 +1967,17 @@ class ModelInfo:
         """
         if categorical_target_class_details is not None:
             warnings.warn(
-                'WARNING: categorical_target_class_details is deprecated in 1.7 and will be removed from 2.0.0 version. As a replacement, use target_class_order while constructing ModelInfo.', DeprecationWarning
+                'WARNING: categorical_target_class_details is deprecated in 1.7 and will be removed from 2.0.0 version. As a replacement, use target_class_order while constructing ModelInfo.',
+                DeprecationWarning,
             )
 
         if custom_explanation_names is None:
             custom_explanation_names = []
 
         if not isinstance(dataset_info, DatasetInfo):
-            raise ValueError(f'The dataset_info parameter must be a valid DatasetInfo object')
+            raise ValueError(
+                f'The dataset_info parameter must be a valid DatasetInfo object'
+            )
 
         if display_name is None:
             if dataset_info.display_name is not None:
@@ -2322,6 +2324,17 @@ class ModelInfo:
                 assert decisions is not None, 'decisions unexpectedly None'
                 decisions.append(column.copy())
 
+        # dataset_id creation
+        if dataset_id is not None:
+            datasets = [dataset_id]
+        elif dataset_info.dataset_id is not None:
+            datasets = [dataset_info.dataset_id]
+        else:
+            raise ValueError(
+                'Please specify a dataset_id, it could not be inferred from the '
+                'dataset_info.'
+            )
+
         # perform checks for weighting parameters
         if weighting_params is not None:
             if (
@@ -2361,6 +2374,7 @@ class ModelInfo:
             metadata=metadata,
             decisions=decisions,
             targets=[target_column],
+            datasets=datasets,
             weighting_params=weighting_params,
             mlflow_params=None,
             model_deployment_params=model_deployment_params,

fiddler/fiddler_api.py

@@ -1282,6 +1282,9 @@ class FiddlerApi:
         with yaml_file.open() as f:
             model_info = ModelInfo.from_dict(yaml.safe_load(f))
 
+        if not model_info.datasets:
+            raise ValueError('Please provide the dataset_id while creating model_info.')
+
         deployment_type = DeploymentType[deployment_type.upper()]
         valid_deployment_types = [DeploymentType.PREDICTOR, DeploymentType.EXECUTOR]
         if deployment_type not in valid_deployment_types:

fiddler/v2/schema/alert.py

@@ -14,7 +14,6 @@ class AlertType(str, enum.Enum):
     DATA_INTEGRITY = 'data_integrity'
     DATA_DRIFT = 'drift'
     SERVICE_METRICS = 'service_metrics'
-    STATISTIC = 'statistic'
 
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}.{self.name}'
@@ -61,9 +60,6 @@ class Metric(str, enum.Enum):
     ## Service Metrics
     TRAFFIC = 'Traffic'
 
-    ## Statistic
-    AVERAGE = 'average'
-
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}.{self.name}'
 

fiddler/v2/schema/common.py

@@ -1,5 +1,5 @@
 import enum
-from typing import Any, List, Optional
+from typing import Any, List, Optional, Union
 
 from pydantic import Field
 
@@ -46,8 +46,8 @@ class Column(BaseDataSchema):
     data_type: DataType = Field(alias='data-type')
     possible_values: Optional[List[Any]] = Field(None, alias='possible-values')
     is_nullable: Optional[bool] = Field(None, alias='is-nullable')
-    value_range_min: Optional[float] = Field(None, alias='value-range-min')
-    value_range_max: Optional[float] = Field(None, alias='value-range-max')
+    value_range_min: Optional[Union[int, float]] = Field(None, alias='value-range-min')
+    value_range_max: Optional[Union[int, float]] = Field(None, alias='value-range-max')
 
     class Config:
         use_enum_values = True

{fiddler_client-1.7.0.dev2.dist-info → fiddler_client-1.7.0.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiddler-client
-Version: 1.7.0.dev2
+Version: 1.7.0.dev4
 Summary: Python client for Fiddler Service
 Home-page: https://fiddler.ai
 Author: Fiddler Labs
@@ -23,7 +23,7 @@ Requires-Dist: packaging
 Requires-Dist: pandas (>=1.2.5)
 Requires-Dist: pip (>=21.0)
 Requires-Dist: pyarrow (>=3.0.0)
-Requires-Dist: pydantic (==1.9.0)
+Requires-Dist: pydantic (>=1.9.0)
 Requires-Dist: pyyaml
 Requires-Dist: requests-toolbelt
 Requires-Dist: requests (<3)
@@ -68,7 +68,7 @@ Version History
 
 ### 1.6.2
   - #### **Modifications**
-    - Made dataset_id a required field in add_model()
+    - Make dataset_id a required field in add_model()
     - Update max_inferred_cardinality to 100
   - #### **New Features**
     - New method for updating a model artifact `update_model_artifact`

{fiddler_client-1.7.0.dev2.dist-info → fiddler_client-1.7.0.dev4.dist-info}/RECORD

@@ -1,13 +1,13 @@
 fiddler/__init__.py,sha256=Pw9NOznq08J3nmNFvomabwRt-xgj28Q-ve7bZhlgrNc,32528
-fiddler/_version.py,sha256=RjVgCy05o0iB-_h-TdwenOn99GZWd5rtdzNR0L6t5WA,27
+fiddler/_version.py,sha256=8onZza00YP733LrBAEFCcPto7B1mxgF5avO7piNrnuU,27
 fiddler/aws_utils.py,sha256=HlA3YxzvKe5bNiLjhmumrX9qepEy-iCa6Y0DEQ27Ulk,6393
 fiddler/client.py,sha256=hXrOg000_NBs_dXTtlJbwQKdHoKiMzTZofkVI_jPoA8,5098
 fiddler/connection.py,sha256=sUtxRsuj5lxxcLBWORJVA6aKI8NXPhYla6b8w0jm3GY,21425
 fiddler/constants.py,sha256=5JTSLDFOprN0UA-pgGib5bbvcvEIGHeE1bvYNhkVJ-0,354
-fiddler/core_objects.py,sha256=HNTViR2r93OaY8WEQ3uEzt_HWXhxE8eoaH34N9a9_mc,128868
+fiddler/core_objects.py,sha256=nb9OrA8Iga7UUpbkb8Ujm4ZQ3EmX-f0X0DrKxO-6GaA,129279
 fiddler/dataset.py,sha256=Eo6haBPS3Vm8GaTWDMcL1JCuoLsQQ5HgZO9X4WKT5J0,4721
 fiddler/experimental.py,sha256=aTkC0-Rvvt9GlNDn13Yv8Ihg92AjoSnIf6xbxNbwaY8,16945
-fiddler/fiddler_api.py,sha256=S2guuNco04nihYrSEdBQfhzLMSsBnVocDIFMyKhZgTk,81261
+fiddler/fiddler_api.py,sha256=zGiUtMvHxsCLWJq0eXTqNNmg7YjirnvOjtH15eDml8A,81387
 fiddler/model.py,sha256=li0D12POxOP5oc5nWhmBqc0eEDMpAbdFUeYBbIDAP_Y,15196
 fiddler/model_info_validator.py,sha256=FN9giSjPYSbNdeFNbUo-i8LHc7sgwTMTPeKuT3pM6TA,6387
 fiddler/monitoring_validator.py,sha256=t5YECqJQQWfyNhDeqW8ce00MHh544Fhdbk6wIvMQUDM,17870
@@ -63,10 +63,10 @@ fiddler/v2/api/model_deployment_mixin.py,sha256=iZzhotIG3xLCRrui-oylsCtZELN2pj5M
 fiddler/v2/api/model_mixin.py,sha256=iFwycgyNzCUbVMyTsjTOIPopyB1w9fOJ2bImHbbpIqU,14391
 fiddler/v2/api/project_mixin.py,sha256=BnjVkV8i6bcsqbfU0IGHm1EwRQ9jMhq6LRFZVFtgMPE,2664
 fiddler/v2/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fiddler/v2/schema/alert.py,sha256=UTYAep0dMXtgUqhv7ZnjxenxU62pkQbFSASvvXiG2x8,4560
+fiddler/v2/schema/alert.py,sha256=n83zqc7XkdZ91I4NjszmvONXtcbwuvwdzyUk5WELbg0,4490
 fiddler/v2/schema/base.py,sha256=3fPJorUMZAaOoMnQBHKVdZBI_eno2-0_xA6s7QDn8fc,346
 fiddler/v2/schema/baseline.py,sha256=QH3mTpYdqFKKcFvGoeEKBeXjpEqlXR8oQ9Gy6wckYW0,462
-fiddler/v2/schema/common.py,sha256=bYBZ4LX_Rnkfw4iFv6V8y-Nag79kDEKrbbXH2kFZkMM,2502
+fiddler/v2/schema/common.py,sha256=cB45sTSw3LcZsQ8iiGrz0Ka_CiprD1xxr477fj4IHec,2533
 fiddler/v2/schema/dataset.py,sha256=5amJkN_iHJr0BHd9bunuFis1lZoYYP0PjavO81Tk9e8,640
 fiddler/v2/schema/events.py,sha256=-bngy8u26finzBkuCOLIbomQVSCCPbtANPH-__EP8fQ,885
 fiddler/v2/schema/job.py,sha256=mDQ3ZevsFT2ZW1wri9BeQSiB7G4ZyoA_3tzuoBvl5ow,157
@@ -85,8 +85,8 @@ fiddler/v2/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 fiddler/v2/validators/dataset_validator.py,sha256=DHkwymg2KfVmryKmoNHj0GI47AFpYRqT39Z7oDvD4lM,1527
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_fiddler_api.py,sha256=3wMvk9hlCwVJEsY0xheOrpnyOTBWVVHbPODoI3TZsok,2132
-fiddler_client-1.7.0.dev2.dist-info/LICENSE.txt,sha256=w8-LUAb_VLBWSsCNmih0pAqLIicJfGu8OJXpDjkIg_o,559
-fiddler_client-1.7.0.dev2.dist-info/METADATA,sha256=MkwJdE3QyK-mD0clp1jmMU1Bs8MGxQDsMOJke_ZkSKc,15784
-fiddler_client-1.7.0.dev2.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-fiddler_client-1.7.0.dev2.dist-info/top_level.txt,sha256=GdJimrE4Q9O20-dA6QljDHm5KBrlz25oQTdbMHu41So,14
-fiddler_client-1.7.0.dev2.dist-info/RECORD,,
+fiddler_client-1.7.0.dev4.dist-info/LICENSE.txt,sha256=w8-LUAb_VLBWSsCNmih0pAqLIicJfGu8OJXpDjkIg_o,559
+fiddler_client-1.7.0.dev4.dist-info/METADATA,sha256=5-jnpKxYATgpntf1wcFseu9LwBWVy6HNJQJT-J0fRCI,15784
+fiddler_client-1.7.0.dev4.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+fiddler_client-1.7.0.dev4.dist-info/top_level.txt,sha256=GdJimrE4Q9O20-dA6QljDHm5KBrlz25oQTdbMHu41So,14
+fiddler_client-1.7.0.dev4.dist-info/RECORD,,