fiddler-client 3.3.1__tar.gz → 3.3.2__tar.gz

{fiddler_client-3.3.1/fiddler_client.egg-info → fiddler_client-3.3.2}/PKG-INFO

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

fiddler_client-3.3.2/fiddler/VERSION

@@ -0,0 +1 @@
+3.3.2

{fiddler_client-3.3.1 → fiddler_client-3.3.2}/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_client-3.3.1 → fiddler_client-3.3.2}/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_client-3.3.1 → fiddler_client-3.3.2}/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 → fiddler_client-3.3.2/fiddler_client.egg-info}/PKG-INFO

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

fiddler_client-3.3.1/fiddler/VERSION

@@ -1 +0,0 @@
-3.3.1