sycommon-python-lib 0.2.7a8__tar.gz → 0.2.7a10__tar.gz

{sycommon_python_lib-0.2.7a8 → sycommon_python_lib-0.2.7a10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a8
+Version: 0.2.7a10
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.7a8 → sycommon_python_lib-0.2.7a10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.7a8"
+version = "0.2.7a10"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.2.7a8 → sycommon_python_lib-0.2.7a10}/src/sycommon/agent/deep_agent.py

@@ -379,9 +379,6 @@ class AgentConfig(BaseModel):
     # user 技能:标记启用沙箱 /skills/user(可写,内容由 MinIO 按 user 灌入);
     # 本地兜底路径仅当目录存在时用于开发期同步,生产期为 None。
     user_skills_dir: Optional[str] = None
-    # 技能是否已同步到沙箱:True 时跳过 _sync_skills_to_sandbox 的 atree 检查,
-    # 但 skills 注入(SkillsMiddleware)不受影响。
-    skills_already_synced: bool = False
     memory_dir: Optional[str] = None
 
     @property
@@ -1201,8 +1198,11 @@ async def create_deep_agent(
     memory_path = "/memory/AGENTS.md" if config.memory_dir else None
 
     # 同步 system 技能到沙箱(按版本检查,已同步则跳过)+ chmod 只读保护
-    # skills_already_synced=True 时跳过同步,但 system_path/user_path 注入不受影响。
-    if config.system_skills_dir and sandbox_backend and not config.skills_already_synced:
+    # version 是唯一判据：_sync_skills_to_sandbox 自身 version 感知（读沙箱 SKILL.md 比对，
+    # 版本一致仅做几次小读取不传文件）。不再用 skills_already_synced 短路——
+    # 那是个不感知 version、也不感知沙箱状态的进程级布尔，会让顶层 version 改了也检测不到。
+    # 每次 create_agent（新会话首回合）跑一遍：版本没变时开销仅为 1+N 次元数据小读取。
+    if config.system_skills_dir and sandbox_backend:
         await _sync_skills_to_sandbox(config.system_skills_dir, sandbox_backend,
                                       sandbox_dest="/skills/system", chmod_readonly=True)
 

{sycommon_python_lib-0.2.7a8 → sycommon_python_lib-0.2.7a10}/src/sycommon/agent/multi_agent_team.py

@@ -136,8 +136,6 @@ class TeamConfig(BaseModel):
     system_skills_dir: Optional[str] = None
     # user 技能:标记启用沙箱 /skills/user(可写,内容由 MinIO 灌入)
     user_skills_dir: Optional[str] = None
-    # 技能是否已同步到沙箱:True 时跳过 _sync_skills_to_sandbox
-    skills_already_synced: bool = False
     memory_dir: Optional[str] = None
 
     @property
@@ -590,7 +588,8 @@ async def create_multi_agent_team(
     agent_config = {"configurable": {"thread_id": tid}}
 
     # 同步 system 技能到沙箱(按版本检查)+ chmod 只读保护(与单 Agent 路径对齐)
-    if config.system_skills_dir and sandbox_backend and not config.skills_already_synced:
+    # version 是唯一判据，不再用 skills_already_synced 短路（不感知 version，会让 version 改了也不同步）。
+    if config.system_skills_dir and sandbox_backend:
         from sycommon.agent.deep_agent import _sync_skills_to_sandbox
         await _sync_skills_to_sandbox(config.system_skills_dir, sandbox_backend,
                                       sandbox_dest="/skills/system", chmod_readonly=True)

{sycommon_python_lib-0.2.7a8 → sycommon_python_lib-0.2.7a10}/src/sycommon/llm/get_llm.py

@@ -6,6 +6,13 @@ from sycommon.llm.sy_langfuse import LangfuseInitializer
 from sycommon.llm.usage_token import LLMWithAutoTokenUsage
 from typing import Any, Optional, Union
 from langchain_core.language_models import BaseChatModel
+from sycommon.middleware.context import current_llm_api_key
+
+
+def resolve_api_key(config_apikey: Optional[str]) -> str:
+    """LLM 网关 apiKey 取值：per-user ContextVar → 配置全局 key → "-" 兜底。"""
+    return current_llm_api_key.get() or config_apikey or "-"
+
 
 _TIMEOUT_UNSET = object()
 
@@ -160,7 +167,7 @@ def get_llm(
         "model_provider": llmConfig.provider,
         "model": llmConfig.model,
         "base_url": llmConfig.baseUrl,
-        "api_key": llmConfig.apiKey or "-",
+        "api_key": resolve_api_key(llmConfig.apiKey),
         "callbacks": callbacks,
         "temperature": temperature,
         "streaming": streaming,

sycommon_python_lib-0.2.7a10/src/sycommon/middleware/context.py

@@ -0,0 +1,9 @@
+import contextvars
+
+current_trace_id = contextvars.ContextVar("trace_id", default=None)
+
+current_headers = contextvars.ContextVar("headers", default=None)
+
+# per-user LLM 网关 apiKey：agent 创建入口 set，get_llm 读取，沿 task 树传播。
+# 为 None 时 get_llm 回退到 LLMConfig.apiKey 全局 key。
+current_llm_api_key = contextvars.ContextVar("llm_api_key", default=None)

{sycommon_python_lib-0.2.7a8 → sycommon_python_lib-0.2.7a10}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a8
+Version: 0.2.7a10
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.7a8 → sycommon_python_lib-0.2.7a10}/src/sycommon_python_lib.egg-info/SOURCES.txt

@@ -318,6 +318,7 @@ tests/test_acp_tool.py
 tests/test_asyncio_logging.py
 tests/test_config_change_notifier.py
 tests/test_hotreload_snapshot.py
+tests/test_llm_apikey_contextvar.py
 tests/test_log_masker.py
 tests/test_resilient_pg_saver.py
 tests/test_simple_chat_agent.py

sycommon_python_lib-0.2.7a10/tests/test_llm_apikey_contextvar.py

@@ -0,0 +1,36 @@
+import pytest
+from sycommon.middleware.context import current_llm_api_key
+
+
+def test_apikey_contextvar_exists_with_default_none():
+    assert current_llm_api_key.get() is None
+
+
+def test_apikey_contextvar_set_and_get():
+    token = current_llm_api_key.set("sk-test-123")
+    try:
+        assert current_llm_api_key.get() == "sk-test-123"
+    finally:
+        current_llm_api_key.reset(token)
+        assert current_llm_api_key.get() is None
+
+
+from sycommon.llm.get_llm import resolve_api_key
+
+
+def test_resolve_api_key_prefers_contextvar():
+    token = current_llm_api_key.set("sk-user-abc")
+    try:
+        assert resolve_api_key(config_apikey="sk-global-xxx") == "sk-user-abc"
+    finally:
+        current_llm_api_key.reset(token)
+
+
+def test_resolve_api_key_falls_back_to_config():
+    assert current_llm_api_key.get() is None  # 无 ContextVar
+    assert resolve_api_key(config_apikey="sk-global-xxx") == "sk-global-xxx"
+
+
+def test_resolve_api_key_falls_back_to_dash():
+    assert resolve_api_key(config_apikey=None) == "-"
+    assert resolve_api_key(config_apikey="") == "-"

sycommon_python_lib-0.2.7a8/src/sycommon/middleware/context.py

@@ -1,5 +0,0 @@
-import contextvars
-
-current_trace_id = contextvars.ContextVar("trace_id", default=None)
-
-current_headers = contextvars.ContextVar("headers", default=None)