capo-lambda-core 0.10.0__tar.gz → 0.11.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (100) hide show
  1. {capo_lambda_core-0.10.0/src/capo_lambda_core.egg-info → capo_lambda_core-0.11.0}/PKG-INFO +3 -1
  2. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/README.md +2 -0
  3. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/pyproject.toml +1 -1
  4. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_services/_aws_config.py +15 -0
  5. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_services/_pipeline.py +207 -0
  6. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_services/async_lambda_core.py +12 -1
  7. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_services/lambda_core.py +12 -1
  8. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0/src/capo_lambda_core.egg-info}/PKG-INFO +3 -1
  9. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/LICENSE +0 -0
  10. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/setup.cfg +0 -0
  11. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/__init__.py +0 -0
  12. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_async.py +0 -0
  13. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_auth/_identity.py +0 -0
  14. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_auth/_providers.py +0 -0
  15. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_auth/_signers.py +0 -0
  16. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_auth/_sigv4.py +0 -0
  17. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_auth/_zapros_handler.py +0 -0
  18. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_aws.py +0 -0
  19. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_body.py +0 -0
  20. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_iter.py +0 -0
  21. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_operations/lambda_core_api_service/create_network_connector.py +0 -0
  22. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_operations/lambda_core_api_service/delete_network_connector.py +0 -0
  23. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_operations/lambda_core_api_service/get_network_connector.py +0 -0
  24. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_operations/lambda_core_api_service/list_network_connector_versions.py +0 -0
  25. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_operations/lambda_core_api_service/list_network_connectors.py +0 -0
  26. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_operations/lambda_core_api_service/update_network_connector.py +0 -0
  27. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_pagination.py +0 -0
  28. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_protocol/__init__.py +0 -0
  29. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_protocol/errors.py +0 -0
  30. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_protocol/eventstream.py +0 -0
  31. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_protocol/serialize.py +0 -0
  32. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_protocol/xml.py +0 -0
  33. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_resources/lambda_core_api_service/network_connector.py +0 -0
  34. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_rule_engine/__init__.py +0 -0
  35. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_rule_engine/_aws_partition.py +0 -0
  36. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_rule_engine/_endpoint_rule_set.py +0 -0
  37. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/_rule_engine/_endpoint_runtime.py +0 -0
  38. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/errors/__init__.py +0 -0
  39. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/errors/_base.py +0 -0
  40. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/errors/invalid_parameter_value_exception.py +0 -0
  41. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/errors/network_connector_limit_exceeded_exception.py +0 -0
  42. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/errors/resource_conflict_exception.py +0 -0
  43. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/errors/resource_not_found_exception.py +0 -0
  44. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/errors/service_exception.py +0 -0
  45. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/errors/too_many_requests_exception.py +0 -0
  46. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/py.typed +0 -0
  47. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/_prelude/blob.py +0 -0
  48. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/_prelude/timestamp.py +0 -0
  49. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/_unknown.py +0 -0
  50. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/associated_compute_resource_types_list.py +0 -0
  51. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/client_token_string.py +0 -0
  52. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/compute_resource_type.py +0 -0
  53. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/core_timestamp.py +0 -0
  54. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/create_network_connector_request.py +0 -0
  55. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/create_network_connector_response.py +0 -0
  56. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/delete_network_connector_request.py +0 -0
  57. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/delete_network_connector_response.py +0 -0
  58. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/get_network_connector_request.py +0 -0
  59. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/get_network_connector_response.py +0 -0
  60. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/list_network_connector_versions_request.py +0 -0
  61. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/list_network_connector_versions_response.py +0 -0
  62. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/list_network_connectors_request.py +0 -0
  63. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/list_network_connectors_response.py +0 -0
  64. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/max_hundred_list_items.py +0 -0
  65. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_arn.py +0 -0
  66. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_configuration.py +0 -0
  67. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_id.py +0 -0
  68. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_identifier.py +0 -0
  69. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_last_update_status.py +0 -0
  70. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_last_update_status_reason.py +0 -0
  71. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_last_update_status_reason_code.py +0 -0
  72. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_name.py +0 -0
  73. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_role_arn.py +0 -0
  74. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_security_group_id.py +0 -0
  75. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_security_group_ids.py +0 -0
  76. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_state.py +0 -0
  77. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_state_reason_code.py +0 -0
  78. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_subnet_id.py +0 -0
  79. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_subnet_ids.py +0 -0
  80. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_summary.py +0 -0
  81. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_tag_key.py +0 -0
  82. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_tag_value.py +0 -0
  83. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_tags.py +0 -0
  84. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_type.py +0 -0
  85. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_version.py +0 -0
  86. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_version_summary.py +0 -0
  87. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_versions_list.py +0 -0
  88. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connector_vpc_egress_configuration.py +0 -0
  89. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_connectors_list.py +0 -0
  90. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/network_protocol.py +0 -0
  91. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/string.py +0 -0
  92. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/throttle_reason.py +0 -0
  93. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/update_network_connector_request.py +0 -0
  94. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core/types/update_network_connector_response.py +0 -0
  95. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core.egg-info/SOURCES.txt +0 -0
  96. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core.egg-info/dependency_links.txt +0 -0
  97. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core.egg-info/requires.txt +0 -0
  98. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/src/capo_lambda_core.egg-info/top_level.txt +0 -0
  99. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/tests/test_body.py +0 -0
  100. {capo_lambda_core-0.10.0 → capo_lambda_core-0.11.0}/tests/test_sigv4.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: capo-lambda-core
