sycommon-python-lib 0.2.8a13__py3-none-any.whl → 0.2.9__py3-none-any.whl

sycommon/logging/log_masker.py

@@ -178,6 +178,33 @@ class LogMasker(metaclass=SingletonMeta):
 
         return None
 
+    def sanitize_deep_str(self, value: Any, key: Any = None) -> Any:
+        """深 JSON 字符串脱敏：把整体序列化的大 JSON 逐层展开后按字段裁剪。
+
+        背景：traceid 等中间件把 response_body / request_body 传成「整体 JSON
+        字符串」——按标量路径只有 maxLength(1000) 一刀切，超限即头尾截断成
+        ``...[N chars truncated]...``，排障时无法 json.loads 还原，中段字段
+        （业务最关心的 data 部分）全部丢失。
+
+        做法：字符串先尝试 json.loads 还原为结构；dict/list 逐层递归（每个
+        叶子标量独立适用 maxLength），无法还原 / 解析失败则回退原字符串走
+        标量截断。递归产物是结构化 dict/list，最终由调用方决定序列化方式——
+        这样即使某个叶子被截断，其余字段仍完整可读。
+
+        仅本地裁剪，不脱字段名（mask/drop 语义不变——命中字段名的值照常
+        掩码/删除）。
+        """
+        if not isinstance(value, str):
+            return self.sanitize(value, key)
+        try:
+            parsed = json.loads(value)
+        except (json.JSONDecodeError, ValueError):
+            return self._truncate_str(value)
+        if not isinstance(parsed, (dict, list)):
+            # "123" / "true" 这类 JSON 标量字符串：还原后反而丢引号语义，按原串截断
+            return self._truncate_str(value)
+        return self._sanitize_value(parsed, key, depth=0)
+
     def _truncate_str(self, s: str) -> str:
         n = self._config.get("maxLength", 1000)
         if len(s) <= n:

sycommon/middleware/traceid.py

@@ -4,6 +4,7 @@ import re
 from typing import Dict, Any
 from fastapi import Request, Response
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.logging.log_masker import masker as _log_masker
 from sycommon.tools.merge_headers import merge_headers
 from sycommon.tools.snowflake import Snowflake
 
@@ -316,15 +317,26 @@ def setup_trace_id_handler(app):
                             response.headers[k] = v
 
             # 构建响应日志
