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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a8
+Version: 0.2.7a9
 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.7a9}/pyproject.toml

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

{sycommon_python_lib-0.2.7a8 → sycommon_python_lib-0.2.7a9}/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.7a9/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.7a9}/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.7a9
 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.7a9}/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.7a9/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)