3
- Version: 0.10.0
3
+ Version: 0.11.0
4
4
  Summary: Typed, async Python SDK for AWS Lambda Core.
5
5
  Project-URL: Homepage, https://capo-sdk.dev/
6
6
  Project-URL: Documentation, https://capo-sdk.dev/services/lambda-core/
@@ -94,6 +94,8 @@ The SDK retries failed operations automatically. Retry behaviour follows the Smi
94
94
 
95
95
  The number of attempts defaults to 3 and can be changed at the client level via `retry_max_attempts`, or per call via `config_overrides`.
96
96
 
97
+ `retry_mode="adaptive"` (or `AWS_RETRY_MODE=adaptive`, or `retry_mode = adaptive` in the AWS profile) also slows the whole client down once the service starts throttling it, then speeds back up as requests succeed. The default is `standard`.
98
+
97
99
  ```python
98
100
  from capo_lambda_core import AsyncLambdaCoreClient
99
101
 
@@ -62,6 +62,8 @@ The SDK retries failed operations automatically. Retry behaviour follows the Smi
62
62
 
63
63
  The number of attempts defaults to 3 and can be changed at the client level via `retry_max_attempts`, or per call via `config_overrides`.
64
64
 
65
+ `retry_mode="adaptive"` (or `AWS_RETRY_MODE=adaptive`, or `retry_mode = adaptive` in the AWS profile) also slows the whole client down once the service starts throttling it, then speeds back up as requests succeed. The default is `standard`.
66
+
65
67
  ```python
66
68
  from capo_lambda_core import AsyncLambdaCoreClient
67
69
 
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "capo-lambda-core"
3
- version = "0.10.0"
3
+ version = "0.11.0"
4
4
  description = "Typed, async Python SDK for AWS Lambda Core."
5
5
  readme = "README.md"
6
6
  requires-python = ">=3.10"
@@ -31,6 +31,7 @@ class AwsSettings:
31
31
  use_fips: bool
32
32
  use_dual_stack: bool
33
33
  max_attempts: int
34
+ retry_mode: str
34
35
 
35
36
 
36
37
  def _env_bool(name: str) -> bool | None:
@@ -109,12 +110,22 @@ def load_aws_settings() -> AwsSettings:
109
110
  use_dual_stack = False
110
111
  max_attempts_raw = os.environ.get("AWS_MAX_ATTEMPTS") or profile.get("max_attempts")
111
112
  max_attempts = int(max_attempts_raw) if max_attempts_raw else 3
113
+ retry_mode = (
114
+ (os.environ.get("AWS_RETRY_MODE") or profile.get("retry_mode") or "standard")
115
+ .strip()
116
+ .lower()
117
+ )
118
+ if retry_mode not in ("legacy", "standard", "adaptive"):
119
+ raise ValueError(
120
+ f"invalid retry_mode {retry_mode!r}: expected 'legacy', 'standard' or 'adaptive'"
121
+ )
112
122
  return AwsSettings(
113
123
  region=region,
114
124
  endpoint=endpoint,
115
125
  use_fips=use_fips,
116
126
  use_dual_stack=use_dual_stack,
117
127
  max_attempts=max_attempts,
128
+ retry_mode=retry_mode,
118
129
  )
