Undefined-bot 3.2.2__tar.gz → 3.2.5__tar.gz

{undefined_bot-3.2.2 → undefined_bot-3.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Undefined-bot
-Version: 3.2.2
+Version: 3.2.5
 Summary: QQ bot platform with cognitive memory architecture and multi-agent Skills, via OneBot V11.
 Project-URL: Repository, https://github.com/69gg/Undefined
 Project-URL: Issues, https://github.com/69gg/Undefined/issues
@@ -79,7 +79,7 @@ Description-Content-Type: text/markdown
       </p>
     </td>
     <td width="30%">
-      <img src="https://raw.githubusercontent.com/69gg/Undefined/main/img/head.jpg" width="100%" alt="Undefined" />
+      <img src="https://raw.githubusercontent.com/69gg/Undefined/main/img/head.png" width="100%" alt="Undefined" />
     </td>
   </tr>
 </table>
@@ -92,8 +92,6 @@ Description-Content-Type: text/markdown
 
 [点击添加官方实例QQ](https://qm.qq.com/q/cvjJoNysGA)
 
-> **推荐上手方式**：优先运行 `uv run Undefined-webui`。它会先拉起管理控制台，你可以在浏览器里直接补配置、校验配置、查看日志、启动 Bot；后续也可以用桌面端或 Android App 连接这同一个管理入口，实现远程管理。
-
 ## ⚡ 核心特性
 
 - **Skills 架构**：全新设计的技能系统，将基础工具（Tools）与智能代理（Agents）分层管理，支持自动发现与注册。

{undefined_bot-3.2.2 → undefined_bot-3.2.5}/README.md

@@ -19,7 +19,7 @@
       </p>
     </td>
     <td width="30%">
-      <img src="https://raw.githubusercontent.com/69gg/Undefined/main/img/head.jpg" width="100%" alt="Undefined" />
+      <img src="https://raw.githubusercontent.com/69gg/Undefined/main/img/head.png" width="100%" alt="Undefined" />
     </td>
   </tr>
 </table>
@@ -32,8 +32,6 @@
 
 [点击添加官方实例QQ](https://qm.qq.com/q/cvjJoNysGA)
 
-> **推荐上手方式**：优先运行 `uv run Undefined-webui`。它会先拉起管理控制台，你可以在浏览器里直接补配置、校验配置、查看日志、启动 Bot；后续也可以用桌面端或 Android App 连接这同一个管理入口，实现远程管理。
-
 ## ⚡ 核心特性
 
 - **Skills 架构**：全新设计的技能系统，将基础工具（Tools）与智能代理（Agents）分层管理，支持自动发现与注册。

{undefined_bot-3.2.2 → undefined_bot-3.2.5}/config.toml.example

@@ -95,8 +95,8 @@ api_mode = "chat_completions"
 # zh: 是否启用 reasoning.effort。
 # en: Enable reasoning.effort.
 reasoning_enabled = false
-# zh: reasoning.effort 档位：none / minimal / low / medium / high / xhigh。
-# en: reasoning.effort level: none / minimal / low / medium / high / xhigh.
+# zh: reasoning effort 档位。
+# en: reasoning effort level.
 reasoning_effort = "medium"
 # zh: 是否启用 thinking（思维链）。
 # en: Enable thinking (reasoning).
@@ -107,6 +107,9 @@ thinking_budget_tokens = 20000
 # zh: 是否在请求中发送 budget_tokens（关闭后由提供商决定思维预算）。
 # en: Whether to include budget_tokens in the request (if disabled, the provider decides the thinking budget).
 thinking_include_budget = true
+# zh: reasoning effort 传参风格：openai（reasoning.effort）/ anthropic（output_config.effort）。
+# en: Reasoning effort wire format: openai (reasoning.effort) / anthropic (output_config.effort).
+reasoning_effort_style = "openai"
 # zh: 思维链工具调用兼容：启用后在多轮工具调用中回传 reasoning_content，避免部分模型返回 400。
 # en: Thinking tool-call compatibility: pass back reasoning_content in multi-turn tool calls to avoid 400 errors from some models.
 thinking_tool_call_compat = true
@@ -155,8 +158,8 @@ api_mode = "chat_completions"
 # zh: 是否启用 reasoning.effort。
 # en: Enable reasoning.effort.
 reasoning_enabled = false
-# zh: reasoning.effort 档位：none / minimal / low / medium / high / xhigh。
-# en: reasoning.effort level: none / minimal / low / medium / high / xhigh.
+# zh: reasoning effort 档位。
+# en: reasoning effort level.
 reasoning_effort = "medium"
 # zh: 是否启用 thinking（思维链）。
 # en: Enable thinking (reasoning).
@@ -167,6 +170,9 @@ thinking_budget_tokens = 20000
 # zh: 是否在请求中发送 budget_tokens（关闭后由提供商决定思维预算）。
 # en: Whether to include budget_tokens in the request (if disabled, the provider decides the thinking budget).
 thinking_include_budget = true
+# zh: reasoning effort 传参风格：openai（reasoning.effort）/ anthropic（output_config.effort）。
+# en: Reasoning effort wire format: openai (reasoning.effort) / anthropic (output_config.effort).
+reasoning_effort_style = "openai"
 # zh: 思维链工具调用兼容：启用后在多轮工具调用中回传 reasoning_content，避免部分模型返回 400。
 # en: Thinking tool-call compatibility: pass back reasoning_content in multi-turn tool calls to avoid 400 errors from some models.
 thinking_tool_call_compat = true
@@ -208,8 +214,8 @@ api_mode = "chat_completions"
 # zh: 是否启用 reasoning.effort。
 # en: Enable reasoning.effort.
 reasoning_enabled = false
-# zh: reasoning.effort 档位：none / minimal / low / medium / high / xhigh。
-# en: reasoning.effort level: none / minimal / low / medium / high / xhigh.
+# zh: reasoning effort 档位。
+# en: reasoning effort level.
 reasoning_effort = "medium"
 # zh: 是否启用 thinking（思维链）。
 # en: Enable thinking (reasoning).
@@ -220,6 +226,9 @@ thinking_budget_tokens = 0
 # zh: 是否在请求中发送 budget_tokens（关闭后由提供商决定思维预算）。
 # en: Whether to include budget_tokens in the request (if disabled, the provider decides the thinking budget).
 thinking_include_budget = true
+# zh: reasoning effort 传参风格：openai（reasoning.effort）/ anthropic（output_config.effort）。
+# en: Reasoning effort wire format: openai (reasoning.effort) / anthropic (output_config.effort).
+reasoning_effort_style = "openai"
 # zh: 思维链工具调用兼容：启用后在多轮工具调用中回传 reasoning_content，避免部分模型返回 400。
 # en: Thinking tool-call compatibility: pass back reasoning_content in multi-turn tool calls to avoid 400 errors from some models.
 thinking_tool_call_compat = true
@@ -234,6 +243,61 @@ responses_force_stateless_replay = false
 # en: Extra request-body params (optional), e.g. temperature or vendor-specific fields.
 [models.security.request_params]
 
+# zh: Naga 外发消息审核模型配置（仅用于 Naga 通过 Runtime API 发消息前的内容审核）。
+# zh: 若无必要可不填写；未配置时回退到 [models.security]。
+# en: Naga outbound moderation model config (used only before Naga sends messages through the Runtime API).
+# en: Optional; falls back to [models.security] when omitted.
+[models.naga]
+# zh: OpenAI-compatible 基址 URL，例如 https://api.openai.com/v1（legacy "/chat/completions" 已弃用但仍兼容）。
+# en: OpenAI-compatible base URL, e.g. https://api.openai.com/v1. Note: legacy "/chat/completions" is deprecated but still supported.
+api_url = ""
+# zh: Naga 审核模型 API Key。
+# en: Naga moderation model API key.
+api_key = ""
+# zh: Naga 审核模型名称。
+# en: Naga moderation model name.
+model_name = ""
+# zh: 可选限制：最大生成 tokens。
+# en: Optional limit: max generation tokens.
+max_tokens = 160
+# zh: 队列发车间隔（秒）。
+# en: Queue interval (seconds).
+queue_interval_seconds = 1.0
+# zh: API 模式：传统 chat.completions 或新版 responses。
+# en: API mode: classic chat.completions or the newer responses API.
+api_mode = "chat_completions"
+# zh: 是否启用 reasoning.effort。
+# en: Enable reasoning.effort.
+reasoning_enabled = false
+# zh: reasoning effort 档位。
+# en: reasoning effort level.
+reasoning_effort = "medium"
+# zh: 是否启用 thinking（思维链）。
+# en: Enable thinking (reasoning).
+thinking_enabled = false
+# zh: thinking 预算 tokens。
+# en: Thinking-budget tokens.
+thinking_budget_tokens = 0
+# zh: 是否在请求中发送 budget_tokens（关闭后由提供商决定思维预算）。
+# en: Whether to include budget_tokens in the request (if disabled, the provider decides the thinking budget).
+thinking_include_budget = true
+# zh: reasoning effort 传参风格：openai（reasoning.effort）/ anthropic（output_config.effort）。
+# en: Reasoning effort wire format: openai (reasoning.effort) / anthropic (output_config.effort).
+reasoning_effort_style = "openai"
+# zh: 思维链工具调用兼容：启用后在多轮工具调用中回传 reasoning_content，避免部分模型返回 400。
+# en: Thinking tool-call compatibility: pass back reasoning_content in multi-turn tool calls to avoid 400 errors from some models.
+thinking_tool_call_compat = true
+# zh: Responses API 的 tool_choice 兼容模式。
+# en: Responses API tool_choice compatibility mode.
+responses_tool_choice_compat = false
+# zh: Responses API 续轮强制降级。
+# en: Responses API force stateless replay.
+responses_force_stateless_replay = false
+
+# zh: 额外请求体参数（可选），可用于 temperature 或供应商私有参数。
+# en: Extra request-body params (optional), e.g. temperature or vendor-specific fields.
+[models.naga.request_params]
+
 # zh: Agent 模型配置（用于执行 agents）。
 # en: Agent model config (used to run agents).
 [models.agent]
@@ -258,8 +322,8 @@ api_mode = "chat_completions"
 # zh: 是否启用 reasoning.effort。
 # en: Enable reasoning.effort.
 reasoning_enabled = false
-# zh: reasoning.effort 档位：none / minimal / low / medium / high / xhigh。
-# en: reasoning.effort level: none / minimal / low / medium / high / xhigh.
+# zh: reasoning effort 档位。
+# en: reasoning effort level.
 reasoning_effort = "medium"
 # zh: 是否启用 thinking（思维链）。
 # en: Enable thinking (reasoning).
@@ -270,6 +334,9 @@ thinking_budget_tokens = 0
 # zh: 是否在请求中发送 budget_tokens（关闭后由提供商决定思维预算）。
 # en: Whether to include budget_tokens in the request (if disabled, the provider decides the thinking budget).
 thinking_include_budget = true
+# zh: reasoning effort 传参风格：openai（reasoning.effort）/ anthropic（output_config.effort）。
+# en: Reasoning effort wire format: openai (reasoning.effort) / anthropic (output_config.effort).
+reasoning_effort_style = "openai"
 # zh: 思维链工具调用兼容：启用后在多轮工具调用中回传 reasoning_content，避免部分模型返回 400。
 # en: Thinking tool-call compatibility: pass back reasoning_content in multi-turn tool calls to avoid 400 errors from some models.
 thinking_tool_call_compat = true
@@ -321,8 +388,8 @@ api_mode = "chat_completions"
 # zh: 是否启用 reasoning.effort。
 # en: Enable reasoning.effort.
 reasoning_enabled = false
-# zh: reasoning.effort 档位：none / minimal / low / medium / high / xhigh。
-# en: reasoning.effort level: none / minimal / low / medium / high / xhigh.
+# zh: reasoning effort 档位。
+# en: reasoning effort level.
 reasoning_effort = "medium"
 # zh: 是否启用 thinking（思维链）。
 # en: Enable thinking (reasoning).
@@ -333,6 +400,9 @@ thinking_budget_tokens = 0
 # zh: 是否在请求中发送 budget_tokens（关闭后由提供商决定思维预算）。
 # en: Whether to include budget_tokens in the request (if disabled, the provider decides the thinking budget).
 thinking_include_budget = true
+# zh: reasoning effort 传参风格：openai（reasoning.effort）/ anthropic（output_config.effort）。
+# en: Reasoning effort wire format: openai (reasoning.effort) / anthropic (output_config.effort).
+reasoning_effort_style = "openai"
 # zh: 思维链工具调用兼容：启用后在多轮工具调用中回传 reasoning_content，避免部分模型返回 400。
 # en: Thinking tool-call compatibility: pass back reasoning_content in multi-turn tool calls to avoid 400 errors from some models.
 thinking_tool_call_compat = true
@@ -871,9 +941,9 @@ job_max_retries = 3
 # en: To get NagaAgent answering without external callbacks, only enable nagaagent_mode_enabled.
 # en: ⚠️ Advanced feature for NagaAgent integration. Not recommended for regular users.
 [naga]
-# zh: 是否启用外部网关集成（回调 API、/naga 命令、绑定管理）。
+# zh: 是否启用外部网关集成（/naga bind/unbind、远端绑定回调、消息发送、解绑 API）。
 # zh: 需同时开启 [features].nagaagent_mode_enabled 才生效。
-# en: Enable external gateway integration (callback API, /naga command, bindings).
+# en: Enable external gateway integration (/naga bind/unbind, bind callback, message send, unbind API).
 # en: Requires [features].nagaagent_mode_enabled = true to take effect.
 enabled = false
 # zh: Naga 服务器 API 地址。
@@ -882,6 +952,6 @@ api_url = ""
 # zh: 双方共享密钥（Undefined ↔ Naga 身份验证）。
 # en: Shared secret key for authentication between Undefined and Naga.
 api_key = ""
-# zh: Naga 服务群聊名单：绑定/回调群发仅限这些群。
-# en: Allowed groups for Naga binding and group callback delivery.
+# zh: Naga 白名单群：/naga 在这些群中才可见；绑定和群聊投递也仅限这些群。
+# en: Naga allowlisted groups: /naga is only visible here, and binding/group delivery are restricted to these groups.
 allowed_groups = []

{undefined_bot-3.2.2 → undefined_bot-3.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Undefined-bot"
-version = "3.2.2"
+version = "3.2.5"
 description = "QQ bot platform with cognitive memory architecture and multi-agent Skills, via OneBot V11."
 readme = "README.md"
 authors = [

undefined_bot-3.2.5/res/prompts/naga_message_moderation.txt

@@ -0,0 +1,26 @@
+你是 Undefined 的 Naga 外发消息审核器。
+
+任务：
+1. 审核 Naga 准备发送到 QQ 的内容是否存在以下明确风险：
+   - pornography：涉黄、淫秽、性交易、未成年人性暗示等
+   - politics_illegal：违法涉政、煽动违法、危害国家安全、鼓动暴力或颠覆等
+   - personal_privacy：明确泄露个人隐私，如手机号、住址、身份证号、银行卡号、真实姓名+敏感联系方式等
+2. 输入里同时提供了：
+   - raw：原始内容
+   - plain_text：去渲染/去标签后的纯文本视图
+   你必须同时判断这两种视图下的风险，尤其要检查“未渲染直接发送时”的安全风险。
+3. 只有在风险明确成立时才输出 block。无法确认、语义正常、只是普通讨论时输出 allow。
+
+输出要求：
+- 必须调用提供的函数工具 `submit_naga_moderation_result`
+- 不要把 JSON 写在正文里
+- 不要输出 Markdown，不要解释，不要加代码块
+- 通过函数参数提交：
+  - `decision`: `allow` 或 `block`
+  - `categories`: 风险类别数组
+  - `reason`: 简短中文原因
+
+规则：
+- 若 `decision=allow`，则 `categories` 为空数组。
+- 若 `decision=block`，则 `categories` 里至少包含一个上面的枚举值。
+- 不要发明新字段，不要输出额外文本。

{undefined_bot-3.2.2 → undefined_bot-3.2.5}/src/Undefined/__init__.py

@@ -1,3 +1,3 @@
 """Undefined - A high-performance, highly scalable QQ group and private chat robot based on a self-developed architecture."""
 
-__version__ = "3.2.2"
+__version__ = "3.2.5"

{undefined_bot-3.2.2 → undefined_bot-3.2.5}/src/Undefined/ai/llm.py

@@ -25,7 +25,9 @@ from Undefined.ai.transports import (
     API_MODE_RESPONSES,
     build_responses_request_body,
     get_api_mode,
-    get_reasoning_payload,
+    get_effort_payload,
+    get_effort_style,
+    get_thinking_payload,
     normalize_responses_result,
 )
 from Undefined.ai.retrieval import RetrievalRequester
@@ -117,8 +119,10 @@ _CHAT_COMPLETIONS_RESERVED_FIELDS: frozenset[str] = (
             "tool_choice",
             "stream",
             "stream_options",
+            "thinking",
             "reasoning",
             "reasoning_effort",
+            "output_config",
         }
     )
     | _SDK_REQUEST_OPTION_FIELDS
@@ -139,6 +143,7 @@ _RESPONSES_RESERVED_FIELDS: frozenset[str] = (
             "thinking",
             "reasoning",
             "reasoning_effort",
+            "output_config",
         }
     )
     | _SDK_REQUEST_OPTION_FIELDS
@@ -870,6 +875,8 @@ def _build_effective_request_kwargs(
         getattr(model_config, "request_params", {}),
         overrides,
     )
+    thinking_override = overrides["thinking"] if "thinking" in overrides else None
+    has_thinking_override = "thinking" in overrides
     reserved_fields = (
         _RESPONSES_RESERVED_FIELDS
         if get_api_mode(model_config) == API_MODE_RESPONSES
@@ -879,11 +886,15 @@ def _build_effective_request_kwargs(
         merged,
         reserved_fields,
     )
+    if has_thinking_override:
+        ignored.pop("thinking", None)
     _warn_ignored_request_params(
         call_type=call_type,
         model_name=model_config.model_name,
         ignored=ignored,
     )
+    if has_thinking_override:
+        allowed["thinking"] = thinking_override
     return allowed
 
 
@@ -1447,12 +1458,20 @@ def build_request_body(
     """构建 API 请求体。"""
     api_mode = get_api_mode(model_config)
     extra_kwargs: dict[str, Any] = dict(kwargs)
-    reasoning_payload = get_reasoning_payload(model_config)
+
+    if "thinking" in extra_kwargs:
+        normalized = _normalize_thinking_override(
+            extra_kwargs.get("thinking"), model_config
+        )
+        if normalized is None:
+            extra_kwargs.pop("thinking", None)
+        else:
+            extra_kwargs["thinking"] = normalized
 
     if api_mode == API_MODE_RESPONSES:
-        extra_kwargs.pop("thinking", None)
         extra_kwargs.pop("reasoning", None)
         extra_kwargs.pop("reasoning_effort", None)
+        extra_kwargs.pop("output_config", None)
         return build_responses_request_body(
             model_config,
             messages,
@@ -1470,28 +1489,21 @@ def build_request_body(
         "max_tokens": max_tokens,
     }
 
-    if "thinking" in extra_kwargs:
-        normalized = _normalize_thinking_override(
-            extra_kwargs.get("thinking"), model_config
-        )
-        if normalized is None:
-            extra_kwargs.pop("thinking", None)
-        else:
-            extra_kwargs["thinking"] = normalized
-
     extra_kwargs.pop("reasoning", None)
     extra_kwargs.pop("reasoning_effort", None)
+    extra_kwargs.pop("output_config", None)
 
-    if getattr(model_config, "thinking_enabled", False):
-        thinking_param: dict[str, Any] = {"type": "enabled"}
-        if getattr(model_config, "thinking_include_budget", True):
-            thinking_param["budget_tokens"] = getattr(
-                model_config, "thinking_budget_tokens", 0
-            )
-        body["thinking"] = thinking_param
+    thinking = get_thinking_payload(model_config)
+    if thinking is not None:
+        body["thinking"] = thinking
 
-    if reasoning_payload is not None:
-        body["reasoning"] = reasoning_payload
+    effort_payload = get_effort_payload(model_config)
+    if effort_payload is not None:
+        style = get_effort_style(model_config)
+        if style == "anthropic":
+            body["output_config"] = effort_payload
+        else:
+            body["reasoning"] = effort_payload
 
     if tools:
         body["tools"] = tools

{undefined_bot-3.2.2 → undefined_bot-3.2.5}/src/Undefined/ai/transports/__init__.py

@@ -5,7 +5,10 @@ from .openai_transport import (
     API_MODE_RESPONSES,
     build_responses_request_body,
     get_api_mode,
+    get_effort_payload,
+    get_effort_style,
     get_reasoning_payload,
+    get_thinking_payload,
     normalize_api_mode,
     normalize_reasoning_effort,
     normalize_responses_result,
@@ -16,7 +19,10 @@ __all__ = [
     "API_MODE_RESPONSES",
     "build_responses_request_body",
     "get_api_mode",
+    "get_effort_payload",
+    "get_effort_style",
     "get_reasoning_payload",
+    "get_thinking_payload",
     "normalize_api_mode",
     "normalize_reasoning_effort",
     "normalize_responses_result",

{undefined_bot-3.2.2 → undefined_bot-3.2.5}/src/Undefined/ai/transports/openai_transport.py

@@ -6,7 +6,6 @@ from typing import Any
 API_MODE_CHAT_COMPLETIONS = "chat_completions"
 API_MODE_RESPONSES = "responses"
 _VALID_API_MODES = {API_MODE_CHAT_COMPLETIONS, API_MODE_RESPONSES}
-_VALID_REASONING_EFFORTS = {"none", "minimal", "low", "medium", "high", "xhigh"}
 
 
 def normalize_api_mode(value: Any, default: str = API_MODE_CHAT_COMPLETIONS) -> str:
@@ -23,13 +22,28 @@ def get_api_mode(model_config: Any) -> str:
 
 
 def normalize_reasoning_effort(value: Any, default: str = "medium") -> str:
-    text = str(value or default).strip().lower()
-    if text not in _VALID_REASONING_EFFORTS:
-        return default
-    return text
+    return str(value or default).strip().lower()
 
 
 def get_reasoning_payload(model_config: Any) -> dict[str, Any] | None:
+    return get_effort_payload(model_config)
+
+
+_VALID_REASONING_EFFORT_STYLES = {"openai", "anthropic"}
+
+
+def get_thinking_payload(model_config: Any) -> dict[str, Any] | None:
+    """构建 thinking 请求参数，仅由 thinking_* 配置控制。"""
+    if not bool(getattr(model_config, "thinking_enabled", False)):
+        return None
+    param: dict[str, Any] = {"type": "enabled"}
+    if bool(getattr(model_config, "thinking_include_budget", True)):
+        param["budget_tokens"] = int(getattr(model_config, "thinking_budget_tokens", 0))
+    return param
+
+
+def get_effort_payload(model_config: Any) -> dict[str, Any] | None:
+    """构建 effort 请求参数（仅在 reasoning_enabled 启用时生效）。"""
     if not bool(getattr(model_config, "reasoning_enabled", False)):
         return None
     return {
@@ -39,6 +53,15 @@ def get_reasoning_payload(model_config: Any) -> dict[str, Any] | None:
     }
 
 
+def get_effort_style(model_config: Any) -> str:
+    style = (
+        str(getattr(model_config, "reasoning_effort_style", "openai") or "openai")
+        .strip()
+        .lower()
+    )
+    return style if style in _VALID_REASONING_EFFORT_STYLES else "openai"
+
+
 def _stringify_content(value: Any) -> str:
     if value is None:
         return ""
@@ -334,9 +357,16 @@ def build_responses_request_body(
         "model": getattr(model_config, "model_name"),
         "max_output_tokens": max_tokens,
     }
-    reasoning = get_reasoning_payload(model_config)
-    if reasoning is not None:
-        body["reasoning"] = reasoning
+    thinking = get_thinking_payload(model_config)
+    effort_payload = get_effort_payload(model_config)
+    if effort_payload is not None:
+        style = get_effort_style(model_config)
+        if style == "anthropic":
+            body["output_config"] = effort_payload
+        else:
+            body["reasoning"] = effort_payload
+    if thinking is not None:
+        body["thinking"] = thinking
     if tools:
         normalized_tools = _normalize_responses_tools(tools, internal_to_api)
         normalized_tool_choice, selected_tool_name = _normalize_responses_tool_choice(