kaq-quant-common 0.1.85__py3-none-any.whl → 0.1.87__py3-none-any.whl

kaq_quant_common/api/rest/instruction/instruction_server_base.py

@@ -9,13 +9,16 @@ from kaq_quant_common.api.rest.instruction.helper.order_helper import \
 from kaq_quant_common.api.rest.instruction.models import \
     InstructionResponseBase
 from kaq_quant_common.api.rest.instruction.models.account import (
-    ContractBalanceRequest, ContractBalanceResponse)
+    AccountIncomeRequest, AccountIncomeResponse, ContractBalanceRequest,
+    ContractBalanceResponse)
 from kaq_quant_common.api.rest.instruction.models.order import (
     AllOpenOrdersRequest, AllOpenOrdersResponse, CancelOrderRequest,
     CancelOrderResponse, ChangeLeverageRequest, ChangeLeverageResponse,
     LimitOrderBookRequest, LimitOrderBookResponse, ModifyOrderRequest,
     ModifyOrderResponse, OrderRequest, OrderResponse, QuerySymbolConfigRequest,
     QuerySymbolConfigResponse)
+from kaq_quant_common.api.rest.instruction.models.position import (
+    QueryOpenInterestRequest, QueryOpenInterestResponse)
 from kaq_quant_common.api.rest.instruction.models.transfer import (
     TransferRequest, TransferResponse)
 from kaq_quant_common.resources.kaq_mysql_resources import \
@@ -93,6 +96,16 @@ class InstructionServerBase(ApiServerBase, ApiInterface, ABC):
     @api_method(LimitOrderBookRequest, LimitOrderBookResponse)
     def get_limit_order(self, request: LimitOrderBookRequest) -> LimitOrderBookResponse:
         return self._on_get_limit_order(request)
+    
+    # 查询账户损益资金流水
+    @api_method(AccountIncomeRequest, AccountIncomeResponse)
+    def get_account_income(self, request: AccountIncomeRequest) -> AccountIncomeResponse:
+        return self._on_get_account_income(request)
+    
+    # 查询未平仓合约数量
+    @api_method(QueryOpenInterestRequest, QueryOpenInterestResponse)
+    def query_open_interest(self, request: QueryOpenInterestRequest) -> QueryOpenInterestResponse:
+        return self._on_query_open_interest(request)
 
     # ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ abstract methods
 
@@ -130,4 +143,12 @@ class InstructionServerBase(ApiServerBase, ApiInterface, ABC):
 
     @abstractmethod
     def _on_get_limit_order(self, request: LimitOrderBookRequest) -> LimitOrderBookResponse:
+        pass
+
+    @abstractmethod
+    def _on_get_account_income(self, request: AccountIncomeRequest) -> AccountIncomeResponse:
+        pass
+
+    @abstractmethod
+    def _on_query_open_interest(self, request: QueryOpenInterestRequest) -> QueryOpenInterestResponse:
         pass

kaq_quant_common/api/rest/instruction/models/account.py

@@ -1,3 +1,4 @@
+from enum import Enum
 from typing import Optional
 
 from pydantic import BaseModel
@@ -22,3 +23,27 @@ class ContractBalanceRequest(InstructionRequestBase):
 class ContractBalanceResponse(InstructionResponseBase):
     #
     assets: list[AssetsInfo]
+
+
+# ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ 查询账户损益资金流水
+class AccountIncomeInfo(BaseModel):
+    symbol: str
+    incomeType: int
+    income: float
+    time: int
+    subType: Optional[str] = None
+
+
+class AccountIncomeRequest(InstructionRequestBase):
+    # 交易对
+    symbol: Optional[str] = None
+    # 收益类型
+    incomeType: Optional[int] = None
+    # 起始时间
+    startTime: Optional[int] = None
+    # 结束时间
+    endTime: Optional[int] = None
+
+
+class AccountIncomeResponse(InstructionResponseBase):
+    income_list: list[AccountIncomeInfo]

kaq_quant_common/api/rest/instruction/models/position.py

@@ -54,3 +54,17 @@ class QueryPositionRequest(InstructionRequestBase):
 class QueryPositionResponse(InstructionResponseBase):
     #
     positions: list[PositionInfo]
+
+
+# ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ 查询未平仓合约数
+class QueryOpenInterestRequest(InstructionRequestBase):
+    # 交易对
+    symbol: str
+
+class QueryOpenInterestResponse(InstructionResponseBase):
+    # 交易对
+    symbol: str
+    # 未平仓合约数量(币)
+    open_interest: float
+    # 时间
+    time: int

kaq_quant_common/resources/kaq_mysql_resources.py

@@ -2,7 +2,7 @@ import os
 import threading
 import time
 import traceback
-from datetime import datetime
+import datetime
 
 import numpy as np
 import pandas as pd
@@ -102,8 +102,13 @@ class KaqQuantMysqlRepository:
         # 从连接池获取连接
         session = self.session_maker()
         try:
