ruff format

Author: dbgold17

airbyte_cdk/sources/streams/http/requests_native_auth/abstract_oauth.py

@@ -153,7 +153,7 @@ def _default_token_expiry_date(self) -> AirbyteDateTime:
         Returns the default token expiry date
         """
         # 1 hour was chosen as a middle ground to avoid unnecessary frequent refreshes and token expiration
-        default_token_expiry_duration_hours = 1 # 1 hour
+        default_token_expiry_duration_hours = 1  # 1 hour
         return ab_datetime_now() + timedelta(hours=default_token_expiry_duration_hours)
 
     def _wrap_refresh_token_exception(
@@ -315,7 +315,7 @@ def _extract_refresh_token(self, response_data: Mapping[str, Any]) -> Any:
     def _extract_token_expiry_date(self, response_data: Mapping[str, Any]) -> AirbyteDateTime:
         """
         Extracts the token_expiry_date, like `expires_in` or `expires_at`, etc from the given response data.
-        
+
         If the token_expiry_date is not found, it will return an existing token expiry date if set, or a default token expiry date.
 
         Args:

unit_tests/sources/declarative/auth/test_oauth.py

@@ -340,13 +340,15 @@ def test_given_no_access_token_but_expiry_in_the_future_when_refresh_token_then_
                     url="https://refresh_endpoint.com/",
                     body="grant_type=client&client_id=some_client_id&client_secret=some_client_secret&refresh_token=some_refresh_token",
                 ),
-                HttpResponse(body=json.dumps({"access_token": "new_access_token", "expires_in": 1000})),
+                HttpResponse(
+                    body=json.dumps({"access_token": "new_access_token", "expires_in": 1000})
+                ),
             )
             oauth.get_access_token()
 
         assert oauth.access_token == "new_access_token"
         assert oauth._token_expiry_date == ab_datetime_now() + timedelta(seconds=1000)
-        
+
     @freezegun.freeze_time("2022-01-01")
     @pytest.mark.parametrize(
         "initial_expiry_date_delta, expected_new_expiry_date_delta, expected_access_token",
@@ -355,15 +357,23 @@ def test_given_no_access_token_but_expiry_in_the_future_when_refresh_token_then_
             (timedelta(days=-1), timedelta(hours=1), "new_access_token"),
             (None, timedelta(hours=1), "new_access_token"),
         ],
-        ids=["initial_expiry_date_in_future", "initial_expiry_date_in_past", "no_initial_expiry_date"],
+        ids=[
+            "initial_expiry_date_in_future",
+            "initial_expiry_date_in_past",
+            "no_initial_expiry_date",
+        ],
     )
     def test_no_expiry_date_provided_by_auth_server(
         self,
         initial_expiry_date_delta,
         expected_new_expiry_date_delta,
         expected_access_token,
     ) -> None:
-        initial_expiry_date = ab_datetime_now().add(initial_expiry_date_delta).isoformat() if initial_expiry_date_delta else None
+        initial_expiry_date = (
+            ab_datetime_now().add(initial_expiry_date_delta).isoformat()
+            if initial_expiry_date_delta
+            else None
+        )
         expected_new_expiry_date = ab_datetime_now().add(expected_new_expiry_date_delta)
         oauth = DeclarativeOauth2Authenticator(
             token_refresh_endpoint="https://refresh_endpoint.com/",

unit_tests/sources/streams/http/requests_native_auth/test_requests_native_auth.py

@@ -252,8 +252,8 @@ def test_refresh_access_token(self, mocker):
                 "scopes": ["no_override"],
             },
         )
-        
-        oauth_with_expired_token= Oauth2Authenticator(
+
+        oauth_with_expired_token = Oauth2Authenticator(
             token_refresh_endpoint="https://refresh_endpoint.com",
             client_id="some_client_id",
             client_secret="some_client_secret",
@@ -266,7 +266,6 @@ def test_refresh_access_token(self, mocker):
                 "scopes": ["no_override"],
             },
         )
