hyperquant 0.76__py3-none-any.whl → 0.78__py3-none-any.whl

hyperquant/broker/bitget.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
+import asyncio
 import logging
+import uuid
 from typing import Any, Literal
 
 import pybotters
@@ -31,7 +33,9 @@ class Bitget:
         self.ws_url = ws_url or "wss://ws.bitget.com/v2/ws/public"
         self.ws_url_private = ws_url or "wss://ws.bitget.com/v2/ws/private"
 
-        self._ws_app = None
+        self.ws_app = None
+        self.has_sub_personal = False
+  
 
     async def __aenter__(self) -> "Bitget":
         await self.update("detail")
@@ -53,11 +57,13 @@ class Bitget:
                 {"instType": "USDT-FUTURES", "channel": "account", "coin": "default"},
             ],
         }
-        self.client.ws_connect(
-            self.ws_url_private,
-            send_json=sub_msg,
-            hdlr_json=self.store.onmessage,
-        )
+        self.ws_app = await self._ensure_private_ws()
+        
+
+        await self.ws_app.current_ws.send_json(sub_msg)
+
+
+        self.has_sub_personal = True
 
     async def update(
         self,
@@ -108,13 +114,17 @@ class Bitget:
         margin_coin: str = "USDT",
         reduce_only: bool | None = None,
         offset_flag: Literal["open", "close", "0", "1"] | None = None,
-        client_order_id: str | None = None,
-        extra_params: dict[str, Any] | None = None,
-    ) -> dict[str, Any]:
-        """Create an order via ``POST /api/v2/mix/order/place-order``.
+        client_order_id: str | None = None
+    ) -> dict[str, Any] | None:
+        """
+        请求成功返回示例:
+
+        .. code:: json
 
