sycommon-python-lib 0.2.0b26__tar.gz → 0.2.0b27__tar.gz

{sycommon_python_lib-0.2.0b26 → sycommon_python_lib-0.2.0b27}/PKG-INFO

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

{sycommon_python_lib-0.2.0b26 → sycommon_python_lib-0.2.0b27}/pyproject.toml

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

{sycommon_python_lib-0.2.0b26 → sycommon_python_lib-0.2.0b27}/src/sycommon/config/Config.py

@@ -2,6 +2,11 @@ import yaml
 
 
 class SingletonMeta(type):
+    """单例元类
+
+    注意：非线程安全，应在程序启动时（同步环境）提前初始化单例，
+    避免在协程环境中首次调用导致问题。
+    """
     _instances = {}
 
     def __call__(cls, *args, **kwargs):
@@ -31,6 +36,35 @@ class Config(metaclass=SingletonMeta):
                 return llm
         raise ValueError(f"No configuration found for model: {model_name}")
 
+    def get_default_llm_config(self):
+        """获取默认的 LLM 配置
+
+        Returns:
+            dict: 默认模型的配置，如果没有设置 default=True 则返回第一个配置
+
+        Raises:
+            ValueError: 如果没有任何 LLM 配置
+        """
+        if not self.llm_configs:
+            raise ValueError("No LLM configuration found")
+
+        # 查找 default=True 的配置
+        for llm in self.llm_configs:
+            if llm.get('default') is True:
+                return llm
+
+        # 如果没有设置 default，返回第一个配置
+        return self.llm_configs[0]
+
+    def get_default_llm_model_name(self):
+        """获取默认模型名称
+
+        Returns:
+            str: 默认模型的名称
+        """
+        config = self.get_default_llm_config()
+        return config.get('model')
+
     def get_embedding_config(self, model_name):
         for llm in self.embedding_configs:
             if llm.get('model') == model_name:

{sycommon_python_lib-0.2.0b26 → sycommon_python_lib-0.2.0b27}/src/sycommon/config/LLMConfig.py

@@ -1,3 +1,4 @@
+from typing import Optional
 from pydantic import BaseModel
 
 
@@ -8,6 +9,7 @@ class LLMConfig(BaseModel):
     maxTokens: int
     vision: bool
     callFunction: bool
+    default: Optional[bool] = False
 
     @classmethod
     def from_config(cls, model_name: str):

{sycommon_python_lib-0.2.0b26 → sycommon_python_lib-0.2.0b27}/src/sycommon/llm/get_llm.py

@@ -4,32 +4,36 @@ from sycommon.config.LLMConfig import LLMConfig
 from sycommon.llm.llm_with_token_tracking import LLMWithTokenTracking
 from sycommon.llm.sy_langfuse import LangfuseInitializer
 from sycommon.llm.usage_token import LLMWithAutoTokenUsage
