Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions crawl4ai/async_webcrawler.py
Original file line number Diff line number Diff line change
Expand Up @@ -1108,14 +1108,19 @@ async def maybe_release_session():

if stream:
async def result_transformer():
inner = dispatcher.run_urls_stream(
crawler=self, urls=urls, config=config
)
try:
async for task_result in dispatcher.run_urls_stream(
crawler=self, urls=urls, config=config
):
async for task_result in inner:
yield transform_result(task_result)
finally:
# Auto-release session after streaming completes
await maybe_release_session()
try:
await inner.aclose()
finally:
# Auto-release only after dispatcher cleanup completes,
# even if closing the inner stream raises.
await maybe_release_session()

return result_transformer()
else:
Expand Down Expand Up @@ -1247,4 +1252,4 @@ async def amap_domain(
config or DomainMapperConfig(**kwargs) if kwargs else DomainMapperConfig()
)

return await self._domain_mapper.scan(domain, mapper_config)
return await self._domain_mapper.scan(domain, mapper_config)
41 changes: 41 additions & 0 deletions tests/async/test_dispatchers.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,47 @@ async def crawl_url(self, url, config, task_id, retry_count=0):
assert dispatcher.concurrent_sessions == 0
assert dispatcher.task_queue.empty()

async def test_arun_many_stream_closure_cleans_up_dispatcher_tasks(self):
class TrackingDispatcher(MemoryAdaptiveDispatcher):
def __init__(self):
super().__init__(max_session_permit=3)
self.tasks = {}

async def crawl_url(self, url, config, task_id, retry_count=0):
self.tasks[url] = asyncio.current_task()
return await super().crawl_url(url, config, task_id, retry_count)

async def controlled_arun(url, config=None, session_id=None):
if url == "fast":
return SimpleNamespace(
url=url,
success=True,
status_code=200,
error_message="",
)
await asyncio.Event().wait()

crawler = AsyncWebCrawler()
crawler.arun = controlled_arun
dispatcher = TrackingDispatcher()
stream = await crawler.arun_many(
["fast", "blocked-1", "blocked-2"],
config=CrawlerRunConfig(stream=True),
dispatcher=dispatcher,
)

first = await asyncio.wait_for(stream.__anext__(), timeout=1)
assert first.url == "fast"

await asyncio.wait_for(stream.aclose(), timeout=1)

assert set(dispatcher.tasks) == {"fast", "blocked-1", "blocked-2"}
assert all(task.done() for task in dispatcher.tasks.values())
assert dispatcher.tasks["blocked-1"].cancelled()
assert dispatcher.tasks["blocked-2"].cancelled()
assert dispatcher.concurrent_sessions == 0
assert dispatcher.task_queue.empty()

async def test_semaphore_basic(self, browser_config, run_config, test_urls):
async with AsyncWebCrawler(config=browser_config) as crawler:
dispatcher = SemaphoreDispatcher(semaphore_count=2)
Expand Down