sycommon-python-lib 0.2.5a28__tar.gz → 0.2.5a29__tar.gz

{sycommon_python_lib-0.2.5a28 → sycommon_python_lib-0.2.5a29}/PKG-INFO

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

{sycommon_python_lib-0.2.5a28 → sycommon_python_lib-0.2.5a29}/pyproject.toml

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

{sycommon_python_lib-0.2.5a28 → sycommon_python_lib-0.2.5a29}/src/sycommon/agent/deep_agent.py

@@ -153,6 +153,44 @@ def _patch_agent_streaming(agent):
         _handle_model_output = _hmo_cell.cell_contents
         _name = _name_cell.cell_contents if _name_cell is not None else None
 
+        def _clamp_max_tokens_for_model(model_, messages):
+            """在 raw_model 上执行 _clamp_max_tokens 逻辑。
+
+            由于 create_deep_agent 提取了 raw_model（绕过了 LLMWithTokenTracking 包装），
+            原本在 LLMWithTokenTracking._agenerate 中自动执行的 _clamp_max_tokens 被跳过，
+            导致 max_tokens 不随 input tokens 动态调整，当 input + max_output > context_window
+            时触发 400 错误。此函数补上这一逻辑。
+
+            注意：_get_bound_model 返回的可能是 _ChatModelBinding（RunnableBindingBase 子类），
+            需要通过 .bound 取到真正的 ChatOpenAI，否则 max_tokens 只设在 wrapper 上不生效。
+            """
+            from sycommon.config.LLMConfig import LLMConfig
+            from sycommon.config.Config import Config
+            from sycommon.llm.token_utils import clamp_max_tokens
+            try:
+                # 解包 binding wrapper，取到真正的 ChatModel
+                raw_model = getattr(model_, 'bound', model_)
+                llm_config = Config().get_llm_config(getattr(raw_model, 'model', None))
+                if not llm_config:
+                    return
+                llm_cfg = LLMConfig(**llm_config)
+                max_tokens_limit = getattr(llm_cfg, 'maxTokens', None)
+                if not max_tokens_limit:
+                    return
+                max_output = getattr(raw_model, 'max_tokens', None)
+                if not max_output:
+                    return
+                dynamic_max = clamp_max_tokens(
+                    raw_model, messages,
+                    context_window=max_tokens_limit,
+                    max_output_tokens=max_output,
+                )
+                SYLogger.debug(
+                    f"[StreamingPatch] clamp max_tokens: "
+                    f"context={max_tokens_limit}, max_output={max_output} → {dynamic_max}")
+            except Exception as e:
+                SYLogger.warning(f"[StreamingPatch] clamp max_tokens failed: {e}")
+
         async def _patched_execute_model_async(request):
             """替代 factory._execute_model_async: 用 astream + config 实现流式回调。"""
             from langchain.agents.middleware.types import ModelResponse
@@ -162,6 +200,9 @@ def _patch_agent_streaming(agent):
             if request.system_message:
                 messages = [request.system_message, *messages]
 
+            # 动态调整 max_tokens，防止 input + max_output 超过上下文窗口
+            _clamp_max_tokens_for_model(model_, messages)
+
             # 从 ContextVar 读取 LangGraph 注入的 config（含 StreamMessagesHandler）
             config = var_child_runnable_config.get()
 
@@ -278,7 +319,7 @@ class AgentConfig(BaseModel):
     debug: bool = False
 
     # Rubric 评分配置
-    rubric_max_iterations: int = 3  # rubric 评估最大迭代次数（0 = 不启用）
+    rubric_max_iterations: int = 0  # rubric 评估最大迭代次数（0 = 不启用，默认关闭）
 
     class Config:
         arbitrary_types_allowed = True

{sycommon_python_lib-0.2.5a28 → sycommon_python_lib-0.2.5a29}/src/sycommon/heartbeat_process/heartbeat_process_worker.py

@@ -30,7 +30,6 @@ from sycommon.heartbeat_process.heartbeat_config import (
     RabbitMQMonitorConfig,
     LogConfig
 )
-from sycommon.synacos.dns_cache import NacosDnsCache
 
 
 def _init_process_logger(log_config: Optional[LogConfig] = None):
@@ -115,10 +114,6 @@ class HeartbeatProcessWorker:
         self._nacos_heartbeat_thread: Optional[threading.Thread] = None
         self._nacos_alert_sent = False
         self._nacos_disconnect_count = 0