119
130
 
120
131
 
@@ -134,6 +145,8 @@ def aws_config() -> Interceptor[TInput, TOutput]:
134
145
  options.use_dual_stack = settings.use_dual_stack
135
146
  if options.retry_max_attempts is None:
136
147
  options.retry_max_attempts = settings.max_attempts
148
+ if options.retry_mode is None:
149
+ options.retry_mode = settings.retry_mode
137
150
  return next(request)
138
151
 
139
152
  return interceptor
@@ -155,6 +168,8 @@ def aaws_config() -> AsyncInterceptor[TInput, TOutput]:
155
168
  options.use_dual_stack = settings.use_dual_stack
156
169
  if options.retry_max_attempts is None:
157
170
  options.retry_max_attempts = settings.max_attempts
171
+ if options.retry_mode is None:
172
+ options.retry_mode = settings.retry_mode
158
173
  return await next(request)
159
174
 
160
175
  return interceptor
@@ -1,6 +1,7 @@
1
1
  from __future__ import annotations
2
2
 
3
3
  import logging
4
+ import math
4
5
  import random
5
6
  import threading
6
7
  import time
@@ -88,15 +89,134 @@ class ThreadSafeRetryQuota(RetryQuota):
88
89
  super().release(last_retry_cost)
89
90
 
90
91
 
92
+ class RateLimiter:
93
+ """Send tokens shared by all operations of one client in adaptive retry mode: the rate drops on throttling and regrows on success."""
94
+
95
+ MIN_FILL_RATE: float = 0.5
96
+ MIN_CAPACITY: float = 1.0
97
+ BETA: float = 0.7
98
+ SCALE_CONSTANT: float = 0.4
99
+ SMOOTHING: float = 0.8
100
+ MAX_RATE_SCALE: float = 2.0
101
+
102
+ def __init__(self, clock: Callable[[], float] = time.monotonic) -> None:
103
+ self._clock = clock
104
+ now = clock()
105
+ self._enabled: bool = False
106
+ self._fill_rate: float = 1.0
107
+ self._max_capacity: float = 1.0
108
+ self._capacity: float = 0.0
109
+ self._last_refill: float = now
110
+ self._last_max_rate: float = 0.0
111
+ self._last_throttle: float = now
112
+ self._measured_rate: float = 0.0
113
+ self._rate_bucket: float = math.floor(now)
114
+ self._request_count: int = 0
115
+
116
+ def acquire(self) -> float:
117
+ """Take a send token: return 0, or the seconds to wait before asking again."""
118
+ if not self._enabled:
119
+ return 0.0
120
+ self._refill(self._clock())
121
+ if self._capacity >= 1:
122
+ self._capacity -= 1
123
+ return 0.0
124
+ return (1 - self._capacity) / self._fill_rate
125
+
126
+ def update(self, is_throttling: bool) -> None:
127
+ """Adjust the send rate after an attempt: cut it on throttling, regrow it otherwise."""
128
+ now = self._clock()
129
+ self._measure(now)
130
+ self._adjust(is_throttling, now)
131
+
132
+ def throttled_mid_stream(self) -> None:
133
+ """Cut the send rate for throttling reported inside an open event stream. No new request was sent, so the measured rate is left alone."""
134
+ self._adjust(True, self._clock())
135
+
136
+ def _adjust(self, is_throttling: bool, now: float) -> None:
137
+ if is_throttling:
138
+ rate = (
139
+ min(self._measured_rate, self._fill_rate)
140
+ if self._enabled
141
+ else self._measured_rate
142
+ )
143
+ self._last_max_rate = rate
144
+ self._last_throttle = now
145
+ new_rate = rate * self.BETA
146
+ self._enabled = True
147
+ else:
148
+ window = (self._last_max_rate * (1 - self.BETA) / self.SCALE_CONSTANT) ** (
149
+ 1 / 3
150
+ )
151
+ new_rate = (
152
+ self.SCALE_CONSTANT * (now - self._last_throttle - window) ** 3
153
+ + self._last_max_rate
154
+ )
155
+ self._set_rate(min(new_rate, self.MAX_RATE_SCALE * self._measured_rate), now)
156
+ if is_throttling:
157
+ logger.debug(
158
+ "throttled, send rate lowered to %.2f requests/s",
159
+ self._fill_rate,
160
+ extra={"send_rate": self._fill_rate},
161
+ )
162
+
163
+ def _refill(self, now: float) -> None:
164
+ self._capacity = min(
165
+ self._max_capacity,
166
+ self._capacity + (now - self._last_refill) * self._fill_rate,
167
+ )
168
+ self._last_refill = now
169
+
170
+ def _measure(self, now: float) -> None:
171
+ # Requests per second, counted in half-second buckets and smoothed.
172
+ bucket = math.floor(now * 2) / 2
173
+ self._request_count += 1
174
+ if bucket > self._rate_bucket:
175
+ current = self._request_count / (bucket - self._rate_bucket)
176
+ self._measured_rate = current * self.SMOOTHING + self._measured_rate * (
177
+ 1 - self.SMOOTHING
178
+ )
179
+ self._request_count = 0
180
+ self._rate_bucket = bucket
181
+
182
+ def _set_rate(self, rate: float, now: float) -> None:
183
+ self._refill(now)
184
+ self._fill_rate = max(rate, self.MIN_FILL_RATE)
185
+ self._max_capacity = max(rate, self.MIN_CAPACITY)
186
+ self._capacity = min(self._capacity, self._max_capacity)
187
+
188
+
189
+ class ThreadSafeRateLimiter(RateLimiter):
190
+ """A ``RateLimiter`` that sync clients can share across threads."""
191
+
192
+ def __init__(self, clock: Callable[[], float] = time.monotonic) -> None:
193
+ super().__init__(clock)
194
+ self._lock: threading.Lock = threading.Lock()
195
+
196
+ def acquire(self) -> float:
197
+ with self._lock:
198
+ return super().acquire()
199
+
200
+ def update(self, is_throttling: bool) -> None:
201
+ with self._lock:
202
+ super().update(is_throttling)
203
+
204
+ def throttled_mid_stream(self) -> None:
205
+ with self._lock:
206
+ super().throttled_mid_stream()
207
+
208
+
91
209
  @dataclass