-from typing import Any, Union
+from typing import Any, Optional, Union
 from langchain_core.language_models import BaseChatModel
 
 
 def get_llm(
-    model: str = "Qwen3.5-122B-A10B",
+    model: Optional[str] = None,
     *,
     streaming: bool = False,
-    temperature: float = 0.1,
+    temperature: Optional[float] = None,
     timeout: float = 180,
     max_retries: int = 3,
     wrap_structured: bool = True,
+    thinking: bool = False,
     **kwargs: Any
 ) -> Union[LLMWithAutoTokenUsage, LLMWithTokenTracking, BaseChatModel]:
     """
     获取LLM实例
 
     Args:
-        model: 模型名称，默认为 Qwen3.5-122B-A10B
+        model: 模型名称，如果为 None 则使用配置中 default=True 的模型
         streaming: 是否启用流式输出
-        temperature: 温度参数
+        temperature: 温度参数，如果为 None 则根据 thinking 模式自动设置
         timeout: 请求超时时间（秒），默认180秒
         max_retries: 最大重试次数，默认3次
         wrap_structured: 是否包装为结构化输出实例，默认True
             - True: 返回 LLMWithAutoTokenUsage，支持 with_structured_output()
             - False: 返回 LLMWithTokenTracking，保留日志、Langfuse 跟踪和 Token 统计
+        thinking: 是否启用思考模式，默认 False（指令模式）
+            - 思考模式: temperature=0.6, top_p=0.95, top_k=20, min_p=0.0, presence_penalty=0.0, repetition_penalty=1.0
+            - 指令模式: temperature=0.7, top_p=0.8, top_k=20, min_p=0.0, presence_penalty=1.5, repetition_penalty=1.0
         **kwargs: 其他透传参数，支持 langchain init_chat_model 所有参数
             - presence_penalty: 存在惩罚
             - extra_body: 额外请求体参数，如 {"top_k": 20, "chat_template_kwargs": {"enable_thinking": False}}
@@ -43,7 +47,19 @@ def get_llm(
 
     Example:
         ```python
-        # 结构化输出（默认使用原生模式）
+        # 使用默认模型（配置中 default=True 的模型）
+        llm = get_llm()
+
+        # 使用指定模型
+        llm = get_llm("Qwen3.5-122B-A10B")
+
+        # 思考模式
+        llm = get_llm("Qwen3.5-122B-A10B", thinking=True)
+
+        # 指令模式（默认）
+        llm = get_llm("Qwen3.5-122B-A10B", thinking=False)
+
+        # 结构化输出
         llm = get_llm("Qwen3.5-122B-A10B")
         chain = llm.with_structured_output(MyModel)
         result = await chain.ainvoke([HumanMessage(content="你好")])
@@ -66,13 +82,51 @@ def get_llm(
         )
         ```
     """