-        # DNS 缓存状态
-        self._dns_cache = NacosDnsCache.get_instance()
-        self._using_cached_ip: bool = False
-        self._original_server_list = None
 
         # RabbitMQ 监控状态
         self._rabbitmq_alert_sent = False
@@ -226,10 +221,6 @@ class HeartbeatProcessWorker:
                         f"Nacos 心跳成功，连续成功: {consecutive_success}次"
                     )
 
-                    # DNS 缓存：连续成功 3 次后，解析域名并缓存 IP
-                    if consecutive_success >= 3 and not self._using_cached_ip:
-                        self._apply_dns_cache()
-
                     # 恢复通知
                     if self._nacos_alert_sent and consecutive_success >= 1:
                         self._nacos_alert_sent = False
@@ -242,9 +233,6 @@ class HeartbeatProcessWorker:
                 else:
                     consecutive_success = 0
                     consecutive_fail += 1
-                    # DNS 缓存：失败时清除缓存并恢复域名
-                    if self._using_cached_ip:
-                        self._revert_dns_cache()
                     logger.warning(
                         f"Nacos 心跳失败，连续失败: {consecutive_fail}次"
                     )
@@ -253,9 +241,6 @@ class HeartbeatProcessWorker:
             except Exception as e:
                 consecutive_success = 0
                 consecutive_fail += 1
-                # DNS 缓存：异常时清除缓存并恢复域名
-                if self._using_cached_ip:
-                    self._revert_dns_cache()
                 logger.error(f"Nacos 心跳异常: {e}")
                 self._handle_nacos_failure(consecutive_fail)
 
@@ -355,60 +340,6 @@ class HeartbeatProcessWorker:
         except Exception as e:
             logger.error(f"发送 Nacos 告警失败: {e}")
 
-    # ── DNS 缓存方法 ─────────────────────────────────────
-
-    def _apply_dns_cache(self):
-        """连续成功 3 次后，将 Nacos 服务端域名解析为 IP 并替换 server_list。"""
-        if self.nacos_client is None:
-            return
-
-        # 备份原始 server_list
-        self._original_server_list = list(self.nacos_client.server_list)
-
-        new_server_list = []
-        changed = False
-        for host, port in self.nacos_client.server_list:
-            if NacosDnsCache.is_ip(host):
-                new_server_list.append((host, port))
-                continue
-            ip = self._dns_cache.resolve(host)
-            if ip:
-                self._dns_cache.cache_ip(host, ip)
-                new_server_list.append((ip, port))
-                changed = True
-                logger.info(f"DNS 缓存 - {host} -> {ip}")
-            else:
-                logger.warning(f"DNS 解析失败，保持域名: {host}")
-                new_server_list.append((host, port))
-
-        if changed:
-            with self.nacos_client.server_list_lock:
-                self.nacos_client.server_list = new_server_list
-                self.nacos_client.current_server = new_server_list[0]
-                self.nacos_client.server_offset = 0
-            self._using_cached_ip = True
-            logger.info(f"DNS 缓存已生效, server_list={new_server_list}")
-
-    def _revert_dns_cache(self):
-        """心跳失败时，恢复原始域名地址，清除 DNS 缓存。"""
-        if self._original_server_list is None:
-            return
-
-        if self.nacos_client is None:
-            return
-
-        # 清除 DNS 缓存条目
-        for host, _ in self._original_server_list:
-            self._dns_cache.invalidate(host)
-
-        # 恢复原始 server_list
-        with self.nacos_client.server_list_lock:
-            self.nacos_client.server_list = list(self._original_server_list)
-            self.nacos_client.current_server = self._original_server_list[0]
-            self.nacos_client.server_offset = 0
-        self._using_cached_ip = False
-        logger.info(f"DNS 缓存已清除, 恢复域名: {self._original_server_list}")
-
     def _run_rabbitmq_monitor(self):
         """运行 RabbitMQ 连接监控（asyncio 事件循环）
 

{sycommon_python_lib-0.2.5a28 → sycommon_python_lib-0.2.5a29}/src/sycommon/llm/llm_with_token_tracking.py

@@ -11,6 +11,7 @@ from langchain_core.language_models import BaseChatModel
 from pydantic import BaseModel, Field
 
 from sycommon.config.LLMConfig import LLMConfig
+from sycommon.llm.token_utils import clamp_max_tokens, count_messages_tokens
 from sycommon.llm.token_usage_mysql_service import TokenUsageMySQLService
 from sycommon.tools.merge_headers import get_header_value
 
@@ -109,64 +110,16 @@ class LLMWithTokenTracking(BaseChatModel):
             return
 
         try:
-            input_est = self._count_tokens(messages)
+            clamp_max_tokens(
+                self.llm, messages,
+                context_window=self.llmConfig.maxTokens,
+                max_output_tokens=max_output,
+            )
         except Exception:
             return
 
-        buffer = 8192
-        available = self.llmConfig.maxTokens - input_est - buffer
-        dynamic_max = min(max_output, max(available, 1024))
-        self.llm.max_tokens = dynamic_max
-
-    @staticmethod
-    def _count_tokens(messages) -> int:
-        """精确计算 messages 的 token 数
-
-        优先使用 tiktoken（OpenAI 兼容模型），否则回退到字符估算。
-        中文等非 ASCII 文本 chars_per_token 约 1.0-1.5，比英文 2.0-4.0 更密集。
-        """
-        total_chars = 0
-        for msg in messages:
-            content = getattr(msg, 'content', '')
-            if isinstance(content, str):
-                total_chars += len(content)
-            elif isinstance(content, list):
-                for part in content:
-                    if isinstance(part, str):
-                        total_chars += len(part)
-                    elif isinstance(part, dict):
-                        total_chars += len(str(part))
-
-        # 检查是否有高比例非 ASCII（中文/日文等）
-        sample = str(total_chars)
-        non_ascii = sum(1 for c in sample if ord(c) > 127)
-        ratio = non_ascii / max(len(sample), 1)
-
-        # 中文等语言 chars_per_token 约 1.5，英文约 4.0
-        chars_per_token = 1.5 if ratio > 0.3 else 3.5
-
-        # 尝试 tiktoken 精确计数
-        try:
-            import tiktoken
-            enc = tiktoken.get_encoding("cl100k_base")
-            token_count = 0
-            for msg in messages:
-                content = getattr(msg, 'content', '')
-                if isinstance(content, str):
-                    token_count += len(enc.encode(content))
-                elif isinstance(content, list):
-                    for part in content:
-                        if isinstance(part, str):
-                            token_count += len(enc.encode(part))
-                        elif isinstance(part, dict):
-                            token_count += len(enc.encode(str(part)))
-            # 加上消息格式开销（role、separator 等）
-            return token_count + len(messages) * 4
-        except Exception:
-            pass
-
-        # 回退：字符估算 + 每条消息 4 token 格式开销
-        return int(total_chars / chars_per_token) + len(messages) * 4
+    # 统一使用 token_utils.count_messages_tokens，保留静态方法作为兼容别名
+    _count_tokens = staticmethod(count_messages_tokens)
 
     def _generate(self, messages, stop=None, run_manager=None, **kwargs):
         """

