fiddler-client 2.1.0.dev4__tar.gz → 2.1.0.dev6__tar.gz

{fiddler-client-2.1.0.dev4 → fiddler-client-2.1.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiddler-client
-Version: 2.1.0.dev4
+Version: 2.1.0.dev6
 Summary: Python client for Fiddler Service
 Home-page: https://fiddler.ai
 Author: Fiddler Labs
@@ -32,6 +32,12 @@ Description: Fiddler Client
           - Introduce Model Tasks `NOT_SET` and `LLM`
           - Relax Target / Output specification for model tasks `NOT_SET` and `LLM`
           - Support custom metrics
+         - #### **Modifications**
+          - `DatasetDataSource` and `EventIdDataSource` will take `dataset_id` instead of `dataset_name`
+        
+        ### 2.0.5
+          - #### **Modifications**
+            - Fix for a minor bug in `fdl.DatasetInfo.from_dataframe()`
         
         ### 2.0.4
           - #### **Modifications**

{fiddler-client-2.1.0.dev4 → fiddler-client-2.1.0.dev6}/PUBLIC.md

@@ -25,6 +25,12 @@ Version History
   - Introduce Model Tasks `NOT_SET` and `LLM`
   - Relax Target / Output specification for model tasks `NOT_SET` and `LLM`
   - Support custom metrics
+ - #### **Modifications**
+  - `DatasetDataSource` and `EventIdDataSource` will take `dataset_id` instead of `dataset_name`
+
+### 2.0.5
+  - #### **Modifications**
+    - Fix for a minor bug in `fdl.DatasetInfo.from_dataframe()`
 
 ### 2.0.4
   - #### **Modifications**

fiddler-client-2.1.0.dev6/fiddler/_version.py

@@ -0,0 +1 @@
+__version__ = '2.1.0.dev6'

{fiddler-client-2.1.0.dev4 → fiddler-client-2.1.0.dev6}/fiddler/api/explainability_mixin.py

@@ -2,7 +2,7 @@ from collections import namedtuple
 from typing import Any, Dict, List, NamedTuple, Optional, Union
 
 import pandas as pd
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from fiddler.libs.http_client import RequestClient
 from fiddler.utils.decorators import handle_api_error_response
@@ -15,7 +15,7 @@ logger = get_logger(__name__)
 
 class DatasetDataSource(BaseModel):
     source_type = 'DATASET'
-    dataset_name: str
+    dataset_name: str = Field(alias='dataset_id')
     source: Optional[str]
     num_samples: Optional[int]
 
@@ -34,7 +34,7 @@ class RowDataSource(BaseModel):
 class EventIdDataSource(BaseModel):
     source_type = 'EVENT_ID'
     event_id: str
-    dataset_name: str
+    dataset_name: str = Field(alias='dataset_id')
 
 
 class ExplainabilityMixin:

{fiddler-client-2.1.0.dev4 → fiddler-client-2.1.0.dev6}/fiddler/core_objects.py

@@ -758,7 +758,7 @@ class DatasetInfo:
         # data type of int, float, bool to category. dropna() won't change
         # is_nullable detection as column_series.dropna() returns a new instance.
 
-        column_series_dropped_na = column_series.dropna()
+        column_series_dropped_na = column_series.dropna().reset_index(drop=True)
         pd_column_dtype = column_series_dropped_na.infer_objects().dtype
         if pd.api.types.is_object_dtype(pd_column_dtype):
             row_count = column_series_dropped_na.shape[0]

{fiddler-client-2.1.0.dev4 → fiddler-client-2.1.0.dev6}/fiddler/exceptions.py

@@ -23,7 +23,7 @@ class AsyncJobFailed(Exception):
 class ErrorResponseHandler:
     def __init__(self, http_error: HTTPError) -> None:
         self.http_error = http_error
-        self.response = http_error.response
+        self.response = getattr(http_error, 'response')
         self.ErrorResponse = namedtuple(  # type: ignore
             'ErrorResponse', ['status_code', 'error_code', 'message', 'errors']
         )

{fiddler-client-2.1.0.dev4 → fiddler-client-2.1.0.dev6}/fiddler_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiddler-client
-Version: 2.1.0.dev4
+Version: 2.1.0.dev6
 Summary: Python client for Fiddler Service
 Home-page: https://fiddler.ai
 Author: Fiddler Labs
@@ -32,6 +32,12 @@ Description: Fiddler Client
           - Introduce Model Tasks `NOT_SET` and `LLM`
           - Relax Target / Output specification for model tasks `NOT_SET` and `LLM`
           - Support custom metrics
+         - #### **Modifications**
+          - `DatasetDataSource` and `EventIdDataSource` will take `dataset_id` instead of `dataset_name`
+        
+        ### 2.0.5
+          - #### **Modifications**
+            - Fix for a minor bug in `fdl.DatasetInfo.from_dataframe()`
         
         ### 2.0.4
           - #### **Modifications**

{fiddler-client-2.1.0.dev4 → fiddler-client-2.1.0.dev6}/tests/fiddler/test_explainability_apis.py

@@ -2,9 +2,11 @@ import json
 import unittest
 
 import pandas as pd
+import pytest
 
 from fiddler.api.explainability_mixin import (
     DatasetDataSource,
+    EventIdDataSource,
     RowDataSource,
     SqlSliceQueryDataSource,
 )
@@ -19,6 +21,16 @@ class TestExplainabilityApis(BaseTestCase):
         self._dataset_name = 'test_dataset'
         self._model_name = 'test_model'
 
+    def test_pydantic_models(self):
+        dataset_source = DatasetDataSource(dataset_id='test_dataset')
+        assert dataset_source.dataset_name == 'test_dataset'
+        assert dataset_source.source_type == 'DATASET'
+
+        event_id_ds = EventIdDataSource(event_id='event_id', dataset_id='test_dataset')
+        assert event_id_ds.dataset_name == 'test_dataset'
+        assert event_id_ds.event_id == 'event_id'
+        assert event_id_ds.source_type == 'EVENT_ID'
+
     def test_feature_importance_from_dataset(self):
         url = f'{self._url}/feature-importance'
 
@@ -29,7 +41,7 @@ class TestExplainabilityApis(BaseTestCase):
             model_id=self._model_name,
             project_id=self._project_name,
             data_source=DatasetDataSource(
-                dataset_name='test_dataset', num_samples=None
+                dataset_id='test_dataset', num_samples=None
             ),
             num_refs=None,
             num_iterations=None,
@@ -95,7 +107,7 @@ class TestExplainabilityApis(BaseTestCase):
             model_id=self._model_name,
             project_id=self._project_name,
             data_source=DatasetDataSource(
-                dataset_name='test_dataset',
+                dataset_id='test_dataset',
                 num_samples=num_samples,
             ),
             num_iterations=num_iterations,
@@ -130,7 +142,7 @@ class TestExplainabilityApis(BaseTestCase):
             model_id=self._model_name,
             project_id=self._project_name,
             data_source=DatasetDataSource(
-                dataset_name='test_dataset',
+                dataset_id='test_dataset',
                 num_samples=None,
             ),
             output_columns=None,
@@ -203,7 +215,7 @@ class TestExplainabilityApis(BaseTestCase):
             model_id=self._model_name,
             project_id=self._project_name,
             data_source=DatasetDataSource(
-                dataset_name='test_dataset',
+                dataset_id='test_dataset',
                 num_samples=num_samples,
             ),
             output_columns=output_columns,
@@ -243,12 +255,12 @@ class TestExplainabilityApis(BaseTestCase):
             project_id=self._project_name,
             input_data_source=RowDataSource(row={'col_a': 3, 'col_b': 'x'}),
             ref_data_source=DatasetDataSource(
-                dataset_name=self._dataset_name, source=None, num_samples=10
+                dataset_id=self._dataset_name, source=None, num_samples=10
             ),
             explanation_type='FIDDLER_SHAP',
             num_permutations=300,
             ci_level=0.95,
-            top_n_class=None,
+            top_n_class=1,
         )
 
         request_body = json.loads(self.requests_mock.calls[0].request.body)