-    if not model or model == "Qwen2.5-72B":
-        model = "Qwen3.5-122B-A10B"
-        kwargs["presence_penalty"] = 0
-        kwargs["extra_body"] = {
+    from sycommon.config.Config import Config
+
+    # 如果没有传递模型名或使用旧模型别名，则使用默认模型
+    if model is None or model in ("Qwen2.5-72B", "Qwen3.5-122B-A10B"):
+        model = Config().get_default_llm_model_name()
+
+    # 根据 thinking 模式设置默认参数
+    if thinking:
+        # 思考模式
+        default_temperature = 0.6
+        default_top_p = 0.95
+        default_extra_body = {
+            "top_k": 20,
+            "min_p": 0.0,
+            "repetition_penalty": 1.0,
+            "chat_template_kwargs": {"enable_thinking": True}
+        }
+        default_presence_penalty = 0.0
+    else:
+        # 指令模式
+        default_temperature = 0.7
+        default_top_p = 0.8
+        default_extra_body = {
             "top_k": 20,
+            "min_p": 0.0,
+            "repetition_penalty": 1.0,
             "chat_template_kwargs": {"enable_thinking": False}
         }
+        default_presence_penalty = 1.5
+
+    # 应用默认参数（用户未指定时才使用默认值）
+    if temperature is None:
+        temperature = default_temperature
+    if "top_p" not in kwargs:
+        kwargs["top_p"] = default_top_p
+    if "presence_penalty" not in kwargs:
+        kwargs["presence_penalty"] = default_presence_penalty
+
+    # 合并 extra_body
+    if "extra_body" not in kwargs:
+        kwargs["extra_body"] = default_extra_body
+    else:
+        # 用户提供了 extra_body，合并默认值
+        merged_extra_body = {**default_extra_body, **kwargs["extra_body"]}
+        kwargs["extra_body"] = merged_extra_body
 
     llmConfig = LLMConfig.from_config(model)
     if not llmConfig:

{sycommon_python_lib-0.2.0b26 → sycommon_python_lib-0.2.0b27}/src/sycommon/synacos/nacos_config_manager.py

@@ -8,20 +8,15 @@ from sycommon.logging.kafka_log import SYLogger
 
 
 class NacosConfigManager:
-    """Nacos配置管理类 - 负责配置读取、监听和更新"""
+    """Nacos配置管理类 - 负责配置读取和监听"""
 
     def __init__(self, client_base: NacosClientBase):
         self.client_base = client_base
 
-        # 配置
-        self.config_watch_interval = self.client_base.nacos_config.get(
-            'configWatchInterval', 30)
-
         # 状态
         self.share_configs: Dict = {}
         self._config_listeners: Dict[str, Callable[[str], None]] = {}
         self._config_cache: Dict[str, str] = {}
-        self._watch_thread: Optional[threading.Thread] = None
         # Nacos原生监听器跟踪
         self._nacos_watchers: Dict[str, bool] = {}
         self._watcher_lock = threading.Lock()
@@ -112,6 +107,9 @@ class NacosConfigManager:
                             if data_id in self._config_listeners:
                                 self._config_listeners[data_id](new_content)
 
+                            # 同步更新到全局 Config 单例
+                            self._sync_to_global_config()
+
                             SYLogger.info(f"nacos:配置热更新完成 - dataId: {data_id}")
                     except Exception as e:
                         SYLogger.error(f"nacos:配置变更回调处理失败: {e}")
@@ -139,33 +137,15 @@ class NacosConfigManager:
             SYLogger.error(f"nacos:获取配置 {data_id} 失败: {str(e)}")
             return None
 
-    def start_watch_configs(self):
-        """启动配置监视线程（作为Nacos原生监听的兜底）"""
-        self._watch_thread = threading.Thread(
-            target=self._watch_configs, daemon=True)
-        self._watch_thread.start()
-
-    def _watch_configs(self):
-        """配置监听线程（兜底机制，确保配置变更不会遗漏）"""
-        check_interval = self.config_watch_interval
+    def _sync_to_global_config(self):
+        """同步配置到全局 Config 单例
 
-        while not self.client_base._shutdown_event.is_set():
-            try:
-                for data_id, callback in list(self._config_listeners.items()):
-                    new_config = self.get_config(data_id)
-                    if new_config and new_config != self._config_cache.get(data_id):
-                        SYLogger.info(f"nacos:兜底检测到配置变更 - dataId: {data_id}")
-                        callback(new_config)
-                        self._config_cache[data_id] = new_config
-                        try:
-                            self.share_configs[data_id] = json.loads(
-                                new_config)
-                        except json.JSONDecodeError:
-                            try:
-                                self.share_configs[data_id] = yaml.safe_load(
-                                    new_config)
-                            except yaml.YAMLError:
-                                SYLogger.error(f"nacos:无法解析 {data_id} 的内容")
-            except Exception as e:
-                SYLogger.error(f"nacos:配置监视线程异常: {str(e)}")
-            self.client_base._shutdown_event.wait(check_interval)
+        当 Nacos 配置变更时，更新 Config 单例中的 LLMConfig 等配置，
+        使得 get_llm() 等函数能获取到最新的配置。
+        """
+        try:
+            from sycommon.config.Config import Config
+            Config().set_attr(self.share_configs)
+            SYLogger.debug("nacos:配置已同步到全局 Config 单例")
+        except Exception as e:
+            SYLogger.error(f"nacos:同步配置到全局单例失败: {e}")

{sycommon_python_lib-0.2.0b26 → sycommon_python_lib-0.2.0b27}/src/sycommon/synacos/nacos_service.py

@@ -68,9 +68,6 @@ class NacosService(metaclass=SingletonMeta):
                 self.nacos_config.get('sharedConfigs', []))
             Config().set_attr(self.share_configs)
 
-            # 启动配置监视线程
-            self.config_manager.start_watch_configs()
-
             # 仅在需要注册时启动心跳
             if self.enable_register_nacos:
                 # 如果启用进程模式，跳过线程模式的心跳启动

{sycommon_python_lib-0.2.0b26 → sycommon_python_lib-0.2.0b27}/src/sycommon_python_lib.egg-info/PKG-INFO

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