sycommon-python-lib 0.1.56b15__py3-none-any.whl → 0.1.56b17__py3-none-any.whl

sycommon/llm/get_llm.py

@@ -1,5 +1,6 @@
 import os
-from typing import Dict, Type, List, Optional, Callable, Any
+from typing import Dict, Tuple, Type, List, Optional, Callable, Any
+from langfuse import Langfuse, get_client, propagate_attributes
 from sycommon.config.Config import Config
 from sycommon.llm.llm_logger import LLMLogger
 from langchain_core.language_models import BaseChatModel
@@ -12,15 +13,18 @@ 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
+from sycommon.tools.env import get_env_var
 from langfuse.langchain import CallbackHandler
 
 
 class StructuredRunnableWithToken(Runnable):
     """带Token统计的Runnable类"""
 
-    def __init__(self, retry_chain: Runnable):
+    def __init__(self, retry_chain: Runnable, langfuse: Langfuse):
         super().__init__()
         self.retry_chain = retry_chain
+        self.langfuse = langfuse
+        self.metadata = {"langfuse_session_id": SYLogger.get_trace_id()}
 
     def _adapt_input(self, input: Any) -> List[BaseMessage]:
         """适配输入格式"""
@@ -72,21 +76,28 @@ class StructuredRunnableWithToken(Runnable):
     # 同步调用
     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)
+            with self.langfuse.start_as_current_observation(as_type="span", name="invoke") as span:
+                with propagate_attributes(session_id=SYLogger.get_trace_id(), user_id=get_env_var('VERSION')):
+                    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
-            )
+                    span.update_trace(
+                        input={"messages": adapted_input}
+                    )
 
-            # 获取Token统计结果
-            token_usage = token_handler.usage_metadata
-            structured_result._token_usage_ = token_usage
+                    structured_result = self.retry_chain.invoke(
+                        {"messages": adapted_input},
+                        config={**processed_config, **self.metadata},
+                        **kwargs
+                    )
 
-            return structured_result
+                    span.update_trace(output=structured_result)
+
+                    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)
@@ -95,20 +106,28 @@ class StructuredRunnableWithToken(Runnable):
     # 异步调用
     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)
+            with self.langfuse.start_as_current_observation(as_type="span", name="ainvoke") as span:
+                with propagate_attributes(session_id=SYLogger.get_trace_id(), user_id=get_env_var('VERSION')):
+                    processed_config, token_handler = self._get_callback_config(
+                        config)
+                    adapted_input = self._adapt_input(input)
+
+                    span.update_trace(
+                        input={"messages": adapted_input}
+                    )
+
+                    structured_result = await self.retry_chain.ainvoke(
+                        {"messages": adapted_input},
+                        config={**processed_config, **self.metadata},
+                        **kwargs
+                    )
 
-            structured_result = await self.retry_chain.ainvoke(
-                {"messages": adapted_input},
-                config=processed_config,
-                **kwargs
-            )
+                    span.update_trace(output=structured_result)
 
-            token_usage = token_handler.usage_metadata
-            structured_result._token_usage_ = token_usage
+                    token_usage = token_handler.usage_metadata
+                    structured_result._token_usage_ = token_usage
 
-            return structured_result
+                    return structured_result
 
         except Exception as e:
             SYLogger.error(f"异步LLM调用失败: {str(e)}", exc_info=True)
@@ -118,9 +137,10 @@ class StructuredRunnableWithToken(Runnable):
 class LLMWithAutoTokenUsage(BaseChatModel):
     """自动为结构化调用返回token_usage的LLM包装类"""
     llm: BaseChatModel = Field(default=None)
+    langfuse: Optional[Langfuse] = Field(default=None, exclude=True)
 
-    def __init__(self, llm: BaseChatModel, **kwargs):
-        super().__init__(llm=llm, ** kwargs)
+    def __init__(self, llm: BaseChatModel, langfuse: Langfuse, **kwargs):
+        super().__init__(llm=llm, langfuse=langfuse, **kwargs)
 
     def with_structured_output(
         self,
@@ -211,7 +231,7 @@ class LLMWithAutoTokenUsage(BaseChatModel):
                 "initial": 0.1, "max": 3.0, "exp_base": 2.0, "jitter": 1.0}
         )
 
-        return StructuredRunnableWithToken(retry_chain)
+        return StructuredRunnableWithToken(retry_chain, self.langfuse)
 
     # ========== 实现BaseChatModel抽象方法 ==========
     def _generate(self, messages, stop=None, run_manager=None, ** kwargs):
@@ -222,6 +242,43 @@ class LLMWithAutoTokenUsage(BaseChatModel):
         return self.llm._llm_type
 
 
