sycommon-python-lib 0.1.56b3__tar.gz → 0.1.56b4__tar.gz

{sycommon_python_lib-0.1.56b3 → sycommon_python_lib-0.1.56b4}/PKG-INFO

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

{sycommon_python_lib-0.1.56b3 → sycommon_python_lib-0.1.56b4}/pyproject.toml

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

sycommon_python_lib-0.1.56b4/src/sycommon/llm/get_llm.py

@@ -0,0 +1,246 @@
+from typing import Dict, Type, List, Optional, Callable, Any
+from sycommon.llm.llm_logger import LLMLogger
+from langchain_core.language_models import BaseChatModel
+from langchain_core.runnables import Runnable, RunnableLambda, RunnableConfig
+from langchain_core.output_parsers import PydanticOutputParser
+from langchain_core.messages import BaseMessage, HumanMessage
+from langchain.chat_models import init_chat_model
+from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder
+from pydantic import BaseModel, ValidationError, Field
+from sycommon.config.LLMConfig import LLMConfig
+from sycommon.llm.llm_tokens import TokensCallbackHandler
+from sycommon.logging.kafka_log import SYLogger
+
+
+class StructuredRunnableWithToken(Runnable):
+    """带Token统计的Runnable类"""
+
+    def __init__(self, retry_chain: Runnable):
+        super().__init__()
+        self.retry_chain = retry_chain
+
+    def _adapt_input(self, input: Any) -> List[BaseMessage]:
+        """适配输入格式"""
+        if isinstance(input, list) and all(isinstance(x, BaseMessage) for x in input):
+            return input
+        elif isinstance(input, BaseMessage):
+            return [input]
+        elif isinstance(input, str):
+            return [HumanMessage(content=input)]
+        elif isinstance(input, dict) and "input" in input:
+            return [HumanMessage(content=str(input["input"]))]
+        else:
+            raise ValueError(f"不支持的输入格式：{type(input)}")
+
+    def _get_callback_config(self, config: Optional[RunnableConfig] = None) -> tuple[RunnableConfig, TokensCallbackHandler]:
+        """构建包含Token统计的回调配置"""
+        # 每次调用创建新的Token处理器实例
+        token_handler = TokensCallbackHandler()
+
+        # 初始化配置
+        if config is None:
+            processed_config = {"callbacks": []}
+        else:
+            processed_config = config.copy()
+            if "callbacks" not in processed_config:
+                processed_config["callbacks"] = []
+
+        # 添加回调（去重）
+        callbacks = processed_config["callbacks"]
+        # 添加LLMLogger（如果不存在）
+        if not any(isinstance(cb, LLMLogger) for cb in callbacks):
+            callbacks.append(LLMLogger())
+        # 添加Token处理器
+        callbacks.append(token_handler)
+
+        # 按类型去重
+        callback_types = {}
+        unique_callbacks = []
+        for cb in callbacks:
+            cb_type = type(cb)
+            if cb_type not in callback_types:
+                callback_types[cb_type] = cb
+                unique_callbacks.append(cb)
+
+        processed_config["callbacks"] = unique_callbacks
+
+        return processed_config, token_handler
+
+    # 同步调用
+    def invoke(self, input: Any, config: Optional[RunnableConfig] = None, ** kwargs) -> Dict[str, Any]:
+        try:
+            processed_config, token_handler = self._get_callback_config(
+                config)
+            adapted_input = self._adapt_input(input)
+
+            structured_result = self.retry_chain.invoke(
+                {"messages": adapted_input},
+                config=processed_config,
+                **kwargs
+            )
+
+            # 获取Token统计结果
+            token_usage = token_handler.usage_metadata
+            structured_result._token_usage_ = token_usage
+
+            return structured_result
+
+        except Exception as e:
+            SYLogger.error(f"同步LLM调用失败: {str(e)}", exc_info=True)
+            return None
+
+    # 异步调用
+    async def ainvoke(self, input: Any, config: Optional[RunnableConfig] = None, ** kwargs) -> Dict[str, Any]:
+        try:
+            processed_config, token_handler = self._get_callback_config(
+                config)
+            adapted_input = self._adapt_input(input)
+
+            structured_result = await self.retry_chain.ainvoke(
+                {"messages": adapted_input},
+                config=processed_config,
+                **kwargs
+            )
+
+            token_usage = token_handler.usage_metadata
+            structured_result._token_usage_ = token_usage
+
+            return structured_result
+
+        except Exception as e:
+            SYLogger.error(f"异步LLM调用失败: {str(e)}", exc_info=True)
+            return None
+
+
+class LLMWithAutoTokenUsage(BaseChatModel):
+    """自动为结构化调用返回token_usage的LLM包装类"""
+    llm: BaseChatModel = Field(default=None)
+
+    def __init__(self, llm: BaseChatModel, **kwargs):
+        super().__init__(llm=llm, ** kwargs)
+
+    def with_structured_output(
+        self,
+        output_model: Type[BaseModel],
+        max_retries: int = 3,
+        is_extract: bool = False,
+        override_prompt: ChatPromptTemplate = None,
+        custom_processors: Optional[List[Callable[[str], str]]] = None,
+        custom_parser: Optional[Callable[[str], BaseModel]] = None
+    ) -> Runnable:
+        """返回支持自动统计Token的结构化Runnable"""
+        parser = PydanticOutputParser(pydantic_object=output_model)
+
+        # 提示词模板
+        accuracy_instructions = """
+        字段值的抽取准确率（0~1之间），评分规则：
+        1.0（完全准确）：直接从原文提取，无需任何加工，且格式与原文完全一致
+        0.9（轻微处理）：数据来源明确，但需进行格式标准化或冗余信息剔除（不改变原始数值）
+        0.8（有限推断）：数据需通过上下文关联或简单计算得出，仍有明确依据
+        0.8以下（不可靠）：数据需大量推测、存在歧义或来源不明，处理方式：直接忽略该数据，设置为None
+        """
+
+        if is_extract:
+            prompt = ChatPromptTemplate.from_messages([
+                MessagesPlaceholder(variable_name="messages"),
+                HumanMessage(content=f"""
+                请提取信息并遵循以下规则：
+                1. 准确率要求：{accuracy_instructions.strip()}
+                2. 输出格式：{parser.get_format_instructions()}
+                """)
+            ])
+        else:
+            prompt = override_prompt or ChatPromptTemplate.from_messages([
+                MessagesPlaceholder(variable_name="messages"),
+                HumanMessage(content=f"""
+                输出格式：{parser.get_format_instructions()}
+                """)
+            ])
+
+        # 文本处理函数
+        def extract_response_content(response: BaseMessage) -> str:
+            try:
+                return response.content
+            except Exception as e:
+                raise ValueError(f"提取响应内容失败：{str(e)}") from e
+
+        def strip_code_block_markers(content: str) -> str:
+            try:
+                return content.strip("```json").strip("```").strip()
+            except Exception as e:
+                raise ValueError(f"移除代码块标记失败：{str(e)}") from e
+
+        def normalize_in_json(content: str) -> str:
+            try:
+                return content.replace("None", "null").replace("none", "null").replace("NONE", "null").replace("''", '""')
+            except Exception as e:
+                raise ValueError(f"JSON格式化失败：{str(e)}") from e
+
+        def default_parse_to_pydantic(content: str) -> BaseModel:
+            try:
+                return parser.parse(content)
+            except (ValidationError, ValueError) as e:
+                raise ValueError(f"解析结构化结果失败：{str(e)}") from e
+
+        # ========== 构建处理链 ==========
+        base_chain = prompt | self.llm | RunnableLambda(
+            extract_response_content)
+
+        # 文本处理链
+        process_runnables = custom_processors or [
+            RunnableLambda(strip_code_block_markers),
+            RunnableLambda(normalize_in_json)
+        ]
+        process_chain = base_chain
+        for runnable in process_runnables:
+            process_chain = process_chain | runnable
+
+        # 解析链
+        parse_chain = process_chain | RunnableLambda(
+            custom_parser or default_parse_to_pydantic)
+
+        # 重试链
+        retry_chain = parse_chain.with_retry(
+            retry_if_exception_type=(ValidationError, ValueError),
+            stop_after_attempt=max_retries,
+            wait_exponential_jitter=True,
+            exponential_jitter_params={
+                "initial": 0.1, "max": 3.0, "exp_base": 2.0, "jitter": 1.0}
+        )
+
+        return StructuredRunnableWithToken(retry_chain)
+
+    # ========== 实现BaseChatModel抽象方法 ==========
+    def _generate(self, messages, stop=None, run_manager=None, ** kwargs):
+        return self.llm._generate(messages, stop=stop, run_manager=run_manager, ** kwargs)
+
+    @property
+    def _llm_type(self) -> str:
+        return self.llm._llm_type
+
+
+def get_llm(
+    model: str = None,
+    streaming: bool = False
+) -> LLMWithAutoTokenUsage:
+    if not model:
+        model = "Qwen2.5-72B"
+
+    llmConfig = LLMConfig.from_config(model)
+    if not llmConfig:
+        raise Exception(f"无效的模型配置：{model}")
+
+    llm = init_chat_model(
+        model_provider=llmConfig.provider,
+        model=llmConfig.model,
+        base_url=llmConfig.baseUrl,
+        api_key="-",
+        temperature=0.1,
+        streaming=streaming,
+        callbacks=[LLMLogger()]
+    )
+
+    if llm is None:
+        raise Exception(f"初始化原始LLM实例失败：{model}")
+
+    return LLMWithAutoTokenUsage(llm)