92
210
  class OperationOptions:
93
211
  client: Client
94
212
  retry_quota: RetryQuota
213
+ rate_limiter: RateLimiter
95
214
  use_dual_stack: bool | None = None
96
215
  use_fips: bool | None = None
97
216
  region: str | None = None
98
217
  endpoint: str | None = None
99
218
  retry_max_attempts: int | None = None
219
+ retry_mode: str | None = None
100
220
  credentials_provider: IdentityProvider[Credentials] | None = None
101
221
  anonymous: bool | None = None
102
222
 
@@ -105,11 +225,13 @@ class OperationOptions:
105
225
  class AsyncOperationOptions:
106
226
  client: AsyncClient
107
227
  retry_quota: RetryQuota
228
+ rate_limiter: RateLimiter
108
229
  use_dual_stack: bool | None = None
109
230
  use_fips: bool | None = None
110
231
  region: str | None = None
111
232
  endpoint: str | None = None
112
233
  retry_max_attempts: int | None = None
234
+ retry_mode: str | None = None
113
235
  credentials_provider: IdentityProvider[Credentials] | None = None
114
236
  anonymous: bool | None = None
115
237
 
@@ -428,6 +550,91 @@ def aretry() -> AsyncInterceptor[TInput, TOutput]:
428
550
  return interceptor
429
551
 
430
552
 
