Skip to content

Commit e7d6757

Browse files
authored
Fix type checking with ty 0.0.100 (#204)
Refs #203
1 parent f4152aa commit e7d6757

11 files changed

Lines changed: 100 additions & 99 deletions

‎src/httpware/middleware/resilience/circuit_breaker.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,9 @@ def _reject(self, request: httpx2.Request, now: float, retry_after: float | None
324324
raise _RejectionError(retry_after, self.take_events())
325325

326326
def _record_closed(self, request: httpx2.Request, *, failed: bool) -> None:
327-
if self._rate_mode:
328-
self._record_outcome(request, failed=failed)
327+
window = self._window
328+
if window is not None:
329+
self._record_outcome(request, window, failed=failed)
329330
elif failed:
330331
self._consecutive_failures += 1
331332
if self._consecutive_failures >= self._failure_threshold:
@@ -337,8 +338,9 @@ def _record_probe_success(self, request: httpx2.Request) -> None:
337338
self._move_to(CircuitState.CLOSED)
338339
self._consecutive_failures = 0
339340
self._consecutive_successes = 0
340-
if self._rate_mode:
341-
self._window.clear() # ty: ignore[unresolved-attribute]
341+
window = self._window
342+
if window is not None:
343+
window.clear()
342344
attributes = {"rejected": self._episode_rejections}
343345
self._queue(request, "circuit.closed", logging.INFO, "circuit closed — service recovered", attributes)
344346

@@ -377,11 +379,10 @@ def _open_rate(self, request: httpx2.Request, *, total: int, failures: int) -> N
377379
},
378380
)
379381

380-
def _record_outcome(self, request: httpx2.Request, *, failed: bool) -> None:
381-
# Only reached in rate mode, where _window and _failure_rate_threshold are non-None.
382+
def _record_outcome(self, request: httpx2.Request, window: _RollingWindow, *, failed: bool) -> None:
382383
now = self._now()
383-
self._window.record(now, failed=failed) # ty: ignore[unresolved-attribute]
384-
total, failures = self._window.totals(now) # ty: ignore[unresolved-attribute]
384+
window.record(now, failed=failed)
385+
total, failures = window.totals(now)
385386
threshold = self._failure_rate_threshold
386387
if threshold is not None and total >= self._minimum_calls and failures / total >= threshold:
387388
self._open_rate(request, total=total, failures=failures)

