fiddler-client 3.0.2__tar.gz → 3.0.4__tar.gz

{fiddler-client-3.0.2/fiddler_client.egg-info → fiddler_client-3.0.4}/PKG-INFO

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

fiddler_client-3.0.4/fiddler/VERSION

@@ -0,0 +1 @@
+3.0.4

{fiddler-client-3.0.2 → fiddler_client-3.0.4}/fiddler/entities/model_deployment.py

@@ -6,7 +6,9 @@ from uuid import UUID
 
 from fiddler.decorators import handle_api_error
 from fiddler.entities.base import BaseEntity
+from fiddler.entities.job import Job
 from fiddler.entities.project import ProjectCompactMixin
+from fiddler.schemas.job import JobCompactResp
 from fiddler.schemas.model_deployment import ModelDeploymentResponse
 from fiddler.utils.logger import get_logger
 
@@ -94,7 +96,7 @@ class ModelDeployment(
         self._resp = resp_obj
 
     @handle_api_error
-    def update(self) -> None:
+    def update(self) -> Job:
         """Update an existing model deployment."""
         payload: dict[str, Any] = {'active': self.active}
         if self.replicas is not None:
@@ -108,6 +110,8 @@ class ModelDeployment(
             url=self._get_url(model_id=self.model_id), data=payload
         )
         self._refresh_from_response(response=response)
+        job_compact = JobCompactResp(**response.json()['data']['job'])
+        return Job.get(id_=job_compact.id)
 
     @classmethod
     def of(cls, model_id: UUID | str) -> ModelDeployment:

{fiddler-client-3.0.2 → fiddler_client-3.0.4}/fiddler/entities/webhook.py

@@ -6,7 +6,9 @@ from uuid import UUID
 
 from fiddler.decorators import handle_api_error
 from fiddler.entities.base import BaseEntity
+from fiddler.schemas.filter_query import OperatorType, QueryCondition, QueryRule
 from fiddler.schemas.webhook import WebhookProvider, WebhookResp
+from fiddler.utils.helpers import raise_not_found
 
 
 class Webhook(BaseEntity):
@@ -81,6 +83,22 @@ class Webhook(BaseEntity):
         response = cls._client().get(url=cls._get_url(id_))
         return cls._from_response(response=response)
 
+    @classmethod
+    @handle_api_error
+    def from_name(cls, name: str) -> Webhook:
+        """Get the webhook instance using webhook name"""
+        _filter = QueryCondition(
+            rules=[QueryRule(field='name', operator=OperatorType.EQUAL, value=name)]
+        )
+
+        response = cls._client().get(
+            url=cls._get_url(), params={'filter': _filter.json()}
+        )
+        if response.json()['data']['total'] == 0:
+            raise_not_found('Webhook not found for the given identifier')
+
+        return cls._from_dict(data=response.json()['data']['items'][0])
+
     @classmethod
     @handle_api_error
     def list(cls) -> Iterator[Webhook]:

{fiddler-client-3.0.2 → fiddler_client-3.0.4}/fiddler/packtools/template_model.py

@@ -36,7 +36,8 @@ class TemplateKerasTF2Model:
         :param hybrid: Boolean value for hybrid data type (for example matrices). Default to False.
         """
         import tensorflow as tf
-        from packtools.keras_ig_helpers import ComputeGradientsKerasTF2
+
+        from fiddler.packtools.keras_ig_helpers import ComputeGradientsKerasTF2
 
         embedding_names = embedding_names or []
         batch_input_shape_list = batch_input_shape_list or []
@@ -197,7 +198,7 @@ class TemplateTreeShap:
         :return: explanations_by_output and extras_by_output: two dictionaries with keys the output columns and values
                  the corresponding explanations and extra information necessary
         """
-        from packtools.project_attributions_helpers import TreeShapAttributions
+        from fiddler.packtools.project_attributions_helpers import TreeShapAttributions
 
         if explanation_name != self.tree_shap_explanations:
             raise NotImplementedError(

{fiddler-client-3.0.2 → fiddler_client-3.0.4}/fiddler/tests/apis/test_model_deployment.py

@@ -3,9 +3,12 @@ from http import HTTPStatus
 import pytest
 import responses
 
+from fiddler.entities.job import Job
 from fiddler.entities.model_deployment import ModelDeployment
 from fiddler.exceptions import NotFound
 from fiddler.tests.constants import (
+    JOB_ID,
+    JOB_NAME,
     MODEL_DEPLOYMENT_ID,
     MODEL_ID,
     MODEL_NAME,
@@ -50,6 +53,7 @@ API_RESPONSE_200 = {
             'full_name': USER_NAME,
             'email': USER_EMAIL,
         },
+        'job': {'id': JOB_ID, 'name': 'Deploy artifact model - manual'},
     },
 }
 
@@ -67,6 +71,31 @@ API_RESPONSE_404 = {
     }
 }
 
