mcp-query-table 0.3.9__py3-none-any.whl → 0.3.11__py3-none-any.whl

mcp_query_table/__main__.py

@@ -17,9 +17,9 @@ def main():
     parser.add_argument("--executable_path", type=str, help="浏览器路径",
                         nargs="?", default=r'C:\Program Files\Google\Chrome\Application\chrome.exe')
     parser.add_argument("--user_data_dir", type=str, help="浏览器用户数据目录",
-                        nargs="?", default=rf'C:\Users\{getpass.getuser()}\AppData\Local\Google\Chrome\User Data\Default')
+                        nargs="?", default=rf'C:\Users\{getpass.getuser()}\AppData\Local\Google\Chrome\User Data')
     parser.add_argument("--transport", type=str, help="传输类型",
-                        default='stdio', choices=['stdio', 'sse'])
+                        default='stdio', choices=['stdio', 'sse', 'streamable-http'])
     parser.add_argument("--host", type=str, help="MCP服务端绑定地址",
                         default='0.0.0.0')
     parser.add_argument("--port", type=int, help="MCP服务端绑定端口",

mcp_query_table/_version.py

@@ -1 +1 @@
-__version__ = "0.3.9"
+__version__ = "0.3.11"

mcp_query_table/server.py

@@ -22,9 +22,9 @@ class QueryServer:
                                       devtools=False,
                                       headless=True)
 
-    async def query(self, query_input: str, query_type: QueryType, max_page: int, site: Site):
+    async def query(self, query_input: str, query_type: QueryType, max_page: int, rename: bool, site: Site):
         page = await self.browser.get_page()
-        df = await qt_query(page, query_input, query_type, max_page, site)
+        df = await qt_query(page, query_input, query_type, max_page, rename, site)
         self.browser.release_page(page)
 
         if self.format == 'csv':
@@ -53,9 +53,10 @@ async def query(
         query_type: Annotated[QueryType, Field(default=QueryType.CNStock,
                                                description="查询类型。支持`A股`、`指数`、`基金`、`港股`、`美股`等")],
         max_page: Annotated[int, Field(default=1, ge=1, le=10, description="最大页数。只查第一页即可")],
+        rename: Annotated[bool, Field(default=False, description="是否重命名列名")],
         site: Annotated[Site, Field(default=Site.THS, description="站点。支持`东方财富`、`通达信`、`同花顺`")]
 ) -> str:
-    return await qsv.query(query_input, query_type, max_page, site)
+    return await qsv.query(query_input, query_type, max_page, rename, site)
 
 
 # chat功能不通过mcp暴露，因为在Cline等客户端中本就有LLM功能，反而导致返回的数据没有正确提交

mcp_query_table/sites/eastmoney.py

@@ -81,7 +81,7 @@ class Pagination:
             datas.extend(v)
         return datas
 
-    def get_dataframe(self):
+    def get_dataframe(self, rename: bool):
         columns = {x['key']: x['title'] for x in self.columns}
         dtypes = {x['key']: convert_type(x['dataType']) for x in self.columns}
 
@@ -98,7 +98,10 @@ class Pagination:
             except ValueError:
                 logger.info("转换失败 {}:{}", k, v)
 
-        return df.rename(columns=columns)
+        if rename:
+            return df.rename(columns=columns)
+        else:
+            return df
 
 
 P = Pagination()
@@ -121,7 +124,8 @@ async def on_response(response):
 async def query(page: Page,
                 q: str = "收盘价>100元",
                 type_: QueryType = 'stock',
-                max_page: int = 5) -> pd.DataFrame:
+                max_page: int = 5,
+                rename: bool = True) -> pd.DataFrame:
     type = _type_.get(type_, None)
     assert type is not None, f"不支持的类型:{type_}"
 
