astrbotmcp 0.2.6__tar.gz → 0.2.8__tar.gz

{astrbotmcp-0.2.6/astrbotmcp.egg-info → astrbotmcp-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astrbotmcp
-Version: 0.2.6
+Version: 0.2.8
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -93,6 +93,37 @@ uv add astrbotmcp
 | `ASTRBOT_USERNAME` | Dashboard 用户名 | - |
 | `ASTRBOT_PASSWORD` | Dashboard 密码 | - |
 | `ASTRBOT_LOG_LEVEL` | 日志级别 | `INFO` |
+| `ASTRBOTMCP_DISABLE_PROXY` | 是否禁用代理（防止本地请求被代理拦截） | `true` |
+
+#### 代理配置说明
+
+如果你在使用代理工具（如 Clash、V2Ray 等），可能会遇到 502 Bad Gateway 错误，这是因为本地请求被代理拦截导致的。
+
+**解决方案：**
+
+1. **默认行为**：AstrBot MCP 默认禁用代理（`ASTRBOTMCP_DISABLE_PROXY=true`），确保本地请求直接发送到 AstrBot。
+
+2. **如果需要使用代理**：设置 `ASTRBOTMCP_DISABLE_PROXY=false`，但请注意这可能导致本地 API 请求失败。
+
+3. **推荐配置**：对于本地 AstrBot 实例，始终禁用代理：
+```json
+{
+  "mcpServers": {
+    "astrbot-mcp": {
+      "command": "uvx",
+      "args": [
+        "--from",
+        "astrbotmcp",
+        "astrbot-mcp"
+      ],
+      "env": {
+        "ASTRBOT_BASE_URL": "http://127.0.0.1:6185",
+        "ASTRBOTMCP_DISABLE_PROXY": "true"
+      }
+    }
+  }
+}
+```
 
 ---
 

{astrbotmcp-0.2.6 → astrbotmcp-0.2.8}/README.md

@@ -79,6 +79,37 @@ uv add astrbotmcp
 | `ASTRBOT_USERNAME` | Dashboard 用户名 | - |
 | `ASTRBOT_PASSWORD` | Dashboard 密码 | - |
 | `ASTRBOT_LOG_LEVEL` | 日志级别 | `INFO` |
+| `ASTRBOTMCP_DISABLE_PROXY` | 是否禁用代理（防止本地请求被代理拦截） | `true` |
+
+#### 代理配置说明
+
+如果你在使用代理工具（如 Clash、V2Ray 等），可能会遇到 502 Bad Gateway 错误，这是因为本地请求被代理拦截导致的。
+
+**解决方案：**
+
+1. **默认行为**：AstrBot MCP 默认禁用代理（`ASTRBOTMCP_DISABLE_PROXY=true`），确保本地请求直接发送到 AstrBot。
+
+2. **如果需要使用代理**：设置 `ASTRBOTMCP_DISABLE_PROXY=false`，但请注意这可能导致本地 API 请求失败。
+
+3. **推荐配置**：对于本地 AstrBot 实例，始终禁用代理：
+```json
+{
+  "mcpServers": {
+    "astrbot-mcp": {
+      "command": "uvx",
+      "args": [
+        "--from",
+        "astrbotmcp",
+        "astrbot-mcp"
+      ],
+      "env": {
+        "ASTRBOT_BASE_URL": "http://127.0.0.1:6185",
+        "ASTRBOTMCP_DISABLE_PROXY": "true"
+      }
+    }
+  }
+}
+```
 
 ---
 

{astrbotmcp-0.2.6 → astrbotmcp-0.2.8}/astrbot_mcp/astrbot_client.py

@@ -98,7 +98,11 @@ class AstrBotClient:
             pwd = hashlib.md5(pwd.encode("utf-8")).hexdigest()
 
         url = f"{self.base_url}/api/auth/login"
-        async with httpx.AsyncClient(timeout=self.timeout) as client:
+        client_kwargs = {"timeout": self.timeout}
+        if self.settings.disable_proxy:
+            client_kwargs["trust_env"] = False  # 禁用代理，忽略环境变量设置
+
+        async with httpx.AsyncClient(**client_kwargs) as client:
             resp = await client.post(
                 url,
                 json={"username": username, "password": pwd},
@@ -142,7 +146,11 @@ class AstrBotClient:
         auth_headers = await self._get_auth_headers()
         headers = {**headers, **auth_headers}
 
-        async with httpx.AsyncClient(timeout=self.timeout) as client:
+        client_kwargs = {"timeout": self.timeout}
+        if self.settings.disable_proxy:
+            client_kwargs["trust_env"] = False  # 禁用代理，忽略环境变量设置
+
+        async with httpx.AsyncClient(**client_kwargs) as client:
             if stream:
                 return await client.build_request(method, url, params=params, json=json_body, files=files)  # type: ignore[return-value]
             response = await client.request(
@@ -181,7 +189,11 @@ class AstrBotClient:
 
         headers = await self._get_auth_headers()
 
-        async with httpx.AsyncClient(timeout=self.timeout) as client:
+        client_kwargs = {"timeout": self.timeout}
+        if self.settings.disable_proxy:
+            client_kwargs["trust_env"] = False  # 禁用代理，忽略环境变量设置
+
+        async with httpx.AsyncClient(**client_kwargs) as client:
             async with client.stream(
                 method,
                 url,
@@ -451,7 +463,11 @@ class AstrBotClient:
             }
             url = f"{self.base_url}/api/chat/post_file"
             headers = await self._get_auth_headers()
-            async with httpx.AsyncClient(timeout=self.timeout) as client:
+            client_kwargs = {"timeout": self.timeout}
+            if self.settings.disable_proxy:
+                client_kwargs["trust_env"] = False  # 禁用代理，忽略环境变量设置
+
+            async with httpx.AsyncClient(**client_kwargs) as client:
                 response = await client.post(url, files=files, headers=headers)
                 response.raise_for_status()
                 return response.json()
@@ -471,10 +487,14 @@ class AstrBotClient:
         """
         temp_path: str | None = None
         try:
-            async with httpx.AsyncClient(
-                timeout=self.timeout,
-                follow_redirects=True,
-            ) as http_client:
+            client_kwargs = {
+                "timeout": self.timeout,
+                "follow_redirects": True
+            }
+            if self.settings.disable_proxy:
+                client_kwargs["trust_env"] = False  # 禁用代理，忽略环境变量设置
+
+            async with httpx.AsyncClient(**client_kwargs) as http_client:
                 async with http_client.stream("GET", url) as response:
                     response.raise_for_status()
 

{astrbotmcp-0.2.6 → astrbotmcp-0.2.8}/astrbot_mcp/config.py

@@ -16,6 +16,7 @@ class AstrBotSettings:
     default_model: str | None = None
     file_root: str | None = None
     direct_media_mode: str | None = None
+    disable_proxy: bool = True  # 默认禁用代理，防止本地请求被代理拦截
 
 
 def _get_env(name: str) -> str | None:
@@ -72,6 +73,12 @@ def get_settings() -> AstrBotSettings:
         "ASTRBOT_MCP_DIRECT_MEDIA_MODE"
     )
 
+    # 默认禁用代理，除非明确设置为false
+    disable_proxy_str = _get_env("ASTRBOTMCP_DISABLE_PROXY")
+    disable_proxy = True  # 默认值
+    if disable_proxy_str is not None:
+        disable_proxy = disable_proxy_str.lower() not in ("false", "0", "no", "n")
+
     return AstrBotSettings(
         base_url=base_url,
         timeout=timeout,
@@ -81,4 +88,5 @@ def get_settings() -> AstrBotSettings:
         default_model=default_model,
         file_root=file_root,
         direct_media_mode=direct_media_mode,
+        disable_proxy=disable_proxy,
     )

{astrbotmcp-0.2.6 → astrbotmcp-0.2.8/astrbotmcp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astrbotmcp
-Version: 0.2.6
+Version: 0.2.8
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -93,6 +93,37 @@ uv add astrbotmcp
 | `ASTRBOT_USERNAME` | Dashboard 用户名 | - |
 | `ASTRBOT_PASSWORD` | Dashboard 密码 | - |
 | `ASTRBOT_LOG_LEVEL` | 日志级别 | `INFO` |
+| `ASTRBOTMCP_DISABLE_PROXY` | 是否禁用代理（防止本地请求被代理拦截） | `true` |
+
+#### 代理配置说明
+
+如果你在使用代理工具（如 Clash、V2Ray 等），可能会遇到 502 Bad Gateway 错误，这是因为本地请求被代理拦截导致的。
+
+**解决方案：**
+
+1. **默认行为**：AstrBot MCP 默认禁用代理（`ASTRBOTMCP_DISABLE_PROXY=true`），确保本地请求直接发送到 AstrBot。
+
+2. **如果需要使用代理**：设置 `ASTRBOTMCP_DISABLE_PROXY=false`，但请注意这可能导致本地 API 请求失败。
+
+3. **推荐配置**：对于本地 AstrBot 实例，始终禁用代理：
+```json
+{
+  "mcpServers": {
+    "astrbot-mcp": {
+      "command": "uvx",
+      "args": [
+        "--from",
+        "astrbotmcp",
+        "astrbot-mcp"
+      ],
+      "env": {
+        "ASTRBOT_BASE_URL": "http://127.0.0.1:6185",
+        "ASTRBOTMCP_DISABLE_PROXY": "true"
+      }
+    }
+  }
+}
+```
 
 ---
 

{astrbotmcp-0.2.6 → astrbotmcp-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "astrbotmcp"
-version = "0.2.6"
+version = "0.2.8"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"