Undefined-bot 3.6.3__tar.gz → 3.6.4__tar.gz

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v3.6.4 可选系统信息注入
+
+本版本新增了默认关闭的系统信息 Prompt 注入能力。
+
+- 新增 `[prompt.system_info]`：可按 OS、Runtime、主机名、CPU、内存、Swap、磁盘、网络、进程和 uptime 控制展示，采集失败时跳过单项，不影响 Prompt 构建。
+
+---
+
 ## v3.6.3 合并转发快照、附件 UID 分析与 Release 下载说明
 
 本版本聚焦合并转发在协议端不可二次读取时的可用性：收到消息时先把可访问的转发树按会话保存为本地快照，后续工具读取优先复用快照，避免内层转发过期或回源失败导致 AI 看不到内容。同时补齐文件分析 Agent 对内部附件 UID 的直接解析能力，并澄清 Release 产物的下载选择。

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Undefined-bot
-Version: 3.6.3
+Version: 3.6.4
 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

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/config.toml.example

@@ -959,6 +959,46 @@ prefetch_tools = ["get_current_time"]
 # zh: 隐藏已预取的工具声明。
 # en: Hide prefetched tools from the model's tool list.
 prefetch_tools_hide = true
+
+# zh: Prompt 系统信息注入。总开关默认关闭；开启后各子项默认展示，可逐项关闭。
+# en: Prompt system information injection. The master switch is disabled by default; enabled sub-items are shown by default and can be disabled individually.
+[prompt.system_info]
+# zh: 是否把当前运行主机的系统信息注入提示词。默认关闭，避免升级后自动暴露本机信息给模型。
+# en: Inject current host system information into prompts. Disabled by default to avoid exposing host data automatically after upgrades.
+enabled = false
+# zh: 展示操作系统、版本、release 和架构。
+# en: Show operating system, version, release, and architecture.
+show_os = true
+# zh: 展示 Python 与 Undefined 版本。
+# en: Show Python and Undefined versions.
+show_runtime = true
+# zh: 展示主机名。
+# en: Show hostname.
+show_host = true
+# zh: 展示 CPU 型号与物理/逻辑核心数。
+# en: Show CPU model and physical/logical core counts.
+show_cpu = true
+# zh: 展示当前 CPU 总使用率。
+# en: Show current total CPU usage.
+show_cpu_usage = true
+# zh: 展示内存总量、已用量与占用率。
+# en: Show memory total, used amount, and usage percentage.
+show_memory = true
+# zh: 展示 Swap 总量、已用量与占用率。
+# en: Show swap total, used amount, and usage percentage.
+show_swap = true
+# zh: 展示可见磁盘分区、文件系统、容量与占用率。
+# en: Show visible disk partitions, filesystem, capacity, and usage percentage.
+show_disks = true
+# zh: 展示非回环网卡地址与网络收发累计。涉及 IP 信息，公网或共享部署可关闭。
+# en: Show non-loopback network addresses and cumulative network I/O. Disable this on public or shared deployments if IP exposure is undesirable.
+show_network = true
+# zh: 展示 Bot 进程 PID、启动时间、运行时长、RSS 与进程 CPU 占用。
+# en: Show bot process PID, start time, uptime, RSS, and process CPU usage.
+show_process = true
+# zh: 展示系统启动时间与系统运行时长。
+# en: Show system boot time and uptime.
+show_uptime = true
 # zh: 搜索服务配置。
 # en: Search service config.
 [search]

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/pyproject.toml

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

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/src/Undefined/__init__.py

@@ -24,7 +24,7 @@ if TYPE_CHECKING:
     from .skills.registry import BaseRegistry as BaseRegistry
     from .skills.tools import ToolRegistry as ToolRegistry
 
