black linting

Author: paalvibeknowit

python/delta_sharing/_internal_auth.py

@@ -126,9 +126,7 @@ def parse_oauth_token_response(self, response: str) -> OAuthClientCredentials:
         # Parsing the response per oauth spec
         # https://datatracker.ietf.org/doc/html/rfc6749#section-5.1
         json_node = json.loads(response)
-        if "access_token" not in json_node or not isinstance(
-            json_node["access_token"], str
-        ):
+        if "access_token" not in json_node or not isinstance(json_node["access_token"], str):
             raise RuntimeError("Missing 'access_token' field in OAuth token response")
         if "expires_in" not in json_node:
             raise RuntimeError("Missing 'expires_in' field in OAuth token response")
@@ -242,9 +240,7 @@ def _signed_jwt(self, jwt_header, jwt_claims):
 
 
 class OAuthClientCredentialsAuthProvider(AuthCredentialProvider):
-    def __init__(
-        self, oauth_client: OAuthClient, auth_config: AuthConfig = AuthConfig()
-    ):
+    def __init__(self, oauth_client: OAuthClient, auth_config: AuthConfig = AuthConfig()):
         self.auth_config = auth_config
         self.oauth_client = oauth_client
         self.current_token: Optional[OAuthClientCredentials] = None
@@ -270,18 +266,14 @@ def maybe_refresh_token(self) -> OAuthClientCredentials:
     def needs_refresh(self, token: OAuthClientCredentials) -> bool:
         now = int(time.time())
         expiration_time = token.creation_timestamp + token.expires_in
-        return (
-            expiration_time - now < self.auth_config.token_renewal_threshold_in_seconds
-        )
+        return expiration_time - now < self.auth_config.token_renewal_threshold_in_seconds
 
     def get_expiration_time(self) -> Optional[str]:
         return None
 
 
 class AuthCredentialProviderFactory:
-    __oauth_auth_provider_cache: Dict[
-        DeltaSharingProfile, OAuthClientCredentialsAuthProvider
-    ] = {}
+    __oauth_auth_provider_cache: Dict[DeltaSharingProfile, OAuthClientCredentialsAuthProvider] = {}
 
     @staticmethod
     def create_auth_credential_provider(profile: DeltaSharingProfile):

python/delta_sharing/tests/test_auth.py

@@ -79,9 +79,7 @@ def test_oauth_client_credentials_auth_provider_exchange_token():
     mock_session = MagicMock(spec=Session)
     mock_session.headers = MagicMock()
 
-    token = OAuthClientCredentials(
-        "access-token", 3600, int(datetime.now().timestamp())
-    )
+    token = OAuthClientCredentials("access-token", 3600, int(datetime.now().timestamp()))
     oauth_client.client_credentials.return_value = token
 
     provider.add_auth_header(mock_session)
@@ -104,9 +102,7 @@ def test_oauth_client_credentials_auth_provider_reuse_token():
     mock_session = MagicMock(spec=Session)
     mock_session.headers = MagicMock()
 
-    valid_token = OAuthClientCredentials(
-        "valid-token", 3600, int(datetime.now().timestamp())
-    )
+    valid_token = OAuthClientCredentials("valid-token", 3600, int(datetime.now().timestamp()))
     provider.current_token = valid_token
 
     provider.add_auth_header(mock_session)
@@ -132,9 +128,7 @@ def test_oauth_client_credentials_auth_provider_refresh_token():
     expired_token = OAuthClientCredentials(
         "expired-token", 1, int(datetime.now().timestamp()) - 3600
     )
-    new_token = OAuthClientCredentials(
-        "new-token", 3600, int(datetime.now().timestamp())
-    )
+    new_token = OAuthClientCredentials("new-token", 3600, int(datetime.now().timestamp()))
     provider.current_token = expired_token
     oauth_client.client_credentials.return_value = new_token
 
@@ -166,9 +160,7 @@ def test_oauth_client_credentials_auth_provider_needs_refresh():
     )
     assert provider.needs_refresh(token_expiring_soon)
 
-    valid_token = OAuthClientCredentials(
-        "valid-token", 600 + 10, int(datetime.now().timestamp())
-    )
+    valid_token = OAuthClientCredentials("valid-token", 600 + 10, int(datetime.now().timestamp()))
     assert not provider.needs_refresh(valid_token)
 
 
@@ -208,9 +200,7 @@ def test_basic_auth_provider_add_auth_header():
     session.headers = MagicMock()
     session.auth = MagicMock()
     provider.add_auth_header(session)
