chore(lint): auto-fix 253 of 283 ruff issues (F401, I001, E402, RUF100, UP037, SIM105)
Mass ruff auto-fix:
- ruff check --fix: 109 issues fixed (F401 unused imports,
I001 unsorted imports, UP037 quoted annotations, SIM105
suppressible exception, RUF100 unused-noqa)
- ruff check --fix --unsafe-fixes: 22 additional issues
- ruff format: 70 files reformatted
- Manual pass: fix 16 misplaced import httpx lines
- Manual pass: fix remaining E402 (import-after-docstring)
Result: 283 errors -> 30 errors.
The remaining 30 are real issues that need manual review:
5 F401 unused-import (likely auto-generated stubs)
5 F821 undefined-name (real bugs in code that references
redis/pydantic/LLMRegistry without imports)
3 BLE001 (the compliance LLM fallback is intentional; the
other two are real)
3 RUF012 mutable-class-default
3 SIM105, 3 SIM117, 2 E722, 2 E741
1 B007, 1 B025, 1 E402, 1 RUF200 (pyproject.toml issue)
Tests: 436/437 pass (1 pre-existing SSE sandbox failure).
format check + import sort: now clean.
make ci: still gated on the 30 remaining real issues.
Follow-up: triage the 30 issues file-by-file.
This commit is contained in:
parent
e60a62a07a
commit
a7c30b12cd
85 changed files with 2374 additions and 1071 deletions
|
|
@ -1,14 +1,11 @@
|
|||
import httpx
|
||||
|
||||
"""Pry — Webhook Delivery Service.
|
||||
Reliable webhook delivery with retries, signing (HMAC), and dead letter queue."""
|
||||
from paths import PRY_DATA_DIR
|
||||
|
||||
# SPDX-License-Identifier: MIT
|
||||
# Copyright (c) 2026 Rug Munch Media LLC
|
||||
#
|
||||
# Part of Pry — https://git.rugmunch.io/RugMunchMedia/pryscraper
|
||||
# Licensed under MIT. See LICENSE.
|
||||
|
||||
import asyncio
|
||||
import hashlib
|
||||
import hmac
|
||||
|
|
@ -17,9 +14,12 @@ import logging
|
|||
import os
|
||||
import time
|
||||
from datetime import UTC, datetime
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
import httpx
|
||||
|
||||
from paths import PRY_DATA_DIR
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
WEBHOOK_DIR = PRY_DATA_DIR / "webhooks"
|
||||
|
|
@ -32,7 +32,9 @@ class WebhookDelivery:
|
|||
DEFAULT_SIGNING_SECRET = "change-me-in-production"
|
||||
|
||||
def __init__(self, signing_secret: str = ""):
|
||||
self.signing_secret = signing_secret or os.getenv("PRY_WEBHOOK_SECRET", self.DEFAULT_SIGNING_SECRET)
|
||||
self.signing_secret = signing_secret or os.getenv(
|
||||
"PRY_WEBHOOK_SECRET", self.DEFAULT_SIGNING_SECRET
|
||||
)
|
||||
self.delivery_log = WEBHOOK_DIR / "deliveries.jsonl"
|
||||
self.dead_letter = WEBHOOK_DIR / "dead_letter.jsonl"
|
||||
self._load_log()
|
||||
|
|
@ -61,6 +63,7 @@ class WebhookDelivery:
|
|||
) -> dict[str, Any]:
|
||||
"""Deliver a webhook with retries."""
|
||||
from client import get_client
|
||||
|
||||
signature = self.sign_payload(payload)
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
|
|
@ -73,8 +76,11 @@ class WebhookDelivery:
|
|||
try:
|
||||
resp = await client.post(url, json=payload, headers=headers, timeout=10)
|
||||
record = {
|
||||
"url": url, "event": event_type, "attempt": attempt,
|
||||
"status": resp.status_code, "success": resp.is_success,
|
||||
"url": url,
|
||||
"event": event_type,
|
||||
"attempt": attempt,
|
||||
"status": resp.status_code,
|
||||
"success": resp.is_success,
|
||||
"timestamp": datetime.now(UTC).isoformat(),
|
||||
}
|
||||
self._log(record)
|
||||
|
|
@ -84,7 +90,12 @@ class WebhookDelivery:
|
|||
self._dead_letter(payload, url, f"HTTP {resp.status_code}")
|
||||
return {"success": False, "status": resp.status_code, "error": "Client error"}
|
||||
except (httpx.HTTPError, httpx.RequestError) as e:
|
||||
record = {"url": url, "attempt": attempt, "error": str(e)[:200], "timestamp": datetime.now(UTC).isoformat()}
|
||||
record = {
|
||||
"url": url,
|
||||
"attempt": attempt,
|
||||
"error": str(e)[:200],
|
||||
"timestamp": datetime.now(UTC).isoformat(),
|
||||
}
|
||||
self._log(record)
|
||||
if attempt < max_retries:
|
||||
await asyncio.sleep(retry_delay * (2 ** (attempt - 1)))
|
||||
|
|
@ -102,8 +113,17 @@ class WebhookDelivery:
|
|||
def _dead_letter(self, payload: dict, url: str, reason: str) -> None:
|
||||
try:
|
||||
with open(self.dead_letter, "a") as f:
|
||||
f.write(json.dumps({"payload": payload, "url": url, "reason": reason,
|
||||
"timestamp": datetime.now(UTC).isoformat()}) + "\n")
|
||||
f.write(
|
||||
json.dumps(
|
||||
{
|
||||
"payload": payload,
|
||||
"url": url,
|
||||
"reason": reason,
|
||||
"timestamp": datetime.now(UTC).isoformat(),
|
||||
}
|
||||
)
|
||||
+ "\n"
|
||||
)
|
||||
except OSError as e:
|
||||
logger.warning("dead_letter_write_failed", extra={"error": str(e)})
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue