fix: 打包后desktop不可用问题

Author: Taois

astrbot/core/provider/sources/anthropic_source.py

@@ -6,6 +6,7 @@
 import anthropic
 import httpx
 from anthropic import AsyncAnthropic
+from anthropic._base_client import httpx as _anthropic_httpx
 from anthropic.types import Message
 from anthropic.types.message_delta_usage import MessageDeltaUsage
 from anthropic.types.usage import Usage
@@ -113,6 +114,7 @@ def _create_http_client(self, provider_config: dict) -> httpx.AsyncClient:
             "Anthropic",
             provider_config.get("proxy", ""),
             headers=self.custom_headers,
+            httpx_module=_anthropic_httpx,
         )
 
     def _apply_thinking_config(self, payloads: dict) -> None:

astrbot/core/provider/sources/openai_source.py

@@ -14,6 +14,7 @@
 
 import httpx
 from openai import AsyncAzureOpenAI, AsyncOpenAI
+from openai._base_client import httpx as _openai_httpx
 from openai._exceptions import NotFoundError
 from openai.lib.streaming.chat._completions import ChatCompletionStreamState
 from openai.types.chat.chat_completion import ChatCompletion
@@ -439,9 +440,13 @@ async def _fallback_to_text_only_and_retry(
         )
 
     def _create_http_client(self, provider_config: dict) -> httpx.AsyncClient:
-        """创建带代理的 HTTP 客户端"""
+        """创建带代理的 HTTP 客户端
+
+        使用 openai 库内部引用的 httpx 模块来创建客户端实例，
+        避免打包后 httpx 被重复收集导致 isinstance 校验失败。
+        """
         proxy = provider_config.get("proxy", "")
-        return create_proxy_client("OpenAI", proxy)
+        return create_proxy_client("OpenAI", proxy, httpx_module=_openai_httpx)
 
     def __init__(self, provider_config, provider_settings) -> None:
         super().__init__(provider_config, provider_settings)

astrbot/core/utils/network_utils.py

@@ -1,6 +1,7 @@
 """Network error handling utilities for providers."""
 
 import ssl
+import types
 
 import httpx
 
@@ -89,6 +90,7 @@ def create_proxy_client(
     proxy: str | None = None,
     headers: dict[str, str] | None = None,
     verify: ssl.SSLContext | str | bool | None = None,
+    httpx_module: types.ModuleType | None = None,
 ) -> httpx.AsyncClient:
     """Create an httpx AsyncClient with proxy configuration if provided.
 
@@ -105,12 +107,19 @@ def create_proxy_client(
         headers: Optional custom headers to include in every request
         verify: Optional override for TLS verification. Defaults to the shared
             system SSL context when not provided.
+        httpx_module: Optional httpx module to use for creating the client.
+            In packaged environments (PyInstaller, Nuitka, etc.), the packaging
+            tool may collect httpx as two separate copies. When the caller needs
+            the created client to pass isinstance checks inside another library
+            (e.g., openai), pass that library's own ``httpx`` module here so
+            the client is created from the same class object.
 
     Returns:
         An httpx.AsyncClient created with the shared system SSL context; the proxy is applied only if one is provided.
     """
+    _httpx = httpx_module or httpx
     resolved_verify = _SYSTEM_SSL_CTX if verify is None else verify
     if proxy:
         logger.info(f"[{provider_label}] 使用代理: {proxy}")
-        return httpx.AsyncClient(proxy=proxy, verify=resolved_verify, headers=headers)
-    return httpx.AsyncClient(verify=resolved_verify, headers=headers)
+        return _httpx.AsyncClient(proxy=proxy, verify=resolved_verify, headers=headers)
+    return _httpx.AsyncClient(verify=resolved_verify, headers=headers)