-    session.post(
-        "https://localhost/delta-sharing/", data={"grant_type": "client_credentials"}
-    )
+    session.post("https://localhost/delta-sharing/", data={"grant_type": "client_credentials"})
     assert session.auth == ("username", "password")
 
 
@@ -232,9 +222,7 @@ def test_factory_creation():
         username="username",
         password="password",
     )
-    provider = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_basic
-    )
+    provider = AuthCredentialProviderFactory.create_auth_credential_provider(profile_basic)
     assert isinstance(provider, BasicAuthProvider)
 
     profile_bearer = DeltaSharingProfile(
@@ -244,9 +232,7 @@ def test_factory_creation():
         bearer_token="token",
         expiration_time=(datetime.now() + timedelta(hours=1)).isoformat(),
     )
-    provider = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_bearer
-    )
+    provider = AuthCredentialProviderFactory.create_auth_credential_provider(profile_bearer)
     assert isinstance(provider, BearerTokenAuthProvider)
 
     profile_oauth = DeltaSharingProfile(
@@ -257,9 +243,7 @@ def test_factory_creation():
         client_id="clientId",
         client_secret="clientSecret",
     )
-    provider = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_oauth
-    )
+    provider = AuthCredentialProviderFactory.create_auth_credential_provider(profile_oauth)
     assert isinstance(provider, OAuthClientCredentialsAuthProvider)
 
     profile_pk = DeltaSharingProfile(
@@ -287,9 +271,7 @@ def test_oauth_auth_provider_reused():
         client_id="clientId",
         client_secret="clientSecret",
     )
-    provider1 = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_oauth1
-    )
+    provider1 = AuthCredentialProviderFactory.create_auth_credential_provider(profile_oauth1)
     assert isinstance(provider1, OAuthClientCredentialsAuthProvider)
 
     profile_oauth2 = DeltaSharingProfile(
@@ -301,9 +283,7 @@ def test_oauth_auth_provider_reused():
         client_secret="clientSecret",
     )
 
-    provider2 = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_oauth2
-    )
+    provider2 = AuthCredentialProviderFactory.create_auth_credential_provider(profile_oauth2)
 
     assert provider1 == provider2
 
@@ -317,9 +297,7 @@ def test_oauth_auth_provider_with_different_profiles():
         client_id="clientId",
         client_secret="clientSecret",
     )
-    provider1 = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_oauth1
-    )
+    provider1 = AuthCredentialProviderFactory.create_auth_credential_provider(profile_oauth1)
     assert isinstance(provider1, OAuthClientCredentialsAuthProvider)
 
     profile_oauth2 = DeltaSharingProfile(
@@ -331,9 +309,7 @@ def test_oauth_auth_provider_with_different_profiles():
         client_secret="clientSecret",
     )
 
-    provider2 = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_oauth2
-    )
+    provider2 = AuthCredentialProviderFactory.create_auth_credential_provider(profile_oauth2)
 
     assert provider1 != provider2
 
@@ -351,9 +327,7 @@ def test_oauth_private_key_auth_provider_reused():
         scope="scope",
         audience="audience",
     )
-    provider1 = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_pk1
-    )
+    provider1 = AuthCredentialProviderFactory.create_auth_credential_provider(profile_pk1)
     assert isinstance(provider1, OAuthClientCredentialsAuthProvider)
 
     profile_pk2 = DeltaSharingProfile(
@@ -368,9 +342,7 @@ def test_oauth_private_key_auth_provider_reused():
         scope="scope",
         audience="audience",
     )
-    provider2 = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_pk2
-    )
+    provider2 = AuthCredentialProviderFactory.create_auth_credential_provider(profile_pk2)
     assert provider1 == provider2
 
 
@@ -387,9 +359,7 @@ def test_oauth_private_key_auth_provider_with_different_profiles():
         scope="scope",
         audience="audience",
     )
-    provider1 = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_pk1
-    )
+    provider1 = AuthCredentialProviderFactory.create_auth_credential_provider(profile_pk1)
     assert isinstance(provider1, OAuthClientCredentialsAuthProvider)
 
     profile_pk2 = DeltaSharingProfile(
@@ -404,7 +374,5 @@ def test_oauth_private_key_auth_provider_with_different_profiles():
         scope="scope",
         audience="audience",
     )
-    provider2 = AuthCredentialProviderFactory.create_auth_credential_provider(
-        profile_pk2
-    )
+    provider2 = AuthCredentialProviderFactory.create_auth_credential_provider(profile_pk2)
     assert provider1 != provider2