hyperquant 0.97__py3-none-any.whl → 0.99__py3-none-any.whl

hyperquant/broker/bitmart.py

@@ -4,7 +4,7 @@ import asyncio
 import json
 import random
 import time
-from typing import Any, Literal, Sequence
+from typing import Any, Literal, Optional, Sequence
 
 import pybotters
 
@@ -33,10 +33,19 @@ class Bitmart:
 
         self.account_index = account_index
         self.apis = apis
+        self.symbol_to_contract_id: dict[str, str] = {}
 
     async def __aenter__(self) -> "Bitmart":
         await self.update("detail")
         asyncio.create_task(self.auto_refresh())
+        
+        for entry in self.store.detail.find():
+            contract_id = entry.get("contract_id")
+            symbol = entry.get("name") or entry.get("display_name")
+            if contract_id is None or symbol is None:
+                continue
+            self.symbol_to_contract_id[str(symbol)] = str(contract_id)
+
         return self
     
     async def auto_refresh(self, sec=3600, test=False) -> None:
@@ -325,8 +334,9 @@ class Bitmart:
         *,
         category: Literal[1,2,"limit","market"] = "limit",
         price: float,
-        volume: float,
-        way: Literal[1, 2, 3, 4, "open_long", "close_short", "close_long", "open_short", "buy", "sell"] = "open_long",
+        qty: float,
+        qty_contract: Optional[int] = None,
+        side: Literal[1, 2, 3, 4, "open_long", "close_short", "close_long", "open_short", "buy", "sell"] = "open_long",
         mode: Literal[1, 2, 3, 4, "gtc", "ioc", "fok", "maker_only", "maker-only", "post_only"] = "gtc",
         open_type: Literal[1, 2, "cross", "isolated"] = "isolated",
         leverage: int | str = 10,
@@ -334,8 +344,9 @@ class Bitmart:
         trigger_price: float | None = None,
         custom_id: int | str | None = None,
         extra_params: dict[str, Any] | None = None,
-    ) -> dict[str, Any]:
+    ) -> int:
         """Submit an order via ``submitOrder``.
+        返回值: order_id (int)
         """
 
         contract_id = self.get_contract_id(symbol)
@@ -351,25 +362,31 @@ class Bitmart:
             raise ValueError(f"Market metadata unavailable for symbol: {symbol}")
 
 
-        contract_size_str = detail.get("contract_size") or detail.get("vol_unit") or "1"
-        try:
-            contract_size_val = float(contract_size_str)
-        except (TypeError, ValueError):
-            contract_size_val = 1.0
-        if contract_size_val <= 0:
-            raise ValueError(f"Invalid contract_size for {symbol}: {contract_size_str}")
-
-        contracts_float = float(volume) / contract_size_val
-        contracts_int = int(round(contracts_float))
-        if contracts_int <= 0:
-            raise ValueError(
-                f"Volume too small for contract size ({contract_size_val}): volume={volume}"
-            )
-        if abs(contracts_float - contracts_int) > 1e-8:
-            raise ValueError(
-                f"Volume must be a multiple of contract_size ({contract_size_val}). "
-                f"Received volume={volume} -> {contracts_float} contracts."
-            )
+        if qty_contract is not None:
+
+            contract_size_str = detail.get("contract_size") or detail.get("vol_unit") or "1"
+            try:
+                contract_size_val = float(contract_size_str)
+            except (TypeError, ValueError):
+                contract_size_val = 1.0
+            if contract_size_val <= 0:
+                raise ValueError(f"Invalid contract_size for {symbol}: {contract_size_str}")
+
+            contracts_float = float(qty) / contract_size_val
+            contracts_int = int(round(contracts_float))
+            if contracts_int <= 0:
+                raise ValueError(
+                    f"Volume too small for contract size ({contract_size_val}): volume={qty}"
+                )
+            if abs(contracts_float - contracts_int) > 1e-8:
+                raise ValueError(
+                    f"Volume must be a multiple of contract_size ({contract_size_val}). "
+                    f"Received volume={qty} -> {contracts_float} contracts."
+                )
+        else:
+            contracts_int = int(qty)
+            if contracts_int <= 0:
+                raise ValueError(f"Volume must be positive integer contracts: volume={qty}")
 
         price_unit = detail.get("price_unit") or 1
         try:
