mcp-query-table 0.3.0__tar.gz → 0.3.2__tar.gz

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp_query_table
-Version: 0.3.0
+Version: 0.3.2
 Summary: query table from website, support MCP
 Author-email: wukan <wu-kan@163.com>
 License: MIT License
@@ -70,31 +70,31 @@ from mcp_query_table import *
 
 
 async def main() -> None:
-   async with BrowserManager(port=9222, browser_path=None, debug=True) as bm:
-      # 问财需要保证浏览器宽度>768，防止界面变成适应手机
-      page = await bm.get_page()
-      df = await query(page, '收益最好的200只ETF', query_type=QueryType.ETF, max_page=1, site=Site.THS)
-      print(df.to_markdown())
-      df = await query(page, '年初至今收益率前50', query_type=QueryType.Fund, max_page=1, site=Site.TDX)
-      print(df.to_csv())
-      df = await query(page, '流通市值前10的行业板块', query_type=QueryType.Index, max_page=1, site=Site.TDX)
-      print(df.to_csv())
-      # TODO 东财翻页要提前登录
-      df = await query(page, '今日涨幅前5的概念板块;', query_type=QueryType.Board, max_page=3, site=Site.EastMoney)
-      print(df)
-
-      output = await chat(page, "1+2等于多少？", provider=Provider.YuanBao)
-      print(output)
-      output = await chat(page, "3+4等于多少？", provider=Provider.YuanBao, create=True)
-      print(output)
-
-      print('done')
-      bm.release_page(page)
-      await page.wait_for_timeout(2000)
+    async with BrowserManager(cdp_endpoint="http://127.0.0.1:9222", executable_path=None, debug=True) as bm:
+        # 问财需要保证浏览器宽度>768，防止界面变成适应手机
+        page = await bm.get_page()
+        df = await query(page, '收益最好的200只ETF', query_type=QueryType.ETF, max_page=1, site=Site.THS)
+        print(df.to_markdown())
+        df = await query(page, '年初至今收益率前50', query_type=QueryType.Fund, max_page=1, site=Site.TDX)
+        print(df.to_csv())
+        df = await query(page, '流通市值前10的行业板块', query_type=QueryType.Index, max_page=1, site=Site.TDX)
+        print(df.to_csv())
+        # TODO 东财翻页要提前登录
+        df = await query(page, '今日涨幅前5的概念板块;', query_type=QueryType.Board, max_page=3, site=Site.EastMoney)
+        print(df)
+
+        output = await chat(page, "1+2等于多少？", provider=Provider.YuanBao)
+        print(output)
+        output = await chat(page, "3+4等于多少？", provider=Provider.YuanBao, create=True)
+        print(output)
+
+        print('done')
+        bm.release_page(page)
+        await page.wait_for_timeout(2000)
 
 
 if __name__ == '__main__':
-   asyncio.run(main())
+    asyncio.run(main())
 
 ```
 
@@ -132,7 +132,7 @@ if __name__ == '__main__':
 
 确保可以在控制台中执行`python -m mcp_query_table -h`。如果不能，可能要先`pip install mcp_query_table`
 
-在`Cline`中可以配置如下。其中`command`是`python`的绝对路径，`browser_path`是`Chrome`的绝对路径。
+在`Cline`中可以配置如下。其中`command`是`python`的绝对路径，`executable_path`是`Chrome`的绝对路径。
 
 ### STDIO方式
 
@@ -146,7 +146,9 @@ if __name__ == '__main__':
         "mcp_query_table",
         "--format",
         "markdown",
-        "--browser_path",
+        "--cdp_endpoint",
+        "http://127.0.0.1:9222",
+        "--executable_path",
         "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe"
       ]
     }
@@ -159,11 +161,20 @@ if __name__ == '__main__':
 先在控制台中执行如下命令，启动`MCP`服务
 
 ```commandline
-python -m mcp_query_table --format markdown --browser_path "C:\Program Files\Google\Chrome\Application\chrome.exe" --transport sse --mcp_port 8000
+python -m mcp_query_table --format markdown --transport sse --port 8000
 ```
 
 然后就可以连接到`MCP`服务了
-http://localhost:8000/sse
+
+```json
+{
+  "mcpServers": {
+    "mcp_query_table": {
+      "url": "http://127.0.0.1:8000/sse"
+    }
+  }
+}
+```
 
 ## 使用`MCP Inspector`进行调试
 
@@ -171,7 +182,8 @@ http://localhost:8000/sse
 npx @modelcontextprotocol/inspector python -m mcp_query_table --format markdown
 ```
 