-__version__ = "3.6.3"
+__version__: str = "3.6.4"
 
 # symbol -> (module_path, attribute_name)；首次访问时才 importlib 加载
 _LAZY_IMPORTS: dict[str, tuple[str, str]] = {

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/src/Undefined/ai/prompts/builder.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+import asyncio
 from collections import deque
 from datetime import datetime
 from typing import Any, Awaitable, Callable, Literal
@@ -30,6 +31,7 @@ from Undefined.ai.prompts.system_context import (
     build_model_config_info,
     select_system_prompt_path,
 )
+from Undefined.ai.prompts.system_info import build_prompt_system_info
 
 logger = logging.getLogger(__name__)
 
@@ -520,6 +522,20 @@ class PromptBuilder:
         # 记忆/认知/历史等上下文统一排在主 system 之后、当前消息之前
         messages.extend(deferred_messages)
 
+        if self._runtime_config_getter is not None:
+            try:
+                system_info = await asyncio.to_thread(
+                    self._build_prompt_system_info_from_runtime_config
+                )
+                if system_info:
+                    messages.append({"role": "system", "content": system_info})
+                    logger.debug(
+                        "[Prompt] 已注入当前系统信息，长度=%s",
+                        len(system_info),
+                    )
+            except Exception as exc:
+                logger.debug("读取当前系统信息失败: %s", exc)
+
         current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         messages.append(
             {
@@ -538,6 +554,13 @@ class PromptBuilder:
         )
         return messages
 
+    def _build_prompt_system_info_from_runtime_config(self) -> str:
+        if self._runtime_config_getter is None:
+            return ""
+        runtime_config = self._runtime_config_getter()
+        system_info_config = getattr(runtime_config, "prompt_system_info", None)
+        return build_prompt_system_info(system_info_config)
+
     def _resolve_chat_scope(
         self, extra_context: dict[str, Any] | None
     ) -> tuple[Literal["group", "private"], int] | None:

undefined_bot-3.6.4/src/Undefined/ai/prompts/system_info.py

@@ -0,0 +1,335 @@
+"""跨平台系统信息采集与 Prompt 格式化。"""
+
+from __future__ import annotations
+
+import ipaddress
+import os
+import platform
+import socket
+import time
+from collections.abc import Iterable
+from datetime import datetime
+from typing import Any
+
+from Undefined import __version__
+
+try:
+    import psutil
+except Exception:  # pragma: no cover - 仅在依赖缺失或平台导入失败时触发
+    psutil = None
+
+_BYTES_PER_GIB = 1024**3
+_CPU_PERCENT_PRIMED = False
+
+
+def _safe_call(func: Any, *args: Any, **kwargs: Any) -> Any | None:
+    try:
+        return func(*args, **kwargs)
+    except Exception:
+        return None
+
+
+def _prime_cpu_percent() -> None:
+    global _CPU_PERCENT_PRIMED
+    if _CPU_PERCENT_PRIMED or psutil is None:
+        return
+    _safe_call(psutil.cpu_percent, interval=None)
+    _CPU_PERCENT_PRIMED = True
+
+
+_prime_cpu_percent()
+
+
+def _format_bytes(value: float | int | None) -> str:
+    if value is None:
+        return "未知"
+    gib = float(value) / _BYTES_PER_GIB
+    if gib >= 1:
+        return f"{gib:.2f} GiB"
+    mib = float(value) / 1024**2
+    return f"{mib:.1f} MiB"
+
+
+def _format_percent(value: Any) -> str:
+    try:
+        return f"{float(value):.1f}%"
+    except (TypeError, ValueError):
+        return "未知"
+
+
+def _format_duration(seconds: float | int | None) -> str:
+    if seconds is None:
+        return "未知"
+    total_seconds = max(0, int(seconds))
+    days, remainder = divmod(total_seconds, 86400)
+    hours, remainder = divmod(remainder, 3600)
+    minutes, seconds = divmod(remainder, 60)
+    parts: list[str] = []
+    if days:
+        parts.append(f"{days}天")
+    if hours:
+        parts.append(f"{hours}小时")
+    if minutes:
+        parts.append(f"{minutes}分钟")
+    if not parts:
+        parts.append(f"{seconds}秒")
+    return "".join(parts)
+
+
+def _format_timestamp(timestamp: float | int | None) -> str:
+    if timestamp is None:
+        return "未知"
+    try:
+        return datetime.fromtimestamp(float(timestamp)).strftime("%Y-%m-%d %H:%M:%S")
+    except (OSError, OverflowError, ValueError):
+        return "未知"
+
+
+def _read_cpu_model() -> str:
+    model = platform.processor().strip()
+    if model:
+        return model
+    if hasattr(platform, "uname"):
+        processor = str(platform.uname().processor or "").strip()
+        if processor:
+            return processor
+    return "未知"
+
+
+def _is_loopback_or_empty_address(address: str) -> bool:
+    text = address.strip()
+    if not text:
+        return True
+    try:
+        parsed = ipaddress.ip_address(text.split("%", 1)[0])
+    except ValueError:
+        return False
+    return parsed.is_loopback or parsed.is_unspecified
+
+
+def _iter_network_addresses() -> Iterable[str]:
+    if psutil is None:
+        return []
+    addrs = _safe_call(psutil.net_if_addrs)
+    if not isinstance(addrs, dict):
+        return []
+
+    lines: list[str] = []
+    for name, items in sorted(addrs.items()):
+        address_parts: list[str] = []
+        for item in items:
+            family = getattr(item, "family", None)
+            if family not in {socket.AF_INET, socket.AF_INET6}:
+                continue
+            address = str(getattr(item, "address", "") or "").strip()
+            if _is_loopback_or_empty_address(address):
+                continue
+            address_parts.append(address)
+        if address_parts:
+            lines.append(f"{name}: {', '.join(address_parts)}")
+    return lines
+
+
+def _iter_disk_lines(max_items: int = 12) -> Iterable[str]:
+    if psutil is None:
+        return []
+    partitions = _safe_call(psutil.disk_partitions, all=False)
+    if not isinstance(partitions, list):
+        return []
+
+    valid_lines: list[str] = []
+    seen_mounts: set[str] = set()
+    for part in partitions:
+        mountpoint = str(getattr(part, "mountpoint", "") or "").strip()
+        if not mountpoint or mountpoint in seen_mounts:
+            continue
+        seen_mounts.add(mountpoint)
+        usage = _safe_call(psutil.disk_usage, mountpoint)
+        if usage is None:
+            continue
+        filesystem = str(getattr(part, "fstype", "") or "未知")
+        total = _format_bytes(getattr(usage, "total", None))
+        used = _format_bytes(getattr(usage, "used", None))
+        percent = _format_percent(getattr(usage, "percent", None))
+        valid_lines.append(f"{mountpoint} ({filesystem}): {used}/{total}, {percent}")
+    lines = valid_lines[:max_items]
+    skipped_count = max(0, len(valid_lines) - max_items)
+    if skipped_count:
+        lines.append(f"... 其余 {skipped_count} 个分区已省略")
+    return lines
+
+
+def _build_os_line() -> str:
+    platform_text = platform.platform(aliased=True, terse=False)
+    machine = platform.machine() or "未知"
+    return f"- OS: {platform_text}; 架构: {machine}"
+
+
+def _build_runtime_line() -> str:
+    python_version = platform.python_version()
+    return f"- Runtime: Python {python_version}; Undefined {__version__}"
+
+
+def _build_host_line() -> str:
+    hostname = platform.node() or socket.gethostname() or "未知"
+    return f"- Host: {hostname}"
+
+
+def _build_cpu_line() -> str:
+    logical = os.cpu_count()
+    physical = None
+    if psutil is not None:
+        physical = _safe_call(psutil.cpu_count, logical=False)
+        logical_psutil = _safe_call(psutil.cpu_count, logical=True)
+        if isinstance(logical_psutil, int) and logical_psutil > 0:
+            logical = logical_psutil
+    model = _read_cpu_model()
+    core_text = f"逻辑核 {logical or '未知'}"
+    if isinstance(physical, int) and physical > 0:
+        core_text = f"物理核 {physical}, {core_text}"
+    return f"- CPU: {model}; {core_text}"
+
+
+def _build_cpu_usage_line() -> str | None:
+    if psutil is None:
+        return None
+    _prime_cpu_percent()
+    usage = _safe_call(psutil.cpu_percent, interval=None)
+    if usage is None:
+        return None
+    return f"- CPU 使用率: {_format_percent(usage)}"
+
+
+def _build_memory_line() -> str | None:
+    if psutil is None:
+        return None
+    mem = _safe_call(psutil.virtual_memory)
+    if mem is None:
+        return None
+    return (
+        "- 内存: "
+        f"{_format_bytes(getattr(mem, 'used', None))}/"
+        f"{_format_bytes(getattr(mem, 'total', None))}, "
+        f"{_format_percent(getattr(mem, 'percent', None))}"
+    )
+
+
+def _build_swap_line() -> str | None:
+    if psutil is None:
+        return None
+    swap = _safe_call(psutil.swap_memory)
+    if swap is None:
+        return None
+    total = getattr(swap, "total", 0) or 0
+    if int(total) <= 0:
+        return "- Swap: 未配置"
+    return (
+        "- Swap: "
+        f"{_format_bytes(getattr(swap, 'used', None))}/"
+        f"{_format_bytes(total)}, "
+        f"{_format_percent(getattr(swap, 'percent', None))}"
+    )
+
+
+def _build_disks_line() -> str | None:
+    lines = list(_iter_disk_lines())
+    if not lines:
+        return None
+    return "- 磁盘:\n  - " + "\n  - ".join(lines)
+
+
+def _build_network_line() -> str | None:
+    address_lines = list(_iter_network_addresses())
+    io_text = ""
+    if psutil is not None:
+        counters = _safe_call(psutil.net_io_counters)
+        if counters is not None:
+            sent = _format_bytes(getattr(counters, "bytes_sent", None))
+            recv = _format_bytes(getattr(counters, "bytes_recv", None))
+            io_text = f"收发累计: sent={sent}, recv={recv}"
+    if not address_lines and not io_text:
+        return None
+    parts: list[str] = []
+    if io_text:
+        parts.append(io_text)
+    if address_lines:
+        parts.append("地址:\n  - " + "\n  - ".join(address_lines))
+    return "- 网络: " + "\n  ".join(parts)
+
+
+def _build_process_line() -> str | None:
+    if psutil is None:
+        pid = os.getpid()
+        return f"- 进程: PID {pid}"
+    process = _safe_call(psutil.Process)
+    if process is None:
+        return None
+    pid = os.getpid()
+    create_time = _safe_call(process.create_time)
+    runtime = (
+        time.time() - float(create_time) if isinstance(create_time, float) else None
+    )
+    memory_info = _safe_call(process.memory_info)
+    rss = getattr(memory_info, "rss", None) if memory_info is not None else None
+    cpu_percent = _safe_call(process.cpu_percent, interval=None)
+    parts = [
+        f"PID {pid}",
+        f"启动于 {_format_timestamp(create_time)}",
+        f"运行 {_format_duration(runtime)}",
+    ]
+    if rss is not None:
+        parts.append(f"RSS {_format_bytes(rss)}")
+    if cpu_percent is not None:
+        parts.append(f"CPU {_format_percent(cpu_percent)}")
+    return "- 进程: " + "; ".join(parts)
+
+
+def _build_uptime_line() -> str | None:
+    if psutil is None:
+        return None
+    boot_time = _safe_call(psutil.boot_time)
+    if not isinstance(boot_time, (int, float)):
+        return None
+    uptime = time.time() - float(boot_time)
+    return f"- 系统启动: {_format_timestamp(boot_time)}; 已运行: {_format_duration(uptime)}"
+
+
+def build_prompt_system_info(config: Any) -> str:
+    """按配置采集并格式化当前系统信息。"""
+
+    if not bool(getattr(config, "enabled", False)):
+        return ""
+
+    parts: list[str] = ["【当前系统信息】"]
+
+    builders: list[tuple[str, Any]] = [
+        ("show_os", _build_os_line),
+        ("show_runtime", _build_runtime_line),
+        ("show_host", _build_host_line),
+        ("show_cpu", _build_cpu_line),
+        ("show_cpu_usage", _build_cpu_usage_line),
+        ("show_memory", _build_memory_line),
+        ("show_swap", _build_swap_line),
+        ("show_disks", _build_disks_line),
+        ("show_network", _build_network_line),
+        ("show_process", _build_process_line),
+        ("show_uptime", _build_uptime_line),
+    ]
+    for flag_name, builder in builders:
+        if not bool(getattr(config, flag_name, True)):
+            continue
+        line = _safe_call(builder)
+        if isinstance(line, str) and line.strip():
+            parts.append(line.strip())
+
+    if len(parts) == 1:
+        return ""
+    parts.append("")
+    parts.append(
+        "注意：以上是当前运行主机的系统信息，可能随时间变化；"
+        "回答系统状态、资源占用、运行环境相关问题时以此为准。"
+    )
+    return "\n".join(parts)
+
+
+__all__ = ["build_prompt_system_info"]

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/src/Undefined/config/__init__.py

@@ -14,6 +14,7 @@ from .models import (
     MessageBatcherConfig,
     ModelPool,
     ModelPoolEntry,
+    PromptSystemInfoConfig,
     RenderCacheConfig,
     RerankModelConfig,
     SecurityModelConfig,
@@ -36,6 +37,7 @@ __all__ = [
     "ModelPoolEntry",
     "MemeConfig",
     "MessageBatcherConfig",
+    "PromptSystemInfoConfig",
     "RenderCacheConfig",
     "get_config",
     "get_config_manager",

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/src/Undefined/config/config_class.py

@@ -21,6 +21,7 @@ from .models import (
     MemeConfig,
     MessageBatcherConfig,
     NagaConfig,
+    PromptSystemInfoConfig,
     RenderCacheConfig,
     RerankModelConfig,
     SecurityModelConfig,
@@ -199,6 +200,8 @@ class Config:
     memes: MemeConfig
     # 同 sender 短时多消息合并器
     message_batcher: MessageBatcherConfig
+    # Prompt 系统信息注入
+    prompt_system_info: PromptSystemInfoConfig
     # HTML 渲染结果缓存
     render_cache: RenderCacheConfig
     # Naga 集成

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/src/Undefined/config/domain_parsers.py

@@ -19,6 +19,7 @@ from .models import (
     MemeConfig,
     MessageBatcherConfig,
     NagaConfig,
+    PromptSystemInfoConfig,
     RenderCacheConfig,
 )
 
@@ -232,6 +233,28 @@ def _parse_message_batcher_config(data: dict[str, Any]) -> MessageBatcherConfig:
     )
 
 
+def _parse_prompt_system_info_config(data: dict[str, Any]) -> PromptSystemInfoConfig:
+    prompt_raw = data.get("prompt", {})
+    prompt_section = prompt_raw if isinstance(prompt_raw, dict) else {}
+    system_info_raw = prompt_section.get("system_info", {})
+    section = system_info_raw if isinstance(system_info_raw, dict) else {}
+
+    return PromptSystemInfoConfig(
+        enabled=_coerce_bool(section.get("enabled"), False),
+        show_os=_coerce_bool(section.get("show_os"), True),
+        show_runtime=_coerce_bool(section.get("show_runtime"), True),
+        show_host=_coerce_bool(section.get("show_host"), True),
+        show_cpu=_coerce_bool(section.get("show_cpu"), True),
+        show_cpu_usage=_coerce_bool(section.get("show_cpu_usage"), True),
+        show_memory=_coerce_bool(section.get("show_memory"), True),
+        show_swap=_coerce_bool(section.get("show_swap"), True),
+        show_disks=_coerce_bool(section.get("show_disks"), True),
+        show_network=_coerce_bool(section.get("show_network"), True),
+        show_process=_coerce_bool(section.get("show_process"), True),
+        show_uptime=_coerce_bool(section.get("show_uptime"), True),
+    )
+
+
 def _parse_render_cache_config(data: dict[str, Any]) -> RenderCacheConfig:
     """解析 ``[render.cache]`` 段，落到 :class:`RenderCacheConfig`。
 

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/src/Undefined/config/load_sections/domains.py

@@ -14,6 +14,7 @@ from ..domain_parsers import (
     _parse_memes_config,
     _parse_message_batcher_config,
     _parse_naga_config,
+    _parse_prompt_system_info_config,
     _parse_render_cache_config,
 )
 from ..model_parsers import (
@@ -36,6 +37,7 @@ def load_domains(
     cognitive = _parse_cognitive_config(data)
     memes = _parse_memes_config(data)
     message_batcher = _parse_message_batcher_config(data)
+    prompt_system_info = _parse_prompt_system_info_config(data)
     render_cache = _parse_render_cache_config(data)
     naga = _parse_naga_config(data)
     models_image_gen = _parse_image_gen_model_config(data)
@@ -51,6 +53,7 @@ def load_domains(
         "cognitive": cognitive,
         "memes": memes,
         "message_batcher": message_batcher,
+        "prompt_system_info": prompt_system_info,
         "render_cache": render_cache,
         "naga": naga,
         "image_gen": image_gen,

{undefined_bot-3.6.3 → undefined_bot-3.6.4}/src/Undefined/config/models.py

@@ -397,6 +397,24 @@ class MessageBatcherConfig:
     allow_cancel_after_send: bool = False
 
 
+@dataclass
+class PromptSystemInfoConfig:
+    """Prompt 中的运行系统信息注入配置。"""
+
+    enabled: bool = False
+    show_os: bool = True
+    show_runtime: bool = True
+    show_host: bool = True
+    show_cpu: bool = True
+    show_cpu_usage: bool = True
+    show_memory: bool = True
+    show_swap: bool = True
+    show_disks: bool = True
+    show_network: bool = True
+    show_process: bool = True
+    show_uptime: bool = True
+
+
 @dataclass
 class RenderCacheConfig:
     """HTML 渲染结果缓存配置。