sycommon-python-lib 0.1.57b7__py3-none-any.whl → 0.1.57b9__py3-none-any.whl

sycommon/llm/get_llm.py

@@ -41,4 +41,7 @@ def get_llm(
     if llm is None:
         raise Exception(f"初始化原始LLM实例失败：{model}")
 
-    return LLMWithAutoTokenUsage(llm, langfuse, llmConfig)
+    # 获取kwargs中summary_prompt参数
+    summary_prompt: str = kwargs.get("summary_prompt")
+
+    return LLMWithAutoTokenUsage(llm, langfuse, llmConfig, summary_prompt)

sycommon/llm/struct_token.py

@@ -21,6 +21,7 @@ class StructuredRunnableWithToken(Runnable):
         retry_chain: Runnable,
         langfuse: Optional[Langfuse] = None,
         llmConfig: Optional[LLMConfig] = None,
+        summary_prompt: Optional[str] = None,
         model_name: str = "Qwen2.5-72B",
         enable_compression: bool = True,
         threshold_ratio: float = 0.8
@@ -29,6 +30,7 @@ class StructuredRunnableWithToken(Runnable):
         self.retry_chain = retry_chain
         self.langfuse = langfuse
         self.llmConfig = llmConfig
+        self.summary_prompt = summary_prompt
         self.model_name = model_name
         self.enable_compression = enable_compression
         self.threshold_ratio = threshold_ratio
@@ -59,7 +61,7 @@ class StructuredRunnableWithToken(Runnable):
     async def _acompress_context(self, messages: List[BaseMessage]) -> List[BaseMessage]:
         """执行异步上下文压缩"""
         # 策略：保留 System Prompt + 最近 N 条，中间的摘要
-        keep_last_n = 4
+        keep_last_n = 1
 
         # 分离系统消息和对话消息
         system_msgs = [m for m in messages if isinstance(m, SystemMessage)]
@@ -74,9 +76,9 @@ class StructuredRunnableWithToken(Runnable):
 
         # 构造摘要 Prompt
         # 注意：这里直接使用 retry_chain 进行摘要，防止死循环
+        summary_content = self.summary_prompt or "请将上下文内容进行摘要，保留关键信息，将内容压缩到原来长度的50%左右，保留关键信息。"
         summary_prompt = [
-            SystemMessage(
-                content="请将上下文内容进行摘要，保留关键信息，将内容压缩到原来长度的50%左右，保留关键信息。"),
+            SystemMessage(content=summary_content),
             HumanMessage(content=f"历史记录:\n{to_summarize}\n\n摘要:")
         ]
 

sycommon/llm/sy_langfuse.py

@@ -46,6 +46,10 @@ class LangfuseInitializer(metaclass=SingletonMeta):
                     'baseUrl', '')
                 os.environ["LANGFUSE_TRACING_ENVIRONMENT"] = environment
                 os.environ["OTEL_SERVICE_NAME"] = server_name
+                # 设置 OTLP 追踪导出器超时时间（单位：秒）
+                os.environ["OTEL_EXPORTER_OTLP_TRACES_TIMEOUT"] = 60
+                # 全局 OTLP 超时（覆盖所有信号：追踪/指标/日志）
+                os.environ["OTEL_EXPORTER_OTLP_TIMEOUT"] = 60
 
                 self._langfuse_client = get_client()
 

sycommon/llm/usage_token.py

@@ -15,9 +15,11 @@ class LLMWithAutoTokenUsage(BaseChatModel):
     llm: BaseChatModel = Field(default=None)
     langfuse: Optional[Langfuse] = Field(default=None, exclude=True)
     llmConfig: Optional[LLMConfig] = Field(default=None, exclude=True)
+    summary_prompt: Optional[str] = Field(default=None, exclude=True)
 
-    def __init__(self, llm: BaseChatModel, langfuse: Langfuse, llmConfig: LLMConfig, **kwargs):
-        super().__init__(llm=llm, langfuse=langfuse, llmConfig=llmConfig, **kwargs)
+    def __init__(self, llm: BaseChatModel, langfuse: Langfuse, llmConfig: LLMConfig, summary_prompt: str, **kwargs):
+        super().__init__(llm=llm, langfuse=langfuse, llmConfig=llmConfig,
+                         summary_prompt=summary_prompt, **kwargs)
 
     def with_structured_output(
         self,
@@ -108,7 +110,7 @@ class LLMWithAutoTokenUsage(BaseChatModel):
                 "initial": 0.1, "max": 3.0, "exp_base": 2.0, "jitter": 1.0}
         )
 
-        return StructuredRunnableWithToken(retry_chain, self.langfuse, self.llmConfig)
+        return StructuredRunnableWithToken(retry_chain, self.langfuse, self.llmConfig, self.summary_prompt)
 
     # ========== 实现BaseChatModel抽象方法 ==========
     def _generate(self, messages, stop=None, run_manager=None, ** kwargs):