+def _init_langfuse() -> Tuple[List[CallbackHandler], Optional[Langfuse]]:
+    """
+    初始化 Langfuse 组件的辅助函数
+    """
+    callbacks = []
+    langfuse = None
+
+    # 基础日志回调
+    callbacks.append(LLMLogger())
+    config_dict = Config().config
+
+    server_name = config_dict.get('Name', '')
+    langfuse_configs = config_dict.get('LangfuseConfig', [])
+    environment = config_dict.get('Nacos', {}).get('namespaceId', '')
+
+    # 查找当前服务对应的 Langfuse 配置
+    target_config = next(
+        (item for item in langfuse_configs if item.get('name') == server_name), None
+    )
+
+    if target_config and target_config.get('enable', False):
+        # 设置环境变量
+        os.environ["LANGFUSE_SECRET_KEY"] = target_config.get('secretKey', '')
+        os.environ["LANGFUSE_PUBLIC_KEY"] = target_config.get('publicKey', '')
+        os.environ["LANGFUSE_BASE_URL"] = target_config.get('baseUrl', '')
+        os.environ["LANGFUSE_TRACING_ENVIRONMENT"] = environment
+
+        # 创建 Langfuse Handler 和 Client
+        langfuse_handler = CallbackHandler(
+            trace_context={"trace_id": SYLogger.get_trace_id()}
+        )
+        callbacks.append(langfuse_handler)
+        langfuse = get_client()
+
+    return callbacks, langfuse
+
+
 def get_llm(
     model: str = None,
     streaming: bool = False
@@ -233,20 +290,7 @@ def get_llm(
     if not llmConfig:
         raise Exception(f"无效的模型配置：{model}")
 
-    callbacks = [LLMLogger()]
-
-    config = Config().config
-    server_name = config.get('Name', '')
-    langfuse_configs = config.get('LangfuseConfig', [])
-    target_config = next(
-        (item for item in langfuse_configs if item.get('name') == server_name), None)
-    if target_config and target_config.get('enable', False):
-        os.environ["LANGFUSE_SECRET_KEY"] = target_config.get('secretKey', '')
-        os.environ["LANGFUSE_PUBLIC_KEY"] = target_config.get('publicKey', '')
-        os.environ["LANGFUSE_BASE_URL"] = target_config.get('baseUrl', '')
-
-        langfuse_handler = CallbackHandler()
-        callbacks += [langfuse_handler]
+    callbacks, langfuse = _init_langfuse()
 
     llm = init_chat_model(
         model_provider=llmConfig.provider,
@@ -261,4 +305,4 @@ def get_llm(
     if llm is None:
         raise Exception(f"初始化原始LLM实例失败：{model}")
 
-    return LLMWithAutoTokenUsage(llm)
+    return LLMWithAutoTokenUsage(llm, langfuse)

sycommon/synacos/nacos_service_discovery.py

@@ -78,6 +78,23 @@ class NacosServiceDiscovery:
                     SYLogger.info(
                         f"nacos:未找到相同版本({version_to_use})的实例，筛选出 {len(no_version_instances)} 个无版本号的实例")
                     return no_version_instances
+            else:
+                no_version_instances = [
+                    instance for instance in all_instances
+                    if 'version' not in instance.get('metadata', {})
+                ]
+
+                if no_version_instances:
+                    # 从通用实例中轮询
+                    with self._round_robin_lock:
+                        selected_index = self._round_robin_index % len(
+                            no_version_instances)
+                        self._round_robin_index = (
+                            selected_index + 1) % len(no_version_instances)
+
+                    SYLogger.info(
+                        f"nacos:无版本请求，从 {len(no_version_instances)} 个通用实例中选择")
+                    return [no_version_instances[selected_index]]
 
             SYLogger.info(
                 f"nacos:使用轮询方式从 {len(all_instances)} 个实例中选择")

sycommon/tools/snowflake.py

@@ -153,13 +153,6 @@ class Snowflake:
                     # 同一毫秒内
                     sequence = (sequence + 1) & self.MAX_SEQUENCE
                     if sequence == 0:
-                        # 【关键优化】：序列号溢出！
-                        # 此时必须等待下一毫秒。为了不阻塞其他线程，我们：
-                        # 1. 更新 last_timestamp 标记进入新毫秒 (可选，但这里直接 release 更安全)
-                        # 2. 释放锁
-                        # 3. 锁外自旋
-                        # 4. 下一轮循环重新抢锁
-
                         self.lock.release()  # 手动释放锁
 
                         # 锁外自旋等待下一毫秒
@@ -251,3 +244,5 @@ if __name__ == "__main__":
     print(f"是否有重复: {'是 ❌' if unique_count != len(ids) else '否 ✅'}")
     print(f"总耗时: {duration:.4f} 秒")
     print(f"吞吐量 (QPS): {len(ids) / duration:,.2f}")
+    print("\n最后一个ID解析:")
+    print(Snowflake.parse_id(int(ids[-1])))

{sycommon_python_lib-0.1.56b15.dist-info → sycommon_python_lib-0.1.56b17.dist-info}/METADATA

@@ -1,28 +1,28 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.56b15
+Version: 0.1.56b17
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: aio-pika>=9.5.8
-Requires-Dist: aiohttp>=3.13.2
+Requires-Dist: aiohttp>=3.13.3
 Requires-Dist: aiomysql>=0.3.2
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: fastapi>=0.127.0
+Requires-Dist: fastapi>=0.128.0
 Requires-Dist: kafka-python>=2.3.0
-Requires-Dist: langchain>=1.2.0
-Requires-Dist: langchain-core>=1.2.6
-Requires-Dist: langchain-openai>=1.1.6
+Requires-Dist: langchain>=1.2.3
+Requires-Dist: langchain-core>=1.2.7
+Requires-Dist: langchain-openai>=1.1.7
 Requires-Dist: langfuse>=3.11.2
-Requires-Dist: langgraph>=1.0.5
+Requires-Dist: langgraph>=1.0.6
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.5.0
 Requires-Dist: nacos-sdk-python<3.0,>=2.0.9
-Requires-Dist: psutil>=7.1.3
+Requires-Dist: psutil>=7.2.1
 Requires-Dist: pydantic>=2.12.5
 Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: pyyaml>=6.0.3
-Requires-Dist: sentry-sdk[fastapi]>=2.48.0
+Requires-Dist: sentry-sdk[fastapi]>=2.49.0
 Requires-Dist: sqlalchemy[asyncio]>=2.0.45
 Requires-Dist: starlette>=0.50.0
 Requires-Dist: uvicorn>=0.40.0

{sycommon_python_lib-0.1.56b15.dist-info → sycommon_python_lib-0.1.56b17.dist-info}/RECORD

@@ -20,7 +20,7 @@ sycommon/health/metrics.py,sha256=fHqO73JuhoZkNPR-xIlxieXiTCvttq-kG-tvxag1s1s,26
 sycommon/health/ping.py,sha256=FTlnIKk5y1mPfS1ZGOeT5IM_2udF5aqVLubEtuBp18M,250
 sycommon/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/llm/embedding.py,sha256=HknwDqXmRQcAZ8-6d8wZ6n7Bv7HtxTajDt1vvzHGeFQ,8411
-sycommon/llm/get_llm.py,sha256=vPwGNm2DaF4-ZzhfRUcDFJY756IK93pvGjAnuhP_Fec,10179
+sycommon/llm/get_llm.py,sha256=0-sqC-2lxmvfBttYvPF7Vc9qIxzCvxzOTeSfc2x4Lw4,12194
 sycommon/llm/llm_logger.py,sha256=n4UeNy_-g4oHQOsw-VUzF4uo3JVRLtxaMp1FcI8FiEo,5437
 sycommon/llm/llm_tokens.py,sha256=-udDyFcmyzx6UAwIi6_d_wwI5kMd5w0-WcS2soVPQxg,4309
 sycommon/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -70,17 +70,17 @@ sycommon/synacos/nacos_client_base.py,sha256=l5jpall6nEt0Hy07Wk-PVU0VN0BmD_Mmtld
 sycommon/synacos/nacos_config_manager.py,sha256=Cff-4gpp0aD7sQVi-nEvDO4BWqK9abEDDDJ9qXKFQgs,4399
 sycommon/synacos/nacos_heartbeat_manager.py,sha256=G80_pOn37WdO_HpYUiAfpwMqAxW0ff0Bnw0NEuge9v0,5568
 sycommon/synacos/nacos_service.py,sha256=BezQ1eDIYwBPE567Po_Qh1Ki_z9WmhZy1J1NiTPbdHY,6118
-sycommon/synacos/nacos_service_discovery.py,sha256=vE72BCLBv4fQ1H9CQJ8efC6R2SPMQlAWPPTb8Ae7i2g,6024
+sycommon/synacos/nacos_service_discovery.py,sha256=O0M4facMa3I9YDFaovrfiTnCMtJWTuewbt9ce4a2-CA,6828
 sycommon/synacos/nacos_service_registration.py,sha256=plg2PmH8CWgmVnPtiIXBxtj-3BpyMdSzKr1wyWRdzh4,10968
 sycommon/synacos/param.py,sha256=KcfSkxnXOa0TGmCjY8hdzU9pzUsA8-4PeyBKWI2-568,1765
 sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
 sycommon/tools/env.py,sha256=Ah-tBwG2C0_hwLGFebVQgKdWWXCjTzBuF23gCkLHYy4,2437
 sycommon/tools/merge_headers.py,sha256=HV_i52Q-9se3SP8qh7ZGYl8bP7Fxtal4CGVkyMwEdM8,4373
-sycommon/tools/snowflake.py,sha256=MUUkBeCm3Tp9SLBU6oNjLsIPAGfn7OmhrR9YvWWhYm8,9569
+sycommon/tools/snowflake.py,sha256=xQlYXwYnI85kSJ1rZ89gMVBhzemP03xrMPVX9vVa3MY,9228
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.56b15.dist-info/METADATA,sha256=JGFO7mcs8XAlW3izcvAQEpESd-pK275n-FqUzl1FJfA,7302
-sycommon_python_lib-0.1.56b15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.56b15.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.56b15.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.56b15.dist-info/RECORD,,
+sycommon_python_lib-0.1.56b17.dist-info/METADATA,sha256=zz5lBYksOaYleWnVs0ZDl8NH1aqGwJ3BS5SNeu4Lv3s,7302
+sycommon_python_lib-0.1.56b17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.56b17.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.56b17.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.56b17.dist-info/RECORD,,