553
+ def rate_limit() -> Interceptor[TInput, TOutput]:
554
+ def interceptor(
555
+ request: OperationRequest[TInput], next: NextFn[TInput, TOutput]
556
+ ) -> OperationResponse[TOutput]:
557
+ if request.options.retry_mode != "adaptive":
558
+ return next(request)
559
+ limiter = request.options.rate_limiter
560
+ while (wait := limiter.acquire()) > 0:
561
+ time.sleep(wait)
562
+ try:
563
+ response = next(request)
564
+ except Exception as exc:
565
+ limiter.update(isinstance(exc, ServiceError) and exc.is_throttling_error)
566
+ raise
567
+ limiter.update(False)
568
+ return response
569
+
570
+ return interceptor
571
+
572
+
573
+ def arate_limit() -> AsyncInterceptor[TInput, TOutput]:
574
+ async def interceptor(
575
+ request: AsyncOperationRequest[TInput], next: AsyncNextFn[TInput, TOutput]
576
+ ) -> AsyncOperationResponse[TOutput]:
577
+ if request.options.retry_mode != "adaptive":
578
+ return await next(request)
579
+ limiter = request.options.rate_limiter
580
+ while (wait := limiter.acquire()) > 0:
581
+ await anysleep(wait)
582
+ try:
583
+ response = await next(request)
584
+ except Exception as exc:
585
+ limiter.update(isinstance(exc, ServiceError) and exc.is_throttling_error)
586
+ raise
587
+ limiter.update(False)
588
+ return response
589
+
590
+ return interceptor
591
+
592
+
593
+ def _on_event_stream_error(
594
+ exc: ServiceError, options: OperationOptions | AsyncOperationOptions
595
+ ) -> None:
596
+ # An error event arrives after a 200 response, so raise_error never saw it:
597
+ # mark it by its code here. It is not retried, but adaptive mode slows down.
598
+ _apply_retry_rules(exc, exc.response)
599
+ if exc.is_throttling_error and options.retry_mode == "adaptive":
600
+ options.rate_limiter.throttled_mid_stream()
601
+
602
+
603
+ def watch_event_stream(output: Any, member: str, options: OperationOptions) -> None:
604
+ """Wrap the event stream ``output[member]`` so the errors it raises get their retry flags and reach the rate limiter."""
605
+ if member not in output:
606
+ return
607
+ events = output[member]
608
+
609
+ def watched() -> Iterator[Any]:
610
+ try:
611
+ yield from events
612
+ except ServiceError as exc:
613
+ _on_event_stream_error(exc, options)
614
+ raise
615
+
616
+ output[member] = watched()
617
+
618
+
619
+ def awatch_event_stream(
620
+ output: Any, member: str, options: AsyncOperationOptions
621
+ ) -> None:
622
+ """Wrap the event stream ``output[member]`` so the errors it raises get their retry flags and reach the rate limiter."""
623
+ if member not in output:
624
+ return
625
+ events = output[member]
626
+
627
+ async def watched() -> AsyncIterator[Any]:
628
+ try:
629
+ async for event in events:
630
+ yield event
631
+ except ServiceError as exc:
632
+ _on_event_stream_error(exc, options)
633
+ raise
634
+
635
+ output[member] = watched()
636
+
637
+
431
638
  def log_operation(operation_logging: OperationLogging) -> Interceptor[TInput, TOutput]:
432
639
  operation = operation_logging.operation
433
640
  redact_input = operation_logging.redact_input
@@ -3,7 +3,7 @@
3
3
  import uuid
4
4
  import warnings
5
5
  from collections.abc import AsyncIterator
6
- from typing import TYPE_CHECKING, Any, Iterable, Optional
6
+ from typing import TYPE_CHECKING, Any, Iterable, Literal, Optional
7
7
 
8
8
  from typing_extensions import Self, TypedDict
9
9
  from zapros import AsyncBaseHandler, AsyncClient
@@ -29,9 +29,11 @@ from capo_lambda_core._services._pipeline import (
29
29
  AsyncOperationRequest,
30
30
  AsyncOperationResponse,
31
31
  OperationLogging,
32
+ RateLimiter,
32
33
  RetryQuota,
33
34
  aexecute_pipeline,
34
35
  alog_operation,
36
+ arate_limit,
35
37
  aretry,
36
38
  )
37
39
 
@@ -64,6 +66,7 @@ if TYPE_CHECKING:
64
66
  class AsyncLambdaCoreClientConfig(TypedDict, total=False, closed=True):
65
67
  operation_interceptors: Iterable[AsyncInterceptor[Any, Any]]
66
68
  retry_max_attempts: int | None
69
+ retry_mode: Literal["standard", "adaptive"] | None
67
70
  region: str | None
68
71
  use_dual_stack: bool | None
69
72
  use_fips: bool | None