‎tests/test_bulkhead.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,10 @@ async def test_bulkhead_rejected_emits_observability_event(caplog: pytest.LogCap
482482
assert len(rejected_records) == 1
483483
record = rejected_records[0]
484484
assert record.levelno == logging.WARNING
485-
assert record.max_concurrent == 1 # ty: ignore[unresolved-attribute]
486-
assert record.acquire_timeout == 0.0 # ty: ignore[unresolved-attribute]
487-
assert record.method == "GET" # ty: ignore[unresolved-attribute]
488-
assert "example.test/y" in record.url # ty: ignore[unresolved-attribute]
485+
assert record.max_concurrent == 1 # ty: ignore[missing-attribute]
486+
assert record.acquire_timeout == 0.0 # ty: ignore[missing-attribute]
487+
assert record.method == "GET" # ty: ignore[missing-attribute]
488+
assert "example.test/y" in record.url # ty: ignore[missing-attribute]
489489

490490

491491
# ───── Single-event-loop guard ──────────────────────────────────────────────

‎tests/test_circuit_breaker.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ async def test_open_emits_opened_event_and_rejects(caplog: pytest.LogCaptureFixt
133133
opened = [r for r in records if "opened" in r.message]
134134
rejected = [r for r in records if "rejecting" in r.message]
135135
assert len(opened) == 1
136-
assert opened[0].event == "circuit.opened" # ty: ignore[unresolved-attribute]
137-
assert opened[0].failure_threshold == 2 # noqa: PLR2004 # ty: ignore[unresolved-attribute]
138-
assert opened[0].failures == 2 # noqa: PLR2004 # ty: ignore[unresolved-attribute]
136+
assert opened[0].event == "circuit.opened" # ty: ignore[missing-attribute]
137+
assert opened[0].failure_threshold == 2 # noqa: PLR2004 # ty: ignore[missing-attribute]
138+
assert opened[0].failures == 2 # noqa: PLR2004 # ty: ignore[missing-attribute]
139139
assert len(rejected) == 1
140-
assert rejected[0].event == "circuit.rejected" # ty: ignore[unresolved-attribute]
141-
assert rejected[0].retry_after is not None # ty: ignore[unresolved-attribute]
142-
assert rejected[0].method == "GET" # ty: ignore[unresolved-attribute]
140+
assert rejected[0].event == "circuit.rejected" # ty: ignore[missing-attribute]
141+
assert rejected[0].retry_after is not None # ty: ignore[missing-attribute]
142+
assert rejected[0].method == "GET" # ty: ignore[missing-attribute]
143143

144144

145145
async def test_success_resets_failure_streak() -> None:
@@ -342,8 +342,8 @@ async def test_probe_failure_reopens_circuit(caplog: pytest.LogCaptureFixture) -
342342
r
343343
for r in caplog.records
344344
if r.name == "httpware.circuit_breaker"
345-
and r.event == "circuit.opened" # ty: ignore[unresolved-attribute]
346-
and r.failures == 1 # ty: ignore[unresolved-attribute]
345+
and r.event == "circuit.opened" # ty: ignore[missing-attribute]
346+
and r.failures == 1 # ty: ignore[missing-attribute]
347347
]
348348
assert len(reopen_records) == 1
349349

@@ -664,11 +664,11 @@ async def test_rate_mode_open_event_carries_rate_attributes(caplog: pytest.LogCa
664664
await client.get("https://example.test/x")
665665
for _ in range(2):
666666
await client.get("https://example.test/x")
667-
opened = [r for r in caplog.records if r.event == "circuit.opened"] # ty: ignore[unresolved-attribute]
667+
opened = [r for r in caplog.records if r.event == "circuit.opened"] # ty: ignore[missing-attribute]
668668
assert opened, "expected a circuit.opened record"
669669
rec = opened[-1]
670-
assert rec.failure_rate_threshold == 0.5 # noqa: PLR2004 # ty: ignore[unresolved-attribute]
671-
assert rec.observed_calls >= 4 # noqa: PLR2004 # ty: ignore[unresolved-attribute]
670+
assert rec.failure_rate_threshold == 0.5 # noqa: PLR2004 # ty: ignore[missing-attribute]
671+
assert rec.observed_calls >= 4 # noqa: PLR2004 # ty: ignore[missing-attribute]
672672
assert hasattr(rec, "failure_rate")
673673
assert not hasattr(rec, "failure_threshold") # classic attribute absent in rate mode
674674

@@ -732,10 +732,10 @@ async def test_rate_mode_probe_failure_reopens_with_classic_attributes(caplog: p
732732
with pytest.raises(InternalServerError):
733733
await probe.get("https://example.test/x")
734734
assert breaker.state is CircuitState.OPEN # the failed probe re-opened it
735-
opened = [r for r in caplog.records if r.event == "circuit.opened"] # ty: ignore[unresolved-attribute]
735+
opened = [r for r in caplog.records if r.event == "circuit.opened"] # ty: ignore[missing-attribute]
736736
assert opened
737737
rec = opened[-1]
738-
assert rec.failures == 1 # ty: ignore[unresolved-attribute] # classic probe-failure shape
738+
assert rec.failures == 1 # ty: ignore[missing-attribute] # classic probe-failure shape
739739
assert hasattr(rec, "failure_threshold")
740740
assert not hasattr(rec, "failure_rate") # NOT the rate shape
741741

@@ -929,8 +929,8 @@ async def _unreachable(request: httpx2.Request) -> httpx2.Response: # pragma: n
929929
clock.advance(step)
930930
with pytest.raises(CircuitOpenError):
931931
await breaker(httpx2.Request("GET", "https://example.test/x"), _unreachable)
932-
rejected = [r for r in caplog.records if r.event == "circuit.rejected"] # ty: ignore[unresolved-attribute]
933-
assert [r.suppressed for r in rejected] == [0, 4] # ty: ignore[unresolved-attribute]
932+
rejected = [r for r in caplog.records if r.event == "circuit.rejected"] # ty: ignore[missing-attribute]
933+
assert [r.suppressed for r in rejected] == [0, 4] # ty: ignore[missing-attribute]
934934

935935

936936
# ── rejection accounting runs per outage episode ──
@@ -962,7 +962,7 @@ async def test_first_rejection_of_a_new_outage_is_emitted(caplog: pytest.LogCapt
962962
await breaker(httpx2.Request("GET", "https://example.test/x"), _ok)
963963
await _open_now(breaker)
964964
await _reject(breaker)
965-
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 0] # ty: ignore[unresolved-attribute]
965+
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 0] # ty: ignore[missing-attribute]
966966

967967

968968
async def test_closed_event_reports_every_rejection_of_the_outage(caplog: pytest.LogCaptureFixture) -> None:
@@ -978,8 +978,8 @@ async def test_closed_event_reports_every_rejection_of_the_outage(caplog: pytest
978978
await _reject(breaker)
979979
clock.advance(5.0)
980980
await breaker(httpx2.Request("GET", "https://example.test/x"), _ok)
981-
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 1] # ty: ignore[unresolved-attribute]
982-
assert [r.rejected for r in _events(caplog, "circuit.closed")] == [4] # ty: ignore[unresolved-attribute]
981+
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 1] # ty: ignore[missing-attribute]
982+
assert [r.rejected for r in _events(caplog, "circuit.closed")] == [4] # ty: ignore[missing-attribute]
983983

984984

985985
async def test_suppressed_never_counts_a_previous_outage(caplog: pytest.LogCaptureFixture) -> None:
@@ -993,7 +993,7 @@ async def test_suppressed_never_counts_a_previous_outage(caplog: pytest.LogCaptu
993993
await breaker(httpx2.Request("GET", "https://example.test/x"), _ok)
994994
await _open_now(breaker)
995995
await _reject(breaker)
996-
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 0] # ty: ignore[unresolved-attribute]
996+
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 0] # ty: ignore[missing-attribute]
997997

