archery-sql-mcp 0.2.0__tar.gz → 0.2.2__tar.gz

{archery_sql_mcp-0.2.0 → archery_sql_mcp-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: archery-sql-mcp
-Version: 0.2.0
+Version: 0.2.2
 Summary: Archery SQL 查询 MCP 工具：自动登录 + 会话自愈 + 只读查询，供任意 MCP 客户端与 CLI 使用
 License: MIT
 Requires-Python: >=3.10

{archery_sql_mcp-0.2.0 → archery_sql_mcp-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "archery-sql-mcp"
-version = "0.2.0"
+version = "0.2.2"
 description = "Archery SQL 查询 MCP 工具：自动登录 + 会话自愈 + 只读查询，供任意 MCP 客户端与 CLI 使用"
 readme = "README.md"
 requires-python = ">=3.10"

{archery_sql_mcp-0.2.0 → archery_sql_mcp-0.2.2}/src/archery_sql_mcp/__init__.py

@@ -28,7 +28,7 @@ from typing import Any, Optional
 
 import httpx
 
-VERSION = "0.2.0"
+VERSION = "0.2.2"
 
 # ── 配置文件与会话缓存位置（可用 ARCHERY_CONFIG_DIR 整体改根目录） ──────────
 _CONFIG_DIR = Path(os.environ.get("ARCHERY_CONFIG_DIR", str(Path.home() / ".archery-mcp")))
@@ -166,15 +166,26 @@ class SessionManager:
                 },
                 headers={"Referer": f"{self.base}/login/"},
             )
-            # 成功：302 跳往非 /login 路径；失败：302 回 /login 或 200 带错误页
-            location = resp.headers.get("location", "")
-            if resp.status_code not in (301, 302) or "/login" in location:
-                reason = _extract_login_error(resp.text) or (
-                    f"HTTP {resp.status_code}"
-                    + (f" → {location}" if location else "")
-                    + "（用户名/密码错误，或账号被禁用）"
-                )
-                raise ArcheryError(f"Archery 登录失败: {reason}")
+            # /authenticate/ 是 ajax JSON 接口：恒为 HTTP 200，
+            # {"status": 0}=成功（sessionid 经 Set-Cookie 下发），status=1 时 msg 为可读错误。
+            # 兼容旧式表单行为（302 跳转）作为回退分支。
+            payload: Any = None
+            try:
+                payload = resp.json()
+            except Exception:
+                payload = None
+            if payload is not None:
+                if payload.get("status") != 0:
+                    raise ArcheryError(f"Archery 登录失败: {payload.get('msg') or payload}")
+            else:
+                location = resp.headers.get("location", "")
+                if resp.status_code not in (301, 302) or "/login" in location:
+                    reason = _extract_login_error(resp.text) or (
+                        f"HTTP {resp.status_code}"
+                        + (f" → {location}" if location else "")
+                        + "（用户名/密码错误，或账号被禁用）"
+                    )
+                    raise ArcheryError(f"Archery 登录失败: {reason}")
 
             self.sessionid = client.cookies.get("sessionid")
             self.csrftoken = client.cookies.get("csrftoken") or cookie_csrf
@@ -248,13 +259,13 @@ class ArcheryClient:
         for _attempt in range(2):
             await self.sm.ensure()
             async with httpx.AsyncClient(
-                timeout=self.cfg["request_timeout_s"], follow_redirects=False
+                timeout=self.cfg["request_timeout_s"], follow_redirects=False,
+                cookies={"csrftoken": self.sm.csrftoken or "",
+                         "sessionid": self.sm.sessionid or ""},
             ) as client:
                 resp = await client.request(
                     method, f"{self.sm.base}{path}",
                     data=data, params=params,
-                    cookies={"csrftoken": self.sm.csrftoken or "",
-                             "sessionid": self.sm.sessionid or ""},
                     headers={"X-CSRFToken": self.sm.csrftoken or "",
                              "Referer": self.sm.base + "/"},
                 )
@@ -306,9 +317,28 @@ class ArcheryClient:
             raise ArcheryError(f"/query/ 返回非 JSON (HTTP {resp.status_code})，请联系管理员确认平台版本兼容性")
         if submitted.get("status") != 0:
             raise ArcheryError(f"/query/ 提交失败: {submitted.get('msg') or submitted}")
-        query_id = (submitted.get("data") or {}).get("query_id")
+        data = submitted.get("data") or {}
+
+        def _finish(columns: Any, rows: Any) -> dict[str, Any]:
+            return {
+                "status": "finished",
+                "columns": columns or [],
+                "rows": rows or [],
+                "row_count": len(rows or []),
+                "elapsed_ms": int((time.monotonic() - started) * 1000),
+            }
+
+        # 同步模式（实测 2026-08-28，公司 Archery 版本）：
+        # /query/ 直接返回 column_list / rows / error，无 query_id。
+        if data.get("column_list") is not None or data.get("rows") is not None:
+            if data.get("error"):
+                raise ArcheryError(f"SQL 执行错误: {data['error']}")
+            return _finish(data.get("column_list"), data.get("rows"))
+
+        # 异步模式（部分 Archery 版本/配置）：提交返回 query_id → 轮询 /queryresult/。
+        query_id = data.get("query_id")
         if not query_id:
-            raise ArcheryError(f"/query/ 未返回 query_id: {submitted}")
+            raise ArcheryError(f"/query/ 未返回结果也未返回 query_id: {submitted}")
 
         # 轮询至终态
         interval = float(self.cfg["poll_interval_s"])