kaq-quant-common 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

kaq_quant_common/api/rest/instruction/helper/order_helper.py

@@ -88,6 +88,19 @@ class OrderHelper:
         redis = self._server._redis
         if redis is None:
             return
+        
+        # 先从 redis 读取现有的 position 数据，获取 funding_rate_records 字段
+        funding_rate_records = None
+        try:
+            existing_position_json = redis.client.hget(self._redis_key_position, position_id)
+            if existing_position_json:
+                existing_position = json.loads(existing_position_json)
+                if existing_position and "funding_rate_records" in existing_position:
+                    funding_rate_records = existing_position.get("funding_rate_records")
+        except Exception as e:
+            # 读取失败不影响后续流程，记录日志
+            self._logger.warning(f"Failed to get funding_rate_records for position {position_id}: {e}")
+        
         data = {
             "id": position_id,
             "exchange": exchange,
@@ -107,6 +120,11 @@ class OrderHelper:
             "close_time": close_time,
             "status": PositionStatus.CLOSE.value,
         }
+        
+        # 如果存在 funding_rate_records，添加到 data 中
+        if funding_rate_records is not None:
+            data["funding_rate_records"] = funding_rate_records
+        
         redis.client.hdel(self._redis_key_position, position_id)
         redis.client.rpush(self._redis_key_position_history, json.dumps(data))
 

kaq_quant_common/resources/kaq_ddb_stream_write_resources.py

@@ -94,7 +94,9 @@ class KaqQuantDdbStreamWriteRepository:
         for row in arr:
             parts = []
             for i, v in enumerate(row):
-                if i in str_idx:
+                if v is None or pd.isna(v):
+                    parts.append("NULL")
+                elif i in str_idx:
                     parts.append(f"'{v}'")   # 直接拼接最快
                 else:
                     parts.append(str(v))

{kaq_quant_common-0.2.1.dist-info → kaq_quant_common-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaq_quant_common
-Version: 0.2.1
+Version: 0.2.3
 Summary: 
 Author: kevinfuture
 Author-email: liuenbofuture@foxmail.com

{kaq_quant_common-0.2.1.dist-info → kaq_quant_common-0.2.3.dist-info}/RECORD

@@ -6,7 +6,7 @@ kaq_quant_common/api/common/auth.py,sha256=XqirJRL4D01YfSrBY4hyugw-Op6OJveNE--An
 kaq_quant_common/api/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kaq_quant_common/api/rest/api_client_base.py,sha256=LYpqjjVGbVRVyP8qdmlgMelUtEY-jGA0JlMJy9d1r4w,1673
 kaq_quant_common/api/rest/api_server_base.py,sha256=URrvzerHIE6XQLERYFcFH1ftLbCYTz3sENAxFD0HWY0,4653
-kaq_quant_common/api/rest/instruction/helper/order_helper.py,sha256=q2opRLHrysvgqoFpAC70WNQpFJsbviHqjRldXj6tiMY,12267
+kaq_quant_common/api/rest/instruction/helper/order_helper.py,sha256=eZ-iEZ7HegHYkqpflwKicbdLlp12gcV2wEtBVNLMBiQ,13195
 kaq_quant_common/api/rest/instruction/instruction_client.py,sha256=NwTEypC4eajGq8oWIgvKSbIAO-KMPH4jQ-7J2b9iN4g,4037
 kaq_quant_common/api/rest/instruction/instruction_server_base.py,sha256=pq1wghAlgtm10aWz70-x1OAqtoRH3lBu-HsIuVRHkqY,6223
 kaq_quant_common/api/rest/instruction/models/__init__.py,sha256=fx5pnfcf9L5KvAqhsQBZkl9fUf9oABuroLGZqDNycpc,312
@@ -41,7 +41,7 @@ kaq_quant_common/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 kaq_quant_common/resources/kaq_ddb_pool_stream_read_resources.py,sha256=Y-rtGpBF3bNh2mPZ2Lze6D9JZnpkqh24OEh7okikh1w,2536
 kaq_quant_common/resources/kaq_ddb_stream_init_resources.py,sha256=0MxxbajocTFzcRD344rfZQPKOwwuqCbyoT6dQpIox-o,3349
 kaq_quant_common/resources/kaq_ddb_stream_read_resources.py,sha256=WShsXMoL8o-JZvrtAd7H2Cg-vrE47QbsdGgURaQwiZs,3165
-kaq_quant_common/resources/kaq_ddb_stream_write_resources.py,sha256=1ngYODoBPV9906oWsW6T4rH1xeVsfPiqhxsg3Md9b04,12551
+kaq_quant_common/resources/kaq_ddb_stream_write_resources.py,sha256=_-bNnxnG5I98JOlV46FYXlYoJRkzlMzWREHUonornF4,12638
 kaq_quant_common/resources/kaq_mysql_init_resources.py,sha256=UcqWey6LgoMqvLq1SxK33nS6-rkViGYhzUPxcrucOks,827
 kaq_quant_common/resources/kaq_mysql_resources.py,sha256=282jpXvYlEQNx-hicYTNBHDii85KYgN7BQQSMS9aPFM,13211
 kaq_quant_common/resources/kaq_postgresql_resources.py,sha256=iG1eYkciI0xUIBdEpGqKGOLBFxvVrfbBoTuaOmhQ0v0,1762
@@ -61,6 +61,6 @@ kaq_quant_common/utils/signal_utils.py,sha256=zBSyEltNTKqkQCsrETd47kEBb3Q_OWUBUn
 kaq_quant_common/utils/sqlite_utils.py,sha256=UDDFKfwL0N-jFifl40HdyOCENh2YQfW5so6hRaSJpv0,5722
 kaq_quant_common/utils/uuid_utils.py,sha256=pm_pnXpd8n9CI66x3A20cOEUiriJyqHaKGCeLrgkBxU,71
 kaq_quant_common/utils/yml_utils.py,sha256=gcKjb_-uuUajBGAl5QBPIZTg2wXm7qeeJvtHflj_zOE,4513
-kaq_quant_common-0.2.1.dist-info/METADATA,sha256=BQR0H2Zhcjyow-c0bEgxlkTrbuR7FEh7I8HJmTszrqk,1970
-kaq_quant_common-0.2.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-kaq_quant_common-0.2.1.dist-info/RECORD,,
+kaq_quant_common-0.2.3.dist-info/METADATA,sha256=wk6Okdv4qKVJxUnM54tR6sTtw4zMR2Qicwv5NZOXsXk,1970
+kaq_quant_common-0.2.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+kaq_quant_common-0.2.3.dist-info/RECORD,,