kaq-quant-common 0.2.1__tar.gz → 0.2.3__tar.gz

{kaq_quant_common-0.2.1 → kaq_quant_common-0.2.3}/PKG-INFO

@@ -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 → kaq_quant_common-0.2.3}/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-0.2.1 → kaq_quant_common-0.2.3}/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 → kaq_quant_common-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kaq_quant_common"
-version = "0.2.1"
+version = "0.2.3"
 description = ""
 authors = [
     {name = "kevinfuture",email = "liuenbofuture@foxmail.com"}