@@ -79,6 +82,7 @@ class AsyncLambdaCoreClient:
79
82
  http_handler: HTTP handler for sending requests. If not provided, creates a default handler.
80
83
  operation_interceptors: Interceptors that wrap every operation call. If not provided, defaults to an empty list.
81
84
  retry_max_attempts: Maximum number of times to retry a failed operation. Defaults to 3.
85
+ retry_mode: ``"standard"`` (the default) or ``"adaptive"``, which also slows the whole client down when the service throttles it.
82
86
  region: The value of the ``AWS::Region`` endpoint parameter.
83
87
  use_dual_stack: The value of the ``AWS::UseDualStack`` endpoint parameter.
84
88
  use_fips: The value of the ``AWS::UseFIPS`` endpoint parameter.
@@ -93,6 +97,7 @@ class AsyncLambdaCoreClient:
93
97
  http_handler: AsyncBaseHandler | None = None,
94
98
  operation_interceptors: Iterable[AsyncInterceptor[Any, Any]] | None = None,
95
99
  retry_max_attempts: int | None = None,
100
+ retry_mode: Literal["standard", "adaptive"] | None = None,
96
101
  region: str | None = None,
97
102
  use_dual_stack: bool | None = None,
98
103
  use_fips: bool | None = None,
@@ -109,6 +114,8 @@ class AsyncLambdaCoreClient:
109
114
  self._client = client.wrap_with_middleware(lambda next: AuthMiddleware(next))
110
115
  # One retry quota for all of this client's operations.
111
116
  self._retry_quota = RetryQuota()
117
+ # One send-rate limiter too, used when retry_mode is adaptive.
118
+ self._rate_limiter = RateLimiter()
112
119
  if credentials is not None and credentials_provider is not None:
