fix(qwen): align with dashscope 1.25.21 API; remove InvalidApiKey monkey-patch

src/ai_client.py

@@ -2390,6 +2390,10 @@ def _ensure_qwen_client() -> None:
   if not api_key:
    raise ValueError("Qwen API key not found in credentials.toml")
   _qwen_region = creds.get("qwen", {}).get("region", "china")
+  if _qwen_region == "international":
+   dashscope.base_http_api_url = "https://dashscope-intl.aliyuncs.com/api/v1"
+  else:
+   dashscope.base_http_api_url = "https://dashscope.aliyuncs.com/api/v1"
   dashscope.api_key = api_key
   _qwen_client = dashscope.Generation
 

src/qwen_adapter.py

@@ -10,8 +10,6 @@ from dashscope.common.error import (
 )
 from src.ai_client import ProviderError
 
-dashscope.common.error.InvalidApiKey = dashscope.common.error.AuthenticationError
-
 def build_dashscope_tools(openai_tools: list[dict[str, Any]]) -> list[dict[str, Any]]:
  out: list[dict[str, Any]] = []
  for t in openai_tools:
@@ -29,9 +27,9 @@ def classify_dashscope_error(exc: Exception) -> ProviderError:
  if isinstance(exc, AuthenticationError):
   return ProviderError(kind="auth", provider="qwen", original=exc)
  if isinstance(exc, TimeoutException):
-  return ProviderError(kind="rate_limit", provider="qwen", original=exc)
+  return ProviderError(kind="network", provider="qwen", original=exc)
  if isinstance(exc, ServiceUnavailableError):
-  return ProviderError(kind="quota", provider="qwen", original=exc)
+  return ProviderError(kind="network", provider="qwen", original=exc)
  if isinstance(exc, InvalidParameter):
   return ProviderError(kind="quota", provider="qwen", original=exc)
  if isinstance(exc, RequestFailure):

tests/test_qwen_provider.py

@@ -41,8 +41,8 @@ def test_qwen_tool_format_translation() -> None:
 def test_qwen_error_classification() -> None:
  from src.ai_client import ProviderError
  from src.qwen_adapter import classify_dashscope_error
- import dashscope
- err = classify_dashscope_error(dashscope.common.error.InvalidApiKey("bad key"))
+ from dashscope.common.error import AuthenticationError
+ err = classify_dashscope_error(AuthenticationError("bad key"))
  assert err.kind == "auth"
  assert err.provider == "qwen"