hyperquant 0.34__py3-none-any.whl → 0.36__py3-none-any.whl

hyperquant/broker/auth.py

@@ -1,6 +1,7 @@
 import time
 import hashlib
 from typing import Any
+from aiohttp import ClientWebSocketResponse
 from multidict import CIMultiDict
 from yarl import URL
 import pybotters
@@ -45,7 +46,10 @@ class Auth:
 
         # 更新 kwargs.body，保证发出去的与签名一致
         kwargs.update({"data": raw_body_for_sign})
-
+    
         return args
+    
 
 pybotters.auth.Hosts.items['futures.ourbit.com'] = pybotters.auth.Item("ourbit", Auth.ourbit)
+
+

hyperquant/broker/models/ourbit.py

@@ -137,6 +137,21 @@ class Ticker(DataStore):
 class Orders(DataStore):
     _KEYS = ["order_id"]
 
+    def _fmt(self, order:dict):
+        return {
+            "order_id": order.get("orderId"),
+            "symbol": order.get("symbol"),
+            "px": order.get("price"),
+            "vol": order.get("vol"),
+            "lev": order.get("leverage"),
+            "side": "buy" if order.get("side") == 1 else "sell",
+            "deal_vol": order.get("dealVol"),
+            "deal_avg_px": order.get("dealAvgPrice"),
+            "create_ts": order.get("createTime"),
+            "update_ts": order.get("updateTime"),
+            "state": "open"
+        }
+
     # {'success': True, 'code': 0, 'data': [{'orderId': '219108574599630976', 'symbol': 'SOL_USDT', 'positionId': 0, 'price': 190, 'priceStr': '190', 'vol': 1, 'leverage': 20, 'side': 1, 'category': 1, 'orderType': 1, 'dealAvgPrice': 0, 'dealAvgPriceStr': '0', 'dealVol': 0, 'orderMargin': 0.09652, 'takerFee': 0, 'makerFee': 0, 'profit': 0, 'feeCurrency': 'USDT', 'openType': 1, 'state': 2, 'externalOid': '_m_2228b23a75204e1982b301e44d439cbb', 'errorCode': 0, 'usedMargin': 0, 'createTime': 1756277955008, 'updateTime': 1756277955037, 'positionMode': 1, 'version': 1, 'showCancelReason': 0, 'showProfitRateShare': 0, 'voucher': False}]}
     def _onresponse(self, data: dict[str, Any]):
         orders = data.get("data", [])
@@ -144,25 +159,33 @@ class Orders(DataStore):
             data_to_insert: list[Item] = []
             for order in orders:
                 order: dict[str, Any] = order
-
-                data_to_insert.append(
-                    {
-                        "order_id": order.get("orderId"),
-                        "symbol": order.get("symbol"),
-                        "px": order.get("priceStr"),
-                        "vol": order.get("vol"),
-                        "lev": order.get("leverage"),
-                        "side": "buy" if order.get("side") == 1 else "sell",
-                        "deal_vol": order.get("dealVol"),
-                        "deal_avg_px": order.get("dealAvgPriceStr"),
-                        "create_ts": order.get("createTime"),
-                        "update_ts": order.get("updateTime"),
-                    }
-                )
+                data_to_insert.append(self._fmt(order))
 
             self._clear()
             self._update(data_to_insert)
-
+        
+    def _on_message(self, msg: dict[str, Any]) -> None:
+        data:dict = msg.get("data", {})
+        if msg.get('channel') == 'push.personal.order':
+            state = data.get("state")
+            if state == 2:
+                order = self._fmt(data)
+                order["state"] = "open"
+                self._insert([order])
+            elif state == 3:
+                order = self._fmt(data)
+                order["state"] = "filled"
+                self._update([order])
+                self._find_and_delete({
+                    "order_id": order.get("order_id")
+                })
+            elif state == 4:
+                order = self._fmt(data)
+                order["state"] = "canceled"
+                self._update([order])
+                self._find_and_delete({
+                    "order_id": order.get("order_id")
+                })
 
 class Detail(DataStore):
     _KEYS = ["symbol"]
@@ -193,15 +216,9 @@ class Detail(DataStore):
 class Position(DataStore):
     _KEYS = ["position_id"]
     # {"success":true,"code":0,"data":[{"positionId":5355366,"symbol":"SOL_USDT","positionType":1,"openType":1,"state":1,"holdVol":1,"frozenVol":0,"closeVol":0,"holdAvgPrice":203.44,"holdAvgPriceFullyScale":"203.44","openAvgPrice":203.44,"openAvgPriceFullyScale":"203.44","closeAvgPrice":0,"liquidatePrice":194.07,"oim":0.10253376,"im":0.10253376,"holdFee":0,"realised":-0.0008,"leverage":20,"marginRatio":0.0998,"createTime":1756275984696,"updateTime":1756275984696,"autoAddIm":false,"version":1,"profitRatio":0,"newOpenAvgPrice":203.44,"newCloseAvgPrice":0,"closeProfitLoss":0,"fee":0.00081376}]}