-        Parameters mirror the Bitget V2 contract REST API but are normalized to
-        match the broker interface (``direction``, ``order_type`` etc.).
+            {
+                "clientOid": "121211212122",
+                "orderId": "121211212122"
+            }
         """
 
         side = self._normalize_direction(direction)
@@ -159,9 +169,6 @@ class Bitget:
         if client_order_id:
             payload["clientOid"] = client_order_id
 
-        if extra_params:
-            payload.update(extra_params)
-
         res = await self.client.post(
             f"{self.rest_api}/api/v2/mix/order/place-order",
             data=payload,
@@ -195,7 +202,7 @@ class Bitget:
 
         res = await self.client.post(
             f"{self.rest_api}/api/v2/mix/order/cancel-order",
-            json=payload,
+            data=payload,
         )
         data = await res.json()
         return self._ensure_ok("cancel_order", data)
@@ -223,6 +230,19 @@ class Bitget:
             )
         return detail
 
+    async def _ensure_private_ws(self):
+        wsqueue = pybotters.WebSocketQueue()
+        ws_app = self.client.ws_connect(
+            self.ws_url_private,
+            hdlr_json=self.store.onmessage,
+        )
+        # async for msg in wsqueue:
+        #     print(msg)
+
+        await ws_app._event.wait()
+        await ws_app.current_ws._wait_authtask()
+        return ws_app
+
     @staticmethod
     def _format_with_step(value: float, step: Any) -> str:
         if step in (None, 0, "0"):

hyperquant/broker/lbank.py

@@ -569,4 +569,4 @@ class Lbank:
             batch = send_jsons[i:i+5]
             await asyncio.gather(*(sub(send_json) for send_json in batch))
             if i + 5 < len(send_jsons):
-                await asyncio.sleep(0.1)
+                await asyncio.sleep(0.3)

hyperquant/broker/models/lbank.py

@@ -298,6 +298,7 @@ class Position(DataStore):
             "realized_pnl": entry.get("CloseProfit"),
             "update_time": entry.get("UpdateTime"),
             "insert_time": entry.get("InsertTime"),
+            "begin_time": entry.get("BeginTime")
         }
 
     def _onresponse(self, data: dict[str, Any] | None) -> None:
@@ -492,7 +493,8 @@ class LbankDataStore(DataStoreCollection):
                     "unrealized_pnl": <未实现盈亏>,
                     "realized_pnl": <已实现盈亏>,
                     "update_time": <更新时间>,
-                    "insert_time": <插入时间>
+                    "insert_time": <插入时间>,
+                    "begin_time": <持仓开始时间>
                 },
                 ...
             ]

{hyperquant-0.76.dist-info → hyperquant-0.78.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperquant
-Version: 0.76
+Version: 0.78
 Summary: A minimal yet hyper-efficient backtesting framework for quantitative trading
 Project-URL: Homepage, https://github.com/yourusername/hyperquant
 Project-URL: Issues, https://github.com/yourusername/hyperquant/issues

{hyperquant-0.76.dist-info → hyperquant-0.78.dist-info}/RECORD

@@ -5,10 +5,10 @@ hyperquant/draw.py,sha256=up_lQ3pHeVLoNOyh9vPjgNwjD0M-6_IetSGviQUgjhY,54624
 hyperquant/logkit.py,sha256=nUo7nx5eONvK39GOhWwS41zNRL756P2J7-5xGzwXnTY,8462
 hyperquant/notikit.py,sha256=x5yAZ_tAvLQRXcRbcg-VabCaN45LUhvlTZnUqkIqfAA,3596
 hyperquant/broker/auth.py,sha256=Wst7mTBuUS2BQ5hZd0a8FNNs5Uc01ac9WzJpseTuyAY,7673
-hyperquant/broker/bitget.py,sha256=PEzULGJJQeQ91TKa4F56WhEpcnUHC3WpIx1pi5UXpVQ,9182
+hyperquant/broker/bitget.py,sha256=X_S0LKZ7FZAEb6oEMr1vdGP1fondzK74BhmNTpRDSEA,9488
 hyperquant/broker/edgex.py,sha256=TqUO2KRPLN_UaxvtLL6HnA9dAQXC1sGxOfqTHd6W5k8,18378
 hyperquant/broker/hyperliquid.py,sha256=7MxbI9OyIBcImDelPJu-8Nd53WXjxPB5TwE6gsjHbto,23252
-hyperquant/broker/lbank.py,sha256=lWpRH4SQR_Ock096MEFZB4917KwQ1aHQxGPKRfN15XM,18995
+hyperquant/broker/lbank.py,sha256=CccyPGx8_nTb6Yze3L5KXbN0dqfeKc2PxIiG04vGcR4,18995
 hyperquant/broker/ourbit.py,sha256=NUcDSIttf-HGWzoW1uBTrGLPHlkuemMjYCm91MigTno,18228
 hyperquant/broker/ws.py,sha256=9Zu5JSLj-ylYEVmFmRwvZDDnVYKwb37cLHfZzA0AZGc,2200
 hyperquant/broker/lib/edgex_sign.py,sha256=lLUCmY8HHRLfLKyGrlTJYaBlSHPsIMWg3EZnQJKcmyk,95785
@@ -18,12 +18,12 @@ hyperquant/broker/lib/util.py,sha256=iMU1qF0CHj5zzlIMEQGwjz-qtEVosEe7slXOCuB7Rcw
 hyperquant/broker/models/bitget.py,sha256=0RwDY75KrJb-c-oYoMxbqxWfsILe-n_Npojz4UFUq7c,11389
 hyperquant/broker/models/edgex.py,sha256=vPAkceal44cjTYKQ_0BoNAskOpmkno_Yo1KxgMLPc6Y,33954
 hyperquant/broker/models/hyperliquid.py,sha256=c4r5739ibZfnk69RxPjQl902AVuUOwT8RNvKsMtwXBY,9459
-hyperquant/broker/models/lbank.py,sha256=7B1NHusI6E5JLhj9Vzk0vzX8Zne3vmAEolGQicSiFw0,19076
+hyperquant/broker/models/lbank.py,sha256=vHkNKxIMzpoC_EwcZnEOPOupizF92yGWi9GKxvYYFUQ,19181
 hyperquant/broker/models/ourbit.py,sha256=xMcbuCEXd3XOpPBq0RYF2zpTFNnxPtuNJZCexMZVZ1k,41965
 hyperquant/datavison/_util.py,sha256=92qk4vO856RqycO0YqEIHJlEg-W9XKapDVqAMxe6rbw,533
 hyperquant/datavison/binance.py,sha256=3yNKTqvt_vUQcxzeX4ocMsI5k6Q6gLZrvgXxAEad6Kc,5001
 hyperquant/datavison/coinglass.py,sha256=PEjdjISP9QUKD_xzXNzhJ9WFDTlkBrRQlVL-5pxD5mo,10482
 hyperquant/datavison/okx.py,sha256=yg8WrdQ7wgWHNAInIgsWPM47N3Wkfr253169IPAycAY,6898
-hyperquant-0.76.dist-info/METADATA,sha256=NfNMp_dfAMLYjQPq2VzuCzemwD3_xWXTQ_Jsqa29v4c,4317
-hyperquant-0.76.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hyperquant-0.76.dist-info/RECORD,,
+hyperquant-0.78.dist-info/METADATA,sha256=dhQ5VbfLxcSR_emPv6aaw1arJWBC3wqUqp5cPSoMsRY,4317
+hyperquant-0.78.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hyperquant-0.78.dist-info/RECORD,,