Compare commits
15 Commits
docker/fix
...
fix/dfs_de
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ceade853c3 | ||
|
|
1bd3de6a47 | ||
|
|
d56b0eb9a9 | ||
|
|
66175e132b | ||
|
|
a30548a98f | ||
|
|
2c918155aa | ||
|
|
854694ef33 | ||
|
|
6534ece026 | ||
|
|
89e28d4eee | ||
|
|
613097d121 | ||
|
|
44ef0682b0 | ||
|
|
46e1a67f61 | ||
|
|
7dfe528d43 | ||
|
|
2dc6588573 | ||
|
|
e3467c08f6 |
@@ -1383,9 +1383,10 @@ class AsyncPlaywrightCrawlerStrategy(AsyncCrawlerStrategy):
|
|||||||
try:
|
try:
|
||||||
await self.adapter.evaluate(page,
|
await self.adapter.evaluate(page,
|
||||||
f"""
|
f"""
|
||||||
(() => {{
|
(async () => {{
|
||||||
try {{
|
try {{
|
||||||
{remove_overlays_js}
|
const removeOverlays = {remove_overlays_js};
|
||||||
|
await removeOverlays();
|
||||||
return {{ success: true }};
|
return {{ success: true }};
|
||||||
}} catch (error) {{
|
}} catch (error) {{
|
||||||
return {{
|
return {{
|
||||||
|
|||||||
@@ -617,7 +617,17 @@ class AsyncWebCrawler:
|
|||||||
else config.chunking_strategy
|
else config.chunking_strategy
|
||||||
)
|
)
|
||||||
sections = chunking.chunk(content)
|
sections = chunking.chunk(content)
|
||||||
extracted_content = config.extraction_strategy.run(url, sections)
|
# extracted_content = config.extraction_strategy.run(url, sections)
|
||||||
|
|
||||||
|
# Use async version if available for better parallelism
|
||||||
|
if hasattr(config.extraction_strategy, 'arun'):
|
||||||
|
extracted_content = await config.extraction_strategy.arun(url, sections)
|
||||||
|
else:
|
||||||
|
# Fallback to sync version run in thread pool to avoid blocking
|
||||||
|
extracted_content = await asyncio.to_thread(
|
||||||
|
config.extraction_strategy.run, url, sections
|
||||||
|
)
|
||||||
|
|
||||||
extracted_content = json.dumps(
|
extracted_content = json.dumps(
|
||||||
extracted_content, indent=4, default=str, ensure_ascii=False
|
extracted_content, indent=4, default=str, ensure_ascii=False
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -369,6 +369,9 @@ class ManagedBrowser:
|
|||||||
]
|
]
|
||||||
if self.headless:
|
if self.headless:
|
||||||
flags.append("--headless=new")
|
flags.append("--headless=new")
|
||||||
|
# Add viewport flag if specified in config
|
||||||
|
if self.browser_config.viewport_height and self.browser_config.viewport_width:
|
||||||
|
flags.append(f"--window-size={self.browser_config.viewport_width},{self.browser_config.viewport_height}")
|
||||||
# merge common launch flags
|
# merge common launch flags
|
||||||
flags.extend(self.build_browser_flags(self.browser_config))
|
flags.extend(self.build_browser_flags(self.browser_config))
|
||||||
elif self.browser_type == "firefox":
|
elif self.browser_type == "firefox":
|
||||||
|
|||||||
@@ -4,14 +4,26 @@ from typing import AsyncGenerator, Optional, Set, Dict, List, Tuple
|
|||||||
from ..models import CrawlResult
|
from ..models import CrawlResult
|
||||||
from .bfs_strategy import BFSDeepCrawlStrategy # noqa
|
from .bfs_strategy import BFSDeepCrawlStrategy # noqa
|
||||||
from ..types import AsyncWebCrawler, CrawlerRunConfig
|
from ..types import AsyncWebCrawler, CrawlerRunConfig
|
||||||
|
from ..utils import normalize_url_for_deep_crawl
|
||||||
|
|
||||||
class DFSDeepCrawlStrategy(BFSDeepCrawlStrategy):
|
class DFSDeepCrawlStrategy(BFSDeepCrawlStrategy):
|
||||||
"""
|
"""
|
||||||
Depth-First Search (DFS) deep crawling strategy.
|
Depth-first deep crawling with familiar BFS rules.
|
||||||
|
|
||||||
Inherits URL validation and link discovery from BFSDeepCrawlStrategy.
|
We reuse the same filters, scoring, and page limits from :class:`BFSDeepCrawlStrategy`,
|
||||||
Overrides _arun_batch and _arun_stream to use a stack (LIFO) for DFS traversal.
|
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(
|
async def _arun_batch(
|
||||||
self,
|
self,
|
||||||
start_url: str,
|
start_url: str,
|
||||||
@@ -19,14 +31,19 @@ class DFSDeepCrawlStrategy(BFSDeepCrawlStrategy):
|
|||||||
config: CrawlerRunConfig,
|
config: CrawlerRunConfig,
|
||||||
) -> List[CrawlResult]:
|
) -> List[CrawlResult]:
|
||||||
"""
|
"""
|
||||||
Batch (non-streaming) DFS mode.
|
Crawl level-by-level but emit results at the end.
|
||||||
Uses a stack to traverse URLs in DFS order, aggregating CrawlResults into a list.
|
|
||||||
|
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`.
|
||||||
"""
|
"""
|
||||||
visited: Set[str] = set()
|
visited: Set[str] = set()
|
||||||
# Stack items: (url, parent_url, depth)
|
# Stack items: (url, parent_url, depth)
|
||||||
stack: List[Tuple[str, Optional[str], int]] = [(start_url, None, 0)]
|
stack: List[Tuple[str, Optional[str], int]] = [(start_url, None, 0)]
|
||||||
depths: Dict[str, int] = {start_url: 0}
|
depths: Dict[str, int] = {start_url: 0}
|
||||||
results: List[CrawlResult] = []
|
results: List[CrawlResult] = []
|
||||||
|
self._reset_seen(start_url)
|
||||||
|
|
||||||
while stack and not self._cancel_event.is_set():
|
while stack and not self._cancel_event.is_set():
|
||||||
url, parent, depth = stack.pop()
|
url, parent, depth = stack.pop()
|
||||||
@@ -71,12 +88,16 @@ class DFSDeepCrawlStrategy(BFSDeepCrawlStrategy):
|
|||||||
config: CrawlerRunConfig,
|
config: CrawlerRunConfig,
|
||||||
) -> AsyncGenerator[CrawlResult, None]:
|
) -> AsyncGenerator[CrawlResult, None]:
|
||||||
"""
|
"""
|
||||||
Streaming DFS mode.
|
Same traversal as :meth:`_arun_batch`, but yield pages immediately.
|
||||||
Uses a stack to traverse URLs in DFS order and yields CrawlResults as they become available.
|
|
||||||
|
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.
|
||||||
"""
|
"""
|
||||||
visited: Set[str] = set()
|
visited: Set[str] = set()
|
||||||
stack: List[Tuple[str, Optional[str], int]] = [(start_url, None, 0)]
|
stack: List[Tuple[str, Optional[str], int]] = [(start_url, None, 0)]
|
||||||
depths: Dict[str, int] = {start_url: 0}
|
depths: Dict[str, int] = {start_url: 0}
|
||||||
|
self._reset_seen(start_url)
|
||||||
|
|
||||||
while stack and not self._cancel_event.is_set():
|
while stack and not self._cancel_event.is_set():
|
||||||
url, parent, depth = stack.pop()
|
url, parent, depth = stack.pop()
|
||||||
@@ -108,3 +129,92 @@ class DFSDeepCrawlStrategy(BFSDeepCrawlStrategy):
|
|||||||
for new_url, new_parent in reversed(new_links):
|
for new_url, new_parent in reversed(new_links):
|
||||||
new_depth = depths.get(new_url, depth + 1)
|
new_depth = depths.get(new_url, depth + 1)
|
||||||
stack.append((new_url, new_parent, new_depth))
|
stack.append((new_url, new_parent, new_depth))
|
||||||
|
|
||||||
|
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
|
||||||
|
|||||||
@@ -94,6 +94,20 @@ class ExtractionStrategy(ABC):
|
|||||||
extracted_content.extend(future.result())
|
extracted_content.extend(future.result())
|
||||||
return extracted_content
|
return extracted_content
|
||||||
|
|
||||||
|
async def arun(self, url: str, sections: List[str], *q, **kwargs) -> List[Dict[str, Any]]:
|
||||||
|
"""
|
||||||
|
Async version: Process sections of text in parallel using asyncio.
|
||||||
|
|
||||||
|
Default implementation runs the sync version in a thread pool.
|
||||||
|
Subclasses can override this for true async processing.
|
||||||
|
|
||||||
|
:param url: The URL of the webpage.
|
||||||
|
:param sections: List of sections (strings) to process.
|
||||||
|
:return: A list of processed JSON blocks.
|
||||||
|
"""
|
||||||
|
import asyncio
|
||||||
|
return await asyncio.to_thread(self.run, url, sections, *q, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class NoExtractionStrategy(ExtractionStrategy):
|
class NoExtractionStrategy(ExtractionStrategy):
|
||||||
"""
|
"""
|
||||||
@@ -780,6 +794,177 @@ class LLMExtractionStrategy(ExtractionStrategy):
|
|||||||
|
|
||||||
return extracted_content
|
return extracted_content
|
||||||
|
|
||||||
|
async def aextract(self, url: str, ix: int, html: str) -> List[Dict[str, Any]]:
|
||||||
|
"""
|
||||||
|
Async version: Extract meaningful blocks or chunks from the given HTML using an LLM.
|
||||||
|
|
||||||
|
How it works:
|
||||||
|
1. Construct a prompt with variables.
|
||||||
|
2. Make an async request to the LLM using the prompt.
|
||||||
|
3. Parse the response and extract blocks or chunks.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
url: The URL of the webpage.
|
||||||
|
ix: Index of the block.
|
||||||
|
html: The HTML content of the webpage.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
A list of extracted blocks or chunks.
|
||||||
|
"""
|
||||||
|
from .utils import aperform_completion_with_backoff
|
||||||
|
|
||||||
|
if self.verbose:
|
||||||
|
print(f"[LOG] Call LLM for {url} - block index: {ix}")
|
||||||
|
|
||||||
|
variable_values = {
|
||||||
|
"URL": url,
|
||||||
|
"HTML": escape_json_string(sanitize_html(html)),
|
||||||
|
}
|
||||||
|
|
||||||
|
prompt_with_variables = PROMPT_EXTRACT_BLOCKS
|
||||||
|
if self.instruction:
|
||||||
|
variable_values["REQUEST"] = self.instruction
|
||||||
|
prompt_with_variables = PROMPT_EXTRACT_BLOCKS_WITH_INSTRUCTION
|
||||||
|
|
||||||
|
if self.extract_type == "schema" and self.schema:
|
||||||
|
variable_values["SCHEMA"] = json.dumps(self.schema, indent=2)
|
||||||
|
prompt_with_variables = PROMPT_EXTRACT_SCHEMA_WITH_INSTRUCTION
|
||||||
|
|
||||||
|
if self.extract_type == "schema" and not self.schema:
|
||||||
|
prompt_with_variables = PROMPT_EXTRACT_INFERRED_SCHEMA
|
||||||
|
|
||||||
|
for variable in variable_values:
|
||||||
|
prompt_with_variables = prompt_with_variables.replace(
|
||||||
|
"{" + variable + "}", variable_values[variable]
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await aperform_completion_with_backoff(
|
||||||
|
self.llm_config.provider,
|
||||||
|
prompt_with_variables,
|
||||||
|
self.llm_config.api_token,
|
||||||
|
base_url=self.llm_config.base_url,
|
||||||
|
json_response=self.force_json_response,
|
||||||
|
extra_args=self.extra_args,
|
||||||
|
)
|
||||||
|
# Track usage
|
||||||
|
usage = TokenUsage(
|
||||||
|
completion_tokens=response.usage.completion_tokens,
|
||||||
|
prompt_tokens=response.usage.prompt_tokens,
|
||||||
|
total_tokens=response.usage.total_tokens,
|
||||||
|
completion_tokens_details=response.usage.completion_tokens_details.__dict__
|
||||||
|
if response.usage.completion_tokens_details
|
||||||
|
else {},
|
||||||
|
prompt_tokens_details=response.usage.prompt_tokens_details.__dict__
|
||||||
|
if response.usage.prompt_tokens_details
|
||||||
|
else {},
|
||||||
|
)
|
||||||
|
self.usages.append(usage)
|
||||||
|
|
||||||
|
# Update totals
|
||||||
|
self.total_usage.completion_tokens += usage.completion_tokens
|
||||||
|
self.total_usage.prompt_tokens += usage.prompt_tokens
|
||||||
|
self.total_usage.total_tokens += usage.total_tokens
|
||||||
|
|
||||||
|
try:
|
||||||
|
content = response.choices[0].message.content
|
||||||
|
blocks = None
|
||||||
|
|
||||||
|
if self.force_json_response:
|
||||||
|
blocks = json.loads(content)
|
||||||
|
if isinstance(blocks, dict):
|
||||||
|
if len(blocks) == 1 and isinstance(list(blocks.values())[0], list):
|
||||||
|
blocks = list(blocks.values())[0]
|
||||||
|
else:
|
||||||
|
blocks = [blocks]
|
||||||
|
elif isinstance(blocks, list):
|
||||||
|
blocks = blocks
|
||||||
|
else:
|
||||||
|
blocks = extract_xml_data(["blocks"], content)["blocks"]
|
||||||
|
blocks = json.loads(blocks)
|
||||||
|
|
||||||
|
for block in blocks:
|
||||||
|
block["error"] = False
|
||||||
|
except Exception:
|
||||||
|
parsed, unparsed = split_and_parse_json_objects(
|
||||||
|
response.choices[0].message.content
|
||||||
|
)
|
||||||
|
blocks = parsed
|
||||||
|
if unparsed:
|
||||||
|
blocks.append(
|
||||||
|
{"index": 0, "error": True, "tags": ["error"], "content": unparsed}
|
||||||
|
)
|
||||||
|
|
||||||
|
if self.verbose:
|
||||||
|
print(
|
||||||
|
"[LOG] Extracted",
|
||||||
|
len(blocks),
|
||||||
|
"blocks from URL:",
|
||||||
|
url,
|
||||||
|
"block index:",
|
||||||
|
ix,
|
||||||
|
)
|
||||||
|
return blocks
|
||||||
|
except Exception as e:
|
||||||
|
if self.verbose:
|
||||||
|
print(f"[LOG] Error in LLM extraction: {e}")
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
"index": ix,
|
||||||
|
"error": True,
|
||||||
|
"tags": ["error"],
|
||||||
|
"content": str(e),
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
async def arun(self, url: str, sections: List[str]) -> List[Dict[str, Any]]:
|
||||||
|
"""
|
||||||
|
Async version: Process sections with true parallelism using asyncio.gather.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
url: The URL of the webpage.
|
||||||
|
sections: List of sections (strings) to process.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
A list of extracted blocks or chunks.
|
||||||
|
"""
|
||||||
|
import asyncio
|
||||||
|
|
||||||
|
merged_sections = self._merge(
|
||||||
|
sections,
|
||||||
|
self.chunk_token_threshold,
|
||||||
|
overlap=int(self.chunk_token_threshold * self.overlap_rate),
|
||||||
|
)
|
||||||
|
|
||||||
|
extracted_content = []
|
||||||
|
|
||||||
|
# Create tasks for all sections to run in parallel
|
||||||
|
tasks = [
|
||||||
|
self.aextract(url, ix, sanitize_input_encode(section))
|
||||||
|
for ix, section in enumerate(merged_sections)
|
||||||
|
]
|
||||||
|
|
||||||
|
# Execute all tasks concurrently
|
||||||
|
results = await asyncio.gather(*tasks, return_exceptions=True)
|
||||||
|
|
||||||
|
# Process results
|
||||||
|
for result in results:
|
||||||
|
if isinstance(result, Exception):
|
||||||
|
if self.verbose:
|
||||||
|
print(f"Error in async extraction: {result}")
|
||||||
|
extracted_content.append(
|
||||||
|
{
|
||||||
|
"index": 0,
|
||||||
|
"error": True,
|
||||||
|
"tags": ["error"],
|
||||||
|
"content": str(result),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
extracted_content.extend(result)
|
||||||
|
|
||||||
|
return extracted_content
|
||||||
|
|
||||||
def show_usage(self) -> None:
|
def show_usage(self) -> None:
|
||||||
"""Print a detailed token usage report showing total and per-request usage."""
|
"""Print a detailed token usage report showing total and per-request usage."""
|
||||||
print("\n=== Token Usage Summary ===")
|
print("\n=== Token Usage Summary ===")
|
||||||
|
|||||||
@@ -1825,6 +1825,82 @@ def perform_completion_with_backoff(
|
|||||||
# ]
|
# ]
|
||||||
|
|
||||||
|
|
||||||
|
async def aperform_completion_with_backoff(
|
||||||
|
provider,
|
||||||
|
prompt_with_variables,
|
||||||
|
api_token,
|
||||||
|
json_response=False,
|
||||||
|
base_url=None,
|
||||||
|
**kwargs,
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Async version: Perform an API completion request with exponential backoff.
|
||||||
|
|
||||||
|
How it works:
|
||||||
|
1. Sends an async completion request to the API.
|
||||||
|
2. Retries on rate-limit errors with exponential delays (async).
|
||||||
|
3. Returns the API response or an error after all retries.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
provider (str): The name of the API provider.
|
||||||
|
prompt_with_variables (str): The input prompt for the completion request.
|
||||||
|
api_token (str): The API token for authentication.
|
||||||
|
json_response (bool): Whether to request a JSON response. Defaults to False.
|
||||||
|
base_url (Optional[str]): The base URL for the API. Defaults to None.
|
||||||
|
**kwargs: Additional arguments for the API request.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict: The API response or an error message after all retries.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from litellm import acompletion
|
||||||
|
from litellm.exceptions import RateLimitError
|
||||||
|
import asyncio
|
||||||
|
|
||||||
|
max_attempts = 3
|
||||||
|
base_delay = 2 # Base delay in seconds, you can adjust this based on your needs
|
||||||
|
|
||||||
|
extra_args = {"temperature": 0.01, "api_key": api_token, "base_url": base_url}
|
||||||
|
if json_response:
|
||||||
|
extra_args["response_format"] = {"type": "json_object"}
|
||||||
|
|
||||||
|
if kwargs.get("extra_args"):
|
||||||
|
extra_args.update(kwargs["extra_args"])
|
||||||
|
|
||||||
|
for attempt in range(max_attempts):
|
||||||
|
try:
|
||||||
|
response = await acompletion(
|
||||||
|
model=provider,
|
||||||
|
messages=[{"role": "user", "content": prompt_with_variables}],
|
||||||
|
**extra_args,
|
||||||
|
)
|
||||||
|
return response # Return the successful response
|
||||||
|
except RateLimitError as e:
|
||||||
|
print("Rate limit error:", str(e))
|
||||||
|
|
||||||
|
if attempt == max_attempts - 1:
|
||||||
|
# Last attempt failed, raise the error.
|
||||||
|
raise
|
||||||
|
|
||||||
|
# Check if we have exhausted our max attempts
|
||||||
|
if attempt < max_attempts - 1:
|
||||||
|
# Calculate the delay and wait
|
||||||
|
delay = base_delay * (2**attempt) # Exponential backoff formula
|
||||||
|
print(f"Waiting for {delay} seconds before retrying...")
|
||||||
|
await asyncio.sleep(delay)
|
||||||
|
else:
|
||||||
|
# Return an error response after exhausting all retries
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
"index": 0,
|
||||||
|
"tags": ["error"],
|
||||||
|
"content": ["Rate limit error. Please try again later."],
|
||||||
|
}
|
||||||
|
]
|
||||||
|
except Exception as e:
|
||||||
|
raise e # Raise any other exceptions immediately
|
||||||
|
|
||||||
|
|
||||||
def extract_blocks(url, html, provider=DEFAULT_PROVIDER, api_token=None, base_url=None):
|
def extract_blocks(url, html, provider=DEFAULT_PROVIDER, api_token=None, base_url=None):
|
||||||
"""
|
"""
|
||||||
Extract content blocks from website HTML using an AI provider.
|
Extract content blocks from website HTML using an AI provider.
|
||||||
|
|||||||
@@ -6,15 +6,16 @@ x-base-config: &base-config
|
|||||||
- "11235:11235" # Gunicorn port
|
- "11235:11235" # Gunicorn port
|
||||||
env_file:
|
env_file:
|
||||||
- .llm.env # API keys (create from .llm.env.example)
|
- .llm.env # API keys (create from .llm.env.example)
|
||||||
environment:
|
# Uncomment to set default environment variables (will overwrite .llm.env)
|
||||||
- OPENAI_API_KEY=${OPENAI_API_KEY:-}
|
# environment:
|
||||||
- DEEPSEEK_API_KEY=${DEEPSEEK_API_KEY:-}
|
# - OPENAI_API_KEY=${OPENAI_API_KEY:-}
|
||||||
- ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY:-}
|
# - DEEPSEEK_API_KEY=${DEEPSEEK_API_KEY:-}
|
||||||
- GROQ_API_KEY=${GROQ_API_KEY:-}
|
# - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY:-}
|
||||||
- TOGETHER_API_KEY=${TOGETHER_API_KEY:-}
|
# - GROQ_API_KEY=${GROQ_API_KEY:-}
|
||||||
- MISTRAL_API_KEY=${MISTRAL_API_KEY:-}
|
# - TOGETHER_API_KEY=${TOGETHER_API_KEY:-}
|
||||||
- GEMINI_API_TOKEN=${GEMINI_API_TOKEN:-}
|
# - MISTRAL_API_KEY=${MISTRAL_API_KEY:-}
|
||||||
- LLM_PROVIDER=${LLM_PROVIDER:-} # Optional: Override default provider (e.g., "anthropic/claude-3-opus")
|
# - GEMINI_API_KEY=${GEMINI_API_KEY:-}
|
||||||
|
# - LLM_PROVIDER=${LLM_PROVIDER:-} # Optional: Override default provider (e.g., "anthropic/claude-3-opus")
|
||||||
volumes:
|
volumes:
|
||||||
- /dev/shm:/dev/shm # Chromium performance
|
- /dev/shm:/dev/shm # Chromium performance
|
||||||
deploy:
|
deploy:
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ A comprehensive web-based tutorial for learning and experimenting with C4A-Scrip
|
|||||||
|
|
||||||
2. **Install Dependencies**
|
2. **Install Dependencies**
|
||||||
```bash
|
```bash
|
||||||
pip install flask
|
pip install -r requirements.txt
|
||||||
```
|
```
|
||||||
|
|
||||||
3. **Launch the Server**
|
3. **Launch the Server**
|
||||||
@@ -28,7 +28,7 @@ A comprehensive web-based tutorial for learning and experimenting with C4A-Scrip
|
|||||||
|
|
||||||
4. **Open in Browser**
|
4. **Open in Browser**
|
||||||
```
|
```
|
||||||
http://localhost:8080
|
http://localhost:8000
|
||||||
```
|
```
|
||||||
|
|
||||||
**🌐 Try Online**: [Live Demo](https://docs.crawl4ai.com/c4a-script/demo)
|
**🌐 Try Online**: [Live Demo](https://docs.crawl4ai.com/c4a-script/demo)
|
||||||
@@ -325,7 +325,7 @@ Powers the recording functionality:
|
|||||||
### Configuration
|
### Configuration
|
||||||
```python
|
```python
|
||||||
# server.py configuration
|
# server.py configuration
|
||||||
PORT = 8080
|
PORT = 8000
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
THREADED = True
|
THREADED = True
|
||||||
```
|
```
|
||||||
@@ -343,9 +343,9 @@ THREADED = True
|
|||||||
**Port Already in Use**
|
**Port Already in Use**
|
||||||
```bash
|
```bash
|
||||||
# Kill existing process
|
# Kill existing process
|
||||||
lsof -ti:8080 | xargs kill -9
|
lsof -ti:8000 | xargs kill -9
|
||||||
# Or use different port
|
# Or use different port
|
||||||
python server.py --port 8081
|
python server.py --port 8001
|
||||||
```
|
```
|
||||||
|
|
||||||
**Blockly Not Loading**
|
**Blockly Not Loading**
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ def get_examples():
|
|||||||
'name': 'Handle Cookie Banner',
|
'name': 'Handle Cookie Banner',
|
||||||
'description': 'Accept cookies and close newsletter popup',
|
'description': 'Accept cookies and close newsletter popup',
|
||||||
'script': '''# Handle cookie banner and newsletter
|
'script': '''# Handle cookie banner and newsletter
|
||||||
GO http://127.0.0.1:8080/playground/
|
GO http://127.0.0.1:8000/playground/
|
||||||
WAIT `body` 2
|
WAIT `body` 2
|
||||||
IF (EXISTS `.cookie-banner`) THEN CLICK `.accept`
|
IF (EXISTS `.cookie-banner`) THEN CLICK `.accept`
|
||||||
IF (EXISTS `.newsletter-popup`) THEN CLICK `.close`'''
|
IF (EXISTS `.newsletter-popup`) THEN CLICK `.close`'''
|
||||||
|
|||||||
39
docs/examples/dfs_crawl_demo.py
Normal file
39
docs/examples/dfs_crawl_demo.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
"""
|
||||||
|
Simple demonstration of the DFS deep crawler visiting multiple pages.
|
||||||
|
|
||||||
|
Run with: python docs/examples/dfs_crawl_demo.py
|
||||||
|
"""
|
||||||
|
import asyncio
|
||||||
|
|
||||||
|
from crawl4ai.async_configs import BrowserConfig, CrawlerRunConfig
|
||||||
|
from crawl4ai.async_webcrawler import AsyncWebCrawler
|
||||||
|
from crawl4ai.cache_context import CacheMode
|
||||||
|
from crawl4ai.deep_crawling.dfs_strategy import DFSDeepCrawlStrategy
|
||||||
|
from crawl4ai.markdown_generation_strategy import DefaultMarkdownGenerator
|
||||||
|
|
||||||
|
|
||||||
|
async def main() -> None:
|
||||||
|
dfs_strategy = DFSDeepCrawlStrategy(
|
||||||
|
max_depth=3,
|
||||||
|
max_pages=50,
|
||||||
|
include_external=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
config = CrawlerRunConfig(
|
||||||
|
deep_crawl_strategy=dfs_strategy,
|
||||||
|
cache_mode=CacheMode.BYPASS,
|
||||||
|
markdown_generator=DefaultMarkdownGenerator(),
|
||||||
|
stream=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
seed_url = "https://docs.python.org/3/" # Plenty of internal links
|
||||||
|
|
||||||
|
async with AsyncWebCrawler(config=BrowserConfig(headless=True)) as crawler:
|
||||||
|
async for result in await crawler.arun(url=seed_url, config=config):
|
||||||
|
depth = result.metadata.get("depth")
|
||||||
|
status = "SUCCESS" if result.success else "FAILED"
|
||||||
|
print(f"[{status}] depth={depth} url={result.url}")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.run(main())
|
||||||
@@ -82,6 +82,42 @@ If you installed Crawl4AI (which installs Playwright under the hood), you alread
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
### Creating a Profile Using the Crawl4AI CLI (Easiest)
|
||||||
|
|
||||||
|
If you prefer a guided, interactive setup, use the built-in CLI to create and manage persistent browser profiles.
|
||||||
|
|
||||||
|
1.⠀Launch the profile manager:
|
||||||
|
```bash
|
||||||
|
crwl profiles
|
||||||
|
```
|
||||||
|
|
||||||
|
2.⠀Choose "Create new profile" and enter a profile name. A Chromium window opens so you can log in to sites and configure settings. When finished, return to the terminal and press `q` to save the profile.
|
||||||
|
|
||||||
|
3.⠀Profiles are saved under `~/.crawl4ai/profiles/<profile_name>` (for example: `/home/<you>/.crawl4ai/profiles/test_profile_1`) along with a `storage_state.json` for cookies and session data.
|
||||||
|
|
||||||
|
4.⠀Optionally, choose "List profiles" in the CLI to view available profiles and their paths.
|
||||||
|
|
||||||
|
5.⠀Use the saved path with `BrowserConfig.user_data_dir`:
|
||||||
|
```python
|
||||||
|
from crawl4ai import AsyncWebCrawler, BrowserConfig
|
||||||
|
|
||||||
|
profile_path = "/home/<you>/.crawl4ai/profiles/test_profile_1"
|
||||||
|
|
||||||
|
browser_config = BrowserConfig(
|
||||||
|
headless=True,
|
||||||
|
use_managed_browser=True,
|
||||||
|
user_data_dir=profile_path,
|
||||||
|
browser_type="chromium",
|
||||||
|
)
|
||||||
|
|
||||||
|
async with AsyncWebCrawler(config=browser_config) as crawler:
|
||||||
|
result = await crawler.arun(url="https://example.com/private")
|
||||||
|
```
|
||||||
|
|
||||||
|
The CLI also supports listing and deleting profiles, and even testing a crawl directly from the menu.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 3. Using Managed Browsers in Crawl4AI
|
## 3. Using Managed Browsers in Crawl4AI
|
||||||
|
|
||||||
Once you have a data directory with your session data, pass it to **`BrowserConfig`**:
|
Once you have a data directory with your session data, pass it to **`BrowserConfig`**:
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ A comprehensive web-based tutorial for learning and experimenting with C4A-Scrip
|
|||||||
|
|
||||||
2. **Install Dependencies**
|
2. **Install Dependencies**
|
||||||
```bash
|
```bash
|
||||||
pip install flask
|
pip install -r requirements.txt
|
||||||
```
|
```
|
||||||
|
|
||||||
3. **Launch the Server**
|
3. **Launch the Server**
|
||||||
@@ -28,7 +28,7 @@ A comprehensive web-based tutorial for learning and experimenting with C4A-Scrip
|
|||||||
|
|
||||||
4. **Open in Browser**
|
4. **Open in Browser**
|
||||||
```
|
```
|
||||||
http://localhost:8080
|
http://localhost:8000
|
||||||
```
|
```
|
||||||
|
|
||||||
**🌐 Try Online**: [Live Demo](https://docs.crawl4ai.com/c4a-script/demo)
|
**🌐 Try Online**: [Live Demo](https://docs.crawl4ai.com/c4a-script/demo)
|
||||||
@@ -325,7 +325,7 @@ Powers the recording functionality:
|
|||||||
### Configuration
|
### Configuration
|
||||||
```python
|
```python
|
||||||
# server.py configuration
|
# server.py configuration
|
||||||
PORT = 8080
|
PORT = 8000
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
THREADED = True
|
THREADED = True
|
||||||
```
|
```
|
||||||
@@ -343,9 +343,9 @@ THREADED = True
|
|||||||
**Port Already in Use**
|
**Port Already in Use**
|
||||||
```bash
|
```bash
|
||||||
# Kill existing process
|
# Kill existing process
|
||||||
lsof -ti:8080 | xargs kill -9
|
lsof -ti:8000 | xargs kill -9
|
||||||
# Or use different port
|
# Or use different port
|
||||||
python server.py --port 8081
|
python server.py --port 8001
|
||||||
```
|
```
|
||||||
|
|
||||||
**Blockly Not Loading**
|
**Blockly Not Loading**
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ def get_examples():
|
|||||||
'name': 'Handle Cookie Banner',
|
'name': 'Handle Cookie Banner',
|
||||||
'description': 'Accept cookies and close newsletter popup',
|
'description': 'Accept cookies and close newsletter popup',
|
||||||
'script': '''# Handle cookie banner and newsletter
|
'script': '''# Handle cookie banner and newsletter
|
||||||
GO http://127.0.0.1:8080/playground/
|
GO http://127.0.0.1:8000/playground/
|
||||||
WAIT `body` 2
|
WAIT `body` 2
|
||||||
IF (EXISTS `.cookie-banner`) THEN CLICK `.accept`
|
IF (EXISTS `.cookie-banner`) THEN CLICK `.accept`
|
||||||
IF (EXISTS `.newsletter-popup`) THEN CLICK `.close`'''
|
IF (EXISTS `.newsletter-popup`) THEN CLICK `.close`'''
|
||||||
@@ -283,7 +283,7 @@ WAIT `.success-message` 5'''
|
|||||||
return jsonify(examples)
|
return jsonify(examples)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
port = int(os.environ.get('PORT', 8080))
|
port = int(os.environ.get('PORT', 8000))
|
||||||
print(f"""
|
print(f"""
|
||||||
╔══════════════════════════════════════════════════════════╗
|
╔══════════════════════════════════════════════════════════╗
|
||||||
║ C4A-Script Interactive Tutorial Server ║
|
║ C4A-Script Interactive Tutorial Server ║
|
||||||
|
|||||||
@@ -69,12 +69,12 @@ The tutorial includes a Flask-based web interface with:
|
|||||||
cd docs/examples/c4a_script/tutorial/
|
cd docs/examples/c4a_script/tutorial/
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
pip install flask
|
pip install -r requirements.txt
|
||||||
|
|
||||||
# Launch the tutorial server
|
# Launch the tutorial server
|
||||||
python app.py
|
python server.py
|
||||||
|
|
||||||
# Open http://localhost:5000 in your browser
|
# Open http://localhost:8000 in your browser
|
||||||
```
|
```
|
||||||
|
|
||||||
## Core Concepts
|
## Core Concepts
|
||||||
@@ -111,8 +111,8 @@ CLICK `.submit-btn`
|
|||||||
# By attribute
|
# By attribute
|
||||||
CLICK `button[type="submit"]`
|
CLICK `button[type="submit"]`
|
||||||
|
|
||||||
# By text content
|
# By accessible attributes
|
||||||
CLICK `button:contains("Sign In")`
|
CLICK `button[aria-label="Search"][title="Search"]`
|
||||||
|
|
||||||
# Complex selectors
|
# Complex selectors
|
||||||
CLICK `.form-container input[name="email"]`
|
CLICK `.form-container input[name="email"]`
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
|
|
||||||
Crawl4AI is the #1 trending GitHub repository, actively maintained by a vibrant community. It delivers blazing-fast, AI-ready web crawling tailored for large language models, AI agents, and data pipelines. Fully open source, flexible, and built for real-time performance, **Crawl4AI** empowers developers with unmatched speed, precision, and deployment ease.
|
Crawl4AI is the #1 trending GitHub repository, actively maintained by a vibrant community. It delivers blazing-fast, AI-ready web crawling tailored for large language models, AI agents, and data pipelines. Fully open source, flexible, and built for real-time performance, **Crawl4AI** empowers developers with unmatched speed, precision, and deployment ease.
|
||||||
|
|
||||||
> **Note**: If you're looking for the old documentation, you can access it [here](https://old.docs.crawl4ai.com).
|
> Enjoy using Crawl4AI? Consider **[becoming a sponsor](https://github.com/sponsors/unclecode)** to support ongoing development and community growth!
|
||||||
|
|
||||||
## 🆕 AI Assistant Skill Now Available!
|
## 🆕 AI Assistant Skill Now Available!
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ dependencies = [
|
|||||||
"rank-bm25~=0.2",
|
"rank-bm25~=0.2",
|
||||||
"snowballstemmer~=2.2",
|
"snowballstemmer~=2.2",
|
||||||
"pydantic>=2.10",
|
"pydantic>=2.10",
|
||||||
"pyOpenSSL>=24.3.0",
|
"pyOpenSSL>=25.3.0",
|
||||||
"psutil>=6.1.1",
|
"psutil>=6.1.1",
|
||||||
"PyYAML>=6.0",
|
"PyYAML>=6.0",
|
||||||
"nltk>=3.9.1",
|
"nltk>=3.9.1",
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ rank-bm25~=0.2
|
|||||||
colorama~=0.4
|
colorama~=0.4
|
||||||
snowballstemmer~=2.2
|
snowballstemmer~=2.2
|
||||||
pydantic>=2.10
|
pydantic>=2.10
|
||||||
pyOpenSSL>=24.3.0
|
pyOpenSSL>=25.3.0
|
||||||
psutil>=6.1.1
|
psutil>=6.1.1
|
||||||
PyYAML>=6.0
|
PyYAML>=6.0
|
||||||
nltk>=3.9.1
|
nltk>=3.9.1
|
||||||
|
|||||||
@@ -364,5 +364,19 @@ async def test_network_error_handling():
|
|||||||
async with AsyncPlaywrightCrawlerStrategy() as strategy:
|
async with AsyncPlaywrightCrawlerStrategy() as strategy:
|
||||||
await strategy.crawl("https://invalid.example.com", config)
|
await strategy.crawl("https://invalid.example.com", config)
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_remove_overlay_elements(crawler_strategy):
|
||||||
|
config = CrawlerRunConfig(
|
||||||
|
remove_overlay_elements=True,
|
||||||
|
delay_before_return_html=5,
|
||||||
|
)
|
||||||
|
|
||||||
|
response = await crawler_strategy.crawl(
|
||||||
|
"https://www2.hm.com/en_us/index.html",
|
||||||
|
config
|
||||||
|
)
|
||||||
|
assert response.status_code == 200
|
||||||
|
assert "Accept all cookies" not in response.html
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
pytest.main([__file__, "-v"])
|
pytest.main([__file__, "-v"])
|
||||||
220
tests/test_llm_extraction_parallel_issue_1055.py
Normal file
220
tests/test_llm_extraction_parallel_issue_1055.py
Normal file
@@ -0,0 +1,220 @@
|
|||||||
|
"""
|
||||||
|
Final verification test for Issue #1055 fix
|
||||||
|
|
||||||
|
This test demonstrates that LLM extraction now runs in parallel
|
||||||
|
when using arun_many with multiple URLs.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import time
|
||||||
|
import asyncio
|
||||||
|
|
||||||
|
grandparent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
sys.path.append(grandparent_dir)
|
||||||
|
|
||||||
|
from crawl4ai import (
|
||||||
|
AsyncWebCrawler,
|
||||||
|
BrowserConfig,
|
||||||
|
CrawlerRunConfig,
|
||||||
|
CacheMode,
|
||||||
|
LLMExtractionStrategy,
|
||||||
|
LLMConfig,
|
||||||
|
)
|
||||||
|
|
||||||
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
|
||||||
|
class SimpleData(BaseModel):
|
||||||
|
title: str
|
||||||
|
summary: str
|
||||||
|
|
||||||
|
|
||||||
|
def print_section(title):
|
||||||
|
print("\n" + "=" * 80)
|
||||||
|
print(title)
|
||||||
|
print("=" * 80 + "\n")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_without_llm():
|
||||||
|
"""Baseline: Test crawling without LLM extraction"""
|
||||||
|
print_section("TEST 1: Crawling WITHOUT LLM Extraction")
|
||||||
|
|
||||||
|
config = CrawlerRunConfig(
|
||||||
|
cache_mode=CacheMode.BYPASS,
|
||||||
|
)
|
||||||
|
|
||||||
|
browser_config = BrowserConfig(headless=True, verbose=False)
|
||||||
|
|
||||||
|
urls = [
|
||||||
|
"https://www.example.com",
|
||||||
|
"https://www.iana.org",
|
||||||
|
"https://www.wikipedia.org",
|
||||||
|
]
|
||||||
|
|
||||||
|
print(f"Crawling {len(urls)} URLs without LLM extraction...")
|
||||||
|
print("Expected: Fast and parallel\n")
|
||||||
|
|
||||||
|
start_time = time.time()
|
||||||
|
|
||||||
|
async with AsyncWebCrawler(config=browser_config) as crawler:
|
||||||
|
results = await crawler.arun_many(urls=urls, config=config)
|
||||||
|
|
||||||
|
duration = time.time() - start_time
|
||||||
|
|
||||||
|
print(f"\n✅ Completed in {duration:.2f}s")
|
||||||
|
print(f" Successful: {sum(1 for r in results if r.success)}/{len(urls)}")
|
||||||
|
print(f" Average: {duration/len(urls):.2f}s per URL")
|
||||||
|
|
||||||
|
return duration
|
||||||
|
|
||||||
|
|
||||||
|
async def test_with_llm_before_fix():
|
||||||
|
"""Demonstrate the problem: Sequential execution with LLM"""
|
||||||
|
print_section("TEST 2: What Issue #1055 Reported (LLM Sequential Behavior)")
|
||||||
|
|
||||||
|
print("The issue reported that with LLM extraction, URLs would crawl")
|
||||||
|
print("one after another instead of in parallel.")
|
||||||
|
print("\nWithout our fix, this would show:")
|
||||||
|
print(" - URL 1 fetches → extracts → completes")
|
||||||
|
print(" - URL 2 fetches → extracts → completes")
|
||||||
|
print(" - URL 3 fetches → extracts → completes")
|
||||||
|
print("\nTotal time would be approximately sum of all individual times.")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_with_llm_after_fix():
|
||||||
|
"""Demonstrate the fix: Parallel execution with LLM"""
|
||||||
|
print_section("TEST 3: After Fix - LLM Extraction in Parallel")
|
||||||
|
|
||||||
|
config = CrawlerRunConfig(
|
||||||
|
cache_mode=CacheMode.BYPASS,
|
||||||
|
extraction_strategy=LLMExtractionStrategy(
|
||||||
|
llm_config=LLMConfig(provider="openai/gpt-4o-mini"),
|
||||||
|
schema=SimpleData.model_json_schema(),
|
||||||
|
extraction_type="schema",
|
||||||
|
instruction="Extract title and summary",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
browser_config = BrowserConfig(headless=True, verbose=False)
|
||||||
|
|
||||||
|
urls = [
|
||||||
|
"https://www.example.com",
|
||||||
|
"https://www.iana.org",
|
||||||
|
"https://www.wikipedia.org",
|
||||||
|
]
|
||||||
|
|
||||||
|
print(f"Crawling {len(urls)} URLs WITH LLM extraction...")
|
||||||
|
print("Expected: Parallel execution with our fix\n")
|
||||||
|
|
||||||
|
completion_times = {}
|
||||||
|
start_time = time.time()
|
||||||
|
|
||||||
|
async with AsyncWebCrawler(config=browser_config) as crawler:
|
||||||
|
results = await crawler.arun_many(urls=urls, config=config)
|
||||||
|
for result in results:
|
||||||
|
elapsed = time.time() - start_time
|
||||||
|
completion_times[result.url] = elapsed
|
||||||
|
print(f" [{elapsed:5.2f}s] ✓ {result.url[:50]}")
|
||||||
|
|
||||||
|
duration = time.time() - start_time
|
||||||
|
|
||||||
|
print(f"\n✅ Total time: {duration:.2f}s")
|
||||||
|
print(f" Successful: {sum(1 for url in urls if url in completion_times)}/{len(urls)}")
|
||||||
|
|
||||||
|
# Analyze parallelism
|
||||||
|
times = list(completion_times.values())
|
||||||
|
if len(times) >= 2:
|
||||||
|
# If parallel, completion times should be staggered, not evenly spaced
|
||||||
|
time_diffs = [times[i+1] - times[i] for i in range(len(times)-1)]
|
||||||
|
avg_diff = sum(time_diffs) / len(time_diffs)
|
||||||
|
|
||||||
|
print(f"\nParallelism Analysis:")
|
||||||
|
print(f" Completion time differences: {[f'{d:.2f}s' for d in time_diffs]}")
|
||||||
|
print(f" Average difference: {avg_diff:.2f}s")
|
||||||
|
|
||||||
|
# In parallel mode, some tasks complete close together
|
||||||
|
# In sequential mode, they're evenly spaced (avg ~2-3s apart)
|
||||||
|
if avg_diff < duration / len(urls):
|
||||||
|
print(f" ✅ PARALLEL: Tasks completed with overlapping execution")
|
||||||
|
else:
|
||||||
|
print(f" ⚠️ SEQUENTIAL: Tasks completed one after another")
|
||||||
|
|
||||||
|
return duration
|
||||||
|
|
||||||
|
|
||||||
|
async def test_multiple_arun_calls():
|
||||||
|
"""Test multiple individual arun() calls in parallel"""
|
||||||
|
print_section("TEST 4: Multiple arun() Calls with asyncio.gather")
|
||||||
|
|
||||||
|
config = CrawlerRunConfig(
|
||||||
|
cache_mode=CacheMode.BYPASS,
|
||||||
|
extraction_strategy=LLMExtractionStrategy(
|
||||||
|
llm_config=LLMConfig(provider="openai/gpt-4o-mini"),
|
||||||
|
schema=SimpleData.model_json_schema(),
|
||||||
|
extraction_type="schema",
|
||||||
|
instruction="Extract title and summary",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
browser_config = BrowserConfig(headless=True, verbose=False)
|
||||||
|
|
||||||
|
urls = [
|
||||||
|
"https://www.example.com",
|
||||||
|
"https://www.iana.org",
|
||||||
|
"https://www.wikipedia.org",
|
||||||
|
]
|
||||||
|
|
||||||
|
print(f"Running {len(urls)} arun() calls with asyncio.gather()...")
|
||||||
|
print("Expected: True parallel execution\n")
|
||||||
|
|
||||||
|
start_time = time.time()
|
||||||
|
|
||||||
|
async with AsyncWebCrawler(config=browser_config) as crawler:
|
||||||
|
tasks = [crawler.arun(url, config=config) for url in urls]
|
||||||
|
results = await asyncio.gather(*tasks)
|
||||||
|
|
||||||
|
duration = time.time() - start_time
|
||||||
|
|
||||||
|
print(f"\n✅ Completed in {duration:.2f}s")
|
||||||
|
print(f" Successful: {sum(1 for r in results if r.success)}/{len(urls)}")
|
||||||
|
print(f" This proves the async LLM extraction works correctly")
|
||||||
|
|
||||||
|
return duration
|
||||||
|
|
||||||
|
|
||||||
|
async def main():
|
||||||
|
print("\n" + "🚀" * 40)
|
||||||
|
print("ISSUE #1055 FIX VERIFICATION")
|
||||||
|
print("Testing: Sequential → Parallel LLM Extraction")
|
||||||
|
print("🚀" * 40)
|
||||||
|
|
||||||
|
# Run tests
|
||||||
|
await test_without_llm()
|
||||||
|
|
||||||
|
await test_with_llm_before_fix()
|
||||||
|
|
||||||
|
time_with_llm = await test_with_llm_after_fix()
|
||||||
|
|
||||||
|
time_gather = await test_multiple_arun_calls()
|
||||||
|
|
||||||
|
# Final summary
|
||||||
|
print_section("FINAL VERDICT")
|
||||||
|
|
||||||
|
print("✅ Fix Verified!")
|
||||||
|
print("\nWhat changed:")
|
||||||
|
print(" • Created aperform_completion_with_backoff() using litellm.acompletion")
|
||||||
|
print(" • Added arun() method to ExtractionStrategy base class")
|
||||||
|
print(" • Implemented parallel arun() in LLMExtractionStrategy")
|
||||||
|
print(" • Updated AsyncWebCrawler to use arun() when available")
|
||||||
|
print("\nResult:")
|
||||||
|
print(" • LLM extraction now runs in parallel across multiple URLs")
|
||||||
|
print(" • Backward compatible - existing strategies still work")
|
||||||
|
print(" • No breaking changes to the API")
|
||||||
|
print("\n✨ Issue #1055 is RESOLVED!")
|
||||||
|
|
||||||
|
print("\n" + "=" * 80 + "\n")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.run(main())
|
||||||
168
tests/test_pyopenssl_security_fix.py
Normal file
168
tests/test_pyopenssl_security_fix.py
Normal file
@@ -0,0 +1,168 @@
|
|||||||
|
"""
|
||||||
|
Lightweight test to verify pyOpenSSL security fix (Issue #1545).
|
||||||
|
|
||||||
|
This test verifies the security requirements are met:
|
||||||
|
1. pyOpenSSL >= 25.3.0 is installed
|
||||||
|
2. cryptography >= 45.0.7 is installed (above vulnerable range)
|
||||||
|
3. SSL/TLS functionality works correctly
|
||||||
|
|
||||||
|
This test can run without full crawl4ai dependencies installed.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import sys
|
||||||
|
from packaging import version
|
||||||
|
|
||||||
|
|
||||||
|
def test_package_versions():
|
||||||
|
"""Test that package versions meet security requirements."""
|
||||||
|
print("=" * 70)
|
||||||
|
print("TEST: Package Version Security Requirements (Issue #1545)")
|
||||||
|
print("=" * 70)
|
||||||
|
|
||||||
|
all_passed = True
|
||||||
|
|
||||||
|
# Test pyOpenSSL version
|
||||||
|
try:
|
||||||
|
import OpenSSL
|
||||||
|
pyopenssl_version = OpenSSL.__version__
|
||||||
|
print(f"\n✓ pyOpenSSL is installed: {pyopenssl_version}")
|
||||||
|
|
||||||
|
if version.parse(pyopenssl_version) >= version.parse("25.3.0"):
|
||||||
|
print(f" ✓ PASS: pyOpenSSL {pyopenssl_version} >= 25.3.0 (required)")
|
||||||
|
else:
|
||||||
|
print(f" ✗ FAIL: pyOpenSSL {pyopenssl_version} < 25.3.0 (required)")
|
||||||
|
all_passed = False
|
||||||
|
|
||||||
|
except ImportError as e:
|
||||||
|
print(f"\n✗ FAIL: pyOpenSSL not installed - {e}")
|
||||||
|
all_passed = False
|
||||||
|
|
||||||
|
# Test cryptography version
|
||||||
|
try:
|
||||||
|
import cryptography
|
||||||
|
crypto_version = cryptography.__version__
|
||||||
|
print(f"\n✓ cryptography is installed: {crypto_version}")
|
||||||
|
|
||||||
|
# The vulnerable range is >=37.0.0 & <43.0.1
|
||||||
|
# We need >= 45.0.7 to be safe
|
||||||
|
if version.parse(crypto_version) >= version.parse("45.0.7"):
|
||||||
|
print(f" ✓ PASS: cryptography {crypto_version} >= 45.0.7 (secure)")
|
||||||
|
print(f" ✓ NOT in vulnerable range (37.0.0 to 43.0.0)")
|
||||||
|
elif version.parse(crypto_version) >= version.parse("37.0.0") and version.parse(crypto_version) < version.parse("43.0.1"):
|
||||||
|
print(f" ✗ FAIL: cryptography {crypto_version} is VULNERABLE")
|
||||||
|
print(f" ✗ Version is in vulnerable range (>=37.0.0 & <43.0.1)")
|
||||||
|
all_passed = False
|
||||||
|
else:
|
||||||
|
print(f" ⚠ WARNING: cryptography {crypto_version} < 45.0.7")
|
||||||
|
print(f" ⚠ May not meet security requirements")
|
||||||
|
|
||||||
|
except ImportError as e:
|
||||||
|
print(f"\n✗ FAIL: cryptography not installed - {e}")
|
||||||
|
all_passed = False
|
||||||
|
|
||||||
|
return all_passed
|
||||||
|
|
||||||
|
|
||||||
|
def test_ssl_basic_functionality():
|
||||||
|
"""Test that SSL/TLS basic functionality works."""
|
||||||
|
print("\n" + "=" * 70)
|
||||||
|
print("TEST: SSL/TLS Basic Functionality")
|
||||||
|
print("=" * 70)
|
||||||
|
|
||||||
|
try:
|
||||||
|
import OpenSSL.SSL
|
||||||
|
|
||||||
|
# Create a basic SSL context to verify functionality
|
||||||
|
context = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_2_METHOD)
|
||||||
|
print("\n✓ SSL Context created successfully")
|
||||||
|
print(" ✓ PASS: SSL/TLS functionality is working")
|
||||||
|
return True
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"\n✗ FAIL: SSL functionality test failed - {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def test_pyopenssl_crypto_integration():
|
||||||
|
"""Test that pyOpenSSL and cryptography integration works."""
|
||||||
|
print("\n" + "=" * 70)
|
||||||
|
print("TEST: pyOpenSSL <-> cryptography Integration")
|
||||||
|
print("=" * 70)
|
||||||
|
|
||||||
|
try:
|
||||||
|
from OpenSSL import crypto
|
||||||
|
|
||||||
|
# Generate a simple key pair to test integration
|
||||||
|
key = crypto.PKey()
|
||||||
|
key.generate_key(crypto.TYPE_RSA, 2048)
|
||||||
|
|
||||||
|
print("\n✓ Generated RSA key pair successfully")
|
||||||
|
print(" ✓ PASS: pyOpenSSL and cryptography are properly integrated")
|
||||||
|
return True
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"\n✗ FAIL: Integration test failed - {e}")
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc()
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
"""Run all security tests."""
|
||||||
|
print("\n")
|
||||||
|
print("╔" + "=" * 68 + "╗")
|
||||||
|
print("║ pyOpenSSL Security Fix Verification - Issue #1545 ║")
|
||||||
|
print("╚" + "=" * 68 + "╝")
|
||||||
|
print("\nVerifying that the pyOpenSSL update resolves the security vulnerability")
|
||||||
|
print("in the cryptography package (CVE: versions >=37.0.0 & <43.0.1)\n")
|
||||||
|
|
||||||
|
results = []
|
||||||
|
|
||||||
|
# Test 1: Package versions
|
||||||
|
results.append(("Package Versions", test_package_versions()))
|
||||||
|
|
||||||
|
# Test 2: SSL functionality
|
||||||
|
results.append(("SSL Functionality", test_ssl_basic_functionality()))
|
||||||
|
|
||||||
|
# Test 3: Integration
|
||||||
|
results.append(("pyOpenSSL-crypto Integration", test_pyopenssl_crypto_integration()))
|
||||||
|
|
||||||
|
# Summary
|
||||||
|
print("\n" + "=" * 70)
|
||||||
|
print("TEST SUMMARY")
|
||||||
|
print("=" * 70)
|
||||||
|
|
||||||
|
all_passed = True
|
||||||
|
for test_name, passed in results:
|
||||||
|
status = "✓ PASS" if passed else "✗ FAIL"
|
||||||
|
print(f"{status}: {test_name}")
|
||||||
|
all_passed = all_passed and passed
|
||||||
|
|
||||||
|
print("=" * 70)
|
||||||
|
|
||||||
|
if all_passed:
|
||||||
|
print("\n✓✓✓ ALL TESTS PASSED ✓✓✓")
|
||||||
|
print("✓ Security vulnerability is resolved")
|
||||||
|
print("✓ pyOpenSSL >= 25.3.0 is working correctly")
|
||||||
|
print("✓ cryptography >= 45.0.7 (not vulnerable)")
|
||||||
|
print("\nThe dependency update is safe to merge.\n")
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
print("\n✗✗✗ SOME TESTS FAILED ✗✗✗")
|
||||||
|
print("✗ Security requirements not met")
|
||||||
|
print("\nDo NOT merge until all tests pass.\n")
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
try:
|
||||||
|
success = main()
|
||||||
|
sys.exit(0 if success else 1)
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
print("\n\nTest interrupted by user")
|
||||||
|
sys.exit(1)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"\n✗ Unexpected error: {e}")
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc()
|
||||||
|
sys.exit(1)
|
||||||
184
tests/test_pyopenssl_update.py
Normal file
184
tests/test_pyopenssl_update.py
Normal file
@@ -0,0 +1,184 @@
|
|||||||
|
"""
|
||||||
|
Test script to verify pyOpenSSL update doesn't break crawl4ai functionality.
|
||||||
|
|
||||||
|
This test verifies:
|
||||||
|
1. pyOpenSSL and cryptography versions are correct and secure
|
||||||
|
2. Basic crawling functionality still works
|
||||||
|
3. HTTPS/SSL connections work properly
|
||||||
|
4. Stealth mode integration works (uses playwright-stealth internally)
|
||||||
|
|
||||||
|
Issue: #1545 - Security vulnerability in cryptography package
|
||||||
|
Fix: Updated pyOpenSSL from >=24.3.0 to >=25.3.0
|
||||||
|
Expected: cryptography package should be >=45.0.7 (above vulnerable range)
|
||||||
|
"""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import sys
|
||||||
|
from packaging import version
|
||||||
|
|
||||||
|
|
||||||
|
def check_versions():
|
||||||
|
"""Verify pyOpenSSL and cryptography versions meet security requirements."""
|
||||||
|
print("=" * 60)
|
||||||
|
print("STEP 1: Checking Package Versions")
|
||||||
|
print("=" * 60)
|
||||||
|
|
||||||
|
try:
|
||||||
|
import OpenSSL
|
||||||
|
pyopenssl_version = OpenSSL.__version__
|
||||||
|
print(f"✓ pyOpenSSL version: {pyopenssl_version}")
|
||||||
|
|
||||||
|
# Check pyOpenSSL >= 25.3.0
|
||||||
|
if version.parse(pyopenssl_version) >= version.parse("25.3.0"):
|
||||||
|
print(f" ✓ Version check passed: {pyopenssl_version} >= 25.3.0")
|
||||||
|
else:
|
||||||
|
print(f" ✗ Version check FAILED: {pyopenssl_version} < 25.3.0")
|
||||||
|
return False
|
||||||
|
|
||||||
|
except ImportError as e:
|
||||||
|
print(f"✗ Failed to import pyOpenSSL: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
import cryptography
|
||||||
|
crypto_version = cryptography.__version__
|
||||||
|
print(f"✓ cryptography version: {crypto_version}")
|
||||||
|
|
||||||
|
# Check cryptography >= 45.0.7 (above vulnerable range)
|
||||||
|
if version.parse(crypto_version) >= version.parse("45.0.7"):
|
||||||
|
print(f" ✓ Security check passed: {crypto_version} >= 45.0.7 (not vulnerable)")
|
||||||
|
else:
|
||||||
|
print(f" ✗ Security check FAILED: {crypto_version} < 45.0.7 (potentially vulnerable)")
|
||||||
|
return False
|
||||||
|
|
||||||
|
except ImportError as e:
|
||||||
|
print(f"✗ Failed to import cryptography: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
print("\n✓ All version checks passed!\n")
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
async def test_basic_crawl():
|
||||||
|
"""Test basic crawling functionality with HTTPS site."""
|
||||||
|
print("=" * 60)
|
||||||
|
print("STEP 2: Testing Basic HTTPS Crawling")
|
||||||
|
print("=" * 60)
|
||||||
|
|
||||||
|
try:
|
||||||
|
from crawl4ai import AsyncWebCrawler
|
||||||
|
|
||||||
|
async with AsyncWebCrawler(verbose=True) as crawler:
|
||||||
|
# Test with a simple HTTPS site (requires SSL/TLS)
|
||||||
|
print("Crawling example.com (HTTPS)...")
|
||||||
|
result = await crawler.arun(
|
||||||
|
url="https://www.example.com",
|
||||||
|
bypass_cache=True
|
||||||
|
)
|
||||||
|
|
||||||
|
if result.success:
|
||||||
|
print(f"✓ Crawl successful!")
|
||||||
|
print(f" - Status code: {result.status_code}")
|
||||||
|
print(f" - Content length: {len(result.html)} bytes")
|
||||||
|
print(f" - SSL/TLS connection: ✓ Working")
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
print(f"✗ Crawl failed: {result.error_message}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"✗ Test failed with error: {e}")
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc()
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
async def test_stealth_mode():
|
||||||
|
"""Test stealth mode functionality (depends on playwright-stealth)."""
|
||||||
|
print("\n" + "=" * 60)
|
||||||
|
print("STEP 3: Testing Stealth Mode Integration")
|
||||||
|
print("=" * 60)
|
||||||
|
|
||||||
|
try:
|
||||||
|
from crawl4ai import AsyncWebCrawler, BrowserConfig
|
||||||
|
|
||||||
|
# Create browser config with stealth mode
|
||||||
|
browser_config = BrowserConfig(
|
||||||
|
headless=True,
|
||||||
|
verbose=False
|
||||||
|
)
|
||||||
|
|
||||||
|
async with AsyncWebCrawler(config=browser_config, verbose=True) as crawler:
|
||||||
|
print("Crawling with stealth mode enabled...")
|
||||||
|
result = await crawler.arun(
|
||||||
|
url="https://www.example.com",
|
||||||
|
bypass_cache=True
|
||||||
|
)
|
||||||
|
|
||||||
|
if result.success:
|
||||||
|
print(f"✓ Stealth crawl successful!")
|
||||||
|
print(f" - Stealth mode: ✓ Working")
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
print(f"✗ Stealth crawl failed: {result.error_message}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"✗ Stealth test failed with error: {e}")
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc()
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
async def main():
|
||||||
|
"""Run all tests."""
|
||||||
|
print("\n")
|
||||||
|
print("╔" + "=" * 58 + "╗")
|
||||||
|
print("║ pyOpenSSL Security Update Verification Test (Issue #1545) ║")
|
||||||
|
print("╚" + "=" * 58 + "╝")
|
||||||
|
print("\n")
|
||||||
|
|
||||||
|
# Step 1: Check versions
|
||||||
|
versions_ok = check_versions()
|
||||||
|
if not versions_ok:
|
||||||
|
print("\n✗ FAILED: Version requirements not met")
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Step 2: Test basic crawling
|
||||||
|
crawl_ok = await test_basic_crawl()
|
||||||
|
if not crawl_ok:
|
||||||
|
print("\n✗ FAILED: Basic crawling test failed")
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Step 3: Test stealth mode
|
||||||
|
stealth_ok = await test_stealth_mode()
|
||||||
|
if not stealth_ok:
|
||||||
|
print("\n✗ FAILED: Stealth mode test failed")
|
||||||
|
return False
|
||||||
|
|
||||||
|
# All tests passed
|
||||||
|
print("\n" + "=" * 60)
|
||||||
|
print("FINAL RESULT")
|
||||||
|
print("=" * 60)
|
||||||
|
print("✓ All tests passed successfully!")
|
||||||
|
print("✓ pyOpenSSL update is working correctly")
|
||||||
|
print("✓ No breaking changes detected")
|
||||||
|
print("✓ Security vulnerability resolved")
|
||||||
|
print("=" * 60)
|
||||||
|
print("\n")
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
try:
|
||||||
|
success = asyncio.run(main())
|
||||||
|
sys.exit(0 if success else 1)
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
print("\n\nTest interrupted by user")
|
||||||
|
sys.exit(1)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"\n✗ Unexpected error: {e}")
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc()
|
||||||
|
sys.exit(1)
|
||||||
Reference in New Issue
Block a user