-    def _onresponse(self, data: dict[str, Any]):
-        positions = data.get("data", [])
-        if positions:
-            data_to_insert: list[Item] = []
-            for position in positions:
-                position: dict[str, Any] = position
-
-                data_to_insert.append(
-                    {
+    
+    def _fmt(self, position:dict):
+        return {
                         "position_id": position.get("positionId"),
                         "symbol": position.get("symbol"),
                         "side": "short" if position.get("positionType") == 2 else "long",
@@ -222,7 +239,17 @@ class Position(DataStore):
                         "margin_ratio": position.get("marginRatio"),
                         "create_ts": position.get("createTime"),
                         "update_ts": position.get("updateTime"),
-                    }
+            }
+    
+    def _onresponse(self, data: dict[str, Any]):
+        positions = data.get("data", [])
+        if positions:
+            data_to_insert: list[Item] = []
+            for position in positions:
+                position: dict[str, Any] = position
+
+                data_to_insert.append(
+                    self._fmt(position)
                 )
 
             self._clear()
@@ -230,31 +257,43 @@ class Position(DataStore):
         else:
             self._clear()
 
+    def _on_message(self, msg: dict[str, Any]) -> None:
+        data:dict = msg.get("data", {})
+        state = data.get("state")
+        position_id = data.get("positionId")
+        if state == 3:
+            self._find_and_delete({"position_id": position_id})
+            return
+        
+        self._update([self._fmt(data)])
+
 class Balance(DataStore):
     _KEYS = ["currency"]
 
+    def _fmt(self, balance: dict) -> dict:
+        return {
+            "available_balance": balance.get("availableBalance"),
+            "bonus": balance.get("bonus"),
+            "currency": balance.get("currency"),
+            "frozen_balance": balance.get("frozenBalance"),
+            "last_bonus": balance.get("lastBonus"),
+            "position_margin": balance.get("positionMargin"),
+            "wallet_balance": balance.get("walletBalance"),
+        }
+
     def _onresponse(self, data: dict[str, Any]):
         balances = data.get("data", [])
         if balances:
             data_to_insert: list[Item] = []
             for balance in balances:
                 balance: dict[str, Any] = balance
-                data_to_insert.append({
-                    "currency": balance.get("currency"),
-                    "position_margin": balance.get("positionMargin"),
-                    "available_balance": balance.get("availableBalance"),
-                    "cash_balance": balance.get("cashBalance"),
-                    "frozen_balance": balance.get("frozenBalance"),
-                    "equity": balance.get("equity"),
-                    "unrealized": balance.get("unrealized"),
-                    "bonus": balance.get("bonus"),
-                    "last_bonus": balance.get("lastBonus"),
-                    "wallet_balance": balance.get("walletBalance"),
-                    "voucher": balance.get("voucher"),
-                    "voucher_using": balance.get("voucherUsing"),
-                })
+                data_to_insert.append(self._fmt(balance))
             self._clear()
             self._insert(data_to_insert)
+    
+    def _on_message(self, msg: dict[str, Any]) -> None:
+        data: dict = msg.get("data", {})
+        self._update([self._fmt(data)])
 
 class OurbitSwapDataStore(DataStoreCollection):
     """
@@ -318,6 +357,12 @@ class OurbitSwapDataStore(DataStoreCollection):
             self.book._on_message(msg)
         if channel == "push.tickers":
             self.ticker._on_message(msg)
+        if channel == "push.personal.position":
+            self.position._on_message(msg)
+        if channel == "push.personal.order":
+            self.orders._on_message(msg)
+        if channel == "push.personal.asset":
+            self.balance._on_message(msg)
         else:
             logger.debug(f"未知的channel: {channel}")
 
@@ -436,7 +481,7 @@ class OurbitSwapDataStore(DataStoreCollection):
                     "side": "buy",
                     "price": "110152.5",
                     "size": "0.1",
-                    "status": "open",
+                    "state": "open", // ("open", "closed", "canceled")
                     "create_ts": 1625247600000,
                     "update_ts": 1625247600000
                 }
@@ -448,57 +493,58 @@ class OurbitSwapDataStore(DataStoreCollection):
     def position(self) -> Position:
         """
         持仓数据
-
         Data structure:
-        .. code:: python
-        [
-            {
-                "position_id": "123456",
-                "symbol": "BTC_USDT",
-                "side": "long",
-                "open_type": "limit",
-                "state": "open",
-                "hold_vol": "0.1",
-                "frozen_vol": "0.0",
-                "close_vol": "0.0",
-                "hold_avg_price": "110152.5",
-                "open_avg_price": "110152.5",
-                "close_avg_price": "0.0",
-                "liquidate_price": "100000.0",
-                "oim": "0.0",
-                "im": "0.0",
-                "hold_fee": "0.0",
-                "realised": "0.0",
-                "leverage": "10",
-                "margin_ratio": "0.1",
-                "create_ts": 1625247600000,
-                "update_ts": 1625247600000
-            }
-        ]
-        """
-        return self._get("position", Position)
 
-    @property
-    def balance(self) -> Balance:
-        """账户余额数据
-        
-        Data structure:
-        .. code:: python
+        .. code:: json
+
             [
                 {
-                    "currency": "USDT",            # 币种
-                    "position_margin": 0.3052,     # 持仓保证金
-                    "available_balance": 19.7284,  # 可用余额
-                    "cash_balance": 19.7284,      # 现金余额
-                    "frozen_balance": 0,          # 冻结余额
-                    "equity": 19.9442,           # 权益
-                    "unrealized": -0.0895,       # 未实现盈亏
-                    "bonus": 0,                  # 奖励
-                    "last_bonus": 0,             # 最后奖励
-                    "wallet_balance": 20.0337,   # 钱包余额
-                    "voucher": 0,               # 代金券
-                    "voucher_using": 0          # 使用中的代金券
+                    "position_id": "123456",
+                    "symbol": "BTC_USDT",
+                    "side": "long",
+                    "open_type": "limit",
+                    "state": "open",
+                    "hold_vol": "0.1",
+                    "frozen_vol": "0.0",
+                    "close_vol": "0.0",
+                    "hold_avg_price": "110152.5",
+                    "open_avg_price": "110152.5",
+                    "close_avg_price": "0.0",
+                    "liquidate_price": "100000.0",
+                    "oim": "0.0",
+                    "im": "0.0",
+                    "hold_fee": "0.0",
+                    "realised": "0.0",
+                    "leverage": "10",
+                    "margin_ratio": "0.1",
+                    "create_ts": 1625247600000,
+                    "update_ts": 1625247600000
                 }
             ]
         """
+        return self._get("position", Position)
+
+    @property
+    def balance(self) -> Balance:
+        @property
+        def balance(self) -> Balance:
+            """账户余额数据
+
+            Data structure:
+
+            .. code:: python
+
+                [
+                    {
+                        "currency": "USDT",            # 币种
+                        "position_margin": 0.3052,     # 持仓保证金
+                        "available_balance": 19.7284,  # 可用余额
+                        "frozen_balance": 0,           # 冻结余额
+                        "bonus": 0,                    # 奖励
+                        "last_bonus": 0,               # 最后奖励
+                        "wallet_balance": 20.0337      # 钱包余额
+                    }
+                ]
+            """
+            return self._get("balance", Balance)
         return self._get("balance", Balance)

hyperquant/broker/ourbit.py

@@ -87,6 +87,13 @@ class OurbitSwap:
             hdlr_json=self.store.onmessage
         )
 
+    async def sub_personal(self):
+        self.client.ws_connect(
+            self.ws_url,
+            send_json={ "method": "sub.personal.user.preference"},
+            hdlr_json=self.store.onmessage
+        )
+
     def ret_content(self, res: pybotters.FetchResult):
         match res.data:
             case {"success": True}:
@@ -113,7 +120,7 @@ class OurbitSwap:
         position_id: Optional[int] = None,
     ):
         """
-        size为合约张数
+        size为合约张数, openType 1 为逐仓, 2为全仓
 
         .. code ::
         {
@@ -134,12 +141,12 @@ class OurbitSwap:
         price = self.fmt_price(symbol, price)
             
         print(f'下单价格 {price}')
-        leverage = max(max_lev, leverage)
+        leverage = min(max_lev, leverage)
 
         data = {
             "symbol": symbol,
             "side": 1 if side == "buy" else 3,
-            "openType": 1,
+            "openType": 2,
             "type": "5",
             "vol": size,
             "leverage": leverage,

hyperquant/broker/ws.py

@@ -1,6 +1,6 @@
 import asyncio
 import pybotters
-
+from pybotters.ws import ClientWebSocketResponse, logger
 
 class Heartbeat:
     @staticmethod
@@ -9,4 +9,29 @@ class Heartbeat:
             await ws.send_str('{"method":"ping"}')
             await asyncio.sleep(10.0)
 
-pybotters.ws.HeartbeatHosts.items['futures.ourbit.com'] = Heartbeat.ourbit
+pybotters.ws.HeartbeatHosts.items['futures.ourbit.com'] = Heartbeat.ourbit
+
+class WssAuth:
+    @staticmethod
+    async def ourbit(ws: ClientWebSocketResponse):
+        key: str = ws._response._session.__dict__["_apis"][
+            pybotters.ws.AuthHosts.items[ws._response.url.host].name
+        ][0]
+        await ws.send_json(
+            {
+                "method": "login",
+                "param": {
+                    "token": key
+                }
+            }
+        )
+        async for msg in ws:
+            # {"channel":"rs.login","data":"success","ts":1756470267848}
+            data = msg.json()
+            if data.get("channel") == "rs.login":
+                if data.get("data") == "success":
+                    break
+                else:
+                    logger.warning(f"WebSocket login failed: {data}")
+
+pybotters.ws.AuthHosts.items['futures.ourbit.com'] = pybotters.auth.Item("ourbit", WssAuth.ourbit)

{hyperquant-0.34.dist-info → hyperquant-0.36.dist-info}/METADATA

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

@@ -4,18 +4,18 @@ hyperquant/db.py,sha256=i2TjkCbmH4Uxo7UTDvOYBfy973gLcGexdzuT_YcSeIE,6678
 hyperquant/draw.py,sha256=up_lQ3pHeVLoNOyh9vPjgNwjD0M-6_IetSGviQUgjhY,54624
 hyperquant/logkit.py,sha256=WALpXpIA3Ywr5DxKKK3k5EKubZ2h-ISGfc5dUReQUBQ,7795
 hyperquant/notikit.py,sha256=x5yAZ_tAvLQRXcRbcg-VabCaN45LUhvlTZnUqkIqfAA,3596
-hyperquant/broker/auth.py,sha256=hrdVuBTZwD3xSy5GI5JTFJhKiHhvIjZHA_7G5IUFznQ,1580
+hyperquant/broker/auth.py,sha256=F9rNP4I8tJTk3IKwA7Z-DG8DMiCZRMQYZPTE9Gigf-Y,1635
 hyperquant/broker/hyperliquid.py,sha256=7MxbI9OyIBcImDelPJu-8Nd53WXjxPB5TwE6gsjHbto,23252
-hyperquant/broker/ourbit.py,sha256=ejaRAM3Q8Iho7ng3o7xx-j0mT3GjrTykfVZNMTg5lO4,9567
-hyperquant/broker/ws.py,sha256=98Djt5n5sHUJKVbQ8Ql1t-G-Wiwu__4MYcUr5P6SDL0,326
+hyperquant/broker/ourbit.py,sha256=FcWIilfr4k-As9UcT3aYbeUWCqZIYahF6Ruc7Qf3tT4,9813
+hyperquant/broker/ws.py,sha256=03-5okpoJincYGvE7vWgu6mdrEchLmsa-ZrGxmsJJ4Q,1239
 hyperquant/broker/lib/hpstore.py,sha256=LnLK2zmnwVvhEbLzYI-jz_SfYpO1Dv2u2cJaRAb84D8,8296
 hyperquant/broker/lib/hyper_types.py,sha256=HqjjzjUekldjEeVn6hxiWA8nevAViC2xHADOzDz9qyw,991
 hyperquant/broker/models/hyperliquid.py,sha256=c4r5739ibZfnk69RxPjQl902AVuUOwT8RNvKsMtwXBY,9459
-hyperquant/broker/models/ourbit.py,sha256=M37U3z9RrMuaFKLKZLi1i35R2-IYWCcrAaCMSsSoX9Y,18565
+hyperquant/broker/models/ourbit.py,sha256=oP_iJRXlYR-itjrO9wa4nxlkmMxExVMDSZWDfff24Ek,19846
 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.34.dist-info/METADATA,sha256=4qgi7gW9ck2jaF72_nb6a-J98V1RpRiMMmv-8BdX3N0,4317
-hyperquant-0.34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hyperquant-0.34.dist-info/RECORD,,
+hyperquant-0.36.dist-info/METADATA,sha256=x504f5mx-Xud9fmgA9U9cxf-GjC17mCB8NTppxsVR30,4317
+hyperquant-0.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hyperquant-0.36.dist-info/RECORD,,