-            response_log_body = response_body.decode('utf-8', errors='ignore')
-            # 检测是否包含 base64 二进制内容（如 PDF、图片等），如有则省略
-            try:
-                resp_json = json.loads(response_log_body)
-                if isinstance(resp_json, dict) and resp_json.get("content") and len(str(resp_json["content"])) > 1000:
-                    resp_json["content"] = f"... (base64/binary content omitted, {len(str(resp_json['content']))} chars)"
-                    response_log_body = json.dumps(resp_json, ensure_ascii=False)
-            except (json.JSONDecodeError, ValueError):
-                pass
+            # response_body 是「整体 JSON 字符串」——按标量路径只受 maxLength(1000)
+            # 一刀切截断,中段字段丢失且无法解码还原。这里走深 JSON 脱敏:逐层展开后
+            # 每个叶子字段独立适用 maxLength,结构完整、json.loads 可还原,排障时
+            # 能直接读 data 内任意字段。解析失败(非 JSON)自动回退标量截断。
+            response_log_body = _log_masker.sanitize_deep_str(
+                response_body.decode('utf-8', errors='ignore'))
+            # 检测是否包含 base64 二进制内容（如 PDF、图片等），如有则省略。
+            # sanitize_deep_str 已把 JSON 字符串还原成结构化 dict——直接在结构上
+            # 改(不要再 json.loads 一个 dict,会 TypeError);仅字符串回退路径走解析。
+            if isinstance(response_log_body, dict):
+                if response_log_body.get("content") and len(str(response_log_body["content"])) > 1000:
+                    response_log_body["content"] = f"... (base64/binary content omitted, {len(str(response_log_body['content']))} chars)"
+            else:
+                try:
+                    resp_json = json.loads(response_log_body)
+                    if isinstance(resp_json, dict) and resp_json.get("content") and len(str(resp_json["content"])) > 1000:
+                        resp_json["content"] = f"... (base64/binary content omitted, {len(str(resp_json['content']))} chars)"
+                        response_log_body = json.dumps(resp_json, ensure_ascii=False)
+                except (json.JSONDecodeError, ValueError):
+                    pass
             response_message = {
                 "traceId": trace_id,
                 "status_code": response.status_code,

sycommon/rabbitmq/rabbitmq_client.py

@@ -153,6 +153,27 @@ class RabbitMQClient:
             logger.debug(f"探测队列 '{self.queue_name}' 消费者数失败: {e}")
             return None
 
+    def _live_aiormq_consumer_tags(self):
+        """取 aiormq 层（broker 真实状态）活跃 consumer tag 集合。
+
+        与 local_consumer_alive 同款内省路径。返回 None 表示无法内省
+        （调用方退化为不过滤，保持旧行为）；空集/非空集均可用于过滤
+        aio-pika RobustQueue._consumers 里的腰斩残留死 tag。"""
+        channel = self._channel
+        if channel is None:
+            return None
+        try:
+            underlay = channel._channel
+            if underlay is None:
+                return None
+            target = getattr(underlay, "channel", None) or underlay
+            consumers = getattr(target, "consumers", None)
+            if isinstance(consumers, dict):
+                return set(consumers.keys())
+            return None
+        except Exception:
+            return None
+
     def local_consumer_alive(self) -> bool:
         """本实例视角的消费者活性（本地注册表快速判定）。
 
@@ -600,18 +621,39 @@ class RabbitMQClient:
         #     则仍按显式 tag 真正 consume,交给服务端校验。
         existing = getattr(self._queue, "_consumers", None)
         if isinstance(existing, dict):
-            if existing and consumer_tag is None:
-                self._consumer_tag = next(iter(existing))
+            # 🔒 死 tag 不复用（2026-08-26 实证修复）：aio-pika 的
+            # RobustQueue.cancel 被 cancel 腰斩（如监控看门狗超时传播）时，
+            # super().cancel() 未返回 → _consumers 永不 pop → 死 tag 残留。
+            # 复用层只看 aio-pika 注册表会"假恢复"（本地以为在消费，broker
+            # 侧没有）。复用前以 aiormq 注册表（broker 真实状态）过滤：
+            # 只复用两边都在的 tag；被过滤掉视为残留，走真 consume 重建。
+            aiormq_tags = self._live_aiormq_consumer_tags()
+            live_existing = {t: v for t, v in existing.items()
+                             if t in aiormq_tags} if aiormq_tags is not None else existing
+            if live_existing and consumer_tag is None:
+                self._consumer_tag = next(iter(live_existing))
                 logger.warning(
-                    f"队列 '{getattr(self._queue, 'name', '?')}' 已有 {len(existing)} 个消费者，"
+                    f"队列 '{getattr(self._queue, 'name', '?')}' 已有 {len(live_existing)} 个消费者，"
                     f"跳过重复注册(复用现有 tag: {self._consumer_tag})")
                 return self._consumer_tag
-            if consumer_tag is not None and consumer_tag in existing:
+            if consumer_tag is not None and consumer_tag in live_existing:
                 self._consumer_tag = consumer_tag
                 logger.info(
                     f"队列 '{getattr(self._queue, 'name', '?')}' 的 tag {consumer_tag} "
                     f"已在消费,跳过重复注册(幂等)")
                 return self._consumer_tag
+            if existing and not live_existing:
+                logger.warning(
+                    f"队列 '{getattr(self._queue, 'name', '?')}' 的 {len(existing)} 个"
+                    f"注册 tag 均不在 aiormq 活跃注册表(疑似腰斩残留)，"
+                    f"不复用，强制重新注册消费")
+                # 🔒 显式传入的 tag 若已被判死（不在 aiormq 活跃集），
+                # 不能再传给 consume：aiormq 本地注册表虽无此 tag，但若
+                # broker 侧仍存活（本地注册表 lag 的误判场景），重复
+                # basic_consume 同 tag 会触发 DuplicateConsumerTag 异常。
+                # 置 None 让 broker 分配全新 tag。
+                if consumer_tag is not None:
+                    consumer_tag = None
 
         self._consumer_tag = await self._queue.consume(
             self._process_message_callback, consumer_tag=consumer_tag)

{sycommon_python_lib-0.2.8a13.dist-info → sycommon_python_lib-0.2.9.dist-info}/METADATA

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

{sycommon_python_lib-0.2.8a13.dist-info → sycommon_python_lib-0.2.9.dist-info}/RECORD

@@ -221,7 +221,7 @@ sycommon/llm/tiktoken_cache/fb374d419588a4632f3f557e76b4b70aebbca790,sha256=RGqV
 sycommon/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/logging/async_sql_logger.py,sha256=TIUAqK8_F9H7Graw00hNjEI3DJ1ZRo5fRUcnqaMZlbU,2187
 sycommon/logging/kafka_log.py,sha256=lAnwb0yhGM44L9xRrY7z-mAt-rOUew-6gmiYbZH9_3Y,44661
-sycommon/logging/log_masker.py,sha256=GYf4NA1YXF070r0MUkj2oh4bygaZo0hEnDih734a-eE,15923
+sycommon/logging/log_masker.py,sha256=WjHXKOmgnEItJzEntFXZM6o0Gc1gATp_I8bxkegHs8w,17449
 sycommon/logging/logger_levels.py,sha256=xJBzPV2H7GpEQggOIjyckEsA4yf6s4NpI9ckgO3xWKA,1154
 sycommon/logging/logger_wrapper.py,sha256=TtzmGw_K5NjBGBq9Gjqtnh834izAv8TQwsOeL2fIbAI,481
 sycommon/logging/process_logger.py,sha256=Lnp7ptU9Uyw18OFBfNxlT9tHPiiWIv9jB8O6IhbELAQ,6266
@@ -242,7 +242,7 @@ sycommon/middleware/sandbox_gateway.py,sha256=ZyXV9iwvaLNNTk0oM-RdjGRSgkBPaPp67A
 sycommon/middleware/timeout.py,sha256=KlxOPa8xl2dg6yuRi_EzkVJG8bX4stb5ueYxctzzGM8,1433
 sycommon/middleware/token_tracking.py,sha256=rEbgV1bgWMdzAERx4aq5XAvOIT6jTY_tK1P0xHJnL3o,6609
 sycommon/middleware/tool_result_truncation.py,sha256=xtwBf8q11Z8EPzmo3Ju4OfUbULOklSsWo_oystxCW0o,13640
-sycommon/middleware/traceid.py,sha256=JoHDW5hSiBi0tjjfkidjpV5L_iGVVLEpnnSnVQs1spo,18329
+sycommon/middleware/traceid.py,sha256=cNXDzmVwE--QrpiJRAWg-_eoXuXExqlAZpEWWeV6hQA,19401
 sycommon/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/models/base_http.py,sha256=efxtsxmQmInlsRVqQU9P17MSVXx3TsNmgimMlz0hNV0,4788
 sycommon/models/log.py,sha256=rZpj6VkDRxK3B6H7XSeWdYZshU8F0Sks8bq1p6pPlDw,500
@@ -260,7 +260,7 @@ sycommon/notice/uvicorn_monitor.py,sha256=_SlLB91N7g-Jt_xP_AX1IWFgA7_1lCqsQFwm_Y
 sycommon/notice/wecom_message.py,sha256=_oA6hg0Ask7NkFbvUpL78WOmyUb6uW7KcY71GhNKiJY,12363
 sycommon/rabbitmq/process_pool_consumer.py,sha256=EXdNypgathjTfPqkccoAW0HiVB9HuZLGhPbWUcYh0_Q,29750
 sycommon/rabbitmq/rabbit_management_client.py,sha256=cf7GSbvdzOA6vFV4jC3IL6wh8yu8IEDgTPHUqRV2_uE,4021
-sycommon/rabbitmq/rabbitmq_client.py,sha256=G36mcyFdrMSHO5FeMcDaVPEN_d8R2u18GCRHG_v8eE8,37343
+sycommon/rabbitmq/rabbitmq_client.py,sha256=_eamRhy_Tqcbj0GwTFm8ALoG9pa71a6yChrthLizh44,39806
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=alZ4vDZAgulSaDbkGJy04nxh239wAVxiYvm2DTLXSBE,18163
 sycommon/rabbitmq/rabbitmq_service.py,sha256=EBepnotvzZvj34t40HEDup_GAtJI_i1xb795n3nh244,10043
 sycommon/rabbitmq/rabbitmq_service_client_manager.py,sha256=UZgpD6n0mdo5u3gaGW-jhUuPV50bRNdXFESzL9ABsR4,10623
@@ -334,8 +334,8 @@ sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
 sycommon/tools/user_id.py,sha256=o-zsubGSR5rSSZf8Pk8B7AhE21ahDTTIW5JZmJO6Flw,4761
 sycommon/xxljob/__init__.py,sha256=7eoBlQxv-B39IfRSCY2bkqdGYs1QRe1umAWd88VMEEM,86
 sycommon/xxljob/xxljob_service.py,sha256=1yifwIBNGsCIxLnQjHKiBlbsigc_zvPH-dMTZcNxe-Q,7649
-sycommon_python_lib-0.2.8a13.dist-info/METADATA,sha256=5hqjCXuLwT_Xod6rUQqUIuZF1tjiMJqh2akzY0LDCWM,8033
-sycommon_python_lib-0.2.8a13.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-sycommon_python_lib-0.2.8a13.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.8a13.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.8a13.dist-info/RECORD,,
+sycommon_python_lib-0.2.9.dist-info/METADATA,sha256=1yHtlqyJ9ed325kCGRfwls1AggAO0hQhB0-y8LKq9Ak,8030
+sycommon_python_lib-0.2.9.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+sycommon_python_lib-0.2.9.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.9.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.9.dist-info/RECORD,,