sycommon-python-lib 0.2.1b9__tar.gz → 0.2.1b10__tar.gz

{sycommon_python_lib-0.2.1b9 → sycommon_python_lib-0.2.1b10}/PKG-INFO

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

{sycommon_python_lib-0.2.1b9 → sycommon_python_lib-0.2.1b10}/pyproject.toml

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

{sycommon_python_lib-0.2.1b9 → sycommon_python_lib-0.2.1b10}/src/sycommon/llm/token_usage_mysql_service.py

@@ -17,7 +17,7 @@ from collections import defaultdict
 from datetime import datetime, date
 from typing import Optional, Dict, Any, List
 
-from sqlalchemy import select, text
+from sqlalchemy import select
 from sqlalchemy.dialects.mysql import insert
 
 from sycommon.config.Config import SingletonMeta, Config
@@ -71,6 +71,16 @@ class _TokenBuffer:
             self._buffer.clear()
         return data
 
+    def put_back(self, data: Dict[tuple, Dict[str, Any]]):
+        """将一批数据批量放回缓冲区（线程安全，仅一次加锁）"""
+        with self._lock:
+            for key, entry in data.items():
+                if key in self._buffer:
+                    self._buffer[key]["input_tokens"] += entry["input_tokens"]
+                    self._buffer[key]["output_tokens"] += entry["output_tokens"]
+                else:
+                    self._buffer[key] = entry.copy()
+
     @property
     def size(self) -> int:
         with self._lock:
@@ -87,7 +97,6 @@ class TokenUsageMySQLService(metaclass=SingletonMeta):
     """
 
     _initialized: bool = False
-    _table_ensured: bool = False
     _db_service: Optional[TokenUsageDBService] = None
     _service_name: Optional[str] = None
     _system_env: Optional[str] = None
@@ -95,12 +104,17 @@ class TokenUsageMySQLService(metaclass=SingletonMeta):
     # 内存聚合
     _buffer: _TokenBuffer = _TokenBuffer()
     _flush_interval: float = 5.0  # 刷盘间隔（秒）
-    _flush_threshold: int = 200   # 缓冲区条目阈值
+    _flush_threshold: int = 200   # 缓冲区条目阈值（预留，暂未使用）
     _flush_timeout: float = 10.0  # 单次刷盘超时（秒）
     _flush_thread: Optional[threading.Thread] = None
     _flush_loop_event: Optional[asyncio.AbstractEventLoop] = None
     _init_lock = threading.Lock()
 
+    # 连续失败降频：连续 flush 失败时自动拉长间隔，最大 60 秒
+    _consecutive_failures: int = 0
+    _MAX_BACKOFF_INTERVAL: float = 60.0
+    _MAX_BACKOFF_EXPONENT: int = 4  # 2^4=16, 16*5=80s > 60s, 更大无意义
+
     def __init__(self):
         pass
 
@@ -179,10 +193,16 @@ class TokenUsageMySQLService(metaclass=SingletonMeta):
 
     @classmethod
     async def _flush_loop(cls):
-        """定时刷盘循环"""
+        """定时刷盘循环（连续失败时自动降频）"""
         while cls._initialized:
             try:
-                await asyncio.sleep(cls._flush_interval)
+                # 动态间隔：连续失败时指数退避，上限 60s
+                exponent = min(cls._consecutive_failures, cls._MAX_BACKOFF_EXPONENT)
+                interval = min(
+                    cls._flush_interval * (2 ** exponent),
+                    cls._MAX_BACKOFF_INTERVAL
+                )
+                await asyncio.sleep(interval)
                 await cls._flush_to_db()
             except asyncio.CancelledError:
                 # 关闭时刷盘一次
@@ -209,8 +229,6 @@ class TokenUsageMySQLService(metaclass=SingletonMeta):
             logging.warning("TokenUsageMySQLService: DB 未就绪，丢弃缓冲区数据")
             return 0
 
-        await cls._ensure_table()
-
         count = 0
         try:
             async with asyncio.timeout(cls._flush_timeout):
@@ -248,53 +266,32 @@ class TokenUsageMySQLService(metaclass=SingletonMeta):
                         except Exception as e:
                             logging.error(f"Token 刷盘写入失败 key={key}: {e}", exc_info=True)
 
+            # 成功：重置连续失败计数
+            cls._consecutive_failures = 0
+
         except TimeoutError:
-            logging.warning(f"Token 刷盘超时（{cls._flush_timeout}s），丢弃 {len(data)} 条数据")
+            cls._consecutive_failures += 1
+            # 将失败的数据批量放回缓冲区（一次加锁），下次 flush 重试
+            cls._buffer.put_back(data)
+            exponent = min(cls._consecutive_failures, cls._MAX_BACKOFF_EXPONENT)
+            next_interval = min(
+                cls._flush_interval * (2 ** exponent),
+                cls._MAX_BACKOFF_INTERVAL
+            )
+            logging.warning(
+                f"Token 刷盘超时（{cls._flush_timeout}s），{len(data)} 条数据退回缓冲区"
+                f"（连续失败 {cls._consecutive_failures} 次，下次间隔 {next_interval:.0f}s）"
+            )
         except Exception as e:
-            logging.error(f"Token 刷盘异常: {e}", exc_info=True)
+            cls._consecutive_failures += 1
+            # 将失败的数据批量放回缓冲区（一次加锁），下次 flush 重试
+            cls._buffer.put_back(data)
+            logging.error(f"Token 刷盘异常: {e}（连续失败 {cls._consecutive_failures} 次，数据已退回缓冲区）", exc_info=True)
 
         if count > 0:
             logging.debug(f"Token 刷盘完成: {count} 条")
         return count
 
-    @classmethod
-    async def _ensure_table(cls):
-        """确保表存在"""
-        if cls._table_ensured:
-            return
-
-        if not cls._db_service:
-            return
-
-        try:
-            async with cls._db_service.session() as session:
-                await session.execute(text(f"""
-                    CREATE TABLE IF NOT EXISTS token_usage_daily (
-                        id INT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
-                        user_id VARCHAR(128) NULL COMMENT '用户ID',
-                        tenant_id VARCHAR(128) NULL COMMENT '租户ID',
-                        service_name VARCHAR(128) NULL COMMENT '服务名称',
-                        system_env VARCHAR(128) NULL COMMENT '系统环境',
-                        input_tokens INT DEFAULT 0 COMMENT '输入token数',
-                        output_tokens INT DEFAULT 0 COMMENT '输出token数',
-                        total_tokens INT DEFAULT 0 COMMENT '总token数',
-                        model VARCHAR(128) NULL COMMENT '最近使用的模型',
-                        usage_date DATE NOT NULL COMMENT '使用日期',
-                        created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                        updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-                        UNIQUE KEY uniq_user_service_env_date (user_id, service_name, system_env, usage_date),
-                        INDEX idx_user_id (user_id),
-                        INDEX idx_service_name (service_name),
-                        INDEX idx_tenant_id (tenant_id),
-                        INDEX idx_usage_date (usage_date),
-                        INDEX idx_system_env (system_env)
-                    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Token使用量日统计表'
-                """))
-                cls._table_ensured = True
-                logging.info("MySQL 表 token_usage_daily 确认存在")
-        except Exception as e:
-            logging.error(f"创建 MySQL 表失败: {e}", exc_info=True)
-
     # ─── 写入接口（写入内存，不直接写 DB） ───
 
     @classmethod

{sycommon_python_lib-0.2.1b9 → sycommon_python_lib-0.2.1b10}/src/sycommon_python_lib.egg-info/PKG-INFO

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