From 7c3ac6a3503e4bedf5004399a6db6c89ab2a0118 Mon Sep 17 00:00:00 2001 From: shenchucheng Date: Mon, 15 Jan 2024 13:20:13 +0800 Subject: [PATCH] fix test_scrape_web_page error --- metagpt/tools/web_browser_engine.py | 2 +- metagpt/tools/web_browser_engine_selenium.py | 2 +- tests/conftest.py | 2 +- tests/metagpt/tools/test_web_browser_engine_playwright.py | 4 ++-- tests/metagpt/tools/test_web_browser_engine_selenium.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/metagpt/tools/web_browser_engine.py b/metagpt/tools/web_browser_engine.py index 61d29688b..411c1604b 100644 --- a/metagpt/tools/web_browser_engine.py +++ b/metagpt/tools/web_browser_engine.py @@ -13,7 +13,7 @@ from metagpt.utils.parse_html import WebPage class WebBrowserEngine: def __init__( self, - engine: WebBrowserEngineType | None = WebBrowserEngineType.PLAYWRIGHT, + engine: WebBrowserEngineType = WebBrowserEngineType.PLAYWRIGHT, run_func: Callable[..., Coroutine[Any, Any, WebPage | list[WebPage]]] | None = None, ): if engine is None: diff --git a/metagpt/tools/web_browser_engine_selenium.py b/metagpt/tools/web_browser_engine_selenium.py index 7988358ff..02dd5c173 100644 --- a/metagpt/tools/web_browser_engine_selenium.py +++ b/metagpt/tools/web_browser_engine_selenium.py @@ -33,7 +33,7 @@ class SeleniumWrapper: def __init__( self, - browser_type: Literal["chrome", "firefox", "edge", "ie"] | None = None, + browser_type: Literal["chrome", "firefox", "edge", "ie"] = "chrome", launch_kwargs: dict | None = None, *, loop: asyncio.AbstractEventLoop | None = None, diff --git a/tests/conftest.py b/tests/conftest.py index f20c261a4..42b460357 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -127,7 +127,7 @@ def proxy(): server = await asyncio.start_server(handle_client, "127.0.0.1", 0) return server, "http://{}:{}".format(*server.sockets[0].getsockname()) - return proxy_func() + return proxy_func # see https://github.com/Delgan/loguru/issues/59#issuecomment-466591978 diff --git a/tests/metagpt/tools/test_web_browser_engine_playwright.py b/tests/metagpt/tools/test_web_browser_engine_playwright.py index 053f1782d..0e838a2f8 100644 --- a/tests/metagpt/tools/test_web_browser_engine_playwright.py +++ b/tests/metagpt/tools/test_web_browser_engine_playwright.py @@ -22,8 +22,8 @@ async def test_scrape_web_page(browser_type, use_proxy, kwagrs, url, urls, proxy global_proxy = config.proxy try: if use_proxy: - server, proxy = await proxy - config.proxy = proxy + server, proxy_url = await proxy() + config.proxy = proxy_url browser = web_browser_engine_playwright.PlaywrightWrapper(browser_type=browser_type, **kwagrs) result = await browser.run(url) assert isinstance(result, WebPage) diff --git a/tests/metagpt/tools/test_web_browser_engine_selenium.py b/tests/metagpt/tools/test_web_browser_engine_selenium.py index 8dcd006f3..e38905b85 100644 --- a/tests/metagpt/tools/test_web_browser_engine_selenium.py +++ b/tests/metagpt/tools/test_web_browser_engine_selenium.py @@ -25,8 +25,8 @@ async def test_scrape_web_page(browser_type, use_proxy, url, urls, proxy, capfd) global_proxy = config.proxy try: if use_proxy: - server, proxy = await proxy - config.proxy = proxy + server, proxy_url = await proxy() + config.proxy = proxy_url browser = web_browser_engine_selenium.SeleniumWrapper(browser_type=browser_type) result = await browser.run(url) assert isinstance(result, WebPage)