fix: preserve redaction context and restore provider hooks

Author: zouyonghe

astrbot/builtin_stars/builtin_commands/commands/provider.py

@@ -263,7 +263,11 @@ async def _find_provider_for_model(
             batch_providers = all_providers[start : start + max_concurrency]
             batch_results = await asyncio.gather(
                 *[
-                    self._get_provider_models(provider, umo=umo)
+                    self._get_provider_models(
+                        provider,
+                        use_cache=False,
+                        umo=umo,
+                    )
                     for provider in batch_providers
                 ],
                 return_exceptions=True,

astrbot/core/provider/manager.py

@@ -73,40 +73,44 @@ def __init__(
         self.curr_tts_provider_inst: TTSProvider | None = None
         """默认的 Text To Speech Provider 实例。已弃用，请使用 get_using_provider() 方法获取当前使用的 Provider 实例。"""
         self.db_helper = db_helper
-        self._on_provider_changed: (
-            Callable[[str, ProviderType, str | None], None] | None
-        ) = None
+        self._provider_change_hooks: list[
+            Callable[[str, ProviderType, str | None], None]
+        ] = []
 
     def set_provider_change_callback(
         self,
         cb: Callable[[str, ProviderType, str | None], None] | None,
     ) -> None:
-        self._on_provider_changed = cb
+        # Backward-compatible single-callback setter.
+        self._provider_change_hooks.clear()
+        if cb is not None:
+            self._provider_change_hooks.append(cb)
 
     def register_provider_change_hook(
         self,
         hook: Callable[[str, ProviderType, str | None], None],
     ) -> None:
-        # Backward-compatible wrapper for older call sites.
-        self.set_provider_change_callback(hook)
+        if hook not in self._provider_change_hooks:
+            self._provider_change_hooks.append(hook)
 
     def _notify_provider_changed(
         self,
         provider_id: str,
         provider_type: ProviderType,
         umo: str | None,
     ) -> None:
-        if not self._on_provider_changed:
+        if not self._provider_change_hooks:
             return
-        try:
-            self._on_provider_changed(provider_id, provider_type, umo)
-        except Exception as e:
-            logger.warning(
-                "调用 provider 变更回调失败: provider_id=%s, type=%s, err=%s",
-                provider_id,
-                provider_type,
-                safe_error("", e),
-            )
+        for hook in list(self._provider_change_hooks):
+            try:
+                hook(provider_id, provider_type, umo)
+            except Exception as e:
+                logger.warning(
+                    "调用 provider 变更钩子失败: provider_id=%s, type=%s, err=%s",
+                    provider_id,
+                    provider_type,
+                    safe_error("", e),
+                )
 
     @property
     def persona_configs(self) -> list:

astrbot/core/utils/error_redaction.py

@@ -1,39 +1,59 @@
 import re
 
 _SECRET_KEYS = (
-    r"(api_?key|access_?token|auth_?token|refresh_?token|session_?id|secret|password)"
+    r"(?:api_?key|access_?token|auth_?token|refresh_?token|session_?id|secret|password)"
 )
 
 _JSON_FIELD_PATTERN = re.compile(
-    rf"(?i)(['\"])({_SECRET_KEYS})\1\s*:\s*(['\"])[^'\"]+\3"
+    rf"(?i)(?P<prefix>(?P<kq>['\"]){_SECRET_KEYS}(?P=kq)\s*:\s*)(?P<vq>['\"])(?P<value>[^'\"]+)(?P=vq)"
 )
 _AUTH_JSON_FIELD_PATTERN = re.compile(
-    r"(?i)(['\"])authorization\1\s*:\s*(['\"])bearer\s+[^'\"]+\2"
+    r"(?i)(?P<prefix>(?P<kq>['\"])authorization(?P=kq)\s*:\s*)(?P<vq>['\"])bearer\s+[^'\"]+(?P=vq)"
+)
+_QUERY_FIELD_PATTERN = re.compile(
+    rf"(?i)(?P<prefix>{_SECRET_KEYS}\s*=\s*)(?P<value>[^&'\" ]+)"
 )
-_QUERY_FIELD_PATTERN = re.compile(rf"(?i)\b{_SECRET_KEYS}\s*=\s*[^&'\" ]+")
 _QUERY_PARAM_PATTERN = re.compile(
-    r"(?i)([?&](?:api_?key|key|access_?token|auth_?token))=[^&'\" ]+"
+    r"(?i)(?P<prefix>[?&](?:api_?key|key|access_?token|auth_?token)=)(?P<value>[^&'\" ]+)"
 )
 _AUTH_HEADER_PATTERN = re.compile(
-    r"(?i)\bauthorization\s*:\s*bearer\s+[A-Za-z0-9._\-]+"
+    r"(?i)(?P<prefix>\bauthorization\s*:\s*bearer\s+)(?P<token>[A-Za-z0-9._\-]+)"
 )
-_BEARER_PATTERN = re.compile(r"(?i)\bbearer\s+[A-Za-z0-9._\-]+")
+_BEARER_PATTERN = re.compile(r"(?i)(?P<prefix>\bbearer\s+)(?P<token>[A-Za-z0-9._\-]+)")
 _SK_PATTERN = re.compile(r"\bsk-[A-Za-z0-9]{16,}\b")
 
 
+def _redact_json_field(match: re.Match[str]) -> str:
+    quote = match.group("vq")
+    return f"{match.group('prefix')}{quote}[REDACTED]{quote}"
+
+
+def _redact_auth_json_field(match: re.Match[str]) -> str:
+    quote = match.group("vq")
+    return f"{match.group('prefix')}{quote}Bearer [REDACTED]{quote}"
+
+
+def _redact_prefixed_value(match: re.Match[str]) -> str:
+    return f"{match.group('prefix')}[REDACTED]"
+
+
+def _redact_bearer_token(match: re.Match[str]) -> str:
+    return f"{match.group('prefix')}[REDACTED]"
+
+
 def _redact_json_like(text: str) -> str:
-    text = _JSON_FIELD_PATTERN.sub("[REDACTED]", text)
-    return _AUTH_JSON_FIELD_PATTERN.sub("[REDACTED]", text)
+    text = _JSON_FIELD_PATTERN.sub(_redact_json_field, text)
+    return _AUTH_JSON_FIELD_PATTERN.sub(_redact_auth_json_field, text)
 
 
 def _redact_query_like(text: str) -> str:
-    text = _QUERY_FIELD_PATTERN.sub("[REDACTED]", text)
-    return _QUERY_PARAM_PATTERN.sub("[REDACTED]", text)
+    text = _QUERY_FIELD_PATTERN.sub(_redact_prefixed_value, text)
+    return _QUERY_PARAM_PATTERN.sub(_redact_prefixed_value, text)
 
 
 def _redact_tokens(text: str) -> str:
-    text = _AUTH_HEADER_PATTERN.sub("[REDACTED]", text)
-    text = _BEARER_PATTERN.sub("[REDACTED]", text)
+    text = _AUTH_HEADER_PATTERN.sub(_redact_bearer_token, text)
+    text = _BEARER_PATTERN.sub(_redact_bearer_token, text)
     return _SK_PATTERN.sub("[REDACTED]", text)