+JOB_API_RESPONSE_200 = {
+    'api_version': '3.0',
+    'kind': 'NORMAL',
+    'data': {
+        'name': JOB_NAME,
+        'info': {
+            'resource_type': 'MODEL',
+            'resource_name': 'bank_churn',
+            'project_name': 'bank_churn',
+        },
+        'id': JOB_ID,
+        'status': 'SUCCESS',
+        'progress': 100,
+        'error_message': None,
+        'error_reason': None,
+        'extras': {
+            'e36d1cf2-766f-4705-8269-b6f93bf1ca14': {
+                'status': 'SUCCESS',
+                'result': {'result': 'Success'},
+                'error_message': None,
+            }
+        },
+    },
+}
+
 
 @responses.activate
 def test_update_model_deployment_success() -> None:
@@ -79,8 +108,13 @@ def test_update_model_deployment_success() -> None:
     model_deployment.cpu = 300
     model_deployment.active = True
 
-    model_deployment.update()
+    responses.get(
+        url=f'{URL}/v3/jobs/{JOB_ID}',
+        json=JOB_API_RESPONSE_200,
+    )
+    job = model_deployment.update()
     assert isinstance(model_deployment, ModelDeployment)
+    assert isinstance(job, Job)
     assert model_deployment.cpu == 300
     assert model_deployment.active
 

{fiddler-client-3.0.2 → fiddler_client-3.0.4}/fiddler/tests/apis/test_webhook.py

@@ -48,6 +48,29 @@ API_RESPONSE_404 = {
     'kind': 'ERROR',
 }
 
+API_RESPONSE_FROM_NAME = {
+    'data': {
+        'page_size': 100,
+        'total': 1,
+        'item_count': 1,
+        'page_count': 1,
+        'page_index': 1,
+        'offset': 0,
+        'items': [
+            {
+                'id': 1,
+                'uuid': WEBHOOK_ID,
+                'name': WEBHOOK_NAME,
+                'url': WEBHOOK_URL,
+                'provider': WEBHOOK_PROVIDER,
+                'created_at': '2024-04-30T13:38:08.408013+00:00',
+                'updated_at': '2024-04-30T13:38:08.408013+00:00',
+                'organization_name': ORG_NAME,
+            }
+        ],
+    }
+}
+
 LIST_API_RESPONSE = {
     'data': {
         'page_size': 100,
@@ -124,6 +147,40 @@ def test_get_webhook_not_found() -> None:
         Webhook.get(id_=webhook_id)
 
 
+@responses.activate
+def test_webhook_from_name_success() -> None:
+    params = {
+        'filter': '{"condition": "AND", "rules": [{"field": "name", "operator": "equal", "value": "test_webhook_config_name"}]}'
+    }
+    responses.get(
+        url=f'{URL}/v2/webhooks',
+        json=API_RESPONSE_FROM_NAME,
+        match=[responses.matchers.query_param_matcher(params)],
+    )
+    webhook = Webhook.from_name(name=WEBHOOK_NAME)
+    assert isinstance(webhook, Webhook)
+
+
+@responses.activate
+def test_webhook_from_name_not_found() -> None:
+    resp = API_RESPONSE_FROM_NAME.copy()
+    resp['data']['total'] = 0
+    resp['data']['item_count'] = 0
+    resp['data']['items'] = []
+
+    params = {
+        'filter': '{"condition": "AND", "rules": [{"field": "name", "operator": "equal", "value": "test_webhook_config_name"}]}'
+    }
+    responses.get(
+        url=f'{URL}/v2/webhooks',
+        json=resp,
+        match=[responses.matchers.query_param_matcher(params)],
+    )
+
+    with pytest.raises(NotFound):
+        Webhook.from_name(name=WEBHOOK_NAME)
+
+
 @responses.activate
 def test_webhook_list_success() -> None:
     responses.get(

{fiddler-client-3.0.2 → fiddler_client-3.0.4/fiddler_client.egg-info}/PKG-INFO

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

fiddler-client-3.0.2/fiddler/VERSION

@@ -1 +0,0 @@
-3.0.2