@@ -265,6 +277,7 @@ class TestExplainabilityApis(BaseTestCase):
         self.assertEqual(request_body['input_data_source']['source_type'], 'ROW')
         self.assertEqual(request_body['explanation_type'], 'FIDDLER_SHAP')
         self.assertEqual(request_body['num_permutations'], 300)
+        self.assertEqual(request_body['top_n_class'], 1)
 
     def test_fairness(self):
         url = f'{self._url}/fairness'
@@ -276,7 +289,7 @@ class TestExplainabilityApis(BaseTestCase):
             model_id=self._model_name,
             project_id=self._project_name,
             data_source=DatasetDataSource(
-                dataset_name=self._dataset_name, source=None, num_samples=None
+                dataset_id=self._dataset_name, source=None, num_samples=None
             ),
             protected_features=['Gender', 'Race'],
             positive_outcome='Churned',
@@ -334,6 +347,15 @@ class TestExplainabilityApis(BaseTestCase):
 
         mock_response = get_base_api_response_body(data=data)
         self.requests_mock.post(url, json=mock_response)
+
+        with pytest.raises(ValueError):
+            self.client.get_predictions(
+            project_id=self._project_name,
+            model_id=self._model_name,
+            input_df={},
+            chunk_size=10,
+        )
+
         df = pd.DataFrame([{'col1': 4, 'col2': 'xyz'}])
         self.client.get_predictions(
             project_id=self._project_name,
@@ -358,6 +380,15 @@ class TestExplainabilityApis(BaseTestCase):
 
         slice_query = 'SELECT * FROM table'  # nosec
 
+        with pytest.raises(ValueError):
+            self.client.get_mutual_information(
+                project_id=self._project_name,
+                dataset_id=self._dataset_name,
+                query=slice_query,
+                column_name=1,
+                normalized=True,
+            )
+
         self.client.get_mutual_information(
             project_id=self._project_name,
             dataset_id=self._dataset_name,

fiddler-client-2.1.0.dev4/fiddler/_version.py

@@ -1 +0,0 @@
-__version__ = '2.1.0.dev4'