f6f7f1b551
* Fix: Use correct URL variable for raw HTML extraction (#1116) - Prevents full HTML content from being passed as URL to extraction strategies - Added unit tests to verify raw HTML and regular URL processing Fix: Wrong URL variable used for extraction of raw html * Fix #1181: Preserve whitespace in code blocks during HTML scraping The remove_empty_elements_fast() method was removing whitespace-only span elements inside <pre> and <code> tags, causing import statements like "import torch" to become "importtorch". Now skips elements inside code blocks where whitespace is significant. * Refactor Pydantic model configuration to use ConfigDict for arbitrary types * Fix EmbeddingStrategy: Uncomment response handling for the variations and clean up mock data. ref #1621 * Fix: permission issues with .cache/url_seeder and other runtime cache dirs. ref #1638 * fix: ensure BrowserConfig.to_dict serializes proxy_config * feat: make LLM backoff configurable end-to-end - extend LLMConfig with backoff delay/attempt/factor fields and thread them through LLMExtractionStrategy, LLMContentFilter, table extraction, and Docker API handlers - expose the backoff parameter knobs on perform_completion_with_backoff/aperform_completion_with_backoff and document them in the md_v2 guides * reproduced AttributeError from #1642 * pass timeout parameter to docker client request * added missing deep crawling objects to init * generalized query in ContentRelevanceFilter to be a str or list * import modules from enhanceable deserialization * parameterized tests * Fix: capture current page URL to reflect JavaScript navigation and add test for delayed redirects. ref #1268 * refactor: replace PyPDF2 with pypdf across the codebase. ref #1412 * Add browser_context_id and target_id parameters to BrowserConfig Enable Crawl4AI to connect to pre-created CDP browser contexts, which is essential for cloud browser services that pre-create isolated contexts. Changes: - Add browser_context_id and target_id parameters to BrowserConfig - Update from_kwargs() and to_dict() methods - Modify BrowserManager.start() to use existing context when provided - Add _get_page_by_target_id() helper method - Update get_page() to handle pre-existing targets - Add test for browser_context_id functionality This enables cloud services to: 1. Create isolated CDP contexts before Crawl4AI connects 2. Pass context/target IDs to BrowserConfig 3. Have Crawl4AI reuse existing contexts instead of creating new ones * Add cdp_cleanup_on_close flag to prevent memory leaks in cloud/server scenarios * Fix: add cdp_cleanup_on_close to from_kwargs * Fix: find context by target_id for concurrent CDP connections * Fix: use target_id to find correct page in get_page * Fix: use CDP to find context by browserContextId for concurrent sessions * Revert context matching attempts - Playwright cannot see CDP-created contexts * Add create_isolated_context flag for concurrent CDP crawls When True, forces creation of a new browser context instead of reusing the default context. Essential for concurrent crawls on the same browser to prevent navigation conflicts. * Add context caching to create_isolated_context branch Uses contexts_by_config cache (same as non-CDP mode) to reuse contexts for multiple URLs with same config. Still creates new page per crawl for navigation isolation. Benefits batch/deep crawls. * Add init_scripts support to BrowserConfig for pre-page-load JS injection This adds the ability to inject JavaScript that runs before any page loads, useful for stealth evasions (canvas/audio fingerprinting, userAgentData). - Add init_scripts parameter to BrowserConfig (list of JS strings) - Apply init_scripts in setup_context() via context.add_init_script() - Update from_kwargs() and to_dict() for serialization * Fix CDP connection handling: support WS URLs and proper cleanup Changes to browser_manager.py: 1. _verify_cdp_ready(): Support multiple URL formats - WebSocket URLs (ws://, wss://): Skip HTTP verification, Playwright handles directly - HTTP URLs with query params: Properly parse with urlparse to preserve query string - Fixes issue where naive f"{cdp_url}/json/version" broke WS URLs and query params 2. close(): Proper cleanup when cdp_cleanup_on_close=True - Close all sessions (pages) - Close all contexts - Call browser.close() to disconnect (doesn't terminate browser, just releases connection) - Wait 1 second for CDP connection to fully release - Stop Playwright instance to prevent memory leaks This enables: - Connecting to specific browsers via WS URL - Reusing the same browser with multiple sequential connections - No user wait needed between connections (internal 1s delay handles it) Added tests/browser/test_cdp_cleanup_reuse.py with comprehensive tests. * Update gitignore * Some debugging for caching * Add _generate_screenshot_from_html for raw: and file:// URLs Implements the missing method that was being called but never defined. Now raw: and file:// URLs can generate screenshots by: 1. Loading HTML into a browser page via page.set_content() 2. Taking screenshot using existing take_screenshot() method 3. Cleaning up the page afterward This enables cached HTML to be rendered with screenshots in crawl4ai-cloud. * Add PDF and MHTML support for raw: and file:// URLs - Replace _generate_screenshot_from_html with _generate_media_from_html - New method handles screenshot, PDF, and MHTML in one browser session - Update raw: and file:// URL handlers to use new method - Enables cached HTML to generate all media types * Add crash recovery for deep crawl strategies Add optional resume_state and on_state_change parameters to all deep crawl strategies (BFS, DFS, Best-First) for cloud deployment crash recovery. Features: - resume_state: Pass saved state to resume from checkpoint - on_state_change: Async callback fired after each URL for real-time state persistence to external storage (Redis, DB, etc.) - export_state(): Get last captured state manually - Zero overhead when features are disabled (None defaults) State includes visited URLs, pending queue/stack, depths, and pages_crawled count. All state is JSON-serializable. * Fix: HTTP strategy raw: URL parsing truncates at # character The AsyncHTTPCrawlerStrategy.crawl() method used urlparse() to extract content from raw: URLs. This caused HTML with CSS color codes like #eee to be truncated because # is treated as a URL fragment delimiter. Before: raw:body{background:#eee} -> parsed.path = 'body{background:' After: raw:body{background:#eee} -> raw_content = 'body{background:#eee' Fix: Strip the raw: or raw:// prefix directly instead of using urlparse, matching how the browser strategy handles it. * Add base_url parameter to CrawlerRunConfig for raw HTML processing When processing raw: HTML (e.g., from cache), the URL parameter is meaningless for markdown link resolution. This adds a base_url parameter that can be set explicitly to provide proper URL resolution context. Changes: - Add base_url parameter to CrawlerRunConfig.__init__ - Add base_url to CrawlerRunConfig.from_kwargs - Update aprocess_html to use base_url for markdown generation Usage: config = CrawlerRunConfig(base_url='https://example.com') result = await crawler.arun(url='raw:{html}', config=config) * Add prefetch mode for two-phase deep crawling - Add `prefetch` parameter to CrawlerRunConfig - Add `quick_extract_links()` function for fast link extraction - Add short-circuit in aprocess_html() for prefetch mode - Add 42 tests (unit, integration, regression) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Updates on proxy rotation and proxy configuration * Add proxy support to HTTP crawler strategy * Add browser pipeline support for raw:/file:// URLs - Add process_in_browser parameter to CrawlerRunConfig - Route raw:/file:// URLs through _crawl_web() when browser operations needed - Use page.set_content() instead of goto() for local content - Fix cookie handling for non-HTTP URLs in browser_manager - Auto-detect browser requirements: js_code, wait_for, screenshot, etc. - Maintain fast path for raw:/file:// without browser params Fixes #310 * Add smart TTL cache for sitemap URL seeder - Add cache_ttl_hours and validate_sitemap_lastmod params to SeedingConfig - New JSON cache format with metadata (version, created_at, lastmod, url_count) - Cache validation by TTL expiry and sitemap lastmod comparison - Auto-migration from old .jsonl to new .json format - Fixes bug where incomplete cache was used indefinitely * Update URL seeder docs with smart TTL cache parameters - Add cache_ttl_hours and validate_sitemap_lastmod to parameter table - Document smart TTL cache validation with examples - Add cache-related troubleshooting entries - Update key features summary * Add MEMORY.md to gitignore * Docs: Add multi-sample schema generation section Add documentation explaining how to pass multiple HTML samples to generate_schema() for stable selectors that work across pages with varying DOM structures. Includes: - Problem explanation (fragile nth-child selectors) - Solution with code example - Key points for multi-sample queries - Comparison table of fragile vs stable selectors * Fix critical RCE and LFI vulnerabilities in Docker API deployment Security fixes for vulnerabilities reported by ProjectDiscovery: 1. Remote Code Execution via Hooks (CVE pending) - Remove __import__ from allowed_builtins in hook_manager.py - Prevents arbitrary module imports (os, subprocess, etc.) - Hooks now disabled by default via CRAWL4AI_HOOKS_ENABLED env var 2. Local File Inclusion via file:// URLs (CVE pending) - Add URL scheme validation to /execute_js, /screenshot, /pdf, /html - Block file://, javascript:, data: and other dangerous schemes - Only allow http://, https://, and raw: (where appropriate) 3. Security hardening - Add CRAWL4AI_HOOKS_ENABLED=false as default (opt-in for hooks) - Add security warning comments in config.yml - Add validate_url_scheme() helper for consistent validation Testing: - Add unit tests (test_security_fixes.py) - 16 tests - Add integration tests (run_security_tests.py) for live server Affected endpoints: - POST /crawl (hooks disabled by default) - POST /crawl/stream (hooks disabled by default) - POST /execute_js (URL validation added) - POST /screenshot (URL validation added) - POST /pdf (URL validation added) - POST /html (URL validation added) Breaking changes: - Hooks require CRAWL4AI_HOOKS_ENABLED=true to function - file:// URLs no longer work on API endpoints (use library directly) * Enhance authentication flow by implementing JWT token retrieval and adding authorization headers to API requests * Add release notes for v0.7.9, detailing breaking changes, security fixes, new features, bug fixes, and documentation updates * Add release notes for v0.8.0, detailing breaking changes, security fixes, new features, bug fixes, and documentation updates Documentation for v0.8.0 release: - SECURITY.md: Security policy and vulnerability reporting guidelines - RELEASE_NOTES_v0.8.0.md: Comprehensive release notes - migration/v0.8.0-upgrade-guide.md: Step-by-step migration guide - security/GHSA-DRAFT-RCE-LFI.md: GitHub security advisory drafts - CHANGELOG.md: Updated with v0.8.0 changes Breaking changes documented: - Docker API hooks disabled by default (CRAWL4AI_HOOKS_ENABLED) - file:// URLs blocked on Docker API endpoints Security fixes credited to Neo by ProjectDiscovery * Add examples for deep crawl crash recovery and prefetch mode in documentation * Release v0.8.0: The v0.8.0 Update - Updated version to 0.8.0 - Added comprehensive demo and release notes - Updated all documentation * Update security researcher acknowledgment with a hyperlink for Neo by ProjectDiscovery * Add async agenerate_schema method for schema generation - Extract prompt building to shared _build_schema_prompt() method - Add agenerate_schema() async version using aperform_completion_with_backoff - Refactor generate_schema() to use shared prompt builder - Fixes Gemini/Vertex AI compatibility in async contexts (FastAPI) * Fix: Enable litellm.drop_params for O-series/GPT-5 model compatibility O-series (o1, o3) and GPT-5 models only support temperature=1. Setting litellm.drop_params=True auto-drops unsupported parameters instead of throwing UnsupportedParamsError. Fixes temperature=0.01 error for these models in LLM extraction. --------- Co-authored-by: rbushria <rbushri@gmail.com> Co-authored-by: AHMET YILMAZ <tawfik@kidocode.com> Co-authored-by: Soham Kukreti <kukretisoham@gmail.com> Co-authored-by: Chris Murphy <chris.murphy@klaviyo.com> Co-authored-by: unclecode <unclecode@kidocode.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
342 lines
11 KiB
Python
342 lines
11 KiB
Python
from typing import List, Dict, Optional, Tuple
|
|
from abc import ABC, abstractmethod
|
|
from itertools import cycle
|
|
import os
|
|
import asyncio
|
|
import time
|
|
|
|
|
|
########### ATTENTION PEOPLE OF EARTH ###########
|
|
# I have moved this config to async_configs.py, kept it here, in case someone still importing it, however
|
|
# be a dear and follow `from crawl4ai import ProxyConfig` instead :)
|
|
class ProxyConfig:
|
|
def __init__(
|
|
self,
|
|
server: str,
|
|
username: Optional[str] = None,
|
|
password: Optional[str] = None,
|
|
ip: Optional[str] = None,
|
|
):
|
|
"""Configuration class for a single proxy.
|
|
|
|
Args:
|
|
server: Proxy server URL (e.g., "http://127.0.0.1:8080")
|
|
username: Optional username for proxy authentication
|
|
password: Optional password for proxy authentication
|
|
ip: Optional IP address for verification purposes
|
|
"""
|
|
self.server = server
|
|
self.username = username
|
|
self.password = password
|
|
|
|
# Extract IP from server if not explicitly provided
|
|
self.ip = ip or self._extract_ip_from_server()
|
|
|
|
def _extract_ip_from_server(self) -> Optional[str]:
|
|
"""Extract IP address from server URL."""
|
|
try:
|
|
# Simple extraction assuming http://ip:port format
|
|
if "://" in self.server:
|
|
parts = self.server.split("://")[1].split(":")
|
|
return parts[0]
|
|
else:
|
|
parts = self.server.split(":")
|
|
return parts[0]
|
|
except Exception:
|
|
return None
|
|
|
|
@staticmethod
|
|
def from_string(proxy_str: str) -> "ProxyConfig":
|
|
"""Create a ProxyConfig from a string in the format 'ip:port:username:password'."""
|
|
parts = proxy_str.split(":")
|
|
if len(parts) == 4: # ip:port:username:password
|
|
ip, port, username, password = parts
|
|
return ProxyConfig(
|
|
server=f"http://{ip}:{port}",
|
|
username=username,
|
|
password=password,
|
|
ip=ip
|
|
)
|
|
elif len(parts) == 2: # ip:port only
|
|
ip, port = parts
|
|
return ProxyConfig(
|
|
server=f"http://{ip}:{port}",
|
|
ip=ip
|
|
)
|
|
else:
|
|
raise ValueError(f"Invalid proxy string format: {proxy_str}")
|
|
|
|
@staticmethod
|
|
def from_dict(proxy_dict: Dict) -> "ProxyConfig":
|
|
"""Create a ProxyConfig from a dictionary."""
|
|
return ProxyConfig(
|
|
server=proxy_dict.get("server"),
|
|
username=proxy_dict.get("username"),
|
|
password=proxy_dict.get("password"),
|
|
ip=proxy_dict.get("ip")
|
|
)
|
|
|
|
@staticmethod
|
|
def from_env(env_var: str = "PROXIES") -> List["ProxyConfig"]:
|
|
"""Load proxies from environment variable.
|
|
|
|
Args:
|
|
env_var: Name of environment variable containing comma-separated proxy strings
|
|
|
|
Returns:
|
|
List of ProxyConfig objects
|
|
"""
|
|
proxies = []
|
|
try:
|
|
proxy_list = os.getenv(env_var, "").split(",")
|
|
for proxy in proxy_list:
|
|
if not proxy:
|
|
continue
|
|
proxies.append(ProxyConfig.from_string(proxy))
|
|
except Exception as e:
|
|
print(f"Error loading proxies from environment: {e}")
|
|
return proxies
|
|
|
|
def to_dict(self) -> Dict:
|
|
"""Convert to dictionary representation."""
|
|
return {
|
|
"server": self.server,
|
|
"username": self.username,
|
|
"password": self.password,
|
|
"ip": self.ip
|
|
}
|
|
|
|
def clone(self, **kwargs) -> "ProxyConfig":
|
|
"""Create a copy of this configuration with updated values.
|
|
|
|
Args:
|
|
**kwargs: Key-value pairs of configuration options to update
|
|
|
|
Returns:
|
|
ProxyConfig: A new instance with the specified updates
|
|
"""
|
|
config_dict = self.to_dict()
|
|
config_dict.update(kwargs)
|
|
return ProxyConfig.from_dict(config_dict)
|
|
|
|
|
|
class ProxyRotationStrategy(ABC):
|
|
"""Base abstract class for proxy rotation strategies"""
|
|
|
|
@abstractmethod
|
|
async def get_next_proxy(self) -> Optional[ProxyConfig]:
|
|
"""Get next proxy configuration from the strategy"""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def add_proxies(self, proxies: List[ProxyConfig]):
|
|
"""Add proxy configurations to the strategy"""
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def get_proxy_for_session(
|
|
self,
|
|
session_id: str,
|
|
ttl: Optional[int] = None
|
|
) -> Optional[ProxyConfig]:
|
|
"""
|
|
Get or create a sticky proxy for a session.
|
|
|
|
If session_id already has an assigned proxy (and hasn't expired), return it.
|
|
If session_id is new, acquire a new proxy and associate it.
|
|
|
|
Args:
|
|
session_id: Unique session identifier
|
|
ttl: Optional time-to-live in seconds for this session
|
|
|
|
Returns:
|
|
ProxyConfig for this session
|
|
"""
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def release_session(self, session_id: str) -> None:
|
|
"""
|
|
Release a sticky session, making the proxy available for reuse.
|
|
|
|
Args:
|
|
session_id: Session to release
|
|
"""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def get_session_proxy(self, session_id: str) -> Optional[ProxyConfig]:
|
|
"""
|
|
Get the proxy for an existing session without creating new one.
|
|
|
|
Args:
|
|
session_id: Session to look up
|
|
|
|
Returns:
|
|
ProxyConfig if session exists and hasn't expired, None otherwise
|
|
"""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def get_active_sessions(self) -> Dict[str, ProxyConfig]:
|
|
"""
|
|
Get all active sticky sessions.
|
|
|
|
Returns:
|
|
Dictionary mapping session_id to ProxyConfig
|
|
"""
|
|
pass
|
|
|
|
class RoundRobinProxyStrategy(ProxyRotationStrategy):
|
|
"""Simple round-robin proxy rotation strategy using ProxyConfig objects.
|
|
|
|
Supports sticky sessions where a session_id can be bound to a specific proxy
|
|
for the duration of the session. This is useful for deep crawling where
|
|
you want to maintain the same IP address across multiple requests.
|
|
"""
|
|
|
|
def __init__(self, proxies: List[ProxyConfig] = None):
|
|
"""
|
|
Initialize with optional list of proxy configurations
|
|
|
|
Args:
|
|
proxies: List of ProxyConfig objects
|
|
"""
|
|
self._proxies: List[ProxyConfig] = []
|
|
self._proxy_cycle = None
|
|
# Session tracking: maps session_id -> (ProxyConfig, created_at, ttl)
|
|
self._sessions: Dict[str, Tuple[ProxyConfig, float, Optional[int]]] = {}
|
|
self._session_lock = asyncio.Lock()
|
|
|
|
if proxies:
|
|
self.add_proxies(proxies)
|
|
|
|
def add_proxies(self, proxies: List[ProxyConfig]):
|
|
"""Add new proxies to the rotation pool"""
|
|
self._proxies.extend(proxies)
|
|
self._proxy_cycle = cycle(self._proxies)
|
|
|
|
async def get_next_proxy(self) -> Optional[ProxyConfig]:
|
|
"""Get next proxy in round-robin fashion"""
|
|
if not self._proxy_cycle:
|
|
return None
|
|
return next(self._proxy_cycle)
|
|
|
|
async def get_proxy_for_session(
|
|
self,
|
|
session_id: str,
|
|
ttl: Optional[int] = None
|
|
) -> Optional[ProxyConfig]:
|
|
"""
|
|
Get or create a sticky proxy for a session.
|
|
|
|
If session_id already has an assigned proxy (and hasn't expired), return it.
|
|
If session_id is new, acquire a new proxy and associate it.
|
|
|
|
Args:
|
|
session_id: Unique session identifier
|
|
ttl: Optional time-to-live in seconds for this session
|
|
|
|
Returns:
|
|
ProxyConfig for this session
|
|
"""
|
|
async with self._session_lock:
|
|
# Check if session exists and hasn't expired
|
|
if session_id in self._sessions:
|
|
proxy, created_at, session_ttl = self._sessions[session_id]
|
|
|
|
# Check TTL expiration
|
|
effective_ttl = ttl if ttl is not None else session_ttl
|
|
if effective_ttl is not None:
|
|
elapsed = time.time() - created_at
|
|
if elapsed >= effective_ttl:
|
|
# Session expired, remove it and get new proxy
|
|
del self._sessions[session_id]
|
|
else:
|
|
return proxy
|
|
else:
|
|
return proxy
|
|
|
|
# Acquire new proxy for this session
|
|
proxy = await self.get_next_proxy()
|
|
if proxy:
|
|
self._sessions[session_id] = (proxy, time.time(), ttl)
|
|
|
|
return proxy
|
|
|
|
async def release_session(self, session_id: str) -> None:
|
|
"""
|
|
Release a sticky session, making the proxy available for reuse.
|
|
|
|
Args:
|
|
session_id: Session to release
|
|
"""
|
|
async with self._session_lock:
|
|
if session_id in self._sessions:
|
|
del self._sessions[session_id]
|
|
|
|
def get_session_proxy(self, session_id: str) -> Optional[ProxyConfig]:
|
|
"""
|
|
Get the proxy for an existing session without creating new one.
|
|
|
|
Args:
|
|
session_id: Session to look up
|
|
|
|
Returns:
|
|
ProxyConfig if session exists and hasn't expired, None otherwise
|
|
"""
|
|
if session_id not in self._sessions:
|
|
return None
|
|
|
|
proxy, created_at, ttl = self._sessions[session_id]
|
|
|
|
# Check TTL expiration
|
|
if ttl is not None:
|
|
elapsed = time.time() - created_at
|
|
if elapsed >= ttl:
|
|
return None
|
|
|
|
return proxy
|
|
|
|
def get_active_sessions(self) -> Dict[str, ProxyConfig]:
|
|
"""
|
|
Get all active sticky sessions (excluding expired ones).
|
|
|
|
Returns:
|
|
Dictionary mapping session_id to ProxyConfig
|
|
"""
|
|
current_time = time.time()
|
|
active_sessions = {}
|
|
|
|
for session_id, (proxy, created_at, ttl) in self._sessions.items():
|
|
# Skip expired sessions
|
|
if ttl is not None:
|
|
elapsed = current_time - created_at
|
|
if elapsed >= ttl:
|
|
continue
|
|
active_sessions[session_id] = proxy
|
|
|
|
return active_sessions
|
|
|
|
async def cleanup_expired_sessions(self) -> int:
|
|
"""
|
|
Remove all expired sessions from tracking.
|
|
|
|
Returns:
|
|
Number of sessions removed
|
|
"""
|
|
async with self._session_lock:
|
|
current_time = time.time()
|
|
expired = []
|
|
|
|
for session_id, (proxy, created_at, ttl) in self._sessions.items():
|
|
if ttl is not None:
|
|
elapsed = current_time - created_at
|
|
if elapsed >= ttl:
|
|
expired.append(session_id)
|
|
|
|
for session_id in expired:
|
|
del self._sessions[session_id]
|
|
|
|
return len(expired)
|