Open-source Python library for AI browser agents, plus Browser Use Cloud: stealth browsers and a hosted agent API.
Python ai-agentsai-toolsbrowser-agentbrowser-automationbrowser-usecdpcloud-browsercomputer-useheadless-browserllmmcpplaywrightpythonremote-browserstealth-browserweb-automationweb-scraping
move watchdogs into subfolder
Nick Sweeting3c90c842a0a2
diff --git a/browser_use/browser/session.py b/browser_use/browser/session.pyindex e4d65092e..ae614739d 100644--- a/browser_use/browser/session.py+++ b/browser_use/browser/session.py@@ -795,17 +795,17 @@ class BrowserSession(BaseModel):self.logger.debug('Watchdogs already attached, skipping duplicate attachment')return- from browser_use.browser.aboutblank_watchdog import AboutBlankWatchdog+ from browser_use.browser.watchdogs.aboutblank_watchdog import AboutBlankWatchdog# from browser_use.browser.crash_watchdog import CrashWatchdog- from browser_use.browser.default_action_watchdog import DefaultActionWatchdog- from browser_use.browser.dom_watchdog import DOMWatchdog- from browser_use.browser.downloads_watchdog import DownloadsWatchdog- from browser_use.browser.local_browser_watchdog import LocalBrowserWatchdog- from browser_use.browser.permissions_watchdog import PermissionsWatchdog- from browser_use.browser.popups_watchdog import PopupsWatchdog- from browser_use.browser.screenshot_watchdog import ScreenshotWatchdog- from browser_use.browser.security_watchdog import SecurityWatchdog+ from browser_use.browser.watchdogs.default_action_watchdog import DefaultActionWatchdog+ from browser_use.browser.watchdogs.dom_watchdog import DOMWatchdog+ from browser_use.browser.watchdogs.downloads_watchdog import DownloadsWatchdog+ from browser_use.browser.watchdogs.local_browser_watchdog import LocalBrowserWatchdog+ from browser_use.browser.watchdogs.permissions_watchdog import PermissionsWatchdog+ from browser_use.browser.watchdogs.popups_watchdog import PopupsWatchdog+ from browser_use.browser.watchdogs.screenshot_watchdog import ScreenshotWatchdog+ from browser_use.browser.watchdogs.security_watchdog import SecurityWatchdog# from browser_use.browser.storage_state_watchdog import StorageStateWatchdog# Initialize CrashWatchdog@@ -1916,9 +1916,7 @@ class BrowserSession(BaseModel):)object_id = result.get('object', {}).get('objectId')if not object_id:- raise ValueError(- f'Could not find #{node.element_index} backendNodeId={node.backend_node_id} in target_id={cdp_session.target_id}'- )+ raise ValueError(f'Could not find #{node.element_index} backendNodeId={node.backend_node_id} in target_id={cdp_session.target_id}')return cdp_sessionexcept (ValueError, Exception) as e:# Fall back to main session if frame not found@@ -1933,9 +1931,7 @@ class BrowserSession(BaseModel):)object_id = result.get('object', {}).get('objectId')if not object_id:- raise ValueError(- f'Could not find #{node.element_index} backendNodeId={node.backend_node_id} in target_id={cdp_session.target_id}'- )+ raise ValueError(f'Could not find #{node.element_index} backendNodeId={node.backend_node_id} in target_id={cdp_session.target_id}')except Exception as e:self.logger.debug(f'Failed to get CDP client for target {node.target_id}: {e}, using main session')diff --git a/browser_use/browser/types.py b/browser_use/browser/watchdogs/__init__.pysimilarity index 100%rename from browser_use/browser/types.pyrename to browser_use/browser/watchdogs/__init__.pydiff --git a/browser_use/browser/aboutblank_watchdog.py b/browser_use/browser/watchdogs/aboutblank_watchdog.pysimilarity index 100%rename from browser_use/browser/aboutblank_watchdog.pyrename to browser_use/browser/watchdogs/aboutblank_watchdog.pydiff --git a/browser_use/browser/crash_watchdog.py b/browser_use/browser/watchdogs/crash_watchdog.pysimilarity index 100%rename from browser_use/browser/crash_watchdog.pyrename to browser_use/browser/watchdogs/crash_watchdog.pydiff --git a/browser_use/browser/default_action_watchdog.py b/browser_use/browser/watchdogs/default_action_watchdog.pysimilarity index 100%rename from browser_use/browser/default_action_watchdog.pyrename to browser_use/browser/watchdogs/default_action_watchdog.pydiff --git a/browser_use/browser/dom_watchdog.py b/browser_use/browser/watchdogs/dom_watchdog.pysimilarity index 100%rename from browser_use/browser/dom_watchdog.pyrename to browser_use/browser/watchdogs/dom_watchdog.pydiff --git a/browser_use/browser/downloads_watchdog.py b/browser_use/browser/watchdogs/downloads_watchdog.pysimilarity index 96%rename from browser_use/browser/downloads_watchdog.pyrename to browser_use/browser/watchdogs/downloads_watchdog.pyindex 71037a356..026f66c35 100644--- a/browser_use/browser/downloads_watchdog.py+++ b/browser_use/browser/watchdogs/downloads_watchdog.py@@ -228,9 +228,16 @@ class DownloadsWatchdog(BaseWatchdog):self.browser_session.browser_profile.downloads_pathor f'{tempfile.gettempdir()}/browser_use_downloads.{str(self.browser_session.id)[-4:]}')++ # Initialize variables that may be used outside try blocks+ unique_filename = None+ file_size = 0+ expected_path = None+ download_result = None+ download_url = event.get('url', '')+ suggested_filename = event.get('suggestedFilename', 'download')+try:- download_url = event.get('url', '')- suggested_filename = event.get('suggestedFilename', 'download')guid = event.get('guid', '')self.logger.debug(f'[DownloadsWatchdog] ⬇️ File download starting: {suggested_filename} from {download_url[:100]}...')@@ -306,6 +313,30 @@ class DownloadsWatchdog(BaseWatchdog):self.logger.debug(f'[DownloadsWatchdog] ✅ Downloaded and saved file: {final_path} ({file_size} bytes)')expected_path = final_path++ # Determine file type from extension+ file_ext = expected_path.suffix.lower().lstrip('.')+ file_type = file_ext if file_ext else None++ # Emit download event+ self.event_bus.dispatch(+ FileDownloadedEvent(+ url=download_url,+ path=str(expected_path),+ file_name=unique_filename,+ file_size=file_size,+ file_type=file_type,+ mime_type=download_result.get('contentType') if download_result else None,+ from_cache=False,+ auto_download=False,+ )+ )++ self.logger.debug(+ f'[DownloadsWatchdog] ✅ File download completed via CDP: {suggested_filename} ({file_size} bytes) saved to {expected_path}'+ )+ # Success - return early+ returnelse:self.logger.error('[DownloadsWatchdog] ❌ No data received from fetch')# Fall through to polling logic@@ -313,30 +344,6 @@ class DownloadsWatchdog(BaseWatchdog):except Exception as fetch_error:self.logger.error(f'[DownloadsWatchdog] ❌ Failed to download file via fetch: {fetch_error}')# Fall through to polling logic-- # Determine file type from extension- file_ext = expected_path.suffix.lower().lstrip('.')- file_type = file_ext if file_ext else None-- # Emit download event- self.event_bus.dispatch(- FileDownloadedEvent(- url=download_url,- path=str(expected_path),- file_name=unique_filename,- file_size=file_size,- file_type=file_type,- mime_type=download_result.get('contentType') if download_result else None,- from_cache=False,- auto_download=False,- )- )-- self.logger.debug(- f'[DownloadsWatchdog] ✅ File download completed via CDP: {suggested_filename} ({file_size} bytes) saved to {expected_path}'- )- # Success - return early- returnexcept Exception as e:self.logger.error(f'[DownloadsWatchdog] ❌ Error handling CDP download: {type(e).__name__} {e}')diff --git a/browser_use/browser/local_browser_watchdog.py b/browser_use/browser/watchdogs/local_browser_watchdog.pysimilarity index 100%rename from browser_use/browser/local_browser_watchdog.pyrename to browser_use/browser/watchdogs/local_browser_watchdog.pydiff --git a/browser_use/browser/permissions_watchdog.py b/browser_use/browser/watchdogs/permissions_watchdog.pysimilarity index 100%rename from browser_use/browser/permissions_watchdog.pyrename to browser_use/browser/watchdogs/permissions_watchdog.pydiff --git a/browser_use/browser/popups_watchdog.py b/browser_use/browser/watchdogs/popups_watchdog.pysimilarity index 100%rename from browser_use/browser/popups_watchdog.pyrename to browser_use/browser/watchdogs/popups_watchdog.pydiff --git a/browser_use/browser/screenshot_watchdog.py b/browser_use/browser/watchdogs/screenshot_watchdog.pysimilarity index 100%rename from browser_use/browser/screenshot_watchdog.pyrename to browser_use/browser/watchdogs/screenshot_watchdog.pydiff --git a/browser_use/browser/security_watchdog.py b/browser_use/browser/watchdogs/security_watchdog.pysimilarity index 100%rename from browser_use/browser/security_watchdog.pyrename to browser_use/browser/watchdogs/security_watchdog.pydiff --git a/browser_use/browser/storage_state_watchdog.py b/browser_use/browser/watchdogs/storage_state_watchdog.pysimilarity index 100%rename from browser_use/browser/storage_state_watchdog.pyrename to browser_use/browser/watchdogs/storage_state_watchdog.pydiff --git a/tests/ci/test_browser_watchdog_downloads.py b/tests/ci/test_browser_watchdog_downloads.pyindex 0f3813492..6350b5775 100644--- a/tests/ci/test_browser_watchdog_downloads.py+++ b/tests/ci/test_browser_watchdog_downloads.py@@ -58,7 +58,7 @@ async def download_test_server(httpserver):return httpserver[email protected](reason='TODO: fix')async def test_downloads_watchdog_lifecycle():"""Test that DownloadsWatchdog starts and stops with browser session."""# Use temp directory for downloads@@ -94,7 +94,7 @@ async def test_downloads_watchdog_lifecycle():await session.event_bus.stop(clear=True, timeout=5)[email protected](reason='TODO: fix')async def test_downloads_watchdog_file_detection(download_test_server):"""Test that DownloadsWatchdog detects file downloads."""# Use temp directory for downloads