-            time_str = time.strftime("%Y_%m_%d_%H_%M", time.localtime(time.time()))
-            sql = f"RENAME TABLE {table_name} TO {table_name}_{time_str};"
+            # 1. 计算上周一的日期字符串
+            today = datetime.date.today()
+            # 2. 先计算本周一，再减去 7 天
+            last_monday = today - datetime.timedelta(days=today.weekday(), weeks=1)
+            # 3. 格式化
+            last_monday_str = last_monday.strftime('%Y%m%d')
+            sql = f"RENAME TABLE {table_name} TO {table_name}_{last_monday_str};"
             session.execute(text(sql))
             return True
         except Exception as e:

{kaq_quant_common-0.1.85.dist-info → kaq_quant_common-0.1.87.dist-info}/METADATA

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

{kaq_quant_common-0.1.85.dist-info → kaq_quant_common-0.1.87.dist-info}/RECORD

@@ -8,11 +8,11 @@ kaq_quant_common/api/rest/api_client_base.py,sha256=LYpqjjVGbVRVyP8qdmlgMelUtEY-
 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/instruction_client.py,sha256=CI5RidyBN51qxq3NKNMIJGs3boCIt-EYN5bnn12ywIo,3489
-kaq_quant_common/api/rest/instruction/instruction_server_base.py,sha256=uKE0O_x3hC3595YCFbIZ2CDnmsk6V7b0dQ4J-5lvbI0,5279
+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
-kaq_quant_common/api/rest/instruction/models/account.py,sha256=3rdsEnEqaHWjQ3yHMZ4pOupfHqHMRZ_W5kxIxuRQoac,632
+kaq_quant_common/api/rest/instruction/models/account.py,sha256=Lj12EvWNxEt7k9dAKSsFhTJDmLX553duMRa5NroJW30,1375
 kaq_quant_common/api/rest/instruction/models/order.py,sha256=F941DPXlbsklpc8jHLaJ2nQZiUmjPt0zyL_bagijSzI,6847
-kaq_quant_common/api/rest/instruction/models/position.py,sha256=PGyZg_z4ZIB09BWl1uRtmePz8T3mzgrHSgpdN0ZKRzA,1268
+kaq_quant_common/api/rest/instruction/models/position.py,sha256=OqtfWWcpGhbijJbwJqERkeFxPiIkzdBnhPx5CfXj8W0,1744
 kaq_quant_common/api/rest/instruction/models/transfer.py,sha256=htjk4hb9THUZP4REW5gtyPdo850jHPtHPWFLPA2ERzo,775
 kaq_quant_common/api/ws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kaq_quant_common/api/ws/exchange/models.py,sha256=RPD5cDRQyISguTjO5Si1V5hJza8Uyr4u2EZEHNFtLb8,664
@@ -43,7 +43,7 @@ kaq_quant_common/resources/kaq_ddb_stream_init_resources.py,sha256=0FY0cmqedrLSY
 kaq_quant_common/resources/kaq_ddb_stream_read_resources.py,sha256=yqeruZELmxAKjVsdnZ7ieAeV3Wt7KpFYJdt8Vn_Y_qA,3163
 kaq_quant_common/resources/kaq_ddb_stream_write_resources.py,sha256=pebBaDypkY6Mn--Od5Wh1_ZfHewbQH3ce_JsfiWsyl4,4139
 kaq_quant_common/resources/kaq_mysql_init_resources.py,sha256=UcqWey6LgoMqvLq1SxK33nS6-rkViGYhzUPxcrucOks,827
-kaq_quant_common/resources/kaq_mysql_resources.py,sha256=j-rvzWs_AMCijj2H_4IPLXFVzS0BTb3x2qVfak7O_lA,13224
+kaq_quant_common/resources/kaq_mysql_resources.py,sha256=UYBFn-o_fFaNwG6bT2E7CYdsns82EmR4ve2XgC9wFJw,13452
 kaq_quant_common/resources/kaq_postgresql_resources.py,sha256=iG1eYkciI0xUIBdEpGqKGOLBFxvVrfbBoTuaOmhQ0v0,1762
 kaq_quant_common/resources/kaq_quant_hive_resources.py,sha256=r114aeRzWkp6ReFPOkNOImY4o3AFQNomdVkivdOD13Y,3438
 kaq_quant_common/resources/kaq_redis_resources.py,sha256=MFBdl0v6ehbtUVhQw0XzH_DmpxNTfjWqlOG210NWYAo,4480
@@ -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.1.85.dist-info/METADATA,sha256=VNPjNY7SWi_wUJxYNOWGOr9zGBDeg2QW7_KO7pdeH-4,1971
-kaq_quant_common-0.1.85.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-kaq_quant_common-0.1.85.dist-info/RECORD,,
+kaq_quant_common-0.1.87.dist-info/METADATA,sha256=7KulEJup2yRnNfueQSSHIWho0V7p457sRCur6WeJxh0,1971
+kaq_quant_common-0.1.87.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+kaq_quant_common-0.1.87.dist-info/RECORD,,