sycommon/rabbitmq/rabbitmq_pool.py

@@ -142,19 +142,18 @@ class RabbitMQConnectionPool:
     async def _ensure_main_channel(self) -> RobustChannel:
         """
         确保主通道有效
-        逻辑：
-        1. 检查连接状态
-        2. 如果断开 -> 清理 -> 轮询重试
-        3. 如果连接在但通道断开 -> 仅重建通道
+        修复逻辑：
+        1. 如果连接对象不存在或已关闭 -> 重建连接
+        2. 如果连接对象存在但处于重连中 -> 等待其 ready
+        3. 如果通道不存在或已关闭 -> 重建通道
         """
         async with self._lock:
             if self._is_shutdown:
                 raise RuntimeError("客户端已关闭")
 
-            # --- 阶段A：连接恢复逻辑 (如果连接断了) ---
+            # --- 阶段A：连接恢复逻辑 ---
             if self._connection is None or self._connection.is_closed:
-
-                # 1. 【强制】先彻底清理所有旧资源
+                # 情况1：连接对象不存在，或已显式关闭 -> 走清理重连流程
                 await self._cleanup_resources()
 
                 retry_hosts = self.hosts.copy()
@@ -162,7 +161,6 @@ class RabbitMQConnectionPool:
                 last_error = None
                 max_attempts = min(len(retry_hosts), 3)
 
-                # 2. 轮询尝试新连接
                 for _ in range(max_attempts):
                     if not retry_hosts:
                         break
@@ -173,19 +171,15 @@ class RabbitMQConnectionPool:
 
                     try:
                         temp_conn = await self._create_connection_impl(host)
-
-                        # 3. 只有在连接成功后，才更新 self._connection
                         self._connection = temp_conn
-                        temp_conn = None  # 转移所有权
+                        temp_conn = None
                         self._initialized = True
                         last_error = None
                         logger.info(f"🔗 [RECONNECT_OK] 切换到节点: {host}")
                         break
-
                     except Exception as e:
                         logger.warning(f"⚠️ [RECONNECT_RETRY] 节点 {host} 不可用")
                         if temp_conn is not None:
-                            # 尝试连接失败了，必须把这个“半成品”连接关掉
                             try:
                                 await temp_conn.close()
                             except Exception:
@@ -193,25 +187,38 @@ class RabbitMQConnectionPool:
                         last_error = e
                         await asyncio.sleep(self.reconnect_interval)
 
-                # 4. 如果所有尝试都失败
                 if last_error:
-                    # 确保状态是干净的
                     self._connection = None
                     self._initialized = False
                     logger.error("💥 [RECONNECT_FATAL] 所有节点重试失败")
                     raise ConnectionError("所有 RabbitMQ 节点连接失败") from last_error
+            else:
+                # 情况2：连接对象存在，但可能处于“连接丢失，正在重连”的状态
+                # 【关键修复】显式调用 connect() 确保连接真正就绪
+                # 如果连接已经好，这会立即返回；如果正在重连，这会等待完成
+                try:
+                    logger.debug(f"⏳ [WAIT_CONN] 等待连接就绪...")
+                    await self._connection.connect(timeout=5)  # 设置一个短暂超时避免卡死太久
+                    logger.debug(f"✅ [WAIT_CONN_OK] 连接已就绪")
+                except asyncio.TimeoutError:
+                    logger.warning("⚠️ [WAIT_CONN_TIMEOUT] 等待连接就绪超时，强制重连")
+                    await self._cleanup_resources()
+                    raise
+                except Exception as e:
+                    logger.error(f"❌ [WAIT_CONN_FAIL] 连接不可用: {e}")
+                    await self._cleanup_resources()
+                    raise
 
-            # --- 阶段B：通道恢复逻辑 (如果连接在但通道断了) ---
-            # 注意：这里不需要清理连接，只重置通道
+            # --- 阶段B：通道恢复逻辑 ---
             if self._channel is None or self._channel.is_closed:
                 try:
+                    # 只有在确保连接有效后，才创建通道
                     self._channel = await self._connection.channel()
                     await self._channel.set_qos(prefetch_count=self.prefetch_count)
                     logger.info(f"✅ [CHANNEL_OK] 主通道已恢复")
                 except Exception as e:
-                    # 如果连通道都创建不了，说明这个连接也是坏的，回滚到阶段A
-                    logger.error(f"❌ [CHANNEL_FAIL] 通道创建失败，标记连接无效: {e}")
-                    # 强制清理连接，触发下一次进入阶段A
+                    logger.error(f"❌ [CHANNEL_FAIL] 通道创建失败: {e}")
+                    # 如果连通道都创建不了，说明连接状态有问题，回滚清理
                     await self._cleanup_resources()
                     raise
 

{sycommon_python_lib-0.1.57b7.dist-info → sycommon_python_lib-0.1.57b9.dist-info}/METADATA

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