sycommon_python_lib-0.1.56b4/src/sycommon/llm/llm_tokens.py

@@ -0,0 +1,119 @@
+from typing import Any
+from langchain_core.callbacks import AsyncCallbackHandler
+from langchain_core.outputs.llm_result import LLMResult
+from sycommon.logging.kafka_log import SYLogger
+
+
+class TokensCallbackHandler(AsyncCallbackHandler):
+    """
+    继承AsyncCallbackHandler的Token统计处理器
+    """
+
+    def __init__(self):
+        super().__init__()
+        self.input_tokens = 0
+        self.output_tokens = 0
+        self.total_tokens = 0
+        self.usage_metadata = {}
+        self.reset()
+
+    def reset(self):
+        """重置Token统计数据"""
+        self.input_tokens = 0
+        self.output_tokens = 0
+        self.total_tokens = 0
+        self.usage_metadata = {
+            "input_tokens": 0,
+            "output_tokens": 0,
+            "total_tokens": 0
+        }
+
+    # ========== 同步回调方法（兼容签名） ==========
+    def on_llm_end(
+        self,
+        response: LLMResult,
+        **kwargs: Any,
+    ) -> None:
+        """同步LLM调用结束时的回调"""
+        self._parse_token_usage(response)
+
+    # ========== 异步回调方法（兼容签名） ==========
+    async def on_llm_end(
+        self,
+        response: LLMResult,
+        **kwargs: Any,
+    ) -> None:
+        """异步LLM调用结束时的回调"""
+        self._parse_token_usage(response)
+
+    def _parse_token_usage(self, response: LLMResult) -> None:
+        """
+        通用Token解析逻辑，不依赖特定类结构
+        兼容各种LLM响应格式
+        """
+        try:
+            # 情况1: 标准LangChain响应（有llm_output属性）
+            if response.llm_output:
+                llm_output = response.llm_output
+                self._parse_from_llm_output(llm_output)
+
+            # 情况2: 包含generations的响应
+            elif response.generations:
+                self._parse_from_generations(response.generations)
+
+            # 计算总Token
+            if self.total_tokens <= 0:
+                self.total_tokens = self.input_tokens + self.output_tokens
+
+            # 更新metadata
+            self.usage_metadata = {
+                "input_tokens": self.input_tokens,
+                "output_tokens": self.output_tokens,
+                "total_tokens": self.total_tokens
+            }
+
+            SYLogger.debug(
+                f"Token统计成功 - 输入: {self.input_tokens}, 输出: {self.output_tokens}")
+
+        except Exception as e:
+            SYLogger.warning(f"Token解析失败: {str(e)}", exc_info=True)
+            self.reset()
+
+    def _parse_from_llm_output(self, llm_output: dict) -> None:
+        """从llm_output字典解析Token信息"""
+        if not isinstance(llm_output, dict):
+            return
+
+        # OpenAI标准格式
+        if 'token_usage' in llm_output:
+            token_usage = llm_output['token_usage']
+            self.input_tokens = token_usage.get(
+                'prompt_tokens', token_usage.get('input_tokens', 0))
+            self.output_tokens = token_usage.get(
+                'completion_tokens', token_usage.get('output_tokens', 0))
+            self.total_tokens = token_usage.get('total_tokens', 0)
+
+        # 直接包含Token信息
+        else:
+            self.input_tokens = llm_output.get(
+                'input_tokens', llm_output.get('prompt_tokens', 0))
+            self.output_tokens = llm_output.get(
+                'output_tokens', llm_output.get('completion_tokens', 0))
+            self.total_tokens = token_usage.get('total_tokens', 0)
+
+    def _parse_from_generations(self, generations: list) -> None:
+        """从generations列表解析Token信息"""
+        if not isinstance(generations, list) or len(generations) == 0:
+            return
+
+        # 遍历generation信息
+        for gen_group in generations:
+            for generation in gen_group:
+                if hasattr(generation, 'generation_info') and generation.generation_info:
+                    gen_info = generation.generation_info
+                    self.input_tokens = gen_info.get(
+                        'input_tokens', gen_info.get('prompt_tokens', 0))
+                    self.output_tokens = gen_info.get(
+                        'output_tokens', gen_info.get('completion_tokens', 0))
+                    self.total_tokens = gen_info.get('total_tokens', 0)
+                    return