113
120
  warnings.warn(
114
121
  "Both credentials and credentials_provider given; provider takes precedence"
@@ -126,6 +133,7 @@ class AsyncLambdaCoreClient:
126
133
  {
127
134
  "operation_interceptors": operation_interceptors or [],
128
135
  "retry_max_attempts": retry_max_attempts,
136
+ "retry_mode": retry_mode,
129
137
  "region": region,
130
138
  "use_dual_stack": use_dual_stack,
131
139
  "use_fips": use_fips,
@@ -153,12 +161,15 @@ class AsyncLambdaCoreClient:
153
161
  if operation_logging is not None:
154
162
  interceptors_.append(alog_operation(operation_logging))
155
163
  interceptors_.append(aretry())
164
+ interceptors_.append(arate_limit())
156
165
  options_: AsyncOperationOptions = AsyncOperationOptions(
157
166
  client=self._client,
158
167
  retry_quota=self._retry_quota,
168
+ rate_limiter=self._rate_limiter,
159
169
  retry_max_attempts=overrides.get(
160
170
  "retry_max_attempts", self._config.get("retry_max_attempts")
161
171
  ),
172
+ retry_mode=overrides.get("retry_mode", self._config.get("retry_mode")),
162
173
  region=overrides.get("region", self._config.get("region")),
163
174
  use_dual_stack=overrides.get(
164
175
  "use_dual_stack", self._config.get("use_dual_stack")
@@ -3,7 +3,7 @@
3
3
  import uuid
4
4
  import warnings
5
5
  from collections.abc import Iterator
6
- from typing import TYPE_CHECKING, Any, Iterable, Optional
6
+ from typing import TYPE_CHECKING, Any, Iterable, Literal, Optional
7
7
 
8
8
  from typing_extensions import Self, TypedDict
9
9
  from zapros import BaseHandler, Client
@@ -29,9 +29,11 @@ from capo_lambda_core._services._pipeline import (
29
29
  OperationOptions,
30
30
  OperationRequest,
31
31
  OperationResponse,
32
+ ThreadSafeRateLimiter,
32
33
  ThreadSafeRetryQuota,
33
34
  execute_pipeline,
34
35
  log_operation,
36
+ rate_limit,
35
37
  retry,
36
38
  )
37
39
 
@@ -64,6 +66,7 @@ if TYPE_CHECKING:
64
66
  class LambdaCoreClientConfig(TypedDict, total=False, closed=True):
65
67
  operation_interceptors: Iterable[Interceptor[Any, Any]]
66
68
  retry_max_attempts: int | None
69
+ retry_mode: Literal["standard", "adaptive"] | None
67
70
  region: str | None
68
71
  use_dual_stack: bool | None
69
72
  use_fips: bool | None
@@ -79,6 +82,7 @@ class LambdaCoreClient:
79
82
  http_handler: HTTP handler for sending requests. If not provided, creates a default handler.
80
83
  operation_interceptors: Interceptors that wrap every operation call. If not provided, defaults to an empty list.
81
84
  retry_max_attempts: Maximum number of times to retry a failed operation. Defaults to 3.
85
+ retry_mode: ``"standard"`` (the default) or ``"adaptive"``, which also slows the whole client down when the service throttles it.
82
86
  region: The value of the ``AWS::Region`` endpoint parameter.
83
87
  use_dual_stack: The value of the ``AWS::UseDualStack`` endpoint parameter.
84
88
  use_fips: The value of the ``AWS::UseFIPS`` endpoint parameter.
@@ -93,6 +97,7 @@ class LambdaCoreClient:
93
97
  http_handler: BaseHandler | None = None,
94
98
  operation_interceptors: Iterable[Interceptor[Any, Any]] | None = None,
95
99
  retry_max_attempts: int | None = None,
100
+ retry_mode: Literal["standard", "adaptive"] | None = None,
96
101
  region: str | None = None,
97
102
  use_dual_stack: bool | None = None,
98
103
  use_fips: bool | None = None,
@@ -109,6 +114,8 @@ class LambdaCoreClient:
109
114
  self._client = client.wrap_with_middleware(lambda next: AuthMiddleware(next))
110
115
  # One retry quota for all of this client's operations.
111
116
  self._retry_quota = ThreadSafeRetryQuota()
117
+ # One send-rate limiter too, used when retry_mode is adaptive.
118
+ self._rate_limiter = ThreadSafeRateLimiter()
112
119
  if credentials is not None and credentials_provider is not None:
113
120
  warnings.warn(
114
121
  "Both credentials and credentials_provider given; provider takes precedence"
@@ -126,6 +133,7 @@ class LambdaCoreClient:
126
133
  {
127
134
  "operation_interceptors": operation_interceptors or [],
128
135
  "retry_max_attempts": retry_max_attempts,
136
+ "retry_mode": retry_mode,
129
137
  "region": region,
130
138
  "use_dual_stack": use_dual_stack,
131
139
  "use_fips": use_fips,
@@ -153,12 +161,15 @@ class LambdaCoreClient:
153
161
  if operation_logging is not None:
154
162
  interceptors_.append(log_operation(operation_logging))
155
163
  interceptors_.append(retry())
164
+ interceptors_.append(rate_limit())
156
165
  options_: OperationOptions = OperationOptions(
157
166
  client=self._client,
158
167
  retry_quota=self._retry_quota,
168
+ rate_limiter=self._rate_limiter,
159
169
  retry_max_attempts=overrides.get(
160
170
  "retry_max_attempts", self._config.get("retry_max_attempts")
161
171
  ),
172
+ retry_mode=overrides.get("retry_mode", self._config.get("retry_mode")),
162
173
  region=overrides.get("region", self._config.get("region")),
163
174
  use_dual_stack=overrides.get(
164
175
  "use_dual_stack", self._config.get("use_dual_stack")
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: capo-lambda-core
3
- Version: 0.10.0
3
+ Version: 0.11.0
4
4
  Summary: Typed, async Python SDK for AWS Lambda Core.
5
5
  Project-URL: Homepage, https://capo-sdk.dev/
6
6
  Project-URL: Documentation, https://capo-sdk.dev/services/lambda-core/
@@ -94,6 +94,8 @@ The SDK retries failed operations automatically. Retry behaviour follows the Smi
94
94
 
95
95
  The number of attempts defaults to 3 and can be changed at the client level via `retry_max_attempts`, or per call via `config_overrides`.
96
96
 
97
+ `retry_mode="adaptive"` (or `AWS_RETRY_MODE=adaptive`, or `retry_mode = adaptive` in the AWS profile) also slows the whole client down once the service starts throttling it, then speeds back up as requests succeed. The default is `standard`.
98
+
97
99
  ```python
98
100
  from capo_lambda_core import AsyncLambdaCoreClient
99
101