{sycommon_python_lib-0.1.57b7.dist-info → sycommon_python_lib-0.1.57b9.dist-info}/RECORD

@@ -20,12 +20,12 @@ 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=Qi9mHQiOUVEcZd4elAaqsAyofdeLtPgU_LF35KlIFU4,14735
-sycommon/llm/get_llm.py,sha256=eZtVx9yNl-VO3O6AhZzCECRTDXRsUTcR88os8hGyJIY,1241
+sycommon/llm/get_llm.py,sha256=jqwGz8RJRx95XwFl6DsRihQX-6B4Q34RAFeFVOQSlAc,1355
 sycommon/llm/llm_logger.py,sha256=n4UeNy_-g4oHQOsw-VUzF4uo3JVRLtxaMp1FcI8FiEo,5437
 sycommon/llm/llm_tokens.py,sha256=-udDyFcmyzx6UAwIi6_d_wwI5kMd5w0-WcS2soVPQxg,4309
-sycommon/llm/struct_token.py,sha256=s8HQf6ZdqKRAnanAo8yPwAM-Ez4P9gGlhI_zBEffphM,12301
-sycommon/llm/sy_langfuse.py,sha256=NZv6ydfn3-cxqQvuB5WdnM9GYliO9qB_RWh_XqIS3VU,3692
-sycommon/llm/usage_token.py,sha256=CDoA_UeZKpNvxH0vNZ8f58tfLV3wC4kd5e1Oferyy9s,5318
+sycommon/llm/struct_token.py,sha256=ScgfO6CzwwMbqXJhoRN-sD2lbYzX7zGhldrsc4s2X08,12440
+sycommon/llm/sy_langfuse.py,sha256=6diWYBmFExQg-PsP_YZdP5niARtgRXfBR-lcYcITfNc,3983
+sycommon/llm/usage_token.py,sha256=7sFpoGgkBeUt0DguW_ASP2tjAskEzbGn4ZmTGmEYQMo,5486
 sycommon/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/logging/async_sql_logger.py,sha256=_OY36XkUm__U3NhMgiecy-qd-nptZ_0gpE3J8lGAr58,2619
 sycommon/logging/kafka_log.py,sha256=gfOqdZe0HJ3PkIFfnNWG4DZVadxsCKJ6AmelR7_Z1Xs,9960
@@ -52,7 +52,7 @@ sycommon/models/sso_user.py,sha256=i1WAN6k5sPcPApQEdtjpWDy7VrzWLpOrOQewGLGoGIw,2
 sycommon/notice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/notice/uvicorn_monitor.py,sha256=VryQYcAtjijJuGDBimbVurgwxlsLaLtkNnABPDY5Tao,7332
 sycommon/rabbitmq/rabbitmq_client.py,sha256=pAhyLfuHl72szLBr-nRqv-QKseT9x_QCR6Mu-IonP1U,16689
-sycommon/rabbitmq/rabbitmq_pool.py,sha256=BiFQgZPzSAFR-n5XhyIafoeWQXETF_31nFRDhMbe6aU,15577
+sycommon/rabbitmq/rabbitmq_pool.py,sha256=EzM3j3MCLgoy6VW8tLONtcZB3VmYQI7CWi_X1kOdqF8,16194
 sycommon/rabbitmq/rabbitmq_service.py,sha256=XSHo9HuIJ_lq-vizRh4xJVdZr_2zLqeLhot09qb0euA,2025
 sycommon/rabbitmq/rabbitmq_service_client_manager.py,sha256=IP9TMFeG5LSrwFPEmOy1ce4baPxBUZnWJZR3nN_-XR4,8009
 sycommon/rabbitmq/rabbitmq_service_connection_monitor.py,sha256=uvoMuJDzJ9i63uVRq1NKFV10CvkbGnTMyEoq2rgjQx8,3013
@@ -82,8 +82,8 @@ sycommon/tools/env.py,sha256=Ah-tBwG2C0_hwLGFebVQgKdWWXCjTzBuF23gCkLHYy4,2437
 sycommon/tools/merge_headers.py,sha256=u9u8_1ZIuGIminWsw45YJ5qnsx9MB-Fot0VPge7itPw,4941
 sycommon/tools/snowflake.py,sha256=xQlYXwYnI85kSJ1rZ89gMVBhzemP03xrMPVX9vVa3MY,9228
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.57b7.dist-info/METADATA,sha256=e43DQ_eU9kbXuhiZpJF4ys1betxau0wepQuOm6v4l1c,7333
-sycommon_python_lib-0.1.57b7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.57b7.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.57b7.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.57b7.dist-info/RECORD,,
+sycommon_python_lib-0.1.57b9.dist-info/METADATA,sha256=NcmwXbyj9wboWXHTZ4B4ZGLRTuz_JwcvcohTThAg1N0,7333
+sycommon_python_lib-0.1.57b9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.57b9.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.57b9.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.57b9.dist-info/RECORD,,