sycommon-python-lib 0.1.56b16__tar.gz → 0.1.56b18__tar.gz

{sycommon_python_lib-0.1.56b16 → sycommon_python_lib-0.1.56b18}/PKG-INFO

@@ -1,28 +1,28 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.56b16
+Version: 0.1.56b18
 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.56b16 → sycommon_python_lib-0.1.56b18}/pyproject.toml

@@ -1,29 +1,29 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.56-beta16"
+version = "0.1.56-beta18"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "aio-pika>=9.5.8",
-    "aiohttp>=3.13.2",
+    "aiohttp>=3.13.3",
     "aiomysql>=0.3.2",
     "decorator>=5.2.1",
-    "fastapi>=0.127.0",
+    "fastapi>=0.128.0",
     "kafka-python>=2.3.0",
-    "langchain>=1.2.0",
-    "langchain-core>=1.2.6",
-    "langchain-openai>=1.1.6",
+    "langchain>=1.2.3",
+    "langchain-core>=1.2.7",
+    "langchain-openai>=1.1.7",
     "langfuse>=3.11.2",
-    "langgraph>=1.0.5",
+    "langgraph>=1.0.6",
     "loguru>=0.7.3",
     "mysql-connector-python>=9.5.0",
     "nacos-sdk-python>=2.0.9,<3.0",
-    "psutil>=7.1.3",
+    "psutil>=7.2.1",
     "pydantic>=2.12.5",
     "python-dotenv>=1.2.1",
     "pyyaml>=6.0.3",
-    "sentry-sdk[fastapi]>=2.48.0",
+    "sentry-sdk[fastapi]>=2.49.0",
     "sqlalchemy[asyncio]>=2.0.45",
     "starlette>=0.50.0",
     "uvicorn>=0.40.0",

{sycommon_python_lib-0.1.56b16 → sycommon_python_lib-0.1.56b18}/src/sycommon/llm/get_llm.py

@@ -14,6 +14,7 @@ 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 sycommon.tools.merge_headers import get_header_value
 from langfuse.langchain import CallbackHandler
 
 
@@ -77,17 +78,23 @@ class StructuredRunnableWithToken(Runnable):
     def invoke(self, input: Any, config: Optional[RunnableConfig] = None, ** kwargs) -> Dict[str, Any]:
         try:
             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')):
+                trace_id = SYLogger.get_trace_id()
+                userid = get_header_value(
+                    SYLogger.get_headers(), "x-userid-header")
+                syVersion = get_header_value(
+                    SYLogger.get_headers(), "s-y-version")
+
+                user_id = userid or syVersion or get_env_var('VERSION')
+                with propagate_attributes(session_id=trace_id, user_id=user_id):
                     processed_config, token_handler = self._get_callback_config(
                         config)
                     adapted_input = self._adapt_input(input)
+                    input = {"messages": adapted_input}
 
-                    span.update_trace(
-                        input={"messages": adapted_input}
-                    )
+                    span.update_trace(input=input)
 
                     structured_result = self.retry_chain.invoke(
-                        {"messages": adapted_input},
+                        input,
                         config={**processed_config, **self.metadata},
                         **kwargs
                     )
@@ -98,7 +105,6 @@ class StructuredRunnableWithToken(Runnable):
                     structured_result._token_usage_ = token_usage
 
                     return structured_result
-
         except Exception as e:
             SYLogger.error(f"同步LLM调用失败: {str(e)}", exc_info=True)
             return None
@@ -107,17 +113,24 @@ class StructuredRunnableWithToken(Runnable):
     async def ainvoke(self, input: Any, config: Optional[RunnableConfig] = None, ** kwargs) -> Dict[str, Any]:
         try:
             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')):
