jarianc/StockDocs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request 'fix: close #1 - add bot-detection evasion for Reuters scraping' (#5) from fix/issue-1 into master

Browse Source 
Reviewed-on: https://git.example.com/jarianc/StockDocs/pulls/5
This commit is contained in:
Jarian Cottingham 2026-07-05 00:23:13 -05:00
commit db7bbf5907
3 changed files with 99 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
scraper/cron_scraper.py
View File

@ -6,12 +6,14 @@ that can be scheduled via cron job.
""" """
import newspaper import newspaper
from newspaper import Config
import json import json
import feedparser import feedparser
import time import time
import os import os
import requests import requests
import logging import logging
import random
from datetime import datetime from datetime import datetime
from selenium import webdriver from selenium import webdriver
from selenium.webdriver.firefox.options import Options as FirefoxOptions from selenium.webdriver.firefox.options import Options as FirefoxOptions
@ -30,6 +32,18 @@ logging.basicConfig(
) )
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# Rotating User-Agents to bypass bot detection (Reuters, etc.)
USER_AGENTS = [
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
"Mozilla/5.0 (Macintosh; Intel Mac OS X 14_5) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Safari/605.1.15",
"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0",
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
"Mozilla/5.0 (Macintosh; Intel Mac OS X 14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
]
def get_random_ua():
return random.choice(USER_AGENTS)
# Robust file path handling - try multiple locations # Robust file path handling - try multiple locations
def get_feed_file_path(): def get_feed_file_path():
"""Get the RSS feed file path, trying multiple locations.""" """Get the RSS feed file path, trying multiple locations."""
@ -165,19 +179,22 @@ def save_article_to_file(article, filename, source="Unfiltered"):
def get_article_with_selenium(url): def get_article_with_selenium(url):
""" """
Gets article text using Selenium Firefox driver with proper error handling Gets article text using Selenium Firefox driver with proper error handling,
and cleanup. cleanup, and bot-detection evasion.
""" """
driver = None driver = None
try: try:
# Configure Firefox options # Configure Firefox options with bot-detection evasion
options = FirefoxOptions() options = FirefoxOptions()
options.add_argument("--headless") options.add_argument("--headless")
options.set_preference("dom.ipc.processCount", 1) # Reduce process count options.set_preference("dom.ipc.processCount", 1)
options.set_preference("general.useragent.override", get_random_ua())
options.set_preference("permissions.default.image", 2)
options.set_preference("dom.webnotifications.enabled", False)
# Initialize driver with timeout # Initialize driver with timeout
driver = webdriver.Firefox(options=options) driver = webdriver.Firefox(options=options)
driver.set_page_load_timeout(30) # 30 seconds timeout driver.set_page_load_timeout(30)
# Navigate to URL # Navigate to URL
driver.get(url) driver.get(url)
@ -188,9 +205,9 @@ def get_article_with_selenium(url):
EC.presence_of_element_located((By.TAG_NAME, "body")) EC.presence_of_element_located((By.TAG_NAME, "body"))
) )
except: except:
pass # Continue even if wait times out pass
time.sleep(2) # Brief additional wait time.sleep(random.uniform(1, 3))
html = driver.page_source html = driver.page_source
@ -204,42 +221,45 @@ def get_article_with_selenium(url):
logger.error(f"Selenium failed for {url}: {str(e)}") logger.error(f"Selenium failed for {url}: {str(e)}")
return "" return ""
finally: finally:
# Always quit the driver
if driver: if driver:
try: try:
driver.quit() driver.quit()
except: except:
pass # Ignore errors in cleanup pass
def get_article_with_playwright(url): def get_article_with_playwright(url):
""" """
Gets article text using Playwright with proper error handling. Gets article text using Playwright with proper bot-detection evasion.
""" """
try: try:
from playwright.sync_api import sync_playwright from playwright.sync_api import sync_playwright
with sync_playwright() as p: with sync_playwright() as p:
# Use Chromium instead of Firefox for better compatibility
browser = p.chromium.launch(headless=True, timeout=30000) browser = p.chromium.launch(headless=True, timeout=30000)
page = browser.new_page() context = browser.new_context(
user_agent=get_random_ua(),
# Set user agent to avoid bot detection viewport={"width": 1920, "height": 1080},
page.set_extra_http_headers( locale="en-US",
{ timezone_id="America/New_York",
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
}
) )
page = context.new_page()
page.goto(url, wait_until="load") page.set_extra_http_headers({
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
"Accept-Language": "en-US,en;q=0.9",
"Accept-Encoding": "gzip, deflate, br",
"Connection": "keep-alive",
"Upgrade-Insecure-Requests": "1",
})
# Wait for content to load page.goto(url, wait_until="domcontentloaded", timeout=30000)
time.sleep(3) time.sleep(random.uniform(2, 4))
html = page.content() html = page.content()
context.close()
browser.close() browser.close()
# Parse with Newspaper4k
article = newspaper.article(url, input_html=html, language="en") article = newspaper.article(url, input_html=html, language="en")
article.nlp() article.nlp()
logger.info(f"Successfully extracted article with Playwright from {url}") logger.info(f"Successfully extracted article with Playwright from {url}")
@ -265,11 +285,16 @@ def pull_article(link, source, title=None, save_to_file=True):
) as f: ) as f:
return f.read() return f.read()
# Random delay before fetching to avoid rate-limiting / bot detection
time.sleep(random.uniform(0.5, 2))
text = "" text = ""
try: try:
# Try newspaper4k first # Try newspaper4k first with proper User-Agent to bypass bot detection
article = newspaper.article(link) ua = get_random_ua()
config = Config(browser_user_agent=ua)
article = newspaper.article(link, browser_user_agent=ua)
article.download() article.download()
article.parse() article.parse()
text = article.text text = article.text

