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

mcp_query_table/__main__.py

@@ -17,7 +17,7 @@ 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')
+                        nargs="?", default=rf'C:\Users\{getpass.getuser()}\AppData\Local\Google\Chrome\User Data\Default')
     parser.add_argument("--transport", type=str, help="传输类型",
                         default='stdio', choices=['stdio', 'sse'])
     parser.add_argument("--host", type=str, help="MCP服务端绑定地址",

mcp_query_table/_version.py

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

mcp_query_table/server.py

@@ -58,7 +58,8 @@ async def query(
     return await qsv.query(query_input, query_type, max_page, site)
 
 
-@mcp.tool(description="大语言模型对话")
+# chat功能不通过mcp暴露，因为在Cline等客户端中本就有LLM功能，反而导致返回的数据没有正确提交
+# @mcp.tool(description="大语言模型对话")
 async def chat(
         prompt: Annotated[str, Field(description="提示词。如：`9.9大还是9.11大？`")],
         create: Annotated[bool, Field(default=False, description="是否创建新对话")],

mcp_query_table/sites/iwencai.py

@@ -10,10 +10,8 @@ import re
 import pandas as pd
 from loguru import logger
 from playwright.async_api import Page
-from playwright_stealth import stealth_async
 
 from mcp_query_table.enums import QueryType
-from mcp_query_table.utils import FixedConfig
 
 # 初次查询页面
 _PAGE1_ = 'https://www.iwencai.com/customized/chart/get-robot-data'
@@ -154,8 +152,6 @@ async def query(page: Page,
     querytype = _querytype_.get(type_, None)
     assert querytype is not None, f"不支持的类型:{type_}"
 
-    await stealth_async(page, FixedConfig())
-
     await page.route(re.compile(r'.*\.(?:jpg|jpeg|png|gif|webp)(?:$|\?)'), lambda route: route.abort())
 
     P.reset()

mcp_query_table/tool.py

@@ -4,11 +4,12 @@ import sys
 import time
 from pathlib import Path
 from typing import Optional
-from urllib.parse import urlparse
+from urllib.parse import urlparse, quote
 
 import pandas as pd
 from loguru import logger
 from playwright.async_api import async_playwright, Playwright, Page
+from playwright_stealth import Stealth
 
 from mcp_query_table.enums import QueryType, Site, Provider
 
@@ -65,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',
-        "msedge.exe": rf"C:\Users\{getpass.getuser()}\AppData\Local\Microsoft\Edge\User Data",
+        "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",
     }
     for k, v in browsers.items():
         if v is None:
@@ -144,7 +145,7 @@ class BrowserManager:
             except:
                 if i == 0:
                     create_detached_process(command)
-                    time.sleep(3)
+                    time.sleep(5)
                     continue
                 if i == 1:
                     raise ConnectionError(
@@ -171,7 +172,8 @@ class BrowserManager:
                     user_data_dir=self.user_data_dir,
                     executable_path=self.executable_path,
                     headless=self.headless,
-                    devtools=self.devtools)
+                    devtools=self.devtools,
+                    timeout=10000, slow_mo=1000)
             except:
                 raise ConnectionError(f"launch失败，可能已经有浏览器已经打开了数据目录。{self.user_data_dir}")
         else:
@@ -203,6 +205,8 @@ class BrowserManager:
             self.context = await self.browser.new_context()
         else:
             self.context = self.browser.contexts[0]
+        # 爱问财，无头模式，需要使用 stealth 插件
+        await Stealth().apply_stealth_async(self.context)
 
         # 复用打开的page
         for page in self.context.pages:
@@ -267,6 +271,7 @@ async def query(
         查询结果
 
     """
+    query_input = quote(query_input.strip(), safe='')
 
     if site == Site.EastMoney:
         from mcp_query_table.sites.eastmoney import query

mcp_query_table/utils.py

@@ -1,10 +1,6 @@
-import random
-import string
 from pathlib import Path
 from typing import List, Tuple
 
-from playwright_stealth import StealthConfig
-
 
 def is_image(path: str) -> bool:
     """判断是否是图片文件"""
@@ -36,16 +32,3 @@ class GlobalVars:
 
     def get_text(self):
         return self.text
-
-
-# https://github.com/AtuboDad/playwright_stealth/issues/31#issuecomment-2342541305
-class FixedConfig(StealthConfig):
-
-    @property
-    def enabled_scripts(self):
-        key = "".join(random.choices(string.ascii_letters, k=10))
-        for script in super().enabled_scripts:
-            if "const opts" in script:
-                yield script.replace("const opts", f"window.{key}")
-                continue
-            yield script.replace("opts", f"window.{key}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp_query_table
-Version: 0.3.7
+Version: 0.3.9
 Summary: query table from website, support MCP
 Author-email: wukan <wu-kan@163.com>
 License: MIT License
@@ -24,19 +24,18 @@ License: MIT License
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
-        
-Keywords: playwright,mcp,table,iwencai,tdx,eastmoney
+License-File: LICENSE
+Keywords: eastmoney,iwencai,mcp,playwright,table,tdx
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: pandas
 Requires-Dist: loguru
-Requires-Dist: playwright
-Requires-Dist: playwright-stealth
 Requires-Dist: mcp
-Dynamic: license-file
+Requires-Dist: pandas
+Requires-Dist: playwright
+Requires-Dist: playwright-stealth>=2.0.0
+Requires-Dist: tabulate
+Description-Content-Type: text/markdown
 
 # mcp_query_table
 
@@ -223,4 +222,4 @@ npx @modelcontextprotocol/inspector python -m mcp_query_table --format markdown
 
 ## 参考
 - [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

mcp_query_table-0.3.9.dist-info/RECORD

@@ -0,0 +1,19 @@
+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,,

{mcp_query_table-0.3.7.dist-info → mcp_query_table-0.3.9.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

mcp_query_table-0.3.7.dist-info/RECORD

@@ -1,20 +0,0 @@
-mcp_query_table/__init__.py,sha256=K-0DU2hpeRvM9ZAuky0aWZtJLuOgKg7ZRd-pL9noc0o,330
-mcp_query_table/__main__.py,sha256=oePptyDeLtOHcR0XZxx-O12hO6LSe6cplb4gaJBG4rI,1453
-mcp_query_table/_version.py,sha256=J0I0c7-a50EOnWXMryTu_E6xhXSYFBPjVpeYP_a3vRI,22
-mcp_query_table/enums.py,sha256=7bu0m0zJBIfiS-eHGURw1ZHWNXgsq6gH1SztUhCgF-Y,678
-mcp_query_table/server.py,sha256=0hnkZGbGvmCREd92QcjtktdyaHPsqpw_hh1n8hRj-S8,3618
-mcp_query_table/tool.py,sha256=tVGGqryE-tcXzfi-Rks_Tj81_NvbHAI2NW1NVqaT_SM,11092
-mcp_query_table/utils.py,sha256=VjKYLRPEa-W3qAOaNSJa9GnezrAAYykn4XY-R4P5NJg,1264
-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=43sBrVCXgiIybv25lEwTS6dlR2jXXceSBVGCOb03woE,5194
-mcp_query_table/sites/tdx.py,sha256=P-GNFUsS5_INy3sicaZbUBdudgQBZuhu_QyVvyw4yDg,4126
-mcp_query_table-0.3.7.dist-info/licenses/LICENSE,sha256=rbvv_CTd7biGwT21tvhgQ2zkbPFXOoON7WFQWEdElBA,1063
-mcp_query_table-0.3.7.dist-info/METADATA,sha256=E-ww9VKlg5JVNXzwXfgBK8VST6DFt8iNDaQIIZVfgrI,9354
-mcp_query_table-0.3.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-mcp_query_table-0.3.7.dist-info/top_level.txt,sha256=5M_8dkO1USOX7_EWbWS6O_TEsZ5yo-AodFNKeUEgvEQ,16
-mcp_query_table-0.3.7.dist-info/RECORD,,

mcp_query_table-0.3.7.dist-info/top_level.txt

@@ -1 +0,0 @@
-mcp_query_table