-打开浏览器并翻页是一个比较耗时的操作，会导致`MCP Inspector`页面超时，可以`http://localhost:5173/?timeout=600000` 表示超时时间为600秒
+打开浏览器并翻页是一个比较耗时的操作，会导致`MCP Inspector`页面超时，可以`http://localhost:5173/?timeout=600000`
+表示超时时间为600秒
 
 第一次尝试编写`MCP`项目，可能会有各种问题，欢迎大家交流。
 

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/README.md

@@ -31,31 +31,31 @@ from mcp_query_table import *
 
 
 async def main() -> None:
-   async with BrowserManager(port=9222, browser_path=None, debug=True) as bm:
-      # 问财需要保证浏览器宽度>768，防止界面变成适应手机
-      page = await bm.get_page()
-      df = await query(page, '收益最好的200只ETF', query_type=QueryType.ETF, max_page=1, site=Site.THS)
-      print(df.to_markdown())
-      df = await query(page, '年初至今收益率前50', query_type=QueryType.Fund, max_page=1, site=Site.TDX)
-      print(df.to_csv())
-      df = await query(page, '流通市值前10的行业板块', query_type=QueryType.Index, max_page=1, site=Site.TDX)
-      print(df.to_csv())
-      # TODO 东财翻页要提前登录
-      df = await query(page, '今日涨幅前5的概念板块;', query_type=QueryType.Board, max_page=3, site=Site.EastMoney)
-      print(df)
-
-      output = await chat(page, "1+2等于多少？", provider=Provider.YuanBao)
-      print(output)
-      output = await chat(page, "3+4等于多少？", provider=Provider.YuanBao, create=True)
-      print(output)
-
-      print('done')
-      bm.release_page(page)
-      await page.wait_for_timeout(2000)
+    async with BrowserManager(cdp_endpoint="http://127.0.0.1:9222", executable_path=None, debug=True) as bm:
+        # 问财需要保证浏览器宽度>768，防止界面变成适应手机
+        page = await bm.get_page()
+        df = await query(page, '收益最好的200只ETF', query_type=QueryType.ETF, max_page=1, site=Site.THS)
+        print(df.to_markdown())
+        df = await query(page, '年初至今收益率前50', query_type=QueryType.Fund, max_page=1, site=Site.TDX)
+        print(df.to_csv())
+        df = await query(page, '流通市值前10的行业板块', query_type=QueryType.Index, max_page=1, site=Site.TDX)
+        print(df.to_csv())
+        # TODO 东财翻页要提前登录
+        df = await query(page, '今日涨幅前5的概念板块;', query_type=QueryType.Board, max_page=3, site=Site.EastMoney)
+        print(df)
+
+        output = await chat(page, "1+2等于多少？", provider=Provider.YuanBao)
+        print(output)
+        output = await chat(page, "3+4等于多少？", provider=Provider.YuanBao, create=True)
+        print(output)
+
+        print('done')
+        bm.release_page(page)
+        await page.wait_for_timeout(2000)
 
 
 if __name__ == '__main__':
-   asyncio.run(main())
+    asyncio.run(main())
 
 ```
 
@@ -93,7 +93,7 @@ if __name__ == '__main__':
 
 确保可以在控制台中执行`python -m mcp_query_table -h`。如果不能，可能要先`pip install mcp_query_table`
 
-在`Cline`中可以配置如下。其中`command`是`python`的绝对路径，`browser_path`是`Chrome`的绝对路径。
+在`Cline`中可以配置如下。其中`command`是`python`的绝对路径，`executable_path`是`Chrome`的绝对路径。
 
 ### STDIO方式
 
@@ -107,7 +107,9 @@ if __name__ == '__main__':
         "mcp_query_table",
         "--format",
         "markdown",
-        "--browser_path",
+        "--cdp_endpoint",
+        "http://127.0.0.1:9222",
+        "--executable_path",
         "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe"
       ]
     }
@@ -120,11 +122,20 @@ if __name__ == '__main__':
 先在控制台中执行如下命令，启动`MCP`服务
 
 ```commandline
