fiddler-client 3.3.0.dev1__tar.gz → 3.3.2__tar.gz

{fiddler_client-3.3.0.dev1/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.0.dev1
+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.0.dev1 → fiddler_client-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_client-3.3.0.dev1 → fiddler_client-3.3.2}/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_client-3.3.0.dev1 → fiddler_client-3.3.2}/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_client-3.3.0.dev1 → 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.0.dev1 → fiddler_client-3.3.2}/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 → 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.0.dev1
+Version: 3.3.2
 Summary: Python client for Fiddler Platform
 Home-page: https://fiddler.ai
 Author: Fiddler Labs

fiddler_client-3.3.0.dev1/fiddler/VERSION

@@ -1 +0,0 @@
-3.3.0.dev1