fiddler-client 3.3.1__py3-none-any.whl → 3.4.0.dev2__py3-none-any.whl

fiddler/VERSION

@@ -1 +1 @@
-3.3.1
+3.4.0.dev2

fiddler/entities/alert_rule.py

@@ -286,7 +286,7 @@ class AlertRule(
                 pagerduty_services=pagerduty_services,
                 pagerduty_severity=pagerduty_severity,
                 webhooks=webhooks,
-            ).dict()
+            ).dict(exclude_none=True)
         except ValidationError as e:
             logger.exception('Invalid input: The format of input is not correct')
             raise e

fiddler/entities/xai.py

@@ -89,44 +89,6 @@ class XaiMixin:
 
         return namedtuple('Explain', response.json()['data'])(**response.json()['data'])
 
-    @handle_api_error
-    def get_fairness(
-        self,
-        data_source: DatasetDataSource | SqlSliceQueryDataSource,
-        protected_features: list[str],
-        positive_outcome: str | int | float | bool,
-        score_threshold: float | None = None,
-    ) -> tuple:
-        """
-        Get fairness analysis on a dataset or a slice.
-
-        :param data_source: DataSource for the input dataset to compute
-            fairness on (DatasetDataSource or SqlSliceQueryDataSource)
-        :param protected_features: list of protected attribute names to compute
-            Fairness analysis on
-        :param positive_outcome: name of the positive outcome to compute
-            Fairness analysis on
-        :param score_threshold: Binary threshold value (between 0 and 1). Default to 0.5
-
-        :return: A named tuple with the fairness results.
-        """
-        self._check_id_attributes()
-
-        payload: dict[str, Any] = {
-            'model_id': self.id,
-            'data_source': data_source.dict(exclude_none=True),
-            'protected_features': protected_features,
-            'positive_outcome': positive_outcome,
-        }
-        if score_threshold:
-            payload['score_threshold'] = score_threshold
-
-        response = self._client().post(url='/v3/analytics/fairness', data=payload)
-
-        return namedtuple('Fairness', response.json()['data'])(
-            **response.json()['data']
-        )
-
     @handle_api_error
     def get_slice(
         self,

fiddler/tests/apis/test_alert_rule.py

@@ -1,5 +1,7 @@
 import json
 import logging
+import uuid
+from copy import deepcopy
 from http import HTTPStatus
 from uuid import UUID
 
@@ -24,6 +26,8 @@ from fiddler.tests.constants import (
     PROJECT_ID,
     PROJECT_NAME,
     TEST_EMAILS,
+    TEST_PAGERDUTY_SERVICES,
+    TEST_PAGERDUTY_SEVERITY,
     TEST_WEBHOOKS,
     URL,
 )
@@ -77,8 +81,8 @@ API_RESPONSE_200 = {
 
 ALERT_NOTIFICATION_API_RESPONSE_200 = {
     'data': {
-        'emails': TEST_EMAILS,
-        'webhooks': TEST_WEBHOOKS,
+        'emails': [],
+        'webhooks': [],
         'pagerduty_services': [],
         'pagerduty_severity': '',
     },
@@ -332,30 +336,126 @@ def test_disable_notifications(caplog) -> None:
 
 
 @responses.activate
-def test_set_notifications() -> None:
+def test_set_notifications_email() -> None:
     responses.get(
         url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}',
         json=API_RESPONSE_200,
     )
 
     alert_rule = AlertRule.get(id_=ALERT_RULE_ID)
+    notification_resp = deepcopy(ALERT_NOTIFICATION_API_RESPONSE_200)
+    notification_resp['data']['emails'] = TEST_EMAILS
     resp = responses.patch(
         url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}/notification',
-        json=ALERT_NOTIFICATION_API_RESPONSE_200,
+        json=notification_resp,
     )
     notifications = alert_rule.set_notification_config(
         emails=TEST_EMAILS,
-        webhooks=TEST_WEBHOOKS,
     )
     assert json.loads(resp.calls[0].request.body) == {
         'emails': TEST_EMAILS,
+    }
+    assert notifications == notification_resp['data']
+
+    # Removing the emails from the notification config
+    notification_resp['data']['emails'] = []
+    resp = responses.patch(
+        url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}/notification',
+        json=notification_resp,
+    )
+    notifications = alert_rule.set_notification_config(
+        emails=[],
+    )
+    assert json.loads(resp.calls[0].request.body) == {
+        'emails': [],
+    }
+    assert notifications == notification_resp['data']
+
+
+@responses.activate
+def test_set_notifications_pagerduty() -> None:
+    responses.get(
+        url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}',
+        json=API_RESPONSE_200,
+    )
+
+    alert_rule = AlertRule.get(id_=ALERT_RULE_ID)
+    notification_resp = deepcopy(ALERT_NOTIFICATION_API_RESPONSE_200)
+    notification_resp['data']['pagerduty_services'] = TEST_PAGERDUTY_SERVICES
+    notification_resp['data']['pagerduty_severity'] = TEST_PAGERDUTY_SEVERITY
+    resp = responses.patch(
+        url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}/notification',
+        json=notification_resp,
+    )
+    notifications = alert_rule.set_notification_config(
+        pagerduty_services=TEST_PAGERDUTY_SERVICES,
+        pagerduty_severity=TEST_PAGERDUTY_SEVERITY,
+    )
+
+    assert json.loads(resp.calls[0].request.body) == {
+        'pagerduty_services': TEST_PAGERDUTY_SERVICES,
+        'pagerduty_severity': TEST_PAGERDUTY_SEVERITY,
+    }
+    assert notifications == notification_resp['data']
+
+    # Removing the webhooks from the notification config
+    notification_resp['data']['pagerduty_services'] = []
+    notification_resp['data']['pagerduty_severity'] = ''
+    resp = responses.patch(
+        url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}/notification',
+        json=notification_resp,
+    )
+    notifications = alert_rule.set_notification_config(
+        pagerduty_services=[],
+        pagerduty_severity='',
+    )
+    assert json.loads(resp.calls[0].request.body) == {
+        'pagerduty_services': [],
+        'pagerduty_severity': '',
+    }
+    assert notifications == notification_resp['data']
+
+
+@responses.activate
+def test_set_notifications_webhooks() -> None:
+    responses.get(
+        url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}',
+        json=API_RESPONSE_200,
+    )
+
+    alert_rule = AlertRule.get(id_=ALERT_RULE_ID)
+    notification_resp = deepcopy(ALERT_NOTIFICATION_API_RESPONSE_200)
+    notification_resp['data']['webhooks'] = TEST_WEBHOOKS
+    resp = responses.patch(
+        url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}/notification',
+        json=notification_resp,
+    )
+    notifications = alert_rule.set_notification_config(
+        webhooks=TEST_WEBHOOKS,
+    )
+
+    notification_resp['data']['webhooks'] = [
+        uuid.UUID(webhook_uuid)
+        for webhook_uuid in notification_resp['data']['webhooks']
+    ]
+    assert json.loads(resp.calls[0].request.body) == {
         'webhooks': TEST_WEBHOOKS,
-        'pagerduty_services': None,
-        'pagerduty_severity': None,
     }
