fiddler-client 3.8.0__tar.gz → 3.8.2__tar.gz

{fiddler-client-3.8.0/fiddler_client.egg-info → fiddler-client-3.8.2}/PKG-INFO

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

fiddler-client-3.8.2/fiddler/VERSION

@@ -0,0 +1 @@
+3.8.2

{fiddler-client-3.8.0 → fiddler-client-3.8.2}/fiddler/entities/alert_rule.py

@@ -48,6 +48,7 @@ class AlertRule(
         segment_id: UUID | str | None = None,
         compare_bin_delta: int | None = None,
         evaluation_delay: int = 0,
+        category: str | None = None,
     ) -> None:
         """Construct a alert rule instance."""
         self.name = name
@@ -65,6 +66,7 @@ class AlertRule(
         self.condition = condition
         self.bin_size = bin_size
         self.segment_id = segment_id
+        self.category = category
 
         self.id: UUID | None = None
         self.project_id: UUID | None = None
@@ -110,6 +112,7 @@ class AlertRule(
             segment_id=resp_obj.segment.id if resp_obj.segment else None,
             compare_bin_delta=resp_obj.compare_bin_delta,
             evaluation_delay=resp_obj.evaluation_delay,
+            category=resp_obj.category
         )
 
         # Add remaining fields
@@ -240,6 +243,7 @@ class AlertRule(
             'feature_names': self.columns,
             'compare_bin_delta': self.compare_bin_delta,
             'evaluation_delay': self.evaluation_delay,
+            'category': self.category,
         }
         if self.baseline_id:
             payload['baseline_id'] = self.baseline_id

{fiddler-client-3.8.0 → fiddler-client-3.8.2}/fiddler/libs/http_client.py

@@ -268,7 +268,7 @@ class RequestClient:
         # message as part of the new exception message.
         raise BaseError(
             f'{method} {url}: giving up after {cycle} attempt(s) / {timer() - t0:.2f} s'
-            + f', last error: {last_exception}'
+            + f', last error: {last_exception}. Timeout can be increased by setting it in fdl.init()'
         ) from last_exception
 
     def _make_request_retry_guts(
@@ -375,7 +375,7 @@ class RequestClient:
             resp = self.session.send(req, **kwargs)
         except requests.exceptions.RequestException as exc:
             if retry_strategy == 'off':
-                log.info('%s error after %.1f s: %s', logpfx, timer() - t0, exc)
+                log.info('%s error after %.1f s: %s . Timeout can be increased by setting it in fdl.init()', logpfx, timer() - t0, exc)
                 # Do not retry, let the caller deal with this exception.
                 raise
 
@@ -401,7 +401,7 @@ class RequestClient:
 
             # Convention: returning the exception tells the caller to retry.
             log.info(
-                '%s retryable error after %.1f s: %s',
+                '%s retryable error after %.1f s: %s . Timeout can be increased by setting it in fdl.init()',
                 logpfx,
                 timer() - t0,
                 exc,

{fiddler-client-3.8.0 → fiddler-client-3.8.2}/fiddler/schemas/alert_rule.py

@@ -38,6 +38,7 @@ class AlertRuleResp(BaseModel):
     threshold_type: Union[str, AlertThresholdAlgo]
     critical_threshold: Optional[float]
     warning_threshold: Optional[float]
+    category: Optional[str]
 
     created_at: datetime
     updated_at: datetime

{fiddler-client-3.8.0 → fiddler-client-3.8.2}/fiddler/tests/apis/test_alert_rule.py

@@ -18,10 +18,6 @@ from fiddler.constants.alert_rule import (
 from fiddler.entities.alert_rule import AlertRule
 from fiddler.exceptions import NotFound
 from fiddler.schemas.alert_rule import NotificationConfig
-from fiddler.tests.apis.test_baseline import (
-    API_RESPONSE_200 as BASELINE_API_RESPONSE_200,
-)
-from fiddler.tests.apis.test_model import API_RESPONSE_200 as MODEL_API_RESPONSE_200
 from fiddler.tests.constants import (
     ALERT_RULE_ID,
     BASELINE_ID,
@@ -258,22 +254,14 @@ def test_delete_alert_rule_not_found() -> None:
 
 
 @responses.activate
-def test_add_alert_rule_success(mocker) -> None:
-    responses.get(
-        url=f'{URL}/v3/models/{MODEL_ID}',
-        json=MODEL_API_RESPONSE_200,
-    )
-    responses.get(
-        url=f'{URL}/v3/baselines/{BASELINE_ID}',
-        json=BASELINE_API_RESPONSE_200,
-    )
+def test_add_alert_rule_success_manual_thresholds(mocker) -> None:
     responses.post(
         url=f'{URL}/v3/alert-rules',
         json=API_RESPONSE_200,
     )
 
     # Test with manual threshold
-    alert_rule_manual_threshold = AlertRule(
+    alert_rule_1 = AlertRule(
         name='alert_name',
         model_id=MODEL_ID,
         metric_id='drift',
@@ -288,16 +276,54 @@ def test_add_alert_rule_success(mocker) -> None:
         evaluation_delay=10,
     ).create()
 
-    assert isinstance(alert_rule_manual_threshold, AlertRule)
-    assert alert_rule_manual_threshold.id == UUID(ALERT_RULE_ID)
-    assert alert_rule_manual_threshold.model.id == UUID(MODEL_ID)
-    assert alert_rule_manual_threshold.project_id == UUID(PROJECT_ID)
-    assert alert_rule_manual_threshold.evaluation_delay == 10
-    assert alert_rule_manual_threshold.threshold_type == AlertThresholdAlgo.MANUAL.value
-    assert alert_rule_manual_threshold.critical_threshold == 2.0
-    assert alert_rule_manual_threshold.warning_threshold == 1.0
+    assert isinstance(alert_rule_1, AlertRule)
+    assert alert_rule_1.id == UUID(ALERT_RULE_ID)
+    assert alert_rule_1.model.id == UUID(MODEL_ID)
+    assert alert_rule_1.project_id == UUID(PROJECT_ID)
+    assert alert_rule_1.evaluation_delay == 10
+    assert alert_rule_1.threshold_type == AlertThresholdAlgo.MANUAL.value
+    assert alert_rule_1.critical_threshold == 2.0
+    assert alert_rule_1.warning_threshold == 1.0
 
-    # Test with auto threshold
+    # create one alert rule with category field
+    mocker.patch.dict(
+        API_RESPONSE_200['data'],
+        {
+            'metric_id': 'frequency',
+            'feature_names': ['geography'],
+            'category': 'France',
+        },
+    )
+    alert_rule_2 = AlertRule(
+        name='alert_name',
+        model_id=MODEL_ID,
+        metric_id='frequency',
+        priority=Priority.HIGH,
+        compare_to=CompareTo.RAW_VALUE,
+        condition=AlertCondition.GREATER,
+        bin_size=BinSize.HOUR,
+        threshold_type=AlertThresholdAlgo.MANUAL.value,
+        critical_threshold=2.0,
+        warning_threshold=1.0,
+        evaluation_delay=10,
+        columns=['geography'],
+        category='France',
+    ).create()
+
+    assert isinstance(alert_rule_2, AlertRule)
+    assert alert_rule_2.id == UUID(ALERT_RULE_ID)
+    assert alert_rule_2.model.id == UUID(MODEL_ID)
+    assert alert_rule_2.project_id == UUID(PROJECT_ID)
+    assert alert_rule_2.evaluation_delay == 10
+    assert alert_rule_2.threshold_type == AlertThresholdAlgo.MANUAL.value
+    assert alert_rule_2.critical_threshold == 2.0
+    assert alert_rule_2.warning_threshold == 1.0
+    assert alert_rule_2.columns == ['geography']
+    assert alert_rule_2.category == 'France'
+
+
+@responses.activate
+def test_add_alert_rule_success_auto_thresholds(mocker) -> None:
     mocker.patch.dict(
         API_RESPONSE_200['data'],
         {

{fiddler-client-3.8.0 → fiddler-client-3.8.2/fiddler_client.egg-info}/PKG-INFO

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

fiddler-client-3.8.0/fiddler/VERSION

@@ -1 +0,0 @@
-3.8.0