echotools 2.3.42__tar.gz → 2.3.43__tar.gz

{echotools-2.3.42 → echotools-2.3.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.42
+Version: 2.3.43
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Author: nichengfuben
 License: MIT

{echotools-2.3.42 → echotools-2.3.43}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.42"
+version = "2.3.43"
 description = "通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链"
 readme = "docs/README.md"
 requires-python = ">=3.8"

{echotools-2.3.42 → echotools-2.3.43}/src/echotools/exec/fncall/protocols/entml_think/core.py

@@ -53,11 +53,11 @@ _INJECTION_MODE_ALIASES: Dict[str, str] = {
 }
 
 _DEFAULT_MAX_BY_LEVEL: Dict[str, int] = {
-    "low": 6554,
-    "medium": 13108,
-    "high": 32768,
-    "xhigh": 52428,
-    "max": 62260,
+    "low": 12800,
+    "medium": 25600,
+    "high": 64000,
+    "xhigh": 102400,
+    "max": 134736,
 }
 
 _LEGACY_ON_DEFAULT_MAX = _DEFAULT_MAX_BY_LEVEL["medium"]
@@ -120,9 +120,12 @@ def parse_max_thinking_length(value: Any) -> Optional[int]:
 def resolve_thinking_injection(
     protocol_options: Optional[Dict[str, Any]] = None,
 ) -> Optional[Tuple[str, Optional[int]]]:
-    """解析注入用 thinking_mode (on/auto) 与 max_thinking_length。
+    """解析注入用 thinking_mode 与 max_thinking_length。
 
-    返回 None 表示不注入任何思考相关内容（none / off）。
+    - thinking_level 为 low|medium|high|xhigh|max 时，thinking_mode 直接传该挡位名。
+    - 仅 thinking_mode=on（无 level）时用 ``on``，并按 medium 默认长度。
+    - auto 传 ``auto``，无默认 max_thinking_length。
+    - none / off 返回 None，不注入任何思考相关内容。
     """
     opts = protocol_options or {}
 
@@ -130,8 +133,12 @@ def resolve_thinking_injection(
     if level is not None:
         if level == "none":
             return None
-        injection_mode = "auto" if level == "auto" else "on"
-        default_max = default_max_thinking_length_for_level(level)
+        if level == "auto":
+            injection_mode = "auto"
+            default_max = None
+        else:
+            injection_mode = level
+            default_max = default_max_thinking_length_for_level(level)
     else:
         mode = normalize_thinking_mode(opts.get("thinking_mode"))
         if mode is None or mode == "off":
@@ -144,8 +151,12 @@ def resolve_thinking_injection(
     return injection_mode, max_length
 
 
+def _uses_forced_thinking_behavior(injection_mode: str) -> bool:
+    return injection_mode != "auto"
+
+
 def _format_thinking_behavior(injection_mode: str) -> str:
-    body = _THINKING_BEHAVIOR_ON if injection_mode == "on" else _THINKING_BEHAVIOR_AUTO
+    body = _THINKING_BEHAVIOR_ON if _uses_forced_thinking_behavior(injection_mode) else _THINKING_BEHAVIOR_AUTO
     return f"<thinking_behavior>\n{body}\n</thinking_behavior>"
 
 

{echotools-2.3.42 → echotools-2.3.43}/src/echotools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.42
+Version: 2.3.43
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Author: nichengfuben
 License: MIT

{echotools-2.3.42 → echotools-2.3.43}/src/tests/test_entml_protocol.py

@@ -128,11 +128,11 @@ def test_normalize_thinking_level(raw, expected) -> None:
 @pytest.mark.parametrize(
     "level,expected",
     [
-        ("low", 6554),
-        ("medium", 13108),
-        ("high", 32768),
-        ("xhigh", 52428),
-        ("max", 62260),
+        ("low", 12800),
+        ("medium", 25600),
+        ("high", 64000),
+        ("xhigh", 102400),
+        ("max", 134736),
         ("none", None),
         ("auto", None),
     ],
@@ -143,13 +143,13 @@ def test_default_max_thinking_length_for_level(level, expected) -> None:
 
 def test_resolve_thinking_injection_levels() -> None:
     assert resolve_thinking_injection({"thinking_level": "none"}) is None
-    assert resolve_thinking_injection({"thinking_level": "low"}) == ("on", 6554)
-    assert resolve_thinking_injection({"thinking_level": "high"}) == ("on", 32768)
+    assert resolve_thinking_injection({"thinking_level": "low"}) == ("low", 12800)
+    assert resolve_thinking_injection({"thinking_level": "high"}) == ("high", 64000)
     assert resolve_thinking_injection({"thinking_level": "auto"}) == ("auto", None)
     assert resolve_thinking_injection({
         "thinking_level": "max",
         "max_thinking_length": 1000,
-    }) == ("on", 1000)
+    }) == ("max", 1000)
 
 
 def test_thinking_prompt_off() -> None:
@@ -163,18 +163,24 @@ def test_thinking_prompt_off() -> None:
 def test_thinking_prompt_on_without_max_length() -> None:
     section = build_entml_thinking_section({"thinking_mode": "on"})
     assert "<entml:thinking_mode>on</entml:thinking_mode>" in section
-    assert "<entml:max_thinking_length>13108</entml:max_thinking_length>" in section
+    assert "<entml:max_thinking_length>25600</entml:max_thinking_length>" in section
     assert "<thinking_behavior>" in section
 
 
 def test_thinking_prompt_on_by_level() -> None:
     section = build_entml_thinking_section({"thinking_level": "low"})
-    assert "<entml:thinking_mode>on</entml:thinking_mode>" in section
-    assert "<entml:max_thinking_length>6554</entml:max_thinking_length>" in section
+    assert "<entml:thinking_mode>low</entml:thinking_mode>" in section
+    assert "<entml:max_thinking_length>12800</entml:max_thinking_length>" in section
     assert "Never skip the thinking block" in section
     assert "Your default is to think before it answers" in section
 
 
+def test_thinking_prompt_medium_by_level() -> None:
+    section = build_entml_thinking_section({"thinking_level": "medium"})
+    assert "<entml:thinking_mode>medium</entml:thinking_mode>" in section
+    assert "<entml:max_thinking_length>25600</entml:max_thinking_length>" in section
+
+
 def test_thinking_prompt_on() -> None:
     section = build_entml_thinking_section({"thinking_mode": "on"})
     assert "<entml:thinking_mode>on</entml:thinking_mode>" in section