sycommon_python_lib-0.2.5a29/src/sycommon/llm/token_utils.py

@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+"""
+Token 计数与 max_tokens 动态调整工具函数
+
+统一供 LLMWithTokenTracking、LLMWithAutoTokenUsage、DeepAgent 等模块使用，
+避免同一逻辑分散在多处。
+"""
+
+from __future__ import annotations
+
+from typing import List, Optional
+
+from langchain_core.messages import BaseMessage
+
+
+def count_messages_tokens(messages: List[BaseMessage]) -> int:
+    """精确计算 messages 的 token 数。
+
+    优先使用 tiktoken（cl100k_base 编码），否则回退到字符估算。
+    中文等非 ASCII 文本 chars_per_token 约 1.0-1.5，比英文 2.0-4.0 更密集。
+
+    Args:
+        messages: LangChain 消息列表。
+
+    Returns:
+        估算的 token 总数（含每条消息 4 token 格式开销）。
+    """
+    total_chars = 0
+    for msg in messages:
+        content = getattr(msg, 'content', '')
+        if isinstance(content, str):
+            total_chars += len(content)
+        elif isinstance(content, list):
+            for part in content:
+                if isinstance(part, str):
+                    total_chars += len(part)
+                elif isinstance(part, dict):
+                    total_chars += len(str(part))
+
+    # 尝试 tiktoken 精确计数
+    try:
+        import tiktoken
+        enc = tiktoken.get_encoding("cl100k_base")
+        token_count = 0
+        for msg in messages:
+            content = getattr(msg, 'content', '')
+            if isinstance(content, str):
+                token_count += len(enc.encode(content))
+            elif isinstance(content, list):
+                for part in content:
+                    if isinstance(part, str):
+                        token_count += len(enc.encode(part))
+                    elif isinstance(part, dict):
+                        token_count += len(enc.encode(str(part)))
+        return token_count + len(messages) * 4
+    except Exception:
+        pass
+
+    # 回退：字符估算（中文 1.5 chars/token，英文 3.5 chars/token）
+    non_ascii = sum(1 for c in str(total_chars) if ord(c) > 127)
+    ratio = non_ascii / max(len(str(total_chars)), 1)
+    chars_per_token = 1.5 if ratio > 0.3 else 3.5
+    return int(total_chars / chars_per_token) + len(messages) * 4
+
+
+def clamp_max_tokens(
+    model,
+    messages: List[BaseMessage],
+    *,
+    context_window: int,
+    max_output_tokens: int,
+    buffer: int = 8192,
+    min_output: int = 1024,
+) -> int:
+    """动态调整模型的 max_tokens，确保 input + max_output 不超过上下文窗口。
+
+    每次调用前根据当前 input tokens 精确计算可用空间，
+    将 model.max_tokens = min(max_output_tokens, context_window - input - buffer)，
+    最低保底 min_output。
+
+    Args:
+        model: 拥有 ``max_tokens`` 属性的 ChatModel 实例。
+        messages: 即将发送给模型的消息列表。
+        context_window: 模型上下文窗口大小（来自 LLMConfig.maxTokens）。
+        max_output_tokens: 配置的最大输出 token 数（来自 LLMConfig.maxOutputTokens）。
+        buffer: 保留的余量 token 数，默认 8192。
+        min_output: 最小输出 token 数保底值，默认 1024。
+
+    Returns:
+        调整后的 max_tokens 值。
+    """
+    input_est = count_messages_tokens(messages)
+    available = context_window - input_est - buffer
+    dynamic_max = min(max_output_tokens, max(available, min_output))
+    model.max_tokens = dynamic_max
+    return dynamic_max