+                trace_id = SYLogger.get_trace_id()
+                userid = get_header_value(
+                    SYLogger.get_headers(), "x-userid-header")
+                syVersion = get_header_value(
+                    SYLogger.get_headers(), "s-y-version")
+
+                user_id = userid or syVersion or get_env_var('VERSION')
+                with propagate_attributes(session_id=trace_id, user_id=user_id):
                     processed_config, token_handler = self._get_callback_config(
                         config)
                     adapted_input = self._adapt_input(input)
 
-                    span.update_trace(
-                        input={"messages": adapted_input}
-                    )
+                    input = {"messages": adapted_input}
+
+                    span.update_trace(input=input)
 
                     structured_result = await self.retry_chain.ainvoke(
-                        {"messages": adapted_input},
+                        input,
                         config={**processed_config, **self.metadata},
                         **kwargs
                     )
@@ -128,7 +141,6 @@ class StructuredRunnableWithToken(Runnable):
                     structured_result._token_usage_ = token_usage
 
                     return structured_result
-
         except Exception as e:
             SYLogger.error(f"异步LLM调用失败: {str(e)}", exc_info=True)
             return None
@@ -268,6 +280,7 @@ def _init_langfuse() -> Tuple[List[CallbackHandler], Optional[Langfuse]]:
         os.environ["LANGFUSE_PUBLIC_KEY"] = target_config.get('publicKey', '')
         os.environ["LANGFUSE_BASE_URL"] = target_config.get('baseUrl', '')
         os.environ["LANGFUSE_TRACING_ENVIRONMENT"] = environment
+        os.environ["OTEL_SERVICE_NAME"] = server_name
 
         # 创建 Langfuse Handler 和 Client
         langfuse_handler = CallbackHandler(

{sycommon_python_lib-0.1.56b16 → sycommon_python_lib-0.1.56b18}/src/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_python_lib-0.1.56b16 → sycommon_python_lib-0.1.56b18}/src/sycommon/tools/merge_headers.py

@@ -95,3 +95,23 @@ def merge_headers(
         processed_headers[key_lower] = value
 
     return processed_headers
+
+
+def get_header_value(headers: list, target_key: str, default=None):
+    """
+    从列表中查找指定 header 的值
+
+    Args:
+        headers: header 列表，例如 [('Content-Type', 'application/json'), ...]
+        target_key: 要查找的 key
+        default: 如果没找到返回的默认值
+    """
+    if not headers:
+        return default
+
+    for item in headers:
+        # 兼容 list 和 tuple，确保长度为2
+        if isinstance(item, (list, tuple)) and len(item) == 2 and item[0] == target_key:
+            return item[1]
+
+    return default

{sycommon_python_lib-0.1.56b16 → sycommon_python_lib-0.1.56b18}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,28 +1,28 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.56b16
+Version: 0.1.56b18
 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.56b16 → sycommon_python_lib-0.1.56b18}/src/sycommon_python_lib.egg-info/requires.txt

@@ -1,22 +1,22 @@
 aio-pika>=9.5.8
-aiohttp>=3.13.2
+aiohttp>=3.13.3
 aiomysql>=0.3.2
 decorator>=5.2.1
-fastapi>=0.127.0
+fastapi>=0.128.0
 kafka-python>=2.3.0
-langchain>=1.2.0
-langchain-core>=1.2.6
-langchain-openai>=1.1.6
+langchain>=1.2.3
+langchain-core>=1.2.7
+langchain-openai>=1.1.7
 langfuse>=3.11.2
-langgraph>=1.0.5
+langgraph>=1.0.6
 loguru>=0.7.3
 mysql-connector-python>=9.5.0
 nacos-sdk-python<3.0,>=2.0.9
-psutil>=7.1.3
+psutil>=7.2.1
 pydantic>=2.12.5
 python-dotenv>=1.2.1
 pyyaml>=6.0.3
-sentry-sdk[fastapi]>=2.48.0
+sentry-sdk[fastapi]>=2.49.0
 sqlalchemy[asyncio]>=2.0.45
 starlette>=0.50.0
 uvicorn>=0.40.0