* 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>
278 lines
12 KiB
Python
278 lines
12 KiB
Python
# dfs_deep_crawl_strategy.py
|
|
from typing import AsyncGenerator, Optional, Set, Dict, List, Tuple
|
|
|
|
from ..models import CrawlResult
|
|
from .bfs_strategy import BFSDeepCrawlStrategy # noqa
|
|
from ..types import AsyncWebCrawler, CrawlerRunConfig
|
|
from ..utils import normalize_url_for_deep_crawl
|
|
|
|
class DFSDeepCrawlStrategy(BFSDeepCrawlStrategy):
|
|
"""
|
|
Depth-first deep crawling with familiar BFS rules.
|
|
|
|
We reuse the same filters, scoring, and page limits from :class:`BFSDeepCrawlStrategy`,
|
|
but walk the graph with a stack so we fully explore one branch before hopping to the
|
|
next. DFS also keeps its own ``_dfs_seen`` set so we can drop duplicate links at
|
|
discovery time without accidentally marking them as “already crawled”.
|
|
"""
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super().__init__(*args, **kwargs)
|
|
self._dfs_seen: Set[str] = set()
|
|
|
|
def _reset_seen(self, start_url: str) -> None:
|
|
"""Start each crawl with a clean dedupe set seeded with the root URL."""
|
|
self._dfs_seen = {start_url}
|
|
|
|
async def _arun_batch(
|
|
self,
|
|
start_url: str,
|
|
crawler: AsyncWebCrawler,
|
|
config: CrawlerRunConfig,
|
|
) -> List[CrawlResult]:
|
|
"""
|
|
Crawl level-by-level but emit results at the end.
|
|
|
|
We keep a stack of ``(url, parent, depth)`` tuples, pop one at a time, and
|
|
hand it to ``crawler.arun_many`` with deep crawling disabled so we remain
|
|
in control of traversal. Every successful page bumps ``_pages_crawled`` and
|
|
seeds new stack items discovered via :meth:`link_discovery`.
|
|
"""
|
|
# Conditional state initialization for resume support
|
|
if self._resume_state:
|
|
visited = set(self._resume_state.get("visited", []))
|
|
stack = [
|
|
(item["url"], item["parent_url"], item["depth"])
|
|
for item in self._resume_state.get("stack", [])
|
|
]
|
|
depths = dict(self._resume_state.get("depths", {}))
|
|
self._pages_crawled = self._resume_state.get("pages_crawled", 0)
|
|
self._dfs_seen = set(self._resume_state.get("dfs_seen", []))
|
|
results: List[CrawlResult] = []
|
|
else:
|
|
# Original initialization
|
|
visited: Set[str] = set()
|
|
# Stack items: (url, parent_url, depth)
|
|
stack: List[Tuple[str, Optional[str], int]] = [(start_url, None, 0)]
|
|
depths: Dict[str, int] = {start_url: 0}
|
|
results: List[CrawlResult] = []
|
|
self._reset_seen(start_url)
|
|
|
|
while stack and not self._cancel_event.is_set():
|
|
url, parent, depth = stack.pop()
|
|
if url in visited or depth > self.max_depth:
|
|
continue
|
|
visited.add(url)
|
|
|
|
# Clone config to disable recursive deep crawling.
|
|
batch_config = config.clone(deep_crawl_strategy=None, stream=False)
|
|
url_results = await crawler.arun_many(urls=[url], config=batch_config)
|
|
|
|
for result in url_results:
|
|
result.metadata = result.metadata or {}
|
|
result.metadata["depth"] = depth
|
|
result.metadata["parent_url"] = parent
|
|
if self.url_scorer:
|
|
result.metadata["score"] = self.url_scorer.score(url)
|
|
results.append(result)
|
|
|
|
# Count only successful crawls toward max_pages limit
|
|
if result.success:
|
|
self._pages_crawled += 1
|
|
# Check if we've reached the limit during batch processing
|
|
if self._pages_crawled >= self.max_pages:
|
|
self.logger.info(f"Max pages limit ({self.max_pages}) reached during batch, stopping crawl")
|
|
break # Exit the generator
|
|
|
|
# Only discover links from successful crawls
|
|
new_links: List[Tuple[str, Optional[str]]] = []
|
|
await self.link_discovery(result, url, depth, visited, new_links, depths)
|
|
|
|
# Push new links in reverse order so the first discovered is processed next.
|
|
for new_url, new_parent in reversed(new_links):
|
|
new_depth = depths.get(new_url, depth + 1)
|
|
stack.append((new_url, new_parent, new_depth))
|
|
|
|
# Capture state after each URL processed (if callback set)
|
|
if self._on_state_change:
|
|
state = {
|
|
"strategy_type": "dfs",
|
|
"visited": list(visited),
|
|
"stack": [
|
|
{"url": u, "parent_url": p, "depth": d}
|
|
for u, p, d in stack
|
|
],
|
|
"depths": depths,
|
|
"pages_crawled": self._pages_crawled,
|
|
"dfs_seen": list(self._dfs_seen),
|
|
}
|
|
self._last_state = state
|
|
await self._on_state_change(state)
|
|
return results
|
|
|
|
async def _arun_stream(
|
|
self,
|
|
start_url: str,
|
|
crawler: AsyncWebCrawler,
|
|
config: CrawlerRunConfig,
|
|
) -> AsyncGenerator[CrawlResult, None]:
|
|
"""
|
|
Same traversal as :meth:`_arun_batch`, but yield pages immediately.
|
|
|
|
Each popped URL is crawled, its metadata annotated, then the result gets
|
|
yielded before we even look at the next stack entry. Successful crawls
|
|
still feed :meth:`link_discovery`, keeping DFS order intact.
|
|
"""
|
|
# Conditional state initialization for resume support
|
|
if self._resume_state:
|
|
visited = set(self._resume_state.get("visited", []))
|
|
stack = [
|
|
(item["url"], item["parent_url"], item["depth"])
|
|
for item in self._resume_state.get("stack", [])
|
|
]
|
|
depths = dict(self._resume_state.get("depths", {}))
|
|
self._pages_crawled = self._resume_state.get("pages_crawled", 0)
|
|
self._dfs_seen = set(self._resume_state.get("dfs_seen", []))
|
|
else:
|
|
# Original initialization
|
|
visited: Set[str] = set()
|
|
stack: List[Tuple[str, Optional[str], int]] = [(start_url, None, 0)]
|
|
depths: Dict[str, int] = {start_url: 0}
|
|
self._reset_seen(start_url)
|
|
|
|
while stack and not self._cancel_event.is_set():
|
|
url, parent, depth = stack.pop()
|
|
if url in visited or depth > self.max_depth:
|
|
continue
|
|
visited.add(url)
|
|
|
|
stream_config = config.clone(deep_crawl_strategy=None, stream=True)
|
|
stream_gen = await crawler.arun_many(urls=[url], config=stream_config)
|
|
async for result in stream_gen:
|
|
result.metadata = result.metadata or {}
|
|
result.metadata["depth"] = depth
|
|
result.metadata["parent_url"] = parent
|
|
if self.url_scorer:
|
|
result.metadata["score"] = self.url_scorer.score(url)
|
|
yield result
|
|
|
|
# Only count successful crawls toward max_pages limit
|
|
# and only discover links from successful crawls
|
|
if result.success:
|
|
self._pages_crawled += 1
|
|
# Check if we've reached the limit during batch processing
|
|
if self._pages_crawled >= self.max_pages:
|
|
self.logger.info(f"Max pages limit ({self.max_pages}) reached during batch, stopping crawl")
|
|
break # Exit the generator
|
|
|
|
new_links: List[Tuple[str, Optional[str]]] = []
|
|
await self.link_discovery(result, url, depth, visited, new_links, depths)
|
|
for new_url, new_parent in reversed(new_links):
|
|
new_depth = depths.get(new_url, depth + 1)
|
|
stack.append((new_url, new_parent, new_depth))
|
|
|
|
# Capture state after each URL processed (if callback set)
|
|
if self._on_state_change:
|
|
state = {
|
|
"strategy_type": "dfs",
|
|
"visited": list(visited),
|
|
"stack": [
|
|
{"url": u, "parent_url": p, "depth": d}
|
|
for u, p, d in stack
|
|
],
|
|
"depths": depths,
|
|
"pages_crawled": self._pages_crawled,
|
|
"dfs_seen": list(self._dfs_seen),
|
|
}
|
|
self._last_state = state
|
|
await self._on_state_change(state)
|
|
|
|
async def link_discovery(
|
|
self,
|
|
result: CrawlResult,
|
|
source_url: str,
|
|
current_depth: int,
|
|
_visited: Set[str],
|
|
next_level: List[Tuple[str, Optional[str]]],
|
|
depths: Dict[str, int],
|
|
) -> None:
|
|
"""
|
|
Find the next URLs we should push onto the DFS stack.
|
|
|
|
Parameters
|
|
----------
|
|
result : CrawlResult
|
|
Output of the page we just crawled; its ``links`` block is our raw material.
|
|
source_url : str
|
|
URL of the parent page; stored so callers can track ancestry.
|
|
current_depth : int
|
|
Depth of the parent; children naturally sit at ``current_depth + 1``.
|
|
_visited : Set[str]
|
|
Present to match the BFS signature, but we rely on ``_dfs_seen`` instead.
|
|
next_level : list of tuples
|
|
The stack buffer supplied by the caller; we append new ``(url, parent)`` items here.
|
|
depths : dict
|
|
Shared depth map so future metadata tagging knows how deep each URL lives.
|
|
|
|
Notes
|
|
-----
|
|
- ``_dfs_seen`` keeps us from pushing duplicates without touching the traversal guard.
|
|
- Validation, scoring, and capacity trimming mirror the BFS version so behaviour stays consistent.
|
|
"""
|
|
next_depth = current_depth + 1
|
|
if next_depth > self.max_depth:
|
|
return
|
|
|
|
remaining_capacity = self.max_pages - self._pages_crawled
|
|
if remaining_capacity <= 0:
|
|
self.logger.info(
|
|
f"Max pages limit ({self.max_pages}) reached, stopping link discovery"
|
|
)
|
|
return
|
|
|
|
links = result.links.get("internal", [])
|
|
if self.include_external:
|
|
links += result.links.get("external", [])
|
|
|
|
seen = self._dfs_seen
|
|
valid_links: List[Tuple[str, float]] = []
|
|
|
|
for link in links:
|
|
raw_url = link.get("href")
|
|
if not raw_url:
|
|
continue
|
|
|
|
normalized_url = normalize_url_for_deep_crawl(raw_url, source_url)
|
|
if not normalized_url or normalized_url in seen:
|
|
continue
|
|
|
|
if not await self.can_process_url(raw_url, next_depth):
|
|
self.stats.urls_skipped += 1
|
|
continue
|
|
|
|
score = self.url_scorer.score(normalized_url) if self.url_scorer else 0
|
|
if score < self.score_threshold:
|
|
self.logger.debug(
|
|
f"URL {normalized_url} skipped: score {score} below threshold {self.score_threshold}"
|
|
)
|
|
self.stats.urls_skipped += 1
|
|
continue
|
|
|
|
seen.add(normalized_url)
|
|
valid_links.append((normalized_url, score))
|
|
|
|
if len(valid_links) > remaining_capacity:
|
|
if self.url_scorer:
|
|
valid_links.sort(key=lambda x: x[1], reverse=True)
|
|
valid_links = valid_links[:remaining_capacity]
|
|
self.logger.info(
|
|
f"Limiting to {remaining_capacity} URLs due to max_pages limit"
|
|
)
|
|
|
|
for url, score in valid_links:
|
|
if score:
|
|
result.metadata = result.metadata or {}
|
|
result.metadata["score"] = score
|
|
next_level.append((url, source_url))
|
|
depths[url] = next_depth
|