-python -m mcp_query_table --format markdown --browser_path "C:\Program Files\Google\Chrome\Application\chrome.exe" --transport sse --mcp_port 8000
+python -m mcp_query_table --format markdown --transport sse --port 8000
 ```
 
 然后就可以连接到`MCP`服务了
-http://localhost:8000/sse
+
+```json
+{
+  "mcpServers": {
+    "mcp_query_table": {
+      "url": "http://127.0.0.1:8000/sse"
+    }
+  }
+}
+```
 
 ## 使用`MCP Inspector`进行调试
 
@@ -132,7 +143,8 @@ http://localhost:8000/sse
 npx @modelcontextprotocol/inspector python -m mcp_query_table --format markdown
 ```
 
-打开浏览器并翻页是一个比较耗时的操作，会导致`MCP Inspector`页面超时，可以`http://localhost:5173/?timeout=600000` 表示超时时间为600秒
+打开浏览器并翻页是一个比较耗时的操作，会导致`MCP Inspector`页面超时，可以`http://localhost:5173/?timeout=600000`
+表示超时时间为600秒
 
 第一次尝试编写`MCP`项目，可能会有各种问题，欢迎大家交流。
 

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/mcp_query_table/__init__.py

@@ -2,3 +2,5 @@ from ._version import __version__
 
 from .enums import QueryType, Site, Provider
 from .tool import BrowserManager, query, chat
+
+TIMEOUT = 1000 * 60 * 2  # 2分钟，在抓取EventStream数据时等待数据返回，防止外层30秒超时

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/mcp_query_table/__main__.py

@@ -10,19 +10,20 @@ def main():
 
     parser.add_argument("--format", type=str, help="输出格式",
                         default='markdown', choices=['markdown', 'csv', 'json'])