2
scraper/rss_feeds.json
View File

@ -2,7 +2,7 @@
"rss_feeds": { "rss_feeds": {
"Reuters – Business News": { "Reuters – Business News": {
"source_website": "reuters.com", "source_website": "reuters.com",
"rss_url": "https://news.google.com/rss/search?q=site:reuters.com+business&hl=en-US&gl=US&ceid=US:en" "rss_url": "https://www.reutersagency.com/feed/"
}, },
"Associated Press – Business": { "Associated Press – Business": {
"source_website": "apnews.com", "source_website": "apnews.com",

67
scraper/scraper.py
View File

@ -1,9 +1,11 @@
import newspaper import newspaper
from newspaper import Config
import json import json
import feedparser import feedparser
import time import time
import os import os
import logging import logging
import random
from datetime import datetime from datetime import datetime
from selenium import webdriver from selenium import webdriver
from selenium.webdriver.firefox.options import Options as FirefoxOptions from selenium.webdriver.firefox.options import Options as FirefoxOptions
@ -27,6 +29,18 @@ MAX_FEED_WORKERS = int(os.getenv("MAX_FEED_WORKERS", "10"))
MAX_ARTICLE_WORKERS = int(os.getenv("MAX_ARTICLE_WORKERS", "10")) MAX_ARTICLE_WORKERS = int(os.getenv("MAX_ARTICLE_WORKERS", "10"))
BATCH_SIZE = int(os.getenv("BATCH_SIZE", "50")) # Batch processing size BATCH_SIZE = int(os.getenv("BATCH_SIZE", "50")) # Batch processing size
# Rotating User-Agents to bypass bot detection (Reuters, etc.)
USER_AGENTS = [
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
"Mozilla/5.0 (Macintosh; Intel Mac OS X 14_5) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Safari/605.1.15",
"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0",
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
"Mozilla/5.0 (Macintosh; Intel Mac OS X 14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
]
def get_random_ua():
return random.choice(USER_AGENTS)
# Ensure necessary NLTK resources are downloaded # Ensure necessary NLTK resources are downloaded
d = Downloader() d = Downloader()
if not d.is_installed("punkt_tab"): if not d.is_installed("punkt_tab"):
@ -237,15 +251,18 @@ def save_article_to_file(article, filename, source="Unfiltered"):
def get_article_with_selenium(url): def get_article_with_selenium(url):
""" """
Gets article text using Selenium Firefox driver with proper error handling Gets article text using Selenium Firefox driver with proper error handling,
and cleanup. cleanup, and bot-detection evasion.
""" """
driver = None driver = None
try: try:
# Configure Firefox options # Configure Firefox options with bot-detection evasion
options = FirefoxOptions() options = FirefoxOptions()
options.add_argument("--headless") options.add_argument("--headless")
options.set_preference("dom.ipc.processCount", 1) # Reduce process count options.set_preference("dom.ipc.processCount", 1)
options.set_preference("general.useragent.override", get_random_ua())
options.set_preference("permissions.default.image", 2) # Block images for speed
options.set_preference("dom.webnotifications.enabled", False)
# Try to initialize driver with explicit path to Firefox # Try to initialize driver with explicit path to Firefox
try: try:
@ -272,7 +289,7 @@ def get_article_with_selenium(url):
except: except:
pass # Continue even if wait times out pass # Continue even if wait times out
time.sleep(2) # Brief additional wait time.sleep(random.uniform(1, 3)) # Random wait to mimic human behavior
html = driver.page_source html = driver.page_source
@ -302,29 +319,38 @@ def get_article_with_selenium(url):
def get_article_with_playwright(url): def get_article_with_playwright(url):
""" """
Gets article text using Playwright with proper error handling. Gets article text using Playwright with proper bot-detection evasion.
""" """
try: try:
from playwright.sync_api import sync_playwright from playwright.sync_api import sync_playwright
with sync_playwright() as p: with sync_playwright() as p:
# Use Chromium instead of Firefox for better compatibility # Use Chromium with full browser context for UA spoofing
browser = p.chromium.launch(headless=True, timeout=30000) browser = p.chromium.launch(headless=True, timeout=30000)
page = browser.new_page() context = browser.new_context(
user_agent=get_random_ua(),
# Set user agent to avoid bot detection viewport={"width": 1920, "height": 1080},
page.set_extra_http_headers( locale="en-US",
{ timezone_id="America/New_York",
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
}
) )
page = context.new_page()
page.goto(url, wait_until="load") # Additional headers for legitimacy
page.set_extra_http_headers({
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
"Accept-Language": "en-US,en;q=0.9",
"Accept-Encoding": "gzip, deflate, br",
"Connection": "keep-alive",
"Upgrade-Insecure-Requests": "1",
})
page.goto(url, wait_until="domcontentloaded", timeout=30000)
# Wait for content to load # Wait for content to load
time.sleep(3) time.sleep(random.uniform(2, 4))
html = page.content() html = page.content()
context.close()
browser.close() browser.close()
# Parse with Newspaper4k # Parse with Newspaper4k
@ -353,11 +379,16 @@ def pull_article(link, source, title=None, save_to_file=True):
) as f: ) as f:
return f.read() return f.read()
# Random delay before fetching to avoid rate-limiting / bot detection
time.sleep(random.uniform(0.5, 2))
text = "" text = ""
try: try:
# Try newspaper4k first # Try newspaper4k first with proper User-Agent to bypass bot detection
article = newspaper.article(link) ua = get_random_ua()
config = Config(browser_user_agent=ua)
article = newspaper.article(link, browser_user_agent=ua)
article.download() article.download()
article.parse() article.parse()
text = article.text text = article.text