fiddler-client 3.5.0.dev1__tar.gz → 3.5.0.dev2__tar.gz

{fiddler_client-3.5.0.dev1/fiddler_client.egg-info → fiddler_client-3.5.0.dev2}/PKG-INFO

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

fiddler_client-3.5.0.dev2/fiddler/VERSION

@@ -0,0 +1 @@
+3.5.0.dev2

{fiddler_client-3.5.0.dev1 → fiddler_client-3.5.0.dev2}/fiddler/libs/http_client.py

@@ -8,7 +8,6 @@ import requests
 import simplejson
 from requests.adapters import HTTPAdapter
 
-import fiddler.libs.aws
 from fiddler.constants.common import JSON_CONTENT_TYPE
 from fiddler.exceptions import (  # pylint: disable=redefined-builtin
     ConnError,
@@ -21,15 +20,6 @@ from fiddler.utils.logger import get_logger
 logger = get_logger(__name__)
 
 
-# Note(JP): this is doing conditional runtime modification for AWS Hadron /
-# SageMaker, depending on
-# - environment variables set by the user
-# - importability of the AWS sagemaker Python SDK
-# TODO: type annotation w/o having to import PartnerAppAuthProvider? This thing
-# is either None or an instantiated auth provider.
-_AWS_SM_AUTH_PROVIDER = fiddler.libs.aws.conditionally_init_aws_sm_auth()  # type: ignore
-
-
 class RequestClient:
     def __init__(
         self,
@@ -44,23 +34,11 @@ class RequestClient:
         self.headers = headers
         self.headers.update({'Content-Type': JSON_CONTENT_TYPE})
         self.session = requests.Session()
-
-        # Note(JP): from the AWS SageMaker partner app guide.
-        if _AWS_SM_AUTH_PROVIDER is not None:
-            # Get callback class (`RequestsAuth` type`) from SM auth provider,
-            # and decorate the `requests` session object with that. This is
-            # enabling the magic of automatically mutating request headers.
-            # Among others, this injects the SigV4 header.
-            self.session.auth = _AWS_SM_AUTH_PROVIDER.get_auth()
-
         self.session.verify = verify
         adapter = HTTPAdapter(
             pool_connections=25,
             pool_maxsize=25,
         )
-
-        # Does mounting the custom HTTP adapter revert the session.auth
-        # change from above?
         self.session.mount(self.base_url, adapter)
 
     def call(

{fiddler_client-3.5.0.dev1 → fiddler_client-3.5.0.dev2}/fiddler/packtools/project_attributions_helpers.py

@@ -159,9 +159,9 @@ class IGTextAttributionsTF2Keras:
                 att, word_tokens, tokenizer, embedding_name, feature_label
             )
             gem_container = gem.GEMContainer(contents=[gem_text])
-            explanations_by_output[self.output_cols[output_field_index]] = (
-                gem_container.render()
-            )
+            explanations_by_output[
+                self.output_cols[output_field_index]
+            ] = gem_container.render()
 
         return explanations_by_output
 
@@ -195,12 +195,10 @@ class IGTabularAttributions:
                 'Parameter attr_input_names_mapping cannot be empty when IG is enabled.'
             )
         for output_field_index, att in enumerate(attributions):
-            explanations_by_output[self.output_cols[output_field_index]] = (
-                get_tabular_attributions_for_output(
-                    self.input_df,
-                    att,
-                    attr_input_names_mapping=attr_input_names_mapping,
-                )
+            explanations_by_output[
+                self.output_cols[output_field_index]
+            ] = get_tabular_attributions_for_output(
+                self.input_df, att, attr_input_names_mapping=attr_input_names_mapping
             )
         return explanations_by_output
 
@@ -388,7 +386,7 @@ def xgb_shap_transform_scale(
     base_value = 1 / (1 + np.exp(-untransformed_base_value))
 
     # Computing the original_explanation_distance to construct the distance_coefficient later on
-    original_explanation_distance = np.sum(shap_values)  # type: ignore
+    original_explanation_distance = np.sum(shap_values)
 
     # Computing the distance between the model_prediction and the transformed base_value
     distance_to_explain = model_prediction - base_value

{fiddler_client-3.5.0.dev1 → fiddler_client-3.5.0.dev2}/fiddler/schemas/model.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from typing import Dict, List, Optional
 from uuid import UUID
 
-from pydantic.fields import Field
+from pydantic.v1 import Field
 
 from fiddler.schemas.base import BaseModel
 from fiddler.schemas.model_schema import ModelSchema

{fiddler_client-3.5.0.dev1 → fiddler_client-3.5.0.dev2}/fiddler/utils/logger.py

@@ -8,13 +8,6 @@ from fiddler.constants.common import LOG_FORMAT, LOGGER_NAME
 def get_logger(name: str) -> Logger:
     """Get logger instance"""
     logger: Logger = logging.getLogger(name)
-
-    # Note(JP): this assumes that get_logger() is only called once per name.
-    # Typically, the null handler is added to stop propagation of log messages
-    # to user's stderr in case they do _not_ configure a logging outlet (think:
-    # the null handler stops propagation into the "last resort handler").
-    # Future: the null handler only needs to be added _once_ to the fiddler-client
-    # logger hierarchy (to the top-level logger).
     logger.addHandler(logging.NullHandler())
     return logger
 

{fiddler_client-3.5.0.dev1 → fiddler_client-3.5.0.dev2/fiddler_client.egg-info}/PKG-INFO

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

{fiddler_client-3.5.0.dev1 → fiddler_client-3.5.0.dev2}/fiddler_client.egg-info/SOURCES.txt

@@ -40,7 +40,6 @@ fiddler/entities/user.py
 fiddler/entities/webhook.py
 fiddler/entities/xai.py
 fiddler/libs/__init__.py
-fiddler/libs/aws.py
 fiddler/libs/http_client.py
 fiddler/libs/json_encoder.py
 fiddler/libs/semver.py
@@ -80,7 +79,6 @@ fiddler/tests/constants.py
 fiddler/tests/test_connection.py
 fiddler/tests/test_json_encoder.py
 fiddler/tests/test_logger.py
-fiddler/tests/test_sagemaker_auth.py
 fiddler/tests/test_utils.py
 fiddler/tests/utils.py
 fiddler/tests/apis/__init__.py

fiddler_client-3.5.0.dev1/fiddler/VERSION

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

fiddler_client-3.5.0.dev1/fiddler/libs/aws.py

@@ -1,95 +0,0 @@
-# type: ignore
-# TODO: do type-checking soon: https://github.com/fiddler-anyprem/hadron/issues/25
-
-# Note(JP): allow for type hints using strings (so that for example
-# "PartnerAppAuthProvider" can be used as a type hint w/o having to import the
-# class).
-from __future__ import annotations
-
-import os
-from collections import namedtuple
-from typing import Optional
-
-from fiddler.exceptions import BaseError
-from fiddler.utils.logger import get_logger
-
-logger = get_logger(__name__)
-
-AwsSageMakerAuthConfig = namedtuple('AwsSageMakerAuthConfig', ['arn', 'url'])
-
-
-def _read_env_for_aws_sagemaker_or_raise() -> Optional[AwsSageMakerAuthConfig]:
-    """
-
-    Raise `fiddler.exceptions.BaseError` when the environment appears to be
-    misconfigured.
-    """
-    av = os.getenv("AWS_PARTNER_APP_AUTH")
-
-    if av is None:
-        return None
-
-    if av.lower().strip() != "true":
-        return None
-
-    # User has declared intent: activate SageMaker authentication. Require
-    # other environment variables to be set.
-    keys = ("AWS_PARTNER_APP_ARN", "AWS_PARTNER_APP_URL")
-    for k in keys:
-        errmsg = f"AWS_PARTNER_APP_AUTH is set to `{av}`, but {k} is not set"
-        if os.getenv(k) is None:
-            # Future: maybe have a ConfigError type?
-            raise BaseError(errmsg)
-
-    # Future: potentially do validation for got error messages, but be sure
-    # that the validation isn't getting in the way, _ever_.
-
-    # Remove leading and trailing whitespace: that's a safe operation, and
-    # always a user/config "error". That we can correct for.
-    arn = os.getenv("AWS_PARTNER_APP_ARN").strip()  # type: ignore[union-attr]
-    url = os.getenv("AWS_PARTNER_APP_URL").strip()  # type: ignore[union-attr]
-    return AwsSageMakerAuthConfig(arn, url)
-
-
-def _import_sm_sdk(c: AwsSageMakerAuthConfig):  # -> "PartnerAppAuthProvider":
-    """
-    Return `sagemaker.PartnerAppAuthProvider` instance or raise an exception.
-    """
-    try:
-        from sagemaker import PartnerAppAuthProvider
-    except Exception as exc:
-        errmsg = (
-            f"The AWS_PARTNER_APP_* environment variables are set, but "
-            f"importing a dependency failed: {exc}"
-        )
-        raise BaseError(errmsg)
-
-    # Note(JP): can initialization of this auth provider object fail? Does it
-    # use Internet resources? Update 1: this call is expected to fail with e.g.
-    # `ValueError: Must specify a valid AWS_PARTNER_APP_ARN environment
-    # variable` when this env var is not set. Update 2: this does indeed deeper
-    # validation of the user-given config values. May throw for example
-    # "ValueError: Must specify a valid AWS_PARTNER_APP_ARN environment
-    # variable" when something non-ARN-looking has been provided. That is, we
-    # can (and should) skip validating these env var values and lave this job
-    # to the SM SDK.
-    p = PartnerAppAuthProvider()
-    logger.info("initialized AWS SageMaker authentication provider: %s", p)
-    return p
-
-
-def conditionally_init_aws_sm_auth():  # -> Optional["PartnerAppAuthProvider"]:
-    """
-    Return `None` or `PartnerAppAuthProvider` instance.
-
-    Raise an exception upon configuration error or when dependencies are
-    missing.
-    """
-    aws_sm_auth_cfg = _read_env_for_aws_sagemaker_or_raise()
-
-    logger.debug("auth config: %s", aws_sm_auth_cfg)
-    if aws_sm_auth_cfg is not None:
-        return _import_sm_sdk(aws_sm_auth_cfg)
-
-    # Just to make this expected case explicit.
-    return None

fiddler_client-3.5.0.dev1/fiddler/tests/test_sagemaker_auth.py

@@ -1,75 +0,0 @@
-import os
-import re
-
-
-import pytest
-import responses
-from responses import matchers
-
-from fiddler.entities.model import Model
-from fiddler.tests.constants import MODEL_ID, URL
-from fiddler.tests.apis.test_model import API_RESPONSE_200
-
-
-# Perform this test only if AWS_* env vars are set (so that this executes in a
-# controlled environment, and skipped as part of general unit test suite
-# invocation)
-@pytest.mark.skipif(
-    os.getenv("AWS_PARTNER_APP_AUTH") is None, reason="AWS_* env vars not set"
-)
-@responses.activate
-def test_header_mutation() -> None:
-    """
-    Assume that the outer environment has set these environment variables:
-
-    AWS_ACCESS_KEY_ID=dummykey
-    AWS_SECRET_ACCESS_KEY=dummysecret
-    AWS_PARTNER_APP_ARN=arn:aws:sagemaker:us-west-2:123456789012:partner-app/Partner/app-678901234567
-    AWS_PARTNER_APP_URL=https://app-678901234567.us-west-2.mlapp.sagemaker.aws
-
-    Note: boto.credentials is not affected by monkeypatch.setenv.
-    fiddler-client initialization happens before entering this test, and
-    the AWS_PARTNER_* vars need to be set _before_ entering this test.
-    """
-
-    arn = (
-        "arn:aws:sagemaker:us-west-2:123456789012:partner-app/Partner/app-678901234567"
-    )
-
-    responses.get(
-        url=f'{URL}/v3/models/{MODEL_ID}',
-        json=API_RESPONSE_200,
-        match=[
-            # regex-based header matching was added in
-            # https://github.com/getsentry/responses/pull/663 which is also the
-            # best documentation for that feature.
-            matchers.header_matcher(
-                {
-                    # Note(JP): note how the dummy AWS_ACCESS_KEY_ID appears in
-                    # the value -- the sagemaker wrapper creates a new
-                    # Authorization header value with a SigV4 signature, using
-                    # AWS credentials.
-                    'Authorization': re.compile(
-                        r'AWS4-HMAC-SHA256 Credential=dummykey/.+'
-                    ),
-                    # The sagemaker wrapper moves the original Authorization
-                    # header here. In this test suite we typically set the
-                    # value 'Bearer footoken'.
-                    'X-Amz-Partner-App-Authorization': 'Bearer footoken',
-                    'X-Amz-Target': 'SageMaker.CallPartnerAppApi',
-                    'X-Mlapp-Sm-App-Server-Arn': arn,
-                    # These two remaining headers are by default set by the
-                    # client.
-                    'Content-Type': 'application/json',
-                    'X-Fiddler-Client-Name': 'python-sdk',
-                }
-            ),
-        ],
-    )
-
-    # This call fails if it does not result in an HTTP request that matches
-    # the pattern/structure defined with the `responses.get(...)` call above.
-    # The error will say "the call doesn't match any registered mock" and
-    # the detailed exception message allows for inspecting the headers seen
-    # vs. the headers expected.
-    Model.get(id_=MODEL_ID)