{sycommon_python_lib-0.2.5a28 → sycommon_python_lib-0.2.5a29}/src/sycommon/llm/usage_token.py

@@ -21,6 +21,7 @@ from sycommon.config.LLMConfig import LLMConfig
 from sycommon.llm.struct_token import StructuredRunnableWithToken
 from sycommon.llm.output_fixing_runnable import OutputFixingRunnable
 from sycommon.llm.native_with_fallback_runnable import NativeWithFallbackRunnable
+from sycommon.llm.token_utils import clamp_max_tokens, count_messages_tokens
 
 
 class LLMWithAutoTokenUsage(BaseChatModel):
@@ -175,55 +176,16 @@ class LLMWithAutoTokenUsage(BaseChatModel):
             return
 
         try:
-            input_est = self._count_tokens(messages)
+            clamp_max_tokens(
+                self.llm, messages,
+                context_window=self.llmConfig.maxTokens,
+                max_output_tokens=max_output,
+            )
         except Exception:
             return
 
-        buffer = 8192
-        available = self.llmConfig.maxTokens - input_est - buffer
-        dynamic_max = min(max_output, max(available, 1024))
-        self.llm.max_tokens = dynamic_max
-
-    @staticmethod
-    def _count_tokens(messages) -> int:
-        """精确计算 messages 的 token 数"""
-        total_chars = 0
-        for msg in messages:
-            content = getattr(msg, 'content', '')
-            if isinstance(content, str):
-                total_chars += len(content)
-            elif isinstance(content, list):
-                for part in content:
-                    if isinstance(part, str):
-                        total_chars += len(part)
-                    elif isinstance(part, dict):
-                        total_chars += len(str(part))
-
-        # 尝试 tiktoken 精确计数
-        try:
-            import tiktoken
-            enc = tiktoken.get_encoding("cl100k_base")
-            token_count = 0
-            for msg in messages:
-                content = getattr(msg, 'content', '')
-                if isinstance(content, str):
-                    token_count += len(enc.encode(content))
-                elif isinstance(content, list):
-                    for part in content:
-                        if isinstance(part, str):
-                            token_count += len(enc.encode(part))
-                        elif isinstance(part, dict):
-                            token_count += len(enc.encode(str(part)))
-            return token_count + len(messages) * 4
-        except Exception:
-            pass
-
-        # 回退：字符估算（中文 1.5，英文 3.5）
-        sample = str(total_chars)
-        non_ascii = sum(1 for c in sample if ord(c) > 127)
-        ratio = non_ascii / max(len(sample), 1)
-        chars_per_token = 1.5 if ratio > 0.3 else 3.5
-        return int(total_chars / chars_per_token) + len(messages) * 4
+    # 统一使用 token_utils.count_messages_tokens，保留静态方法作为兼容别名
+    _count_tokens = staticmethod(count_messages_tokens)
 
     # ========== 实现BaseChatModel抽象方法 ==========
     def _generate(self, messages, stop=None, run_manager=None, **kwargs):

