mdbq 4.0.109__py3-none-any.whl → 4.0.110__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.109'
+VERSION = '4.0.110'

mdbq/redis/redis_cache.py

@@ -16,6 +16,8 @@ import time
 import threading
 import socket
 from datetime import datetime, date
+from decimal import Decimal
+from uuid import UUID
 from typing import Optional, Dict, Any, List, Union
 import redis
 from mdbq.log import mylogger
@@ -32,13 +34,42 @@ logger = mylogger.MyLogger(
 )
 
 
-class DateTimeEncoder(json.JSONEncoder):
-    """自定义JSON编码器，支持datetime和date对象"""
+class MySQLDataEncoder(json.JSONEncoder):
+    """自定义JSON编码器，支持MySQL常见数据类型"""
     def default(self, obj):
-        if isinstance(obj, datetime):
-            return obj.isoformat()
-        elif isinstance(obj, date):
-            return obj.isoformat()
+        try:
+            if isinstance(obj, datetime):
+                return obj.isoformat()
+            elif isinstance(obj, date):
+                return obj.isoformat()
+            elif isinstance(obj, Decimal):
+                # Decimal转换为字符串保持精度
+                return str(obj)
+            elif isinstance(obj, UUID):
+                return str(obj)
+            elif isinstance(obj, bytes):
+                # 二进制数据转换为base64
+                import base64
+                return base64.b64encode(obj).decode('utf-8')
+            elif isinstance(obj, (set, frozenset)):
+                # 集合类型转换为列表
+                return list(obj)
+            elif hasattr(obj, 'isoformat'):
+                # 其他日期时间类型
+                return obj.isoformat()
+            elif hasattr(obj, '__float__'):
+                # 数值类型
+                return float(obj)
+            elif hasattr(obj, '__str__'):
+                # 其他有字符串表示的对象
+                return str(obj)
+            elif hasattr(obj, '__dict__'):
+                # 处理其他对象，转换为字典
+                return obj.__dict__
+        except Exception as e:
+            # 如果所有方法都失败，返回对象的字符串表示
+            return f"<{type(obj).__name__}: {str(obj)[:100]}>"
+        
         return super().default(obj)
 
 
@@ -268,7 +299,7 @@ class SmartCacheSystem:
             
             # 序列化值
             if isinstance(value, (dict, list, tuple)):
-                serialized_value = json.dumps(value, ensure_ascii=False, sort_keys=True, cls=DateTimeEncoder)
+                serialized_value = json.dumps(value, ensure_ascii=False, sort_keys=True, cls=MySQLDataEncoder)
             else:
                 serialized_value = str(value)
             
@@ -481,7 +512,7 @@ class SmartCacheSystem:
                         stats_data['ops_per_second'],
                         stats_data['unique_keys_count'],
                         stats_data['uptime_seconds'],
-                        json.dumps(stats_data['hot_keys'], ensure_ascii=False, cls=DateTimeEncoder),
+                        json.dumps(stats_data['hot_keys'], ensure_ascii=False, cls=MySQLDataEncoder),
                         socket.gethostname(),
                         self.instance_name
                     ))

{mdbq-4.0.109.dist-info → mdbq-4.0.110.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 4.0.109
+Version: 4.0.110
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-4.0.109.dist-info → mdbq-4.0.110.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=isMXV0CRhxtt0uFUp2iQA8kCLhOxtlSnZABiy7X6FW8,19
+mdbq/__version__.py,sha256=iklgoo0dwUOPXd5UdfLVLjIut4R-avmlkGfuFD8UJGs,19
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
 mdbq/auth/auth_backend.py,sha256=ZxKRXPXa2t9ngRZEXKM72MzcMvN-0OtiVDOhZRTrm3w,85948
 mdbq/auth/rate_limiter.py,sha256=1m_Paxp8pDNpmyoFGRpFMVOJpbmeIvfVcfiQ2oH72qM,32850
@@ -26,7 +26,7 @@ mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,239
 mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
-mdbq/redis/redis_cache.py,sha256=C1AsTi0oaQeq4t-hSx11b-1ZN7NXmRLsTlrjZ8KuhOw,25772
+mdbq/redis/redis_cache.py,sha256=vu0eJ063iXngm_C1h6NAkaYS69PSDT7gjjJed006hIc,27044
 mdbq/route/__init__.py,sha256=BT_dAY7V-U2o72bevq1B9Mq9QA7GodwtkxyLNdGaoE8,22
 mdbq/route/analytics.py,sha256=dngj5hVwKddEUy59nSYbOoJ9C7OVrtCmCkvW6Uj9RYM,28097
 mdbq/route/monitor.py,sha256=7gLyeq7TqnbhPwhUw0dg-hw9-0OWeKoMdMhcANSDGVs,42255
@@ -34,7 +34,7 @@ mdbq/route/routes.py,sha256=QVGfTvDgu0CpcKCvk1ra74H8uojgqTLUav1fnVAqLEA,29433
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
 mdbq/selenium/get_driver.py,sha256=1NTlVUE6QsyjTrVVVqTO2LOnYf578ccFWlWnvIXGtic,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.0.109.dist-info/METADATA,sha256=lQkQNnJ-hH1d8H6y4RDz0tmbzH41ZH0J8qWNEa_YZCk,365
-mdbq-4.0.109.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.109.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.109.dist-info/RECORD,,
+mdbq-4.0.110.dist-info/METADATA,sha256=SExR69CN7vO5WwGP6xGeE6HxE5Uw-VoB2CFoUs0hZu8,365
+mdbq-4.0.110.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.110.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.110.dist-info/RECORD,,