-    assert notifications == NotificationConfig(
-        **ALERT_NOTIFICATION_API_RESPONSE_200['data']
+    assert notifications == notification_resp['data']
+
+    # Removing the webhooks from the notification config
+    notification_resp['data']['webhooks'] = []
+    resp = responses.patch(
+        url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}/notification',
+        json=notification_resp,
     )
+    notifications = alert_rule.set_notification_config(
+        webhooks=[],
+    )
+    assert json.loads(resp.calls[0].request.body) == {
+        'webhooks': [],
+    }
+    assert notifications == notification_resp['data']
 
 
 @responses.activate

fiddler/tests/apis/test_xai.py

@@ -219,104 +219,6 @@ EXPLAIN_RESPONSE_200 = {
     'kind': 'NORMAL',
 }
 
-FAIRNESS_RESPONSE_200 = {
-    'data': {
-        'protected_attributes': ['Gender'],
-        'label_distribution': {
-            'columns': ['Gender', 'data_label', 'count'],
-            'labels': [
-                ['Female', 'Churned', 79],
-                ['Female', 'Not Churned', 377],
-                ['Male', 'Churned', 39],
-                ['Male', 'Not Churned', 505],
-            ],
-        },
-        'model_outcomes': {
-            'columns': ['Gender', 'model_outcome', 'count'],
-            'outcomes': [
-                ['Female', 'Churned', 51],
-                ['Female', 'Not Churned', 405],
-                ['Male', 'Churned', 28],
-                ['Male', 'Not Churned', 516],
-            ],
-        },
-        'technical_metrics': {
-            'columns': [
-                'Gender',
-                'true_positive_rate',
-                'false_positive_rate',
-                'true_negative_rate',
-                'false_negative_rate',
-                'false_omission_rate',
-                'false_discovery_rate',
-            ],
-            'values': [
-                [
-                    'Female',
-                    0.569620253164557,
-                    0.015915119363395226,
-                    0.9840848806366048,
-                    0.43037974683544306,
-                    0.08395061728395062,
-                    0.11764705882352941,
-                ],
-                [
-                    'Male',
-                    0.5897435897435898,
-                    0.009900990099009901,
-                    0.9900990099009901,
-                    0.41025641025641024,
-                    0.031007751937984496,
-                    0.17857142857142858,
-                ],
-            ],
-        },
-        'fairness_metrics': {
-            'demographic_parity': {
-                'index': ['dp'],
-                'columns': ['Female', 'Male'],
-                'data': [[0.1118421052631579, 0.051470588235294115]],
-                'ratio': 0.4602076124567474,
-            },
-            'equal_opportunity': {
-                'index': ['tpr'],
-                'columns': ['Female', 'Male'],
-                'data': [[0.569620253164557, 0.5897435897435898]],
-                'ratio': 0.9658778205833792,
-            },
-            'group_benefit_equality': {
-                'index': ['group_benefit'],
-                'columns': ['Female', 'Male'],
-                'data': [[0.6455696202531646, 0.717948717948718]],
-                'ratio': 0.8991862567811935,
-            },
-            'disparate_impact': {
-                'pairs': [
-                    {
-                        'reference': ['Female'],
-                        'groups': [['Male']],
-                        'values': [0.4602076124567474],
-                    },
-                    {
-                        'reference': ['Male'],
-                        'groups': [['Female']],
-                        'values': [0.4602076124567474],
-                    },
-                ],
-                'absolute_min': {
-                    'groups': [['Female'], ['Male']],
-                    'value': 0.4602076124567474,
-                },
-            },
-        },
-        'model_task': 'BINARY_CLASSIFICATION',
-        'total_samples': 1000,
-        'valid_samples': 1000,
-    },
-    'api_version': '3.0',
-    'kind': 'NORMAL',
-}
-
 FETCH_SLICE_RESPONSE_200 = {
     'data': {
         'metadata': {
@@ -653,30 +555,6 @@ def test_explain() -> None:
     )
 
 
-@responses.activate
-def test_fairness() -> None:
-    responses.get(
-        url=f'{URL}/v3/models/{MODEL_ID}',
-        json=MODEL_API_RESPONSE_200,
-    )
-    model = Model.get(id_=MODEL_ID)
-
-    responses.post(
-        url=f'{URL}/v3/analytics/fairness',
-        json=FAIRNESS_RESPONSE_200,
-    )
-    fairness = model.get_fairness(
-        data_source=DatasetDataSource(
-            env_type='PRODUCTION',
-        ),
-        protected_features=['Gender'],
-        positive_outcome='Churned',
-    )
-    assert fairness == namedtuple('Fairness', FAIRNESS_RESPONSE_200['data'])(
-        **FAIRNESS_RESPONSE_200['data']
-    )
-
-
 @responses.activate
 def test_get_slice() -> None:
     responses.get(

fiddler/tests/constants.py

@@ -21,6 +21,8 @@ DATASET_NAME = 'dataset3'
 BASELINE_ID = 'af05646f-0cef-4638-84c9-0d195df2575d'
 ALERT_RULE_ID = 'ed8f18e6-c319-4374-8884-71126a6bab85'
 TEST_EMAILS = ['test@fiddler.ai', 'admin@fiddler.ai']
+TEST_PAGERDUTY_SERVICES = ['service1', 'service2']
+TEST_PAGERDUTY_SEVERITY = 'critical'
 TEST_WEBHOOKS = [
     'e20bf4cc-d2cf-4540-baef-d96913b14f1b',
     '6e796fda-0111-4a72-82cd-f0f219e903e1',

{fiddler_client-3.3.1.dist-info → fiddler_client-3.4.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiddler-client
-Version: 3.3.1
+Version: 3.4.0.dev2
 Summary: Python client for Fiddler Platform
 Home-page: https://fiddler.ai
 Author: Fiddler Labs

{fiddler_client-3.3.1.dist-info → fiddler_client-3.4.0.dev2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fiddler/VERSION,sha256=7yp5wvfcN4AKc_2ZMLMHgkziCvkgy8cVkyNFZBjnfms,6
+fiddler/VERSION,sha256=OsbxGngFod6pq5rBBkwkHkBw7Gm0SAeOuUpKKfMB1wQ,11
 fiddler/__init__.py,sha256=pBLW7thJD1HkYhH5bJJbJFXSN8FNezos-rBU3HWhb4A,3794
 fiddler/configs.py,sha256=ZimSo0Gk7j1BFkjDHdRdycrGZ8oh-7G5TBXYiOh1HvU,217
 fiddler/connection.py,sha256=fLdSXpu5dwoK-h4Vtc9nbdKENOJ7jfEmrnDhVAtChck,5677
@@ -17,7 +17,7 @@ fiddler/constants/model_deployment.py,sha256=SfagLKVD7tK1QmYQFJLDrA4-6FaSeNF6tik
 fiddler/constants/xai.py,sha256=GR8VguB6FTfMJZ291FIbfDsY4S9BGOft3VxNW5jMf90,214
 fiddler/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiddler/entities/alert_record.py,sha256=RcDACWDNpntkiId-JpkLQvVeIbuaZAzn6AWl2zYIh9A,3564
-fiddler/entities/alert_rule.py,sha256=4z6rhmP3Rqa46nDj490AoGExBLaqOsJE1Ct36wcoKuQ,10492
+fiddler/entities/alert_rule.py,sha256=otenqprXqODzd-pGeTDB6sFzHBCioeMrGGVYOtUw_n8,10509
 fiddler/entities/base.py,sha256=YCTLt1ta8UbD7u-5BW7v_ocA4S7LevEncI5XPS_SB60,2106
 fiddler/entities/baseline.py,sha256=k3D-K8WC5MkHDILyejRaH1v9jdCIymT96McDBOVQ9A0,7907
 fiddler/entities/custom_expression.py,sha256=SdS61JiI0gOxWwHAGxkHh1vqS5XsRtyeNSDs5E-Sg2U,6568
@@ -33,7 +33,7 @@ fiddler/entities/project.py,sha256=G5omjjKHEjvhenMvW-R0bYwrkRVHixIOhTPZb1pS7FI,4
 fiddler/entities/surrogate.py,sha256=94RkJmv8uwNhRL8PaliuiRv-R0EXDMKJTimE9boXKwQ,3077
 fiddler/entities/user.py,sha256=ev_Xx9QHAdEHYzNDafzQihXOcD8ME5XkpKgc8MiqCnw,1243
 fiddler/entities/webhook.py,sha256=BhwV-05EaFtOATbnlPWUaGeziRSewBPSNSGsYFbIRfc,4514
-fiddler/entities/xai.py,sha256=BlknQh4vPMDUQUZUuvHlKQzacEeQucbrFNy5xf10-x8,21173
+fiddler/entities/xai.py,sha256=GaippPwXFrNda1O4aBMkYTm6WJZ8HWqw7sq-GMKyx7g,19739
 fiddler/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiddler/libs/http_client.py,sha256=bl2V-q66NoPHm950CiDqOoF-kCPztYWUYNy9hVUsbqg,6027
 fiddler/libs/json_encoder.py,sha256=brsrWySvtZdaBArIkqKM5WwJUbvZf6ZbKozn1CewjOc,512
@@ -70,7 +70,7 @@ fiddler/schemas/xai.py,sha256=AZbjjBlTDZbQGj3U-pTM1UX_LJltjy__2t-kM2v5FuY,739
 fiddler/schemas/xai_params.py,sha256=7WbUCBojzZckjOA2NUxnk5y3M2WKKXclSzkt5HBfyUU,313
 fiddler/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiddler/tests/conftest.py,sha256=Dmz9FKAFHYdq1AWmcY7NES9pU4cbY9qKWQiojjaX_0E,840
-fiddler/tests/constants.py,sha256=XuDw_3kzQEcgum-FynCfJzp-sAuRZ0wFS_w9tACFh6s,1264
+fiddler/tests/constants.py,sha256=hKIh_XoGJVL8mWhdtUiMo0niII0iCXLkGMSVNv6y7l0,1352
 fiddler/tests/test_connection.py,sha256=d8WoB0QRZEObWfeRAZRXRm1kw9wfEysmeo4Bld7x8js,1865
 fiddler/tests/test_json_encoder.py,sha256=GJeFT5tTA4RTfZn1q2xm1V5SEj5DNsW3LeHPVfFxcFw,783
 fiddler/tests/test_logger.py,sha256=bhpS8TLrYBUOIzuk9XAs_Inot54LOWhw0A-8oXhZ2FM,312
@@ -78,7 +78,7 @@ fiddler/tests/test_utils.py,sha256=AF6y7UfboEkCa-nNw0aF30SdHC7yW2Hh78J4H_4s78k,3
 fiddler/tests/utils.py,sha256=FEDbASW4pYZktdEK2FLnIDyZCwBzpb60m6EzkvOkwSc,335
 fiddler/tests/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiddler/tests/apis/test_alert_record.py,sha256=_0EBRDn87TqTiO1KYEHKQQVtVZjj4lYjbt8Ix-RRTSg,3118
-fiddler/tests/apis/test_alert_rule.py,sha256=o0bi6CNTgHIM19oCJTStgB01jWHgUIJcueAGavd-DM4,11258
+fiddler/tests/apis/test_alert_rule.py,sha256=0qwyTxRdt1tW1DuMwaqFJgbAEIV9cQ9xSo9F3XS660U,14638
 fiddler/tests/apis/test_baseline.py,sha256=R_vvbZdSenpYMSydurENJrE_uNWE3sJR9sHJksfU_Jk,7494
 fiddler/tests/apis/test_custom_metric.py,sha256=QlNa80M9PxqaqzW-3nCtH5kKLRHYu2iqFDautBusbos,8208
 fiddler/tests/apis/test_dataset.py,sha256=1Xc9Ng91fLMc2C6dpKfse42fQ0anza3ZOKOD1TqCvTQ,4636
@@ -94,15 +94,15 @@ fiddler/tests/apis/test_model_surrogate.py,sha256=h3OPgD1-_n6gTd0YH_hDcBBRjBfXv1
 fiddler/tests/apis/test_project.py,sha256=IEYT3imD4dZJg-OT888G4jQJ_AxxHN5_VkCHcmwUnGA,6015
 fiddler/tests/apis/test_segment.py,sha256=hQiXpZEKLJrnlRBLLMsP3jph8H8K7AEUw17sMK6BuF8,7804
 fiddler/tests/apis/test_webhook.py,sha256=Tf6bggAFeUA0a9TKTjJ34dM_UM_l6_Q-5N9utyuieeE,8099
-fiddler/tests/apis/test_xai.py,sha256=BJxqrdAxk7qivWR7JYygfguAm-sdDTDpaBxzz0deG8s,30888
+fiddler/tests/apis/test_xai.py,sha256=pg7SGC1D8vqGxRhNmlI94c7pDMlb0KWj2Ow9GGIQCEM,26943
 fiddler/utils/__init__.py,sha256=ooAJR6_tVaF6UKZriz5ynZPj8IeCzaDIPKV23F-e4Fk,53
 fiddler/utils/helpers.py,sha256=Xl_T_se9SOeMTmVJAOVzzmkekUsmpFMlAb2KvPCWfTw,2908
 fiddler/utils/logger.py,sha256=FdJ3LkS9dbRjWsw5oJmNNsd7q0XRVEIvx5-TWys7L0k,669
 fiddler/utils/model_generator.py,sha256=TwQMQDpy-0gcq6HyL68s37N-sk_nGPq33mmppK6i7hI,2203
 fiddler/utils/validations.py,sha256=i8NtgrpCsitq6BPa5lygpKDh07oaOXu7PAlCIcMvqzY,408
 fiddler/utils/version.py,sha256=iC8Ry7UFl9EJW_xU1WbzO_l4yK6V7eQ6U5exB3xT864,531
-fiddler_client-3.3.1.dist-info/LICENSE.txt,sha256=w8-LUAb_VLBWSsCNmih0pAqLIicJfGu8OJXpDjkIg_o,559
-fiddler_client-3.3.1.dist-info/METADATA,sha256=FHpLgL7fqr__hT059Z9_wfWWY5xzpRTqhD6qc6h4KXg,1589
-fiddler_client-3.3.1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-fiddler_client-3.3.1.dist-info/top_level.txt,sha256=ndC6LqvKmrTTs8czRlBOYdYgSqZbHuMf0zHt_HWpzzk,8
-fiddler_client-3.3.1.dist-info/RECORD,,
+fiddler_client-3.4.0.dev2.dist-info/LICENSE.txt,sha256=w8-LUAb_VLBWSsCNmih0pAqLIicJfGu8OJXpDjkIg_o,559
+fiddler_client-3.4.0.dev2.dist-info/METADATA,sha256=xosKzZsH9kXQTYJ0mZjQOXZgcklKrkobJdRy9agMPbI,1594
+fiddler_client-3.4.0.dev2.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+fiddler_client-3.4.0.dev2.dist-info/top_level.txt,sha256=ndC6LqvKmrTTs8czRlBOYdYgSqZbHuMf0zHt_HWpzzk,8
+fiddler_client-3.4.0.dev2.dist-info/RECORD,,

{fiddler_client-3.3.1.dist-info → fiddler_client-3.4.0.dev2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any