{sycommon_python_lib-0.2.5a28 → sycommon_python_lib-0.2.5a29}/src/sycommon/synacos/nacos_heartbeat_manager.py

@@ -2,7 +2,6 @@ import asyncio
 import threading
 import time
 from sycommon.logging.kafka_log import SYLogger
-from sycommon.synacos.dns_cache import NacosDnsCache
 from sycommon.synacos.nacos_client_base import NacosClientBase
 from sycommon.synacos.nacos_service_registration import NacosServiceRegistration
 
@@ -63,10 +62,6 @@ class NacosHeartbeatManager:
         self._alert_sent: bool = False
         self._disconnect_count: int = 0
         self._alert_fail_count: int = 0
-        # DNS 缓存状态
-        self._dns_cache = NacosDnsCache.get_instance()
-        self._using_cached_ip: bool = False
-        self._original_server_list = None  # 备份原始 (domain, port) 列表
 
     def start_heartbeat(self):
         """启动心跳线程（确保单例）"""
@@ -122,9 +117,6 @@ class NacosHeartbeatManager:
                         SYLogger.info(
                             f"nacos:心跳发送成功 - 间隔: {self.heartbeat_interval}秒, 连续成功: {consecutive_success}次"
                         )
-                        # DNS 缓存：连续成功 3 次后，解析域名并缓存 IP
-                        if consecutive_success >= 3 and not self._using_cached_ip:
-                            self._apply_dns_cache()
                         # 恢复后发送通知（心跳成功一次即恢复）
                         if self._alert_sent and consecutive_success >= 1:
                             SYLogger.info(f"nacos:检测恢复状态 - _alert_sent={self._alert_sent}, consecutive_success={consecutive_success}")
@@ -142,9 +134,6 @@ class NacosHeartbeatManager:
                         consecutive_success = 0  # 失败时重置连续成功计数
                         consecutive_fail += 1
                         self._heartbeat_fail_count += 1
-                        # DNS 缓存：失败时清除缓存并恢复域名
-                        if self._using_cached_ip:
-                            self._revert_dns_cache()
                         SYLogger.warning(
                             f"nacos:心跳发送失败 - 连续失败: {consecutive_fail}次"
                         )
@@ -175,9 +164,6 @@ class NacosHeartbeatManager:
                 consecutive_fail += 1
                 consecutive_success = 0  # 异常时重置连续成功计数
                 self._heartbeat_fail_count += 1
-                # DNS 缓存：异常时清除缓存并恢复域名
-                if self._using_cached_ip:
-                    self._revert_dns_cache()
                 SYLogger.error(
                     f"nacos:心跳异常: {str(e)}, 连续失败: {consecutive_fail}次")
 
@@ -257,59 +243,3 @@ class NacosHeartbeatManager:
         else:
             SYLogger.warning(f"nacos:心跳发送失败，Nacos返回: {result}")
             return False
-
-    # ── DNS 缓存方法 ─────────────────────────────────────
-
-    def _apply_dns_cache(self):
-        """连续成功 3 次后，将 Nacos 服务端域名解析为 IP 并替换 server_list。"""
-        nacos_client = self.client_base.nacos_client
-        if nacos_client is None:
-            return
-
-        # 备份原始 server_list
-        self._original_server_list = list(nacos_client.server_list)
-
-        new_server_list = []
-        changed = False
-        for host, port in nacos_client.server_list:
-            if NacosDnsCache.is_ip(host):
-                new_server_list.append((host, port))
-                continue
-            ip = self._dns_cache.resolve(host)
-            if ip:
-                self._dns_cache.cache_ip(host, ip)
-                new_server_list.append((ip, port))
-                changed = True
-                SYLogger.info(f"nacos:DNS 缓存 - {host} -> {ip}")
-            else:
-                SYLogger.warning(f"nacos:DNS 解析失败，保持域名: {host}")
-                new_server_list.append((host, port))
-
-        if changed:
-            with nacos_client.server_list_lock:
-                nacos_client.server_list = new_server_list
-                nacos_client.current_server = new_server_list[0]
-                nacos_client.server_offset = 0
-            self._using_cached_ip = True
-            SYLogger.info(f"nacos:DNS 缓存已生效, server_list={new_server_list}")
-
-    def _revert_dns_cache(self):
-        """心跳失败时，恢复原始域名地址，清除 DNS 缓存。"""
-        if self._original_server_list is None:
-            return
-
-        nacos_client = self.client_base.nacos_client
-        if nacos_client is None:
-            return
-
-        # 清除 DNS 缓存条目
-        for host, _ in self._original_server_list:
-            self._dns_cache.invalidate(host)
-
-        # 恢复原始 server_list
-        with nacos_client.server_list_lock:
-            nacos_client.server_list = list(self._original_server_list)
-            nacos_client.current_server = self._original_server_list[0]
-            nacos_client.server_offset = 0
-        self._using_cached_ip = False
-        SYLogger.info(f"nacos:DNS 缓存已清除, 恢复域名: {self._original_server_list}")

