sdpy-kit 0.8.0__tar.gz → 0.8.1__tar.gz

{sdpy_kit-0.8.0 → sdpy_kit-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sdpy-kit
-Version: 0.8.0
+Version: 0.8.1
 Summary: SDPY Kit——统一数据库访问层（PG/MySQL/SQLite）与 AI/Redis/文件/文档/向量工具集
 Author-email: Clark <changhongyuan@126.com>
 License-Expression: MIT

{sdpy_kit-0.8.0 → sdpy_kit-0.8.1}/kit/__init__.py

@@ -23,7 +23,7 @@ Author: Clark Chang
 数据库访问通过 kit.db 子包提供（基于 SQLModel）。
 """
 
-__version__ = "0.8.0"
+__version__ = "0.8.1"
 
 from kit.db import (
     MYSQL,

{sdpy_kit-0.8.0 → sdpy_kit-0.8.1}/kit/ai/agent/loop.py

@@ -121,11 +121,13 @@ class Agent:
             raise ValueError("tool_timeout 必须 > 0")
         if max_tool_result_chars < 1:
             raise ValueError("max_tool_result_chars 必须 >= 1")
-        self._tools: ToolRegistry = tools or ToolRegistry()
+        self._tools: ToolRegistry = tools if tools is not None else ToolRegistry()
         self._skills: SkillRegistry | None = skills
         self._servers: tuple[McpServerConfig, ...] = tuple(servers)
         self._system_prompt: str | None = system_prompt or None
-        self._approval: ApprovalHook = approval or DefaultApproval()
+        self._approval: ApprovalHook = (
+            approval if approval is not None else DefaultApproval()
+        )
         self._max_turns: int = max_turns
         self._timeout: float = timeout
         self._tool_timeout: float = tool_timeout
@@ -133,7 +135,11 @@ class Agent:
         self._chat: ChatLike | None = chat
         self._chat_factory: Callable[[str], ChatLike] | None = chat_factory
         self._model: str | None = model
-        self._session: Session = session or Session(self._compose_system_prompt())
+        self._session: Session = (
+            session
+            if session is not None
+            else Session(self._compose_system_prompt())
+        )
 
         self._merged: ToolRegistry | None = None
         self._mcp: list[Any] = []
@@ -302,10 +308,10 @@ class Agent:
                     stop_reason="completed",
                 )
 
-            self._append_assistant(prepared, sink, reply)
             if turn >= self._max_turns:
                 # 最后一轮不再执行工具：没有余量回灌结果，避免无意义副作用
                 raise MaxTurnsExceeded(self._max_turns, turn)
+            self._append_assistant(prepared, sink, reply)
             for call in reply.tool_calls:
                 try:
                     record = await self._dispatch_tool_call(call, deadline, turn)
@@ -409,7 +415,7 @@ class Agent:
             prepared = self._validate_messages(messages)
             sink: Session | None = None
         else:
-            target = session or self._session
+            target = session if session is not None else self._session
             prepared = self._validate_messages(target.messages())
             sink = target
         index = self._skills.index_block() if self._skills is not None else ""
@@ -524,7 +530,10 @@ class Agent:
         profile = getattr(source, "last_profile", None)
         if not isinstance(profile, str) or not profile:
             return
-        self._locked_chat = self._build_locked_chat(profile)
+        try:
+            self._locked_chat = self._build_locked_chat(profile)
+        except AIError as exc:
+            raise AgentModelError(f"锁定档案 {profile!r} 失败: {exc}") from exc
         logger.info(f"工具循环已锁定档案: {profile}")
 
     def _build_locked_chat(self, profile: str) -> ChatLike:

{sdpy_kit-0.8.0 → sdpy_kit-0.8.1}/kit/ai/agent/mcp.py

@@ -162,9 +162,11 @@ class McpConnection:
         """
         if self._stack is not None:
             return
-        client = self._client if self._client is not None else self._build_client()
         stack = AsyncExitStack()
         try:
+            client = (
+                self._client if self._client is not None else self._build_client()
+            )
             async with asyncio.timeout(self._config.connect_timeout):
                 await stack.enter_async_context(client)
                 self._tools = list(await client.list_tools())

{sdpy_kit-0.8.0 → sdpy_kit-0.8.1}/kit/ai/agent/skill.py

@@ -355,7 +355,12 @@ def _parse_script(
             f"{skill_file} 的脚本 {name!r} 缺少合法 args"
             "（必须是 type=object 的 JSON Schema）"
         )
-    _resolve_within(root, path)
+    try:
+        _resolve_within(root, path)
+    except ToolExecutionError as exc:
+        raise SkillValidationError(
+            f"{skill_file} 的脚本 {name!r} 路径非法: {exc}"
+        ) from exc
     description = item.get("description", "")
     if not isinstance(description, str):
         description = str(description)