fiddler-client 3.3.0.dev1__py3-none-any.whl → 3.3.2__py3-none-any.whl

fiddler/VERSION

@@ -1 +1 @@
-3.3.0.dev1
+3.3.2

fiddler/decorators.py

@@ -39,7 +39,7 @@ def handle_api_error(func: _WrappedFuncType) -> _WrappedFuncType:
                 error_resp = ErrorResponse(**e.response.json())
             except requests.JSONDecodeError:
                 raise HttpError(
-                    message=f'Invalid response content-type - {e.response.content}'
+                    message=f"Invalid response content-type - {e.response.content}"  # type: ignore
                 )
 
             if status_code == HTTPStatus.CONFLICT:

fiddler/entities/alert_rule.py

@@ -5,6 +5,8 @@ from datetime import datetime
 from typing import Any, Iterator
 from uuid import UUID
 
+from pydantic import ValidationError
+
 from fiddler.constants.alert_rule import AlertCondition, BinSize, CompareTo, Priority
 from fiddler.decorators import handle_api_error
 from fiddler.entities.base import BaseEntity
@@ -276,14 +278,18 @@ class AlertRule(
 
         :return: NotificationConfig object
         """
-        payload: dict[str, Any] = {}
-        if emails is not None:
-            payload['emails'] = emails
-        if pagerduty_services is not None:
-            payload['pagerduty_services'] = pagerduty_services
-            payload['pagerduty_severity'] = pagerduty_severity
-        if webhooks is not None:
-            payload['webhooks'] = webhooks
+
+        # Validating input
+        try:
+            payload: dict[str, Any] = NotificationConfig(
+                emails=emails,
+                pagerduty_services=pagerduty_services,
+                pagerduty_severity=pagerduty_severity,
+                webhooks=webhooks,
+            ).dict(exclude_none=True)
+        except ValidationError as e:
+            logger.exception('Invalid input: The format of input is not correct')
+            raise e
         response = self._client().patch(
             url=self._get_notification_url(id_=self.id),
             data=payload,

fiddler/tests/apis/test_alert_rule.py

@@ -1,10 +1,13 @@
 import json
 import logging
+import uuid
+from copy import deepcopy
 from http import HTTPStatus
 from uuid import UUID
 
 import pytest
 import responses
+from pydantic import ValidationError
 
 from fiddler.constants.alert_rule import AlertCondition, BinSize, CompareTo, Priority
 from fiddler.entities.alert_rule import AlertRule
@@ -23,6 +26,8 @@ from fiddler.tests.constants import (
     PROJECT_ID,
     PROJECT_NAME,
     TEST_EMAILS,
+    TEST_PAGERDUTY_SERVICES,
+    TEST_PAGERDUTY_SEVERITY,
     TEST_WEBHOOKS,
     URL,
 )
@@ -76,8 +81,8 @@ API_RESPONSE_200 = {
 
 ALERT_NOTIFICATION_API_RESPONSE_200 = {
     'data': {
-        'emails': TEST_EMAILS,
-        'webhooks': TEST_WEBHOOKS,
+        'emails': [],
+        'webhooks': [],
         'pagerduty_services': [],
         'pagerduty_severity': '',
     },
@@ -331,28 +336,143 @@ 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,
     }
-    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
+def test_set_notifications_invalid_input(caplog) -> None:
+    responses.get(
+        url=f'{URL}/v3/alert-rules/{ALERT_RULE_ID}',
+        json=API_RESPONSE_200,
+    )
+
+    alert_rule = AlertRule.get(id_=ALERT_RULE_ID)
+
+    with pytest.raises(ValidationError):
+        alert_rule.set_notification_config(
+            emails=TEST_EMAILS[0],
+            webhooks=TEST_WEBHOOKS,
+        )
+    assert 'Invalid input: The format of input is not correct' in caplog.messages[0]
 
 
 @responses.activate

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/tests/test_logger.py

@@ -6,7 +6,7 @@ from fiddler.utils.logger import set_logging
 
 def test_set_logging() -> None:
     app_logger = logging.getLogger(LOGGER_NAME)
-    assert len(app_logger.handlers) == 0
+    assert len(app_logger.handlers) == 2
 
     set_logging(level=logging.ERROR)
-    assert len(app_logger.handlers) == 1
+    assert len(app_logger.handlers) == 3

{fiddler_client-3.3.0.dev1.dist-info → fiddler_client-3.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiddler-client
-Version: 3.3.0.dev1
+Version: 3.3.2
 Summary: Python client for Fiddler Platform
 Home-page: https://fiddler.ai
 Author: Fiddler Labs
@@ -10,17 +10,17 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pip >=21.0
-Requires-Dist: requests <3
+Requires-Dist: pip>=21.0
+Requires-Dist: requests<3
 Requires-Dist: requests-toolbelt
-Requires-Dist: pandas >=1.2.5
-Requires-Dist: pydantic <2,>=1.10.15
-Requires-Dist: deprecated ==1.2.14
+Requires-Dist: pandas>=1.2.5
+Requires-Dist: pydantic<2,>=1.10.15
+Requires-Dist: deprecated==1.2.14
 Requires-Dist: tqdm
-Requires-Dist: simplejson >=3.17.0
-Requires-Dist: pyarrow >=7.0.0
+Requires-Dist: simplejson>=3.17.0
+Requires-Dist: pyarrow>=7.0.0
 Requires-Dist: pyyaml
-Requires-Dist: typing-extensions <5,>=4.6.0
+Requires-Dist: typing-extensions<5,>=4.6.0
 
 Fiddler Client
 =============

{fiddler_client-3.3.0.dev1.dist-info → fiddler_client-3.3.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-fiddler/VERSION,sha256=QfGRdQhPzwQNImJpp9R4Y_lPSzeteYCWJbW7LMYoRf8,11
+fiddler/VERSION,sha256=q7pfzW0SddYteOCdiCdtzyZNITf4UyOrUOrd3MMa7qk,6
 fiddler/__init__.py,sha256=pBLW7thJD1HkYhH5bJJbJFXSN8FNezos-rBU3HWhb4A,3794
 fiddler/configs.py,sha256=ZimSo0Gk7j1BFkjDHdRdycrGZ8oh-7G5TBXYiOh1HvU,217
 fiddler/connection.py,sha256=fLdSXpu5dwoK-h4Vtc9nbdKENOJ7jfEmrnDhVAtChck,5677
-fiddler/decorators.py,sha256=tWZliQQeUGwY0rU52FO9JXuOBueQXVEJywEbrgUEw1U,1820
+fiddler/decorators.py,sha256=TyM5__nxjX8tIT83YAnIWMkWlh5GIsGg6F8wdlHeq-g,1836
 fiddler/exceptions.py,sha256=T4ZpkTYPbnWvUX7y5XehnCyHqQPj3qqsIDKCZQNtaIE,2221
 fiddler/version.py,sha256=8fyg3UhFpqghMpxbtYIwNcB1lhCG6yTkPBbDS7IrwxY,140
 fiddler/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=T7MadLOcDnBBzAYDveWWmuVU0MciQtqrlHC3GFZK8ws,10371
+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
@@ -70,15 +70,15 @@ 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=StDWgtVoBOplRsvcH44Su-ikOWcafT29Kof-K-jiTxc,312
+fiddler/tests/test_logger.py,sha256=bhpS8TLrYBUOIzuk9XAs_Inot54LOWhw0A-8oXhZ2FM,312
 fiddler/tests/test_utils.py,sha256=AF6y7UfboEkCa-nNw0aF30SdHC7yW2Hh78J4H_4s78k,3333
 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=UhAaUwuumU8-xCLhecNNtCfBIrtRtnoZ-qHLD2rp_ck,10657
+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
@@ -101,8 +101,8 @@ 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.0.dev1.dist-info/LICENSE.txt,sha256=w8-LUAb_VLBWSsCNmih0pAqLIicJfGu8OJXpDjkIg_o,559
-fiddler_client-3.3.0.dev1.dist-info/METADATA,sha256=vpMA84-iC5vW2tVn6osO6Tvskmv5AVGlfmJJCfLiNTM,1602
-fiddler_client-3.3.0.dev1.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-fiddler_client-3.3.0.dev1.dist-info/top_level.txt,sha256=ndC6LqvKmrTTs8czRlBOYdYgSqZbHuMf0zHt_HWpzzk,8
-fiddler_client-3.3.0.dev1.dist-info/RECORD,,
+fiddler_client-3.3.2.dist-info/LICENSE.txt,sha256=w8-LUAb_VLBWSsCNmih0pAqLIicJfGu8OJXpDjkIg_o,559
+fiddler_client-3.3.2.dist-info/METADATA,sha256=z2aHBHYnPpGL1sEbNL3zlfIXEECfFwXncCd1BfqRLNQ,1589
+fiddler_client-3.3.2.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+fiddler_client-3.3.2.dist-info/top_level.txt,sha256=ndC6LqvKmrTTs8czRlBOYdYgSqZbHuMf0zHt_HWpzzk,8
+fiddler_client-3.3.2.dist-info/RECORD,,

{fiddler_client-3.3.0.dev1.dist-info → fiddler_client-3.3.2.dist-info}/WHEEL

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