@@ -141,4 +145,4 @@ async def query(page: Page,
             await page.get_by_role("button", name="下一页").click()
         await on_response(await response_info.value)
 
-    return P.get_dataframe()
+    return P.get_dataframe(rename)

mcp_query_table/sites/iwencai.py

@@ -80,7 +80,7 @@ class Pagination:
             datas.extend(v)
         return datas
 
-    def get_dataframe(self):
+    def get_dataframe(self, rename: bool):
         columns = {x['key']: x['index_name'] for x in self.columns}
         dtypes = {x['key']: convert_type(x['type']) for x in self.columns}
 
@@ -94,7 +94,10 @@ class Pagination:
             except ValueError:
                 logger.info("转换失败 {}:{}", k, v)
 
-        return df.rename(columns=columns)
+        if rename:
+            return df.rename(columns=columns)
+        else:
+            return df
 
 
 P = Pagination()
@@ -148,7 +151,8 @@ async def on_response(response):
 async def query(page: Page,
                 w: str = "收盘价>1000元",
                 type_: QueryType = 'stock',
-                max_page: int = 5) -> pd.DataFrame:
+                max_page: int = 5,
+                rename: bool = False) -> pd.DataFrame:
     querytype = _querytype_.get(type_, None)
     assert querytype is not None, f"不支持的类型:{type_}"
 
@@ -168,4 +172,4 @@ async def query(page: Page,
             await page.get_by_text("下页").click()
         await on_response(await response_info.value)
 
-    return P.get_dataframe()
+    return P.get_dataframe(rename)

mcp_query_table/sites/tdx.py

@@ -78,7 +78,7 @@ class Pagination:
             datas.extend(v)
         return datas
 
-    def get_dataframe(self):
+    def get_dataframe(self, rename: bool):
         dtypes = [convert_type(x) for x in self.dtypes]
         df = pd.DataFrame(self.get_list(), columns=self.columns)
         for i, v in enumerate(dtypes):
@@ -128,7 +128,8 @@ async def on_response2(response):
 async def query(page: Page,
                 message: str = "收盘价>100元",
                 type_: QueryType = 'AG',
-                max_page: int = 5) -> pd.DataFrame:
+                max_page: int = 5,
+                rename: bool = False) -> pd.DataFrame:
     queryType = _queryType_.get(type_, None)
     assert queryType is not None, f"不支持的类型:{type_}"
 
