fixup: make caller_info non-nullable in RetryContext

Author: m1yag1

src/globus_sdk/transport/retry.py

@@ -34,7 +34,7 @@ def __init__(
         self,
         attempt: int,
         *,
-        caller_info: RequestCallerInfo | None = None,
+        caller_info: RequestCallerInfo,
         response: requests.Response | None = None,
         exception: Exception | None = None,
     ) -> None:

tests/unit/transport/test_default_retry_policy.py

@@ -19,7 +19,8 @@ def test_retry_policy_respects_retry_after(mocksleep, http_status):
     dummy_response = mock.Mock()
     dummy_response.headers = {"Retry-After": "5"}
     dummy_response.status_code = http_status
-    ctx = RetryContext(1, response=dummy_response)
+    caller_info = RequestCallerInfo(authorizer=None)
+    ctx = RetryContext(1, caller_info=caller_info, response=dummy_response)
 
     assert checker.should_retry(ctx) is True
     mocksleep.assert_not_called()
@@ -36,7 +37,8 @@ def test_retry_policy_ignores_retry_after_too_high(mocksleep, http_status):
     dummy_response = mock.Mock()
     dummy_response.headers = {"Retry-After": "20"}
     dummy_response.status_code = http_status
-    ctx = RetryContext(1, response=dummy_response)
+    caller_info = RequestCallerInfo(authorizer=None)
+    ctx = RetryContext(1, caller_info=caller_info, response=dummy_response)
 
     assert checker.should_retry(ctx) is True
     mocksleep.assert_not_called()
@@ -52,7 +54,8 @@ def test_retry_policy_ignores_malformed_retry_after(mocksleep, http_status):
     dummy_response = mock.Mock()
     dummy_response.headers = {"Retry-After": "not-an-integer"}
     dummy_response.status_code = http_status
-    ctx = RetryContext(1, response=dummy_response)
+    caller_info = RequestCallerInfo(authorizer=None)
+    ctx = RetryContext(1, caller_info=caller_info, response=dummy_response)
 
     assert checker.should_retry(ctx) is True
     mocksleep.assert_not_called()
@@ -70,7 +73,8 @@ def test_retry_policy_ignores_malformed_retry_after(mocksleep, http_status):
 def test_default_retry_check_noop_on_exception(checkname, mocksleep):
     transport = RequestsTransport()
     method = getattr(transport, checkname)
-    ctx = RetryContext(1, exception=Exception("foo"))
+    caller_info = RequestCallerInfo(authorizer=None)
+    ctx = RetryContext(1, caller_info=caller_info, exception=Exception("foo"))
     assert method(ctx) is RetryCheckResult.no_decision
 
 

tests/unit/transport/test_retry_check_runner.py

@@ -1,17 +1,18 @@
 from unittest import mock
 
-from globus_sdk.transport import RetryCheckResult, RetryCheckRunner, RetryContext
+from globus_sdk.transport import RequestCallerInfo, RetryCheckResult, RetryCheckRunner, RetryContext
 
 
 def _make_test_retry_context(*, status=200, exception=None, response=None):
+    caller_info = RequestCallerInfo(authorizer=None)
     if exception:
-        return RetryContext(1, exception=exception)
+        return RetryContext(1, caller_info=caller_info, exception=exception)
     elif response:
-        return RetryContext(1, response=response)
+        return RetryContext(1, caller_info=caller_info, response=response)
 
     dummy_response = mock.Mock()
     dummy_response.status_code = 200
-    return RetryContext(1, response=dummy_response)
+    return RetryContext(1, caller_info=caller_info, response=dummy_response)
 
 
 def test_retry_check_runner_should_retry_explicit_on_first_check():

tests/unit/transport/test_transfer_transport.py

@@ -1,7 +1,7 @@
 from unittest import mock
 
 from globus_sdk.services.transfer.transport import TransferRequestsTransport
-from globus_sdk.transport import RetryCheckRunner, RetryContext
+from globus_sdk.transport import RequestCallerInfo, RetryCheckRunner, RetryContext
 
 
 def test_transfer_does_not_retry_external():
@@ -19,7 +19,8 @@ def test_transfer_does_not_retry_external():
     dummy_response = mock.Mock()
     dummy_response.json = lambda: body
     dummy_response.status_code = 502
-    ctx = RetryContext(1, response=dummy_response)
+    caller_info = RequestCallerInfo(authorizer=None)
+    ctx = RetryContext(1, caller_info=caller_info, response=dummy_response)
 
     assert checker.should_retry(ctx) is False
 
@@ -42,7 +43,8 @@ def test_transfer_does_not_retry_endpoint_error():
     dummy_response = mock.Mock()
     dummy_response.json = lambda: body
     dummy_response.status_code = 502
-    ctx = RetryContext(1, response=dummy_response)
+    caller_info = RequestCallerInfo(authorizer=None)
+    ctx = RetryContext(1, caller_info=caller_info, response=dummy_response)
 
     assert checker.should_retry(ctx) is False
 
@@ -57,6 +59,7 @@ def _raise_value_error():
     dummy_response = mock.Mock()
     dummy_response.json = _raise_value_error
     dummy_response.status_code = 502
-    ctx = RetryContext(1, response=dummy_response)
+    caller_info = RequestCallerInfo(authorizer=None)
+    ctx = RetryContext(1, caller_info=caller_info, response=dummy_response)
 
     assert checker.should_retry(ctx) is True