{sycommon_python_lib-0.1.56b3 → sycommon_python_lib-0.1.56b4}/src/sycommon/synacos/nacos_service.py

@@ -817,6 +817,11 @@ class NacosService(metaclass=SingletonMeta):
                 return []
 
             all_instances = instances.get('hosts', [])
+            # 筛选已上线实例
+            all_instances = [
+                instance for instance in all_instances
+                if instance.get('enabled', True)  # 默认True担心阿里变更sdk
+            ]
             SYLogger.info(
                 f"nacos:共发现 {len(all_instances)} 个 {service_name} 服务实例")
 

{sycommon_python_lib-0.1.56b3 → sycommon_python_lib-0.1.56b4}/src/sycommon_python_lib.egg-info/PKG-INFO

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

{sycommon_python_lib-0.1.56b3 → sycommon_python_lib-0.1.56b4}/src/sycommon_python_lib.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ src/sycommon/llm/__init__.py
 src/sycommon/llm/embedding.py
 src/sycommon/llm/get_llm.py
 src/sycommon/llm/llm_logger.py
+src/sycommon/llm/llm_tokens.py
 src/sycommon/logging/__init__.py
 src/sycommon/logging/async_sql_logger.py
 src/sycommon/logging/kafka_log.py

sycommon_python_lib-0.1.56b3/src/sycommon/llm/get_llm.py