@@ -396,7 +413,7 @@ class Bitmart:
         price_fmt = f"{adjusted_price:.15f}".rstrip("0").rstrip(".") or "0"
 
         way_value = self._normalize_enum(
-            way,
+            side,
             {
                 "open_long": 1,
                 "close_short": 2,
@@ -460,7 +477,10 @@ class Bitmart:
         
         if resp.get("success") is False or resp.get("errno") not in (None, "OK"):
             raise ValueError(f"Bitmart submitOrder error: {resp}")
-        return resp
+        
+        # {"errno":"OK","message":"Success","data":{"order_id":3000236525013551},"success":true}
+        # 直接取order_id返回
+        return resp.get("data", {}).get("order_id")
 
     async def cancel_order(
         self,

hyperquant/broker/models/bitmart.py

@@ -381,7 +381,7 @@ class BitmartDataStore(DataStoreCollection):
     @property
     def orders(self) -> Orders:
         """用户订单 (`userAllOrders`)。
-
+        key: order_id
         .. code:: json
 
             [
@@ -510,19 +510,19 @@ class BitmartDataStore(DataStoreCollection):
                 {
                     "account_id": 14794011,
                     "coin_code": "USDT",
-                    "available_vol": "0",
-                    "cash_vol": "0",
+                    "available_vol": "10.970977797397999999",
+                    "cash_vol": "11.000536099457999999",
                     "freeze_vol": "0",
-                    "realised_vol": "0",
-                    "un_realised_vol": "0",
-                    "earnings_vol": "0",
+                    "realised_vol": "0.000536099457999999",
+                    "un_realised_vol": "-0.00001502",
+                    "earnings_vol": "0.000536099457999999",
                     "total_im": "",
                     "margin_balance": "",
                     "available_balance": "",
                     "trans_out_balance": "",
                     "status": 0,
                     "total_balance": "",
-                    "account_rights": "0",
+                    "account_rights": "11.000521079457999999",
                     "bonus_voucher_vol": "",
                     "freeze_bonus_voucher_vol": ""
                 }

{hyperquant-0.97.dist-info → hyperquant-0.99.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperquant
-Version: 0.97
+Version: 0.99
 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.97.dist-info → hyperquant-0.99.dist-info}/RECORD

@@ -6,7 +6,7 @@ hyperquant/logkit.py,sha256=nUo7nx5eONvK39GOhWwS41zNRL756P2J7-5xGzwXnTY,8462
 hyperquant/notikit.py,sha256=x5yAZ_tAvLQRXcRbcg-VabCaN45LUhvlTZnUqkIqfAA,3596
 hyperquant/broker/auth.py,sha256=C8B5-x8Qcaeafm4ZwPCVFR7GRURmHC3CE4_vdg00Qgw,12139
 hyperquant/broker/bitget.py,sha256=X_S0LKZ7FZAEb6oEMr1vdGP1fondzK74BhmNTpRDSEA,9488
-hyperquant/broker/bitmart.py,sha256=3lAkSy8J2p-M-663cUVFuRU-XtgNEwWAa4SKgeG6Vb8,16798
+hyperquant/broker/bitmart.py,sha256=d9eEWCskoRRAH0knjyT8K-3ob0MK_0uQ9h_0UnQSOJM,17708
 hyperquant/broker/coinup.py,sha256=eOr8BTRXiTb5tCU2FDmvBdXXgqiwVmCbP5pdeA1ORJ8,20390
 hyperquant/broker/coinw.py,sha256=SnJU0vASh77rfcpMGWaIfTblQSjQk3vjlW_4juYdbcs,17214
 hyperquant/broker/edgex.py,sha256=TqUO2KRPLN_UaxvtLL6HnA9dAQXC1sGxOfqTHd6W5k8,18378
@@ -20,7 +20,7 @@ hyperquant/broker/lib/hpstore.py,sha256=LnLK2zmnwVvhEbLzYI-jz_SfYpO1Dv2u2cJaRAb8
 hyperquant/broker/lib/hyper_types.py,sha256=HqjjzjUekldjEeVn6hxiWA8nevAViC2xHADOzDz9qyw,991
 hyperquant/broker/lib/util.py,sha256=iMU1qF0CHj5zzlIMEQGwjz-qtEVosEe7slXOCuB7Rcw,566
 hyperquant/broker/models/bitget.py,sha256=0RwDY75KrJb-c-oYoMxbqxWfsILe-n_Npojz4UFUq7c,11389
-hyperquant/broker/models/bitmart.py,sha256=sZQPWDOhLMGdZZzAIP1z2lDKKQeuGZYDiYLjqamK1B4,20326
+hyperquant/broker/models/bitmart.py,sha256=6lOpQXLcuR7MEayvMt_e-okE2A8CCUvpzAT6aCxWSaM,20455
 hyperquant/broker/models/coinup.py,sha256=X_ngB2_sgTOdfAZqTyeWvCN03j-0_inZ6ugZKW6hR7k,11173
 hyperquant/broker/models/coinw.py,sha256=LvLMVP7i-qkkTK1ubw8eBkMK2RQmFoKPxdKqmC4IToY,22157
 hyperquant/broker/models/edgex.py,sha256=vPAkceal44cjTYKQ_0BoNAskOpmkno_Yo1KxgMLPc6Y,33954
@@ -32,6 +32,6 @@ hyperquant/datavison/_util.py,sha256=92qk4vO856RqycO0YqEIHJlEg-W9XKapDVqAMxe6rbw
 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.97.dist-info/METADATA,sha256=LwzokAHUJ7hKAvG0RAfUsx9kSM9qcdti-mXc6sPQrBI,4409
-hyperquant-0.97.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hyperquant-0.97.dist-info/RECORD,,
+hyperquant-0.99.dist-info/METADATA,sha256=Xp8eYdpew89TrwNCR-NUygnlHVMwrQ3SkG8kCogxm28,4409
+hyperquant-0.99.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hyperquant-0.99.dist-info/RECORD,,