-    parser.add_argument("--cdp_port", type=int, help="浏览器远程调试端口",
-                        default=9222)
-    parser.add_argument("--browser_path", type=str, help="浏览器类型",
+    parser.add_argument("--cdp_endpoint", type=str, help="浏览器CDP调试地址",
+                        default="http://127.0.0.1:9222")
+    parser.add_argument("--executable_path", type=str, help="浏览器类型",
                         default=r'C:\Program Files\Google\Chrome\Application\chrome.exe')
 
     parser.add_argument("--transport", type=str, help="传输类型",
                         default='stdio', choices=['stdio', 'sse'])
-    parser.add_argument("--mcp_host", type=str, help="MCP服务端地址",
+    parser.add_argument("--host", type=str, help="MCP服务端绑定地址",
                         default='0.0.0.0')
-    parser.add_argument("--mcp_port", type=int, help="MCP服务端端口",
+    parser.add_argument("--port", type=int, help="MCP服务端绑定端口",
                         default='8000')
     args = parser.parse_args()
-    serve(args.format, args.cdp_port, args.browser_path, args.transport, args.mcp_host, args.mcp_port)
+    serve(args.format, args.cdp_endpoint, args.executable_path,
+          args.transport, args.host, args.port)
 
 
 if __name__ == "__main__":

mcp_query_table-0.3.2/mcp_query_table/_version.py

@@ -0,0 +1 @@
+__version__ = "0.3.2"

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/mcp_query_table/enums.py

@@ -23,6 +23,6 @@ class Site(Enum):
 
 class Provider(Enum):
     """提供商"""
-    N = '纳米搜索'  # 360 纳米搜索
+    Nami = '纳米搜索'  # 360 纳米搜索
     YuanBao = '腾讯元宝'  # 腾讯元宝
     BaiDu = '百度AI搜索'  # 百度AI搜索

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/mcp_query_table/providers/baidu.py

@@ -7,11 +7,11 @@ import json
 
 from playwright.async_api import Page
 
+import mcp_query_table
 from mcp_query_table.tool import GlobalVars
 
 _PAGE0_ = "https://chat.baidu.com/search"
 _PAGE1_ = "https://chat.baidu.com/aichat/api/conversation"
-_TIMEOUT_ = 1000 * 120
 
 G = GlobalVars()
 
@@ -55,9 +55,9 @@ async def on_response(response):
 async def on_route(route):
     # 避免出现 Protocol error (Network.getResponseBody): No data found for resource with given identifier
     # print("on_route", route.request.url)
-    if route.request.url.startswith(_PAGE1_):
+    if route.request.url == _PAGE1_:
         # TODO 为何只要转发一下就没事了？
-        response = await route.fetch(timeout=_TIMEOUT_)
+        response = await route.fetch(timeout=mcp_query_table.TIMEOUT)
         await route.fulfill(response=response)
     else:
         await route.continue_()
@@ -74,7 +74,7 @@ async def chat(page: Page,
         await page.goto(_PAGE0_)
 
     await page.route(_PAGE1_, on_route)
-    async with page.expect_response(_PAGE1_, timeout=_TIMEOUT_) as response_info:
+    async with page.expect_response(_PAGE1_, timeout=mcp_query_table.TIMEOUT) as response_info:
         await page.locator("#chat-input-box").fill(prompt)
         await page.locator("#chat-input-box").press("Enter")
     await on_response(await response_info.value)

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/mcp_query_table/providers/n.py

@@ -5,12 +5,12 @@ import json
 
 from playwright.async_api import Page
 
+import mcp_query_table
 from mcp_query_table.tool import GlobalVars
 
 _PAGE0_ = "https://www.n.cn"
 _PAGE1_ = "https://www.n.cn/search"
 _PAGE2_ = "https://www.n.cn/api/common/chat/v2"
-_TIMEOUT_ = 1000 * 120
 
 G = GlobalVars()
 
@@ -68,7 +68,7 @@ async def chat(page: Page,
     else:
         name = "提出后续问题，Enter发送，Shift+Enter 换行"
 
-    async with page.expect_response(_PAGE2_, timeout=_TIMEOUT_) as response_info:
+    async with page.expect_response(_PAGE2_, timeout=mcp_query_table.TIMEOUT) as response_info:
         textbox = page.get_by_role("textbox", name=name)
         await textbox.fill(prompt)
         await textbox.press("Enter")

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/mcp_query_table/providers/yuanbao.py

@@ -5,11 +5,11 @@ import json
 
 from playwright.async_api import Page
 
+import mcp_query_table
 from mcp_query_table.tool import GlobalVars
 
 _PAGE0_ = "https://yuanbao.tencent.com/"
 _PAGE1_ = "https://yuanbao.tencent.com/api/chat"
-_TIMEOUT_ = 1000 * 120
 
 G = GlobalVars()
 
@@ -52,7 +52,7 @@ async def on_route(route):
     # print("on_route", route.request.url)
     if route.request.url.startswith(_PAGE1_):
         # TODO 这里会导致数据全部加载，逻辑变了，所以界面可能混乱
-        response = await route.fetch(timeout=_TIMEOUT_)
+        response = await route.fetch(timeout=mcp_query_table.TIMEOUT)
         await route.fulfill(
             # 强行加utf-8，否则编码搞不定
             content_type="text/event-stream; charset=utf-8",
@@ -73,7 +73,7 @@ async def chat(page: Page,
         await page.goto(_PAGE0_)
 
     await page.route(f"{_PAGE1_}/*", on_route)
-    async with page.expect_response(f"{_PAGE1_}/*", timeout=_TIMEOUT_) as response_info:
+    async with page.expect_response(f"{_PAGE1_}/*", timeout=mcp_query_table.TIMEOUT) as response_info:
         textbox = page.locator(".ql-editor")
         await textbox.fill(prompt)
         await textbox.press("Enter")

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/mcp_query_table/server.py

@@ -10,9 +10,12 @@ from mcp_query_table.tool import BrowserManager
 
 
 class QueryServer:
-    def __init__(self, format: str = 'markdown', port: int = 9222, browser_path: Optional[str] = None) -> None:
+    def __init__(self,
+                 format: str = 'markdown',
+                 cdp_endpoint: Optional[str] = 'http://127.0.0.1:9222',
+                 executable_path: Optional[str] = None) -> None:
         self.format: str = format
-        self.browser = BrowserManager(port=port, browser_path=browser_path, debug=False)
+        self.browser = BrowserManager(cdp_endpoint=cdp_endpoint, executable_path=executable_path, debug=False)
 
     async def query(self, query_input: str, query_type: QueryType, max_page: int, site: Site):
         page = await self.browser.get_page()
@@ -54,19 +57,21 @@ async def query(
 async def chat(
         prompt: Annotated[str, Field(description="提示词。如：`9.9大还是9.11大？`")],
         create: Annotated[bool, Field(default=False, description="是否创建新对话")],
-        provider: Annotated[Provider, Field(default=Provider.N, description="提供商。支持`纳米搜索`、`腾讯元宝`")]
+        provider: Annotated[
+            Provider, Field(default=Provider.Nami, description="提供商。支持`纳米搜索`、`腾讯元宝`、`百度AI搜索`")]
 ) -> str:
     return await qsv.chat(prompt, create, provider)
 
 
-def serve(format, cdp_port, browser_path, transport, mcp_host, mcp_port):
+def serve(format, cdp_endpoint, executable_path, transport, host, port):
     qsv.format = format
-    qsv.port = cdp_port
-    qsv.browser_path = browser_path
-    logger.info("serve:{},{},{},{}", qsv.format, qsv.port, qsv.browser_path, transport)
+    qsv.cdp_endpoint = cdp_endpoint
+    qsv.executable_path = executable_path
+    logger.info(f"{format=},{transport=}")
+    logger.info(f"{cdp_endpoint=},{executable_path=}")
     if transport == 'sse':
-        logger.info("mcp:{},{}:{}", transport, mcp_host, mcp_port)
+        logger.info(f"{host=},{port=}", transport, host, port)
 
-    mcp.settings.host = mcp_host
-    mcp.settings.port = mcp_port
+    mcp.settings.host = host
+    mcp.settings.port = port
     mcp.run(transport=transport)

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/mcp_query_table/tool.py

@@ -10,11 +10,6 @@ from playwright.async_api import async_playwright, Playwright, Page
 
 from mcp_query_table.enums import QueryType, Site, Provider
 
-browsers_path = {
-    "chrome.exe": r"C:\Program Files\Google\Chrome\Application\chrome.exe",
-    "msedge.exe": r"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"
-}
-
 
 def create_detached_process(command):
     # 设置通用参数
@@ -33,6 +28,29 @@ def create_detached_process(command):
     return subprocess.Popen(command, **kwargs)
 
 
+def is_local_url(url: str) -> bool:
+    """判断url是否是本地地址"""
+    for local in ('localhost', '127.0.0.1'):
+        if local in url.lower():
+            return True
+    return False
+
+
+def get_executable_path(executable_path) -> Optional[str]:
+    """获取浏览器可执行文件路径"""
+    browsers = {
+        "default": executable_path,
+        "chrome.exe": r"C:\Program Files\Google\Chrome\Application\chrome.exe",
+        "msedge.exe": r"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe",
+    }
+    for k, v in browsers.items():
+        if v is None:
+            continue
+        if Path(v).exists():
+            return v
+    return None
+
+
 class BrowserManager:
     async def __aenter__(self):
         return self
@@ -40,29 +58,24 @@ class BrowserManager:
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         await self.cleanup()
 
-    def __init__(self, port: int = 9222, browser_path: Optional[str] = None, debug: bool = False):
+    def __init__(self,
+                 cdp_endpoint: Optional[str] = None,
+                 executable_path: Optional[str] = None,
+                 debug: bool = False):
         """
 
         Parameters
         ----------
-        port:int
-            浏览器调试端口
-        browser_path
-            浏览器可执行路径。推荐使用chrome，因为Microsoft Edge必须在任务管理器中完全退出才能启动调试端口
+        cdp_endpoint:str
+            浏览器CDP地址
+        executable_path:str
+            浏览器可执行文件路径。推荐使用chrome，因为Microsoft Edge必须在任务管理器中完全退出才能启动调试端口
         debug:bool
             是否显示开发者工具
 
         """
-        if browser_path is None:
-            for k, v in browsers_path.items():
-                if Path(v).exists():
-                    browser_path = v
-                    break
-            if browser_path is None:
-                raise ValueError("未找到浏览器可执行文件")
-
-        self.port = port
-        self.browser_path = browser_path
+        self.cdp_endpoint = cdp_endpoint or 'http://127.0.0.1:9222'
+        self.executable_path = executable_path
         self.debug = debug
 
         self.playwright: Optional[Playwright] = None
@@ -77,25 +90,18 @@ class BrowserManager:
         if self.playwright:
             await self.playwright.stop()
 
-    async def _launch(self) -> None:
-        """启动浏览器，并连接CDP协议
-
-        References
-        ----------
-        https://blog.csdn.net/qq_30576521/article/details/142370538
-
-        """
-        endpoint = f"http://127.0.0.1:{self.port}"
-        command = [self.browser_path, f'--remote-debugging-port={self.port}', '--start-maximized']
-        name = Path(self.browser_path).name
+    async def _connect_to_local(self) -> None:
+        """连接本地浏览器"""
+        port = self.cdp_endpoint.split(':')[-1]
+        executable_path = get_executable_path(self.executable_path)
+        command = [executable_path, f'--remote-debugging-port={port}', '--start-maximized']
         if self.debug:
             command.append('--auto-open-devtools-for-tabs')
 
-        self.playwright = await async_playwright().start()
-
         for i in range(2):
             try:
-                self.browser = await self.playwright.chromium.connect_over_cdp(endpoint, timeout=10000, slow_mo=1000)
+                self.browser = await self.playwright.chromium.connect_over_cdp(self.cdp_endpoint,
+                                                                               timeout=10000, slow_mo=1000)
                 break
             except:
                 if i == 0:
@@ -105,7 +111,30 @@ class BrowserManager:
                     continue
                 if i == 1:
                     raise ConnectionError(
-                        f"已提前打开了浏览器，但未开启远程调试端口？请关闭浏览器全部进程后重试 `taskkill /f /im {name}`")
+                        f"已提前打开了浏览器，但未开启远程调试端口？请关闭浏览器全部进程后重试 `taskkill /f /im {Path(executable_path).name}`")
+
+    async def _connect_to_remote(self) -> None:
+        """连接远程浏览器"""
+        try:
+            self.browser = await self.playwright.chromium.connect_over_cdp(self.cdp_endpoint,
+                                                                           timeout=10000, slow_mo=1000)
+        except:
+            raise ConnectionError(f"连接远程浏览器失败，请检查CDP地址和端口是否正确。{self.cdp_endpoint}")
+
+    async def _launch(self) -> None:
+        """启动浏览器，并连接CDP协议
+
+        References
+        ----------
+        https://blog.csdn.net/qq_30576521/article/details/142370538
+
+        """
+        self.playwright = await async_playwright().start()
+
+        if is_local_url(self.cdp_endpoint):
+            await self._connect_to_local()
+        else:
+            await self._connect_to_remote()
 
         self.context = self.browser.contexts[0]
         # 复用打开的page
@@ -201,8 +230,27 @@ async def chat(
         page: Page,
         prompt: str = "9.9大还是9.11大？",
         create: bool = False,
-        provider: Provider = Provider.N) -> str:
-    if provider == Provider.N:
+        provider: Provider = Provider.Nami) -> str:
+    """大语言对话
+
+    Parameters
+    ----------
+    page : playwright.sync_api.Page
+        页面
+    prompt : str, optional
+        对话内容, by default "9.9大还是9.11大？"
+    create : bool, optional
+        是否创建新对话, by default False
+    provider : Provider, optional
+        提供商, by default Provider.N
+
+    Returns
+    -------
+    str
+        对话结果
+
+    """
+    if provider == Provider.Nami:
         from mcp_query_table.providers.n import chat
         return await chat(page, prompt, create)
     if provider == Provider.YuanBao:

{mcp_query_table-0.3.0 → mcp_query_table-0.3.2}/mcp_query_table.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp_query_table
-Version: 0.3.0
+Version: 0.3.2
 Summary: query table from website, support MCP
 Author-email: wukan <wu-kan@163.com>
 License: MIT License
@@ -70,31 +70,31 @@ from mcp_query_table import *
 
 
 async def main() -> None:
-   async with BrowserManager(port=9222, browser_path=None, debug=True) as bm:
-      # 问财需要保证浏览器宽度>768，防止界面变成适应手机
-      page = await bm.get_page()
-      df = await query(page, '收益最好的200只ETF', query_type=QueryType.ETF, max_page=1, site=Site.THS)
-      print(df.to_markdown())
-      df = await query(page, '年初至今收益率前50', query_type=QueryType.Fund, max_page=1, site=Site.TDX)
-      print(df.to_csv())
-      df = await query(page, '流通市值前10的行业板块', query_type=QueryType.Index, max_page=1, site=Site.TDX)
-      print(df.to_csv())
-      # TODO 东财翻页要提前登录
-      df = await query(page, '今日涨幅前5的概念板块;', query_type=QueryType.Board, max_page=3, site=Site.EastMoney)
-      print(df)
-
-      output = await chat(page, "1+2等于多少？", provider=Provider.YuanBao)
-      print(output)
-      output = await chat(page, "3+4等于多少？", provider=Provider.YuanBao, create=True)
-      print(output)
-
-      print('done')
-      bm.release_page(page)
-      await page.wait_for_timeout(2000)
+    async with BrowserManager(cdp_endpoint="http://127.0.0.1:9222", executable_path=None, debug=True) as bm:
+        # 问财需要保证浏览器宽度>768，防止界面变成适应手机
+        page = await bm.get_page()
+        df = await query(page, '收益最好的200只ETF', query_type=QueryType.ETF, max_page=1, site=Site.THS)
+        print(df.to_markdown())
+        df = await query(page, '年初至今收益率前50', query_type=QueryType.Fund, max_page=1, site=Site.TDX)
+        print(df.to_csv())
+        df = await query(page, '流通市值前10的行业板块', query_type=QueryType.Index, max_page=1, site=Site.TDX)
+        print(df.to_csv())
+        # TODO 东财翻页要提前登录
+        df = await query(page, '今日涨幅前5的概念板块;', query_type=QueryType.Board, max_page=3, site=Site.EastMoney)
+        print(df)
+
+        output = await chat(page, "1+2等于多少？", provider=Provider.YuanBao)
+        print(output)
+        output = await chat(page, "3+4等于多少？", provider=Provider.YuanBao, create=True)
+        print(output)
+
+        print('done')
+        bm.release_page(page)
+        await page.wait_for_timeout(2000)
 
 
 if __name__ == '__main__':
-   asyncio.run(main())
+    asyncio.run(main())
 
 ```
 
@@ -132,7 +132,7 @@ if __name__ == '__main__':
 
 确保可以在控制台中执行`python -m mcp_query_table -h`。如果不能，可能要先`pip install mcp_query_table`
 
-在`Cline`中可以配置如下。其中`command`是`python`的绝对路径，`browser_path`是`Chrome`的绝对路径。
+在`Cline`中可以配置如下。其中`command`是`python`的绝对路径，`executable_path`是`Chrome`的绝对路径。
 
 ### STDIO方式
 
@@ -146,7 +146,9 @@ if __name__ == '__main__':
         "mcp_query_table",
         "--format",
         "markdown",
-        "--browser_path",
+        "--cdp_endpoint",
+        "http://127.0.0.1:9222",
+        "--executable_path",
         "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe"
       ]
     }
@@ -159,11 +161,20 @@ if __name__ == '__main__':
 先在控制台中执行如下命令，启动`MCP`服务
 
 ```commandline
-python -m mcp_query_table --format markdown --browser_path "C:\Program Files\Google\Chrome\Application\chrome.exe" --transport sse --mcp_port 8000
+python -m mcp_query_table --format markdown --transport sse --port 8000
 ```
 
 然后就可以连接到`MCP`服务了
-http://localhost:8000/sse
+
+```json
+{
+  "mcpServers": {
+    "mcp_query_table": {
+      "url": "http://127.0.0.1:8000/sse"
+    }
+  }
+}
+```
 
 ## 使用`MCP Inspector`进行调试
 
@@ -171,7 +182,8 @@ http://localhost:8000/sse
 npx @modelcontextprotocol/inspector python -m mcp_query_table --format markdown
 ```
 
-打开浏览器并翻页是一个比较耗时的操作，会导致`MCP Inspector`页面超时，可以`http://localhost:5173/?timeout=600000` 表示超时时间为600秒
+打开浏览器并翻页是一个比较耗时的操作，会导致`MCP Inspector`页面超时，可以`http://localhost:5173/?timeout=600000`
+表示超时时间为600秒
 
 第一次尝试编写`MCP`项目，可能会有各种问题，欢迎大家交流。
 

mcp_query_table-0.3.0/mcp_query_table/_version.py

@@ -1 +0,0 @@
-__version__ = "0.3.0"