{sycommon_python_lib-0.2.5a28 → sycommon_python_lib-0.2.5a29}/src/sycommon_python_lib.egg-info/PKG-INFO

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

{sycommon_python_lib-0.2.5a28 → sycommon_python_lib-0.2.5a29}/src/sycommon_python_lib.egg-info/SOURCES.txt

@@ -191,6 +191,7 @@ src/sycommon/llm/struct_token.py
 src/sycommon/llm/sy_langfuse.py
 src/sycommon/llm/token_usage_es_service.py
 src/sycommon/llm/token_usage_mysql_service.py
+src/sycommon/llm/token_utils.py
 src/sycommon/llm/usage_token.py
 src/sycommon/llm/tiktoken_cache/9b5ad71b2ce5302211f9c61530b329a4922fc6a4
 src/sycommon/llm/tiktoken_cache/fb374d419588a4632f3f557e76b4b70aebbca790
@@ -246,7 +247,6 @@ src/sycommon/sse/__init__.py
 src/sycommon/sse/event.py
 src/sycommon/sse/sse.py
 src/sycommon/synacos/__init__.py
-src/sycommon/synacos/dns_cache.py
 src/sycommon/synacos/example.py
 src/sycommon/synacos/example2.py
 src/sycommon/synacos/feign.py

sycommon_python_lib-0.2.5a28/src/sycommon/synacos/dns_cache.py

@@ -1,67 +0,0 @@
-"""Nacos 服务端地址 DNS 缓存模块。
-
-心跳连续成功 3 次后缓存域名解析结果，避免后续每次心跳都做 DNS 解析。
-心跳失败时清除缓存，重新走域名解析，再次连续成功 3 次后重新缓存。
-"""
-import socket
-import threading
-from typing import Dict, Optional
-
-
-class NacosDnsCache:
-    """线程安全的 Nacos 服务端地址 DNS 缓存（单例）。"""
-
-    _instance = None
-    _init_lock = threading.Lock()
-
-    def __init__(self):
-        self._cache: Dict[str, str] = {}  # domain -> resolved IP
-        self._lock = threading.Lock()
-
-    @classmethod
-    def get_instance(cls) -> "NacosDnsCache":
-        if cls._instance is None:
-            with cls._init_lock:
-                if cls._instance is None:
-                    cls._instance = cls()
-        return cls._instance
-
-    # ── 公共方法 ──────────────────────────────────────────
-
-    def resolve(self, hostname: str) -> Optional[str]:
-        """将域名解析为 IP 地址，失败返回 None。已为 IP 的直接返回。"""
-        if self.is_ip(hostname):
-            return hostname
-        try:
-            return socket.gethostbyname(hostname)
-        except (socket.gaierror, socket.herror, OSError):
-            return None
-
-    def cache_ip(self, domain: str, ip: str):
-        """显式缓存 domain -> IP 映射。"""
-        with self._lock:
-            self._cache[domain] = ip
-
-    def get_cached(self, domain: str) -> Optional[str]:
-        """返回缓存的 IP，无缓存返回 None。"""
-        with self._lock:
-            return self._cache.get(domain)
-
-    def invalidate(self, domain: str):
-        """删除指定域名的缓存条目。"""
-        with self._lock:
-            self._cache.pop(domain, None)
-
-    def clear(self):
-        """清空所有缓存。"""
-        with self._lock:
-            self._cache.clear()
-
-    @staticmethod
-    def is_ip(addr: str) -> bool:
-        """判断 addr 是否已是 IP 地址（IPv4），跳过解析。"""
-        try:
-            socket.inet_aton(addr)
-            return True
-        except (socket.error, OSError):
-            return False