mcp-query-table 0.3.8__tar.gz → 0.3.9__tar.gz

{mcp_query_table-0.3.8 → mcp_query_table-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp_query_table
-Version: 0.3.8
+Version: 0.3.9
 Summary: query table from website, support MCP
 Author-email: wukan <wu-kan@163.com>
 License: MIT License
@@ -33,8 +33,7 @@ Requires-Dist: loguru
 Requires-Dist: mcp
 Requires-Dist: pandas
 Requires-Dist: playwright
-Requires-Dist: playwright-stealth
-Requires-Dist: setuptools
+Requires-Dist: playwright-stealth>=2.0.0
 Requires-Dist: tabulate
 Description-Content-Type: text/markdown
 

{mcp_query_table-0.3.8 → mcp_query_table-0.3.9}/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-0.3.9/mcp_query_table/_version.py

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

{mcp_query_table-0.3.8 → mcp_query_table-0.3.9}/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-0.3.8 → mcp_query_table-0.3.9}/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
 
@@ -204,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:
@@ -268,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-0.3.8 → mcp_query_table-0.3.9}/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.8 → mcp_query_table-0.3.9}/pyproject.toml

@@ -16,9 +16,8 @@ dependencies = [
     "pandas",
     "loguru",
     "playwright",
-    "playwright-stealth",
+    "playwright-stealth>=2.0.0", # https://github.com/Mattwmaster58/playwright_stealth
     "mcp",
-    "setuptools", # playwright-stealth中要使用pkg_resources，而pkg_resources在setuptools中
     "tabulate"
 ]
 dynamic = ["version"]

mcp_query_table-0.3.8/mcp_query_table/_version.py

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