998998

999999
async def test_events_of_one_call_arrive_in_transition_order(caplog: pytest.LogCaptureFixture) -> None:
@@ -1004,7 +1004,7 @@ async def test_events_of_one_call_arrive_in_transition_order(caplog: pytest.LogC
10041004
await _reject(breaker)
10051005
clock.advance(1.0)
10061006
await breaker(httpx2.Request("GET", "https://example.test/x"), _ok)
1007-
assert [r.event for r in caplog.records] == [ # ty: ignore[unresolved-attribute]
1007+
assert [r.event for r in caplog.records] == [ # ty: ignore[missing-attribute]
10081008
"circuit.opened",
10091009
"circuit.rejected",
10101010
"circuit.half_open",

‎tests/test_circuit_breaker_sync.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ def test_open_emits_opened_event_and_rejects(caplog: pytest.LogCaptureFixture) -
9898
opened = [r for r in records if "opened" in r.message]
9999
rejected = [r for r in records if "rejecting" in r.message]
100100
assert len(opened) == 1
101-
assert opened[0].event == "circuit.opened" # ty: ignore[unresolved-attribute]
102-
assert opened[0].failure_threshold == 2 # noqa: PLR2004 # ty: ignore[unresolved-attribute]
103-
assert opened[0].failures == 2 # noqa: PLR2004 # ty: ignore[unresolved-attribute]
101+
assert opened[0].event == "circuit.opened" # ty: ignore[missing-attribute]
102+
assert opened[0].failure_threshold == 2 # noqa: PLR2004 # ty: ignore[missing-attribute]
103+
assert opened[0].failures == 2 # noqa: PLR2004 # ty: ignore[missing-attribute]
104104
assert len(rejected) == 1
105-
assert rejected[0].event == "circuit.rejected" # ty: ignore[unresolved-attribute]
106-
assert rejected[0].retry_after is not None # ty: ignore[unresolved-attribute]
107-
assert rejected[0].method == "GET" # ty: ignore[unresolved-attribute]
105+
assert rejected[0].event == "circuit.rejected" # ty: ignore[missing-attribute]
106+
assert rejected[0].retry_after is not None # ty: ignore[missing-attribute]
107+
assert rejected[0].method == "GET" # ty: ignore[missing-attribute]
108108

109109

110110
def test_success_resets_failure_streak() -> None:
@@ -247,8 +247,8 @@ def test_probe_failure_reopens_circuit(caplog: pytest.LogCaptureFixture) -> None
247247
r
248248
for r in caplog.records
249249
if r.name == "httpware.circuit_breaker"
250-
and r.event == "circuit.opened" # ty: ignore[unresolved-attribute]
251-
and r.failures == 1 # ty: ignore[unresolved-attribute]
250+
and r.event == "circuit.opened" # ty: ignore[missing-attribute]
251+
and r.failures == 1 # ty: ignore[missing-attribute]
252252
]
253253
assert len(reopen_records) == 1
254254

@@ -587,10 +587,10 @@ def test_rate_mode_probe_failure_reopens_with_classic_attributes(caplog: pytest.
587587
with pytest.raises(InternalServerError):
588588
probe.get("https://example.test/x")
589589
assert breaker.state is CircuitState.OPEN # the failed probe re-opened it
590-
opened = [r for r in caplog.records if r.event == "circuit.opened"] # ty: ignore[unresolved-attribute]
590+
opened = [r for r in caplog.records if r.event == "circuit.opened"] # ty: ignore[missing-attribute]
591591
assert opened
592592
rec = opened[-1]
593-
assert rec.failures == 1 # ty: ignore[unresolved-attribute] # classic probe-failure shape
593+
assert rec.failures == 1 # ty: ignore[missing-attribute] # classic probe-failure shape
594594
assert hasattr(rec, "failure_threshold")
595595
assert not hasattr(rec, "failure_rate") # NOT the rate shape
596596

@@ -797,8 +797,8 @@ def test_rejected_event_is_emitted_at_most_once_per_second(caplog: pytest.LogCap
797797
clock.advance(step)
798798
with pytest.raises(CircuitOpenError):
799799
breaker(httpx2.Request("GET", "https://example.test/x"), _unreachable)
800-
rejected = [r for r in caplog.records if r.event == "circuit.rejected"] # ty: ignore[unresolved-attribute]
801-
assert [r.suppressed for r in rejected] == [0, 4] # ty: ignore[unresolved-attribute]
800+
rejected = [r for r in caplog.records if r.event == "circuit.rejected"] # ty: ignore[missing-attribute]
801+
assert [r.suppressed for r in rejected] == [0, 4] # ty: ignore[missing-attribute]
802802

803803

804804
class _LockProbe(logging.Handler):
@@ -946,7 +946,7 @@ def test_first_rejection_of_a_new_outage_is_emitted(caplog: pytest.LogCaptureFix
946946
breaker(httpx2.Request("GET", "https://example.test/x"), _ok)
947947
_open_now(breaker)
948948
_reject(breaker)
949-
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 0] # ty: ignore[unresolved-attribute]
949+
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 0] # ty: ignore[missing-attribute]
950950

951951

952952
def test_closed_event_reports_every_rejection_of_the_outage(caplog: pytest.LogCaptureFixture) -> None:
@@ -962,8 +962,8 @@ def test_closed_event_reports_every_rejection_of_the_outage(caplog: pytest.LogCa
962962
_reject(breaker)
963963
clock.advance(5.0)
964964
breaker(httpx2.Request("GET", "https://example.test/x"), _ok)
965-
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 1] # ty: ignore[unresolved-attribute]
966-
assert [r.rejected for r in _events(caplog, "circuit.closed")] == [4] # ty: ignore[unresolved-attribute]
965+
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 1] # ty: ignore[missing-attribute]
966+
assert [r.rejected for r in _events(caplog, "circuit.closed")] == [4] # ty: ignore[missing-attribute]
967967

968968

969969
def test_suppressed_never_counts_a_previous_outage(caplog: pytest.LogCaptureFixture) -> None:
@@ -977,7 +977,7 @@ def test_suppressed_never_counts_a_previous_outage(caplog: pytest.LogCaptureFixt
977977
breaker(httpx2.Request("GET", "https://example.test/x"), _ok)
978978
_open_now(breaker)
979979
_reject(breaker)
980-
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 0] # ty: ignore[unresolved-attribute]
980+
assert [r.suppressed for r in _events(caplog, "circuit.rejected")] == [0, 0] # ty: ignore[missing-attribute]
981981

982982

983983
def test_locked_admission_into_a_circuit_closed_since_the_unlocked_read_gets_the_closed_ticket() -> None:

‎tests/test_keyed_circuit_breaker.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ async def test_events_carry_the_circuit_key(caplog: pytest.LogCaptureFixture) ->
191191
with pytest.raises(CircuitOpenError):
192192
await client.get("https://a.test/x")
193193
records = [r for r in caplog.records if r.name == "httpware.circuit_breaker"]
194-
assert [r.event for r in records] == ["circuit.opened", "circuit.rejected"] # ty: ignore[unresolved-attribute]
195-
assert all(r.circuit_key == "https://a.test" for r in records) # ty: ignore[unresolved-attribute]
194+
assert [r.event for r in records] == ["circuit.opened", "circuit.rejected"] # ty: ignore[missing-attribute]
195+
assert all(r.circuit_key == "https://a.test" for r in records) # ty: ignore[missing-attribute]
196196

197197

198198
async def test_circuit_key_is_the_normalized_origin_without_userinfo(caplog: pytest.LogCaptureFixture) -> None:
@@ -201,7 +201,7 @@ async def test_circuit_key_is_the_normalized_origin_without_userinfo(caplog: pyt
201201
with caplog.at_level(logging.WARNING, logger="httpware.circuit_breaker"):
202202
await _fail_n(client, "https://user:secret@A.test:443/x?q=1", 1)
203203
await _fail_n(client, "http://a.test:8080/x", 1)
204-
keys = [r.circuit_key for r in caplog.records if r.name == "httpware.circuit_breaker"] # ty: ignore[unresolved-attribute]
204+
keys = [r.circuit_key for r in caplog.records if r.name == "httpware.circuit_breaker"] # ty: ignore[missing-attribute]
205205
assert keys == ["https://a.test", "http://a.test:8080"]
206206

207207

@@ -211,7 +211,7 @@ async def test_circuit_key_of_a_custom_key_is_its_str(caplog: pytest.LogCaptureF
211211
async with _client(handler, breaker=breaker) as client:
212212
with caplog.at_level(logging.WARNING, logger="httpware.circuit_breaker"):
213213
await _fail_n(client, "https://a.test/x", 1)
214-
keys = [r.circuit_key for r in caplog.records if r.name == "httpware.circuit_breaker"] # ty: ignore[unresolved-attribute]
214+
keys = [r.circuit_key for r in caplog.records if r.name == "httpware.circuit_breaker"] # ty: ignore[missing-attribute]
215215
assert keys == ["('a.test', 1)"]
216216

217217

‎tests/test_keyed_circuit_breaker_sync.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ def test_events_carry_the_circuit_key(caplog: pytest.LogCaptureFixture) -> None:
190190
with pytest.raises(CircuitOpenError):
191191
client.get("https://a.test/x")
192192
records = [r for r in caplog.records if r.name == "httpware.circuit_breaker"]
193-
assert [r.event for r in records] == ["circuit.opened", "circuit.rejected"] # ty: ignore[unresolved-attribute]
194-
assert all(r.circuit_key == "https://a.test" for r in records) # ty: ignore[unresolved-attribute]
193+
assert [r.event for r in records] == ["circuit.opened", "circuit.rejected"] # ty: ignore[missing-attribute]
194+
assert all(r.circuit_key == "https://a.test" for r in records) # ty: ignore[missing-attribute]
195195

196196

197197
def test_circuit_key_is_the_normalized_origin_without_userinfo(caplog: pytest.LogCaptureFixture) -> None:
@@ -202,7 +202,7 @@ def test_circuit_key_is_the_normalized_origin_without_userinfo(caplog: pytest.Lo
202202
):
203203
_fail_n(client, "https://user:secret@A.test:443/x?q=1", 1)
204204
_fail_n(client, "http://a.test:8080/x", 1)
205-
keys = [r.circuit_key for r in caplog.records if r.name == "httpware.circuit_breaker"] # ty: ignore[unresolved-attribute]
205+
keys = [r.circuit_key for r in caplog.records if r.name == "httpware.circuit_breaker"] # ty: ignore[missing-attribute]
206206
assert keys == ["https://a.test", "http://a.test:8080"]
207207

208208

@@ -214,7 +214,7 @@ def test_circuit_key_of_a_custom_key_is_its_str(caplog: pytest.LogCaptureFixture
214214
caplog.at_level(logging.WARNING, logger="httpware.circuit_breaker"),
215215
):
216216
_fail_n(client, "https://a.test/x", 1)
217-
keys = [r.circuit_key for r in caplog.records if r.name == "httpware.circuit_breaker"] # ty: ignore[unresolved-attribute]
217+
keys = [r.circuit_key for r in caplog.records if r.name == "httpware.circuit_breaker"] # ty: ignore[missing-attribute]
218218
assert keys == ["('a.test', 1)"]
219219

220220

0 commit comments

Comments
 (0)