@@ -147,4 +148,4 @@ async def query(page: Page,
             await page.get_by_role("button", name="下一页").click()
         await on_response1(await response_info.value)
 
-    return P.get_dataframe()
+    return P.get_dataframe(rename)

mcp_query_table/tool.py

@@ -66,8 +66,8 @@ def get_user_data_dir(user_data_dir) -> Optional[str]:
     """获取浏览器可用户目录"""
     browsers = {
         "default": user_data_dir,
-        "chrome.exe": rf'C:\Users\{getpass.getuser()}\AppData\Local\Google\Chrome\User Data\Default',
-        "msedge.exe": rf"C:\Users\{getpass.getuser()}\AppData\Local\Microsoft\Edge\User Data\Default",
+        "chrome.exe": rf'C:\Users\{getpass.getuser()}\AppData\Local\Google\Chrome\User Data',  # 使用默认配置文件时无法创建CDP
+        "msedge.exe": rf"C:\Users\{getpass.getuser()}\AppData\Local\Microsoft\Edge\User Data",
     }
     for k, v in browsers.items():
         if v is None:
@@ -136,6 +136,10 @@ class BrowserManager:
         command = [executable_path, f'--remote-debugging-port={port}', '--start-maximized']
         if self.devtools:
             command.append('--auto-open-devtools-for-tabs')
+        if self.user_data_dir:
+            command.append(f'--user-data-dir={self.user_data_dir}')
+        else:
+            logger.warning('Chrome必须另行指定`--user-data-dir`才能创建CDP连接')
 
         for i in range(2):
             try:
@@ -249,7 +253,9 @@ async def query(
         query_input: str = "收盘价>100元",
         query_type: QueryType = QueryType.CNStock,
         max_page: int = 5,
-        site: Site = Site.THS) -> pd.DataFrame:
+        rename: bool = False,
+        site: Site = Site.THS,
+) -> pd.DataFrame:
     """查询表格
 
     Parameters
@@ -262,6 +268,8 @@ async def query(
         查询类型, by default QueryType.astock
     max_page : int, optional
         最大页数, by default 5
+    rename: bool
+        是否重命名列名, by default False
     site : Site, optional
         站点, by default Site.iwencai
 
@@ -275,13 +283,13 @@ async def query(
 
     if site == Site.EastMoney:
         from mcp_query_table.sites.eastmoney import query
-        return await query(page, query_input, query_type, max_page)
+        return await query(page, query_input, query_type, max_page, rename)
     if site == Site.THS:
         from mcp_query_table.sites.iwencai import query
-        return await query(page, query_input, query_type, max_page)
+        return await query(page, query_input, query_type, max_page, rename)
     if site == Site.TDX:
         from mcp_query_table.sites.tdx import query
-        return await query(page, query_input, query_type, max_page)
+        return await query(page, query_input, query_type, max_page, rename)
 
     raise ValueError(f"未支持的站点:{site}")
 

{mcp_query_table-0.3.9.dist-info → mcp_query_table-0.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp_query_table
-Version: 0.3.9
+Version: 0.3.11
 Summary: query table from website, support MCP
 Author-email: wukan <wu-kan@163.com>
 License: MIT License
@@ -137,6 +137,8 @@ if __name__ == '__main__':
 - `endpoint`以`ws://`开头，连接远程`Playwright Server`。也是无头模式，但无法指定`user_data_dir`，所以使用受限
     - 参考：https://playwright.dev/python/docs/docker#running-the-playwright-server
 
+`Chrome`新版的安全策略使用默认`user_data_dir`时将无法创建`CDP`服务，建议重新复制配置目录到其他地方
+
 ## MCP支持
 
 确保可以在控制台中执行`python -m mcp_query_table -h`。如果不能，可能要先`pip install mcp_query_table`
@@ -172,7 +174,7 @@ if __name__ == '__main__':
 先在控制台中执行如下命令，启动`MCP`服务
 
 ```commandline
-python -m mcp_query_table --format markdown --transport sse --port 8000 --endpoint http://127.0.0.1:9222
+python -m mcp_query_table --format markdown --transport sse --port 8000 --endpoint http://127.0.0.1:9222  --user_data_dir "D:\user-data-dir"
 ```
 
 然后就可以连接到`MCP`服务了
@@ -188,6 +190,14 @@ python -m mcp_query_table --format markdown --transport sse --port 8000 --endpoi
 }
 ```
 
+### Streamable HTTP方式
+
+```commandline
+python -m mcp_query_table --format markdown --transport streamable-http --port 8000 --endpoint http://127.0.0.1:9222  --user_data_dir "D:\user-data-dir"
+```
+
+连接的地址是`http://127.0.0.1:8000/mcp`
+
 ## 使用`MCP Inspector`进行调试
 
 ```commandline
@@ -221,5 +231,7 @@ npx @modelcontextprotocol/inspector python -m mcp_query_table --format markdown
 ![streamlit](docs/img/streamlit.png)
 
 ## 参考
+
 - [Selenium webdriver无法附加到edge实例，edge的--remote-debugging-port选项无效](https://blog.csdn.net/qq_30576521/article/details/142370538)
-- https://github.com/AtuboDad/playwright_stealth/issues/31
+- https://github.com/AtuboDad/playwright_stealth/issues/31
+- https://github.com/browser-use/browser-use/issues/1520

mcp_query_table-0.3.11.dist-info/RECORD

@@ -0,0 +1,19 @@
+mcp_query_table/__init__.py,sha256=K-0DU2hpeRvM9ZAuky0aWZtJLuOgKg7ZRd-pL9noc0o,330
+mcp_query_table/__main__.py,sha256=Hl70DkzAY1wJNnrirjiMRXHhemptXXy_1Q3sASMTWSk,1472
+mcp_query_table/_version.py,sha256=TESjMH0a_iUkwdfWT4nyzKizSFmmCY2omxnS2XyT97Y,23
+mcp_query_table/enums.py,sha256=7bu0m0zJBIfiS-eHGURw1ZHWNXgsq6gH1SztUhCgF-Y,678
+mcp_query_table/server.py,sha256=re3UnNAe75IJAH8oyJZAzYAzp_rg3uH1vIroKJ7k69w,3871
+mcp_query_table/tool.py,sha256=3wUZfvfA_4fNmc5sWi60gdGuqT5y7ZPKt-Nibw9NzY4,11737
+mcp_query_table/utils.py,sha256=MUKcklPF9TkABhM8wN0-kW0iy9AlmjL6oycZyxB_Qk8,722
+mcp_query_table/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp_query_table/providers/baidu.py,sha256=S75D2zbpqG1r4Rxz7pJf5u2ZHNLO8nqV-LPEjlACtHg,3390
+mcp_query_table/providers/n.py,sha256=SLalpwHSdkXNoMCLQEx1TEFlo50dS7I9JNli5jz8w6k,3202
+mcp_query_table/providers/yuanbao.py,sha256=1wRMy7Z2JraM3MrgLDSdyg-EqX-D26ysx7CW1GFtVho,3292
+mcp_query_table/sites/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp_query_table/sites/eastmoney.py,sha256=wuM1rJkuQKrtL0a6ZyslMohPtucSgrs_jjaZWdkxhZo,4593
+mcp_query_table/sites/iwencai.py,sha256=oCxNuGxiYcaMREHGpNoqspmCLlXSkvTFw2_EsmJSzlw,5174
+mcp_query_table/sites/tdx.py,sha256=-u-rzhmYPW1m3zUFQsd-RUztafC43gQPhtmB6OuqA4M,4184
+mcp_query_table-0.3.11.dist-info/METADATA,sha256=s7yPOuqh4HbNpdz5CjRo5INmcSGwxm0neIr0XrM2quA,9830
+mcp_query_table-0.3.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mcp_query_table-0.3.11.dist-info/licenses/LICENSE,sha256=rbvv_CTd7biGwT21tvhgQ2zkbPFXOoON7WFQWEdElBA,1063
+mcp_query_table-0.3.11.dist-info/RECORD,,

mcp_query_table-0.3.9.dist-info/RECORD

@@ -1,19 +0,0 @@
-mcp_query_table/__init__.py,sha256=K-0DU2hpeRvM9ZAuky0aWZtJLuOgKg7ZRd-pL9noc0o,330
-mcp_query_table/__main__.py,sha256=K0r7y8PD9y9pFg3bAQxNo21KlQpGz1jqGg_zptPfenM,1461
-mcp_query_table/_version.py,sha256=xmkmdvq15kb61xdtCoa1YARnvHBnUgI-0GWIJYvHNeA,22
-mcp_query_table/enums.py,sha256=7bu0m0zJBIfiS-eHGURw1ZHWNXgsq6gH1SztUhCgF-Y,678
-mcp_query_table/server.py,sha256=D2-7ZmutijphasbLMosg9P5EOhJTB4RvC9-zmvCvc5k,3749
-mcp_query_table/tool.py,sha256=dW6Hcv7aB-hBotd7OBzCWQrpRck1h5812y6sRCUENVA,11380
-mcp_query_table/utils.py,sha256=MUKcklPF9TkABhM8wN0-kW0iy9AlmjL6oycZyxB_Qk8,722
-mcp_query_table/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_query_table/providers/baidu.py,sha256=S75D2zbpqG1r4Rxz7pJf5u2ZHNLO8nqV-LPEjlACtHg,3390
-mcp_query_table/providers/n.py,sha256=SLalpwHSdkXNoMCLQEx1TEFlo50dS7I9JNli5jz8w6k,3202
-mcp_query_table/providers/yuanbao.py,sha256=1wRMy7Z2JraM3MrgLDSdyg-EqX-D26ysx7CW1GFtVho,3292
-mcp_query_table/sites/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_query_table/sites/eastmoney.py,sha256=LImjpYVuM5YnXwnNzB2hkKfHofocZZScetGqMOCHZpk,4477
-mcp_query_table/sites/iwencai.py,sha256=FlIQOAN6wPz0B8w5DFX-EHekPO5HPIYdLMhiX1dYV7s,5057
-mcp_query_table/sites/tdx.py,sha256=P-GNFUsS5_INy3sicaZbUBdudgQBZuhu_QyVvyw4yDg,4126
-mcp_query_table-0.3.9.dist-info/METADATA,sha256=w6Kk_cokNDdnTgr7APF6IhlSVOHJTrDAO0uGdhTaNvA,9353
-mcp_query_table-0.3.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcp_query_table-0.3.9.dist-info/licenses/LICENSE,sha256=rbvv_CTd7biGwT21tvhgQ2zkbPFXOoON7WFQWEdElBA,1063
-mcp_query_table-0.3.9.dist-info/RECORD,,