@@ -1,177 +0,0 @@
-from typing import Dict, Type, List, Union, Optional, Callable
-
-from sycommon.llm.llm_logger import LLMLogger
-from langchain_core.language_models import BaseChatModel
-from langchain_core.runnables import Runnable, RunnableLambda
-from langchain_core.output_parsers import PydanticOutputParser
-from langchain_core.messages import BaseMessage, SystemMessage, HumanMessage
-from langchain.chat_models import init_chat_model
-from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder
-from pydantic import BaseModel, ValidationError
-from sycommon.config.LLMConfig import LLMConfig
-
-
-def get_llm(model: str = None, streaming: bool = False) -> BaseChatModel:
-    if not model:
-        model = "Qwen2.5-72B"
-        # model = "SyMid"
-    llmConfig = LLMConfig.from_config(model)
-    llm = None
-    if llmConfig:
-        llm = init_chat_model(
-            model_provider=llmConfig.provider,
-            model=llmConfig.model,
-            base_url=llmConfig.baseUrl,
-            api_key="-",
-            temperature=0.1,
-            streaming=streaming,
-        )
-    else:
-        raise Exception("Invalid model")
-
-    # 为LLM动态添加with_structured_output方法，官方的with_structured_output方法有概率在qwen2.5中导致模型卡死不返回数据，2.5对functioncall支持不好
-    def with_structured_output(
-        self: BaseChatModel,
-        output_model: Type[BaseModel],
-        max_retries: int = 3,
-        is_extract: bool = False,
-        override_prompt: ChatPromptTemplate = None,
-        # 自定义处理函数列表（每个函数接收str，返回str）
-        custom_processors: Optional[List[Callable[[str], str]]] = None,
-        # 自定义解析函数（接收str，返回BaseModel）
-        custom_parser: Optional[Callable[[str], BaseModel]] = None
-    ) -> Runnable[List[BaseMessage], BaseModel]:
-        parser = PydanticOutputParser(pydantic_object=output_model)
-
-        accuracy_instructions = """
-        字段值的抽取准确率（0~1之间），评分规则：
-        1.0（完全准确）：直接从原文提取，无需任何加工，且格式与原文完全一致
-        0.9（轻微处理）：数据来源明确，但需进行格式标准化或冗余信息剔除（不改变原始数值）
-        0.8（有限推断）：数据需通过上下文关联或简单计算得出，仍有明确依据
-        0.8以下（不可靠）：数据需大量推测、存在歧义或来源不明，处理方式：直接忽略该数据，设置为None
-        """
-
-        if is_extract:
-            # 抽取模式下使用固定的抽取专用prompt
-            prompt = ChatPromptTemplate.from_messages([
-                MessagesPlaceholder(variable_name="messages"),
-                HumanMessage(content=f"""
-                请提取信息并遵循以下规则：
-                1. 准确率要求：{accuracy_instructions.strip()}
-                2. 输出格式：{parser.get_format_instructions()}
-                """)
-            ])
-        else:
-            if override_prompt:
-                prompt = override_prompt
-            else:
-                prompt = ChatPromptTemplate.from_messages([
-                    MessagesPlaceholder(variable_name="messages"),
-                    HumanMessage(content=f"""
-                    输出格式：{parser.get_format_instructions()}
-                    """)
-                ])
-
-        # ========== 基础处理函数 ==========
-        def extract_response_content(response: BaseMessage) -> str:
-            """提取响应中的文本内容"""
-            try:
-                return response.content
-            except Exception as e:
-                raise ValueError(f"提取响应内容失败：{str(e)}") from e
-
-        def strip_code_block_markers(content: str) -> str:
-            """移除JSON代码块标记（```json/```）"""
-            try:
-                return content.strip("```json").strip("```").strip()
-            except Exception as e:
-                raise ValueError(
-                    f"移除代码块标记失败（内容：{str(content)[:100]}）：{str(e)}") from e
-
-        def normalize_in_json(content: str) -> str:
-            """将None替换为null，确保JSON格式合法"""
-            try:
-                cleaned = content.replace("None", "null")
-                cleaned = cleaned.replace("none", "null")
-                cleaned = cleaned.replace("NONE", "null")
-                cleaned = cleaned.replace("''", '""')
-                return cleaned
-            except Exception as e:
-                raise ValueError(
-                    f"替换None为null失败（内容：{str(content)[:100]}）：{str(e)}") from e
-
-        def default_parse_to_pydantic(content: str) -> BaseModel:
-            """默认解析函数：将处理后的文本解析为Pydantic模型"""
-            try:
-                return parser.parse(content)
-            except (ValidationError, ValueError) as e:
-                raise type(e)(f"解析失败（原始内容：{content[:200]}）：{str(e)}") from e
-
-        # ========== 构建处理链条 ==========
-        # 基础链 prompt → LLM → 提取响应内容
-        base_chain = (
-            prompt
-            | self
-            | RunnableLambda(extract_response_content)
-        )
-
-        # 处理函数链 优先使用自定义，否则用默认
-        if custom_processors:
-            # 自定义处理函数 → 转为RunnableLambda列表
-            process_runnables = [RunnableLambda(
-                func) for func in custom_processors]
-        else:
-            # 默认处理函数：移除代码块标记 → 标准化JSON空值
-            process_runnables = [
-                RunnableLambda(strip_code_block_markers),
-                RunnableLambda(normalize_in_json)
-            ]
-
-        # 拼接处理链
-        process_chain = base_chain
-        for runnable in process_runnables:
-            process_chain = process_chain | runnable
-
-        # 解析函数 优先使用自定义，否则用默认
-        parse_func = custom_parser if custom_parser else default_parse_to_pydantic
-        parse_chain = process_chain | RunnableLambda(parse_func)
-
-        retry_chain = parse_chain.with_retry(
-            retry_if_exception_type=(ValidationError, ValueError),
-            stop_after_attempt=max_retries,
-            wait_exponential_jitter=True,
-            exponential_jitter_params={
-                "initial": 0.1,  # 初始等待时间（秒）
-                "max": 3.0,      # 最大等待时间（秒）
-                "exp_base": 2.0,  # 指数基数（默认2）
-                "jitter": 1.0    # 随机抖动值（默认1）
-            }
-        )
-
-        class StructuredRunnable(Runnable[Union[List[BaseMessage], BaseMessage, str, Dict[str, str]], BaseModel]):
-            def _adapt_input(self, input: Union[List[BaseMessage], BaseMessage, str, Dict[str, str]]) -> List[BaseMessage]:
-                """将多种输入格式统一转换为 List[BaseMessage]"""
-                if isinstance(input, list) and all(isinstance(x, BaseMessage) for x in input):
-                    return input
-                elif isinstance(input, BaseMessage):
-                    return [input]
-                elif isinstance(input, str):
-                    return [HumanMessage(content=input)]
-                elif isinstance(input, dict) and "input" in input:
-                    return [HumanMessage(content=str(input["input"]))]
-                else:
-                    raise ValueError(
-                        "不支持的输入格式，请使用消息列表、单条消息、文本或 {'input': '文本'}")
-
-            def invoke(self, input: Union[List[BaseMessage], BaseMessage, str, Dict[str, str]], config={"callbacks": [LLMLogger()]}):
-                adapted_input = self._adapt_input(input)
-                return retry_chain.invoke({"messages": adapted_input}, config=config)
-
-            async def ainvoke(self, input: Union[List[BaseMessage], BaseMessage, str, Dict[str, str]], config={"callbacks": [LLMLogger()]}):
-                adapted_input = self._adapt_input(input)
-                return await retry_chain.ainvoke({"messages": adapted_input}, config=config)
-
-        return StructuredRunnable()
-
-    llm.__class__.with_structured_output = with_structured_output
-    return llm