fiddler-client 3.0.0.dev10__tar.gz → 3.0.0.dev11__tar.gz

{fiddler-client-3.0.0.dev10/fiddler_client.egg-info → fiddler-client-3.0.0.dev11}/PKG-INFO

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

fiddler-client-3.0.0.dev11/fiddler/VERSION

@@ -0,0 +1 @@
+3.0.0-dev11

{fiddler-client-3.0.0.dev10 → fiddler-client-3.0.0.dev11}/fiddler/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from fiddler.connection import Connection, ConnectionMixin, init  # noqa
 from fiddler.constants.alert_rule import (  # noqa
     AlertCondition,
@@ -5,7 +7,7 @@ from fiddler.constants.alert_rule import (  # noqa
     CompareTo,
     Priority,
 )
-from fiddler.constants.baseline import BaselineType, WindowSize  # noqa
+from fiddler.constants.baseline import BaselineType, WindowBinSize  # noqa
 from fiddler.constants.dataset import EnvType  # noqa
 from fiddler.constants.job import JobStatus  # noqa
 from fiddler.constants.model import (  # noqa
@@ -19,14 +21,14 @@ from fiddler.constants.model_deployment import ArtifactType, DeploymentType  # n
 from fiddler.constants.xai import ExplainMethod  # noqa
 from fiddler.entities.alert_record import AlertRecord  # noqa
 from fiddler.entities.alert_rule import AlertRule  # noqa
-from fiddler.entities.baseline import Baseline  # noqa
+from fiddler.entities.baseline import Baseline, BaselineCompact  # noqa
 from fiddler.entities.custom_expression import CustomMetric, Segment  # noqa
-from fiddler.entities.dataset import Dataset  # noqa
+from fiddler.entities.dataset import Dataset, DatasetCompact  # noqa
 from fiddler.entities.file import File  # noqa
 from fiddler.entities.job import Job  # noqa
-from fiddler.entities.model import Model  # noqa
+from fiddler.entities.model import Model, ModelCompact  # noqa
 from fiddler.entities.model_deployment import ModelDeployment  # noqa
-from fiddler.entities.project import Project  # noqa
+from fiddler.entities.project import Project, ProjectCompact  # noqa
 from fiddler.entities.webhook import Webhook  # noqa
 from fiddler.exceptions import (  # noqa
     ApiError,
@@ -62,11 +64,22 @@ from fiddler.schemas.xai_params import XaiParams  # noqa
 from fiddler.utils.logger import set_logging  # noqa
 from fiddler.version import __version__  # noqa
 
+# Global connection object
+conn: Connection | None = None
+
+
+def set_conn(conn_: Connection) -> None:
+    """Set global conn variable"""
+    global conn
+    conn = conn_
+
+
 __all__ = [
     '__version__',
     'Connection',
     'ConnectionMixin',
     'init',
+    'conn',
     # Constants
     'AlertCondition',
     'ArtifactStatus',
@@ -82,7 +95,7 @@ __all__ = [
     'ModelInputType',
     'ModelTask',
     'Priority',
-    'WindowSize',
+    'WindowBinSize',
     # Schemas
     'CustomFeature',
     'DatasetDataSource',
@@ -103,13 +116,17 @@ __all__ = [
     'AlertRecord',
     'AlertRule',
     'Baseline',
+    'BaselineCompact',
     'Dataset',
+    'DatasetCompact',
     'CustomMetric',
     'File',
     'Job',
     'Model',
+    'ModelCompact',
     'ModelDeployment',
     'Project',
+    'ProjectCompact',
     'Segment',
     'Webhook',
     # Exceptions

{fiddler-client-3.0.0.dev10 → fiddler-client-3.0.0.dev11}/fiddler/connection.py

@@ -15,9 +15,6 @@ from fiddler.version import __version__
 
 logger = get_logger(__name__)
 
-# Global connection object
-connection: Connection | None = None
-
 
 class Connection:
     def __init__(  # pylint: disable=too-many-arguments
@@ -123,35 +120,37 @@ class Connection:
 
 class ConnectionMixin:
     @classmethod
-    def _connection(cls) -> Connection:
+    def _conn(cls) -> Connection:
         """Fiddler connection instance"""
-        assert connection is not None
-        return connection
+        from fiddler import conn
+
+        assert conn is not None
+        return conn
 
     @classmethod
     def _client(cls) -> RequestClient:
         """Request client instance"""
-        return cls._connection().client
+        return cls._conn().client
 
     @property
     def organization_name(self) -> str:
         """Organization name property"""
-        return self._connection().server_info.organization.name
+        return self._conn().server_info.organization.name
 
     @property
     def organization_id(self) -> UUID:
         """Organization id property"""
-        return self._connection().server_info.organization.id
+        return self._conn().server_info.organization.id
 
     @classmethod
     def get_organization_name(cls) -> str:
         """Organization name"""
-        return cls._connection().server_info.organization.name
+        return cls._conn().server_info.organization.name
 
     @classmethod
     def get_organization_id(cls) -> UUID:
         """Organization id"""
-        return cls._connection().server_info.organization.id
+        return cls._conn().server_info.organization.id
 
 
 def init(  # pylint: disable=too-many-arguments
@@ -173,8 +172,9 @@ def init(  # pylint: disable=too-many-arguments
     :param validate: Whether to validate the server/client version compatibility.
          Some functionalities might not work if this is turned off.
     """
-    global connection  # pylint: disable=global-statement
-    connection = Connection(
+    from fiddler import set_conn
+
+    conn = Connection(
         url=url,
         token=token,
         proxies=proxies,
@@ -182,3 +182,5 @@ def init(  # pylint: disable=too-many-arguments
         verify=verify,
         validate=validate,
     )
+
+    set_conn(conn_=conn)

fiddler-client-3.0.0.dev11/fiddler/constants/baseline.py

@@ -0,0 +1,15 @@
+import enum
+
+
+@enum.unique
+class BaselineType(str, enum.Enum):
+    STATIC = 'STATIC'
+    ROLLING = 'ROLLING'
+
+
+@enum.unique
+class WindowBinSize(str, enum.Enum):
+    HOUR = 'Hour'
+    DAY = 'Day'
+    WEEK = 'Week'
+    MONTH = 'Month'

{fiddler-client-3.0.0.dev10 → fiddler-client-3.0.0.dev11}/fiddler/entities/baseline.py

@@ -5,6 +5,7 @@ from datetime import datetime
 from typing import Any, Iterator
 from uuid import UUID
 
+from fiddler.constants.baseline import WindowBinSize
 from fiddler.constants.dataset import EnvType
 from fiddler.decorators import handle_api_error
 from fiddler.entities.base import BaseEntity
@@ -28,8 +29,8 @@ class Baseline(
         dataset_id: UUID | str | None = None,
         start_time: int | None = None,
         end_time: int | None = None,
-        offset: int | None = None,
-        window_size: int | None = None,
+        offset_delta: int | None = None,
+        window_bin_size: WindowBinSize | str | None = None,
     ) -> None:
         """Construct a baseline instance."""
         self.name = name
@@ -39,8 +40,8 @@ class Baseline(
         self.dataset_id = dataset_id
         self.start_time = start_time
         self.end_time = end_time
-        self.offset = offset
-        self.window_size = window_size
+        self.offset_delta = offset_delta
+        self.window_bin_size = window_bin_size
 
         self.id: UUID | None = None
         self.row_count: int | None = None
@@ -73,8 +74,8 @@ class Baseline(
             type_=resp_obj.type,
             start_time=resp_obj.start_time,
             end_time=resp_obj.end_time,
-            offset=resp_obj.offset,
-            window_size=resp_obj.window_size,
+            offset_delta=resp_obj.offset_delta,
+            window_bin_size=resp_obj.window_bin_size,
         )
 
         # Add remaining fields
@@ -109,8 +110,8 @@ class Baseline(
             'type',
             'start_time',
             'end_time',
-            'offset',
-            'window_size',
+            'offset_delta',
+            'window_bin_size',
             'created_at',
             'updated_at',
             'row_count',
@@ -210,10 +211,10 @@ class Baseline(
             payload['start_time'] = self.start_time
         if self.end_time:
             payload['end_time'] = self.end_time
-        if self.offset:
-            payload['offset'] = self.offset
-        if self.window_size:
-            payload['window_size'] = self.window_size
+        if self.offset_delta:
+            payload['offset_delta'] = self.offset_delta
+        if self.window_bin_size:
+            payload['window_bin_size'] = self.window_bin_size
 
         response = self._client().post(
             url=self._get_url(),

{fiddler-client-3.0.0.dev10 → fiddler-client-3.0.0.dev11}/fiddler/entities/model_deployment.py

@@ -110,7 +110,7 @@ class ModelDeployment(
         self._refresh_from_response(response=response)
 
     @classmethod
-    def of(cls, model_id: UUID) -> ModelDeployment:
+    def of(cls, model_id: UUID | str) -> ModelDeployment:
         """
         Get model deployment instance of the given model
 

{fiddler-client-3.0.0.dev10 → fiddler-client-3.0.0.dev11}/fiddler/schemas/baseline.py

@@ -24,8 +24,8 @@ class BaselineResp(BaseModel):
     type: str
     start_time: Optional[int]
     end_time: Optional[int]
-    offset: Optional[int]
-    window_size: Optional[int]
+    offset_delta: Optional[int]
+    window_bin_size: Optional[str]
     row_count: Optional[int]
 
     model: ModelCompactResp

{fiddler-client-3.0.0.dev10 → fiddler-client-3.0.0.dev11}/fiddler/tests/apis/test_baseline.py

@@ -29,8 +29,8 @@ API_RESPONSE_200 = {
         'type': 'STATIC',
         'start_time': None,
         'end_time': None,
-        'offset': None,
-        'window_size': None,
+        'offset_delta': None,
+        'window_bin_size': None,
         'row_count': 20000,
         'model': {
             'id': MODEL_ID,
@@ -80,8 +80,8 @@ LIST_API_RESPONSE = {
                 'type': 'STATIC',
                 'start_time': None,
                 'end_time': None,
-                'offset': None,
-                'window_size': None,
+                'offset_delta': None,
+                'window_bin_size': None,
                 'row_count': 20000,
                 'model': {
                     'id': MODEL_ID,

{fiddler-client-3.0.0.dev10 → fiddler-client-3.0.0.dev11}/fiddler/tests/conftest.py

@@ -26,5 +26,5 @@ def connection(session_mocker: MockerFixture) -> Connection:
         }
     )
     session_mocker.patch.object(conn, '_get_server_info', return_value=server_info)
-    session_mocker.patch('fiddler.connection.connection', conn)
+    session_mocker.patch('fiddler.conn', conn)
     yield conn

{fiddler-client-3.0.0.dev10 → fiddler-client-3.0.0.dev11/fiddler_client.egg-info}/PKG-INFO

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

fiddler-client-3.0.0.dev10/fiddler/VERSION

@@ -1 +0,0 @@
-3.0.0.dev10

fiddler-client-3.0.0.dev10/fiddler/constants/baseline.py

@@ -1,18 +0,0 @@
-import enum
-
-
-@enum.unique
-class BaselineType(str, enum.Enum):
-    STATIC = 'STATIC'
-    ROLLING = 'ROLLING'
-
-
-@enum.unique
-class WindowSize(enum.IntEnum):
-    ONE_HOUR = 3600
-    ONE_DAY = 86400
-    ONE_WEEK = 604800
-    ONE_MONTH = 2592000
-
-    def __str__(self) -> str:
-        return self.name