mirror of
https://github.com/TauricResearch/TradingAgents.git
synced 2026-09-19 19:25:24 +03:00
fix(reddit): go RSS-first with 429 backoff and robust transport errors
The JSON search endpoint is reliably WAF-blocked (403) for public clients, so probing it on every call doubled request volume against Reddit's per-IP rate limit and tripped 429 on the RSS fallback, blanking the sentiment feed. Fetch the Atom/RSS feed directly (JSON kept as an opt-in path that still degrades to RSS on 403), back off once on a 429 honouring Retry-After, and pace requests a little wider. Also broaden the error handling to catch http.client chunked transfer errors (IncompleteRead/BadStatusLine) alongside OSError, which on their own slipped through and crashed the pipeline.
This commit is contained in:
@@ -1,31 +1,32 @@
|
||||
"""Reddit search fetcher for ticker-specific discussion posts.
|
||||
|
||||
Primary path is Reddit's public JSON search endpoint
|
||||
(``reddit.com/r/{sub}/search.json``), which carries the richest data
|
||||
(score, comment count, body). Reddit's WAF increasingly returns
|
||||
``HTTP 403 Blocked`` on that endpoint (issue #862), so when the JSON request
|
||||
fails we transparently fall back to the public Atom/RSS search feed
|
||||
(``/search.rss``). The RSS feed is gated less aggressively and serves the
|
||||
same descriptive User-Agent we already send; the fallback lacks score /
|
||||
comment counts, so RSS-sourced posts are marked and the formatter omits those
|
||||
metrics rather than printing fake zeros.
|
||||
Default path is Reddit's public Atom/RSS search feed
|
||||
(``reddit.com/r/{sub}/search.rss``). The richer JSON search endpoint
|
||||
(``/search.json``) is reliably WAF-blocked (``HTTP 403``) for public clients
|
||||
(issue #862), and probing it on every call only doubled our request volume
|
||||
against Reddit's per-IP rate limit — tripping ``429`` on the RSS fallback — so
|
||||
it is kept (``_fetch_subreddit_json``) but not used by default. On a 429 we back
|
||||
off once (honouring ``Retry-After``). RSS lacks score / comment counts, so those
|
||||
posts are marked and the formatter omits the metrics rather than printing fake
|
||||
zeros.
|
||||
|
||||
No API key required either way. Returns formatted plaintext blocks ready for
|
||||
prompt injection and degrades gracefully — returns a placeholder string
|
||||
rather than raising, so callers never special-case missing data.
|
||||
No API key required. Returns formatted plaintext blocks ready for prompt
|
||||
injection and degrades gracefully — returns a placeholder string rather than
|
||||
raising, so callers never special-case missing data.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import html
|
||||
import http.client
|
||||
import json
|
||||
import logging
|
||||
import re
|
||||
import time
|
||||
import xml.etree.ElementTree as ET
|
||||
from collections.abc import Iterable
|
||||
from datetime import datetime
|
||||
from typing import Iterable, Optional
|
||||
from urllib.error import HTTPError, URLError
|
||||
from urllib.error import HTTPError
|
||||
from urllib.parse import urlencode
|
||||
from urllib.request import Request, urlopen
|
||||
|
||||
@@ -56,7 +57,7 @@ def _search_qs(ticker: str, limit: int) -> str:
|
||||
})
|
||||
|
||||
|
||||
def _iso_to_timestamp(iso_str: Optional[str]) -> Optional[float]:
|
||||
def _iso_to_timestamp(iso_str: str | None) -> float | None:
|
||||
"""Parse an Atom ``published`` timestamp to a UTC epoch, or None."""
|
||||
if not iso_str:
|
||||
return None
|
||||
@@ -78,23 +79,48 @@ def _strip_html(content: str) -> str:
|
||||
return " ".join(html.unescape(text).split())
|
||||
|
||||
|
||||
def _retry_after_seconds(exc: HTTPError) -> float | None:
|
||||
"""Seconds to wait from a 429's ``Retry-After`` header, capped at 30s."""
|
||||
try:
|
||||
val = exc.headers.get("Retry-After") if getattr(exc, "headers", None) else None
|
||||
return min(float(val), 30.0) if val else None
|
||||
except (ValueError, TypeError, AttributeError):
|
||||
return None
|
||||
|
||||
|
||||
def _fetch_subreddit_rss(
|
||||
ticker: str,
|
||||
sub: str,
|
||||
limit: int,
|
||||
timeout: float,
|
||||
_retry: bool = True,
|
||||
) -> list[dict]:
|
||||
"""Fallback path: parse the public Atom search feed for a subreddit.
|
||||
"""Default path: parse the public Atom search feed for a subreddit.
|
||||
|
||||
Carries no score / comment counts, so those fields are left None and the
|
||||
post is tagged ``source="rss"`` for honest display.
|
||||
post is tagged ``source="rss"`` for honest display. On a 429 (Reddit's
|
||||
per-IP rate limit) we back off once — honouring ``Retry-After`` when
|
||||
present — before giving up, so a transient burst doesn't blank the feed.
|
||||
"""
|
||||
url = _RSS.format(sub=sub, qs=_search_qs(ticker, limit))
|
||||
req = Request(url, headers={"User-Agent": _UA})
|
||||
try:
|
||||
with urlopen(req, timeout=timeout) as resp:
|
||||
root = ET.fromstring(resp.read())
|
||||
except (HTTPError, URLError, TimeoutError, ET.ParseError) as exc:
|
||||
except HTTPError as exc:
|
||||
if exc.code == 429 and _retry:
|
||||
wait = _retry_after_seconds(exc) or 5.0
|
||||
logger.warning(
|
||||
"Reddit RSS 429 for r/%s · %s — backing off %.1fs then retrying once",
|
||||
sub, ticker, wait,
|
||||
)
|
||||
time.sleep(wait)
|
||||
return _fetch_subreddit_rss(ticker, sub, limit, timeout, _retry=False)
|
||||
logger.warning("Reddit RSS fetch failed for r/%s · %s: %s", sub, ticker, exc)
|
||||
return []
|
||||
except (OSError, http.client.HTTPException, ET.ParseError) as exc:
|
||||
# OSError covers URLError/TimeoutError/connection resets; HTTPException
|
||||
# covers chunked-transfer errors (IncompleteRead/BadStatusLine, #1024).
|
||||
logger.warning("Reddit RSS fetch failed for r/%s · %s: %s", sub, ticker, exc)
|
||||
return []
|
||||
|
||||
@@ -116,12 +142,20 @@ def _fetch_subreddit_rss(
|
||||
return posts
|
||||
|
||||
|
||||
def _fetch_subreddit(
|
||||
def _fetch_subreddit_json(
|
||||
ticker: str,
|
||||
sub: str,
|
||||
limit: int,
|
||||
timeout: float,
|
||||
) -> list[dict]:
|
||||
"""Richer JSON search path (carries score / comment counts).
|
||||
|
||||
Reddit's WAF currently returns ``403 Blocked`` on this endpoint for
|
||||
non-OAuth clients (issue #862), so it is NOT used by default — calling it on
|
||||
every request only doubled our volume against the per-IP rate limit and
|
||||
triggered 429s on the RSS fallback. Kept for the day the WAF relaxes or an
|
||||
OAuth token is wired in; degrades to RSS on failure.
|
||||
"""
|
||||
url = _API.format(sub=sub, qs=_search_qs(ticker, limit))
|
||||
req = Request(url, headers={"User-Agent": _UA, "Accept": "application/json"})
|
||||
try:
|
||||
@@ -129,7 +163,7 @@ def _fetch_subreddit(
|
||||
payload = json.loads(resp.read())
|
||||
children = (payload.get("data") or {}).get("children") or []
|
||||
return [c.get("data", {}) for c in children if isinstance(c, dict)]
|
||||
except (HTTPError, URLError, json.JSONDecodeError, TimeoutError) as exc:
|
||||
except (OSError, http.client.HTTPException, json.JSONDecodeError) as exc:
|
||||
logger.warning(
|
||||
"Reddit JSON fetch failed for r/%s · %s: %s — falling back to RSS feed.",
|
||||
sub, ticker, exc,
|
||||
@@ -137,18 +171,34 @@ def _fetch_subreddit(
|
||||
return _fetch_subreddit_rss(ticker, sub, limit, timeout)
|
||||
|
||||
|
||||
def _fetch_subreddit(
|
||||
ticker: str,
|
||||
sub: str,
|
||||
limit: int,
|
||||
timeout: float,
|
||||
) -> list[dict]:
|
||||
"""Fetch one subreddit, RSS-first.
|
||||
|
||||
The JSON search endpoint is reliably WAF-blocked (403) for public clients,
|
||||
so we go straight to the RSS feed — which serves our identified User-Agent
|
||||
reliably — halving our request volume against Reddit's per-IP rate limit.
|
||||
"""
|
||||
return _fetch_subreddit_rss(ticker, sub, limit, timeout)
|
||||
|
||||
|
||||
def fetch_reddit_posts(
|
||||
ticker: str,
|
||||
subreddits: Iterable[str] = DEFAULT_SUBREDDITS,
|
||||
limit_per_sub: int = 5,
|
||||
timeout: float = 10.0,
|
||||
inter_request_delay: float = 0.4,
|
||||
inter_request_delay: float = 1.0,
|
||||
) -> str:
|
||||
"""Fetch recent Reddit posts mentioning ``ticker`` across finance
|
||||
subreddits and return them as a formatted plaintext block.
|
||||
|
||||
``inter_request_delay`` keeps us under Reddit's public rate limit
|
||||
(~10 req/min per IP) even if the caller queries many subreddits.
|
||||
``inter_request_delay`` paces the (now RSS-only) per-subreddit requests to
|
||||
stay under Reddit's public per-IP rate limit; combined with the RSS-first
|
||||
path it makes 429s rare even when several analyses run back-to-back.
|
||||
"""
|
||||
blocks = []
|
||||
total_posts = 0
|
||||
|
||||
Reference in New Issue
Block a user