-        
 
         resp.status_code = 200
         mocker.patch.object(
@@ -288,7 +287,7 @@ def test_refresh_access_token(self, mocker):
         assert isinstance(expires_in, AirbyteDateTime)
         assert expires_in == ab_datetime_now().add(timedelta(seconds=2000))
         assert token == "access_token"
-        
+
         # Test with expires_in as datetime(str)
         mocker.patch.object(
             resp,
@@ -298,24 +297,24 @@ def test_refresh_access_token(self, mocker):
         # This should raise a ValueError because the token_expiry_is_time_of_expiration is False by default
         with pytest.raises(ValueError):
             token, expires_in = oauth.refresh_access_token()
-            
-        # Test with no expires_in 
+
+        # Test with no expires_in
         mocker.patch.object(
             resp,
             "json",
             return_value={"access_token": "access_token"},
         )
-        
+
         # Since the initialized token is not expired (now + 3 days), we don't expect the expiration date to be updated
         token, expires_in = oauth.refresh_access_token()
-        
+
         assert isinstance(expires_in, AirbyteDateTime)
         assert expires_in == ab_datetime_now().add(timedelta(days=3))
         assert token == "access_token"
-        
+
         # Since the initialized token is expired (now - 3 days), we expect the expiration date to be updated to the default value (now + 1 hour)
         token, expires_in = oauth_with_expired_token.refresh_access_token()
-        
+
         assert isinstance(expires_in, AirbyteDateTime)
         assert expires_in == ab_datetime_now().add(timedelta(hours=1))
         assert token == "access_token"
@@ -356,7 +355,7 @@ def test_refresh_access_token(self, mocker):
             },
         )
         token, expires_in = oauth.refresh_access_token()
-        
+
         assert isinstance(expires_in, AirbyteDateTime)
         assert expires_in == ab_datetime_now().add(timedelta(seconds=2002))
         assert token == "access_token_deeply_nested"
@@ -579,6 +578,7 @@ def test_refresh_access_token_wrapped(
             assert exc_info.value.message == error_message
             assert exc_info.value.failure_type == FailureType.config_error
 
+
 @freezegun.freeze_time("2022-12-31")
 class TestSingleUseRefreshTokenOauth2Authenticator:
     @pytest.fixture
@@ -636,14 +636,20 @@ def test_given_no_message_repository_get_access_token(
             token_expiry_date_format=expiry_date_format,
             token_expiry_is_time_of_expiration=bool(expiry_date_format),
         )
-        
+
         # Mock the response from the refresh token endpoint
         resp.status_code = 200
         mocker.patch.object(
-            resp, "json", return_value={"access_token": "new_access_token", "expires_in": expires_in_value, "refresh_token": "new_refresh_token"}
+            resp,
+            "json",
+            return_value={
+                authenticator.get_access_token_name(): "new_access_token",
+                authenticator.get_expires_in_name(): expires_in_value,
+                authenticator.get_refresh_token_name(): "new_refresh_token",
+            },
         )
         mocker.patch.object(requests, "request", side_effect=mock_request, autospec=True)
-        
+
         authenticator.token_has_expired = mocker.Mock(return_value=True)
         access_token = authenticator.get_access_token()
         captured = capsys.readouterr()
@@ -678,10 +684,16 @@ def test_given_message_repository_when_get_access_token_then_emit_message(
         # Mock the response from the refresh token endpoint
         resp.status_code = 200
         mocker.patch.object(
-            resp, "json", return_value={"access_token": "new_access_token", "expires_in": "2023-04-04", "refresh_token": "new_refresh_token"}
+            resp,
+            "json",
+            return_value={
+                authenticator.get_access_token_name(): "new_access_token",
+                authenticator.get_expires_in_name(): "2023-04-04",
+                authenticator.get_refresh_token_name(): "new_refresh_token",
+            },
         )
         mocker.patch.object(requests, "request", side_effect=mock_request, autospec=True)
-        
+
         authenticator.token_has_expired = mocker.Mock(return_value=True)
 
         authenticator.get_access_token()
@@ -746,16 +758,17 @@ def test_refresh_access_token(self, mocker, connector_config):
             client_id=connector_config["credentials"]["client_id"],
             client_secret=connector_config["credentials"]["client_secret"],
         )
-        
+
         # Mock the response from the refresh token endpoint
         resp.status_code = 200
         mocker.patch.object(
-            resp, "json", 
+            resp,
+            "json",
             return_value={
                 authenticator.get_access_token_name(): "new_access_token",
                 authenticator.get_expires_in_name(): "42",
                 authenticator.get_refresh_token_name(): "new_refresh_token",
-            }
+            },
         )
         mocker.patch.object(requests, "request", side_effect=mock_request, autospec=True)