hyperquant 0.2__py3-none-any.whl → 0.4__py3-none-any.whl

hyperquant/broker/ourbit.py

@@ -0,0 +1,500 @@
+import asyncio
+from typing import Literal, Optional
+import pybotters
+from .models.ourbit import OurbitSwapDataStore, OurbitSpotDataStore
+from decimal import Decimal, ROUND_HALF_UP
+
+
+class OurbitSwap:
+
+    def __init__(self, client: pybotters.Client):
+        """
+        ✅ 完成:
+            下单, 撤单, 查询资金, 查询持有订单, 查询历史订单
+
+        """
+        self.client = client
+        self.store = OurbitSwapDataStore()
+        self.api_url = "https://futures.ourbit.com"
+        self.ws_url = "wss://futures.ourbit.com/edge"
+
+    async def __aenter__(self) -> "OurbitSwap":
+        client = self.client
+        await self.store.initialize(
+            client.get(f"{self.api_url}/api/v1/contract/detailV2?client=web")
+        )
+        return self
+
+    async def update(
+        self, update_type: Literal["position", "orders", "balance", "ticker", "all"] = "all"
+    ):
+        """由于交易所很多不支持ws推送，这里使用Rest"""
+        all_urls = [
+            f"{self.api_url}/api/v1/private/position/open_positions",
+            f"{self.api_url}/api/v1/private/order/list/open_orders?page_size=200",
+            f"{self.api_url}/api/v1/private/account/assets",
+            f"{self.api_url}/api/v1/contract/ticker",
+            f"{self.api_url}/api/platform/spot/market/v2/symbols"
+        ]
+
+        url_map = {
+            "position": [all_urls[0]],
+            "orders": [all_urls[1]],
+            "balance": [all_urls[2]],
+            "ticker": [all_urls[3]],
+            "all": all_urls,
+        }
+
+        try:
+            urls = url_map[update_type]
+        except KeyError:
+            raise ValueError(f"update_type err: {update_type}")
+
+        # 直接传协程进去，initialize 会自己 await
+        await self.store.initialize(*(self.client.get(url) for url in urls))
+
+    async def sub_tickers(self):
+        self.client.ws_connect(
+            self.ws_url,
+            send_json={
+                "method": "sub.tickers",
+                "param": {
+                    "timezone": "UTC+8"
+                }
+            },
+            hdlr_json=self.store.onmessage
+        )
+
+    async def sub_orderbook(self, symbols: str | list[str]):
+        if isinstance(symbols, str):
+            symbols = [symbols]
+
+        send_jsons = []
+        # send_json={"method":"sub.depth.step","param":{"symbol":"BTC_USDT","step":"0.1"}},
+
+        for symbol in symbols:
+            step = self.store.detail.find({"symbol": symbol})[0].get("tick_size")
+            
+            send_jsons.append({
+                "method": "sub.depth.step",
+                "param": {
+                    "symbol": symbol,
+                    "step": str(step)
+                }
+            })
+
+        await self.client.ws_connect(
+            self.ws_url,
+            send_json=send_jsons,
+            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}:
+                return res.data["data"]
+            case _:
+                raise Exception(f"Failed api {res.response.url}: {res.data}")
+    
+
+    def fmt_price(self, symbol, price: float) -> float:
+        tick = self.store.detail.find({"symbol": symbol})[0].get("tick_size")
+        tick_dec = Decimal(str(tick))
+        price_dec = Decimal(str(price))
+        return float((price_dec / tick_dec).quantize(Decimal("1"), rounding=ROUND_HALF_UP) * tick_dec)
+
+    async def place_order(
+        self,
+        symbol: str,
+        side: Literal["buy", "sell", "close_buy", "close_sell"],
+        size: float = None,
+        price: float = None,
+        order_type: Literal["market", "limit_GTC", "limit_IOC"] = "market",
+        usdt_amount: Optional[float] = None,
+        leverage: Optional[int] = 20,
+        position_id: Optional[int] = None,
+    ):
+        """
+        size为合约张数, openType 1 为逐仓, 2为全仓
+
+        .. code ::
+        {
+            "orderId": "219602019841167810",
+            "ts": 1756395601543
+        }
+
+        """
+        if (size is None) == (usdt_amount is None):
+            raise ValueError("params err")
+
+        max_lev = self.store.detail.find({"symbol": symbol})[0].get("max_lev")
+        
+        if usdt_amount is not None:
+            cs = self.store.detail.find({"symbol": symbol})[0].get("contract_sz")
+            size = max(int(usdt_amount / cs / price), 1)
+
+        if price is not None:
+            price = self.fmt_price(symbol, price)
+            
+
+        leverage = min(max_lev, leverage)
+
+        data = {
+            "symbol": symbol,
+            "side": 1 if side == "buy" else 3,
+            "openType": 2,
+            "type": "5",
+            "vol": size,
+            "leverage": leverage,
+            "marketCeiling": False,
+            "priceProtect": "0",
+        }
+
+        if order_type == "limit_IOC":
+            data["type"] = 3
+            data["price"] = str(price)
+        if order_type == "limit_GTC":
+            data["type"] = "1"
+            data["price"] = str(price)
+
+        if "close" in side:
+            if side == 'close_buy':
+                data["side"] = 2
+            elif side == 'close_sell':
+                data["side"] = 4
+  
+            if position_id is None:
+                raise ValueError("position_id is required for closing position")
+            data["positionId"] = position_id
+        # import time
+        # print(time.time(), '下单')
+        res =  await self.client.fetch(
+            "POST", f"{self.api_url}/api/v1/private/order/create", data=data
+        )
+        return self.ret_content(res)
+    
+    async def place_tpsl(self, 
+        position_id: int,
+        take_profit: Optional[float] = None,
+        stop_loss: Optional[float] = None,
+    ):
+        """
+        position_id 持仓ID
+
+        .. code:: json
+
+            {
+                "success": true,
+                "code": 0,
+                "data": 2280508
+            }
+        """
+        if (take_profit is None) and (stop_loss is None):
+            raise ValueError("params err")
+
+        data = {
+            "positionId": position_id,
+            "profitTrend": "1",
+            "lossTrend": "1",
+            "profitLossVolType": "SAME",
+            "volType": 2,
+            "takeProfitReverse": 2,
+            "stopLossReverse": 2,
+            "priceProtect": "0",
+        }
+
+        if take_profit is not None:
+            data["takeProfitPrice"] = take_profit
+        if stop_loss is not None:
+            data["stopLossPrice"] = stop_loss
+        
+
+        res = await self.client.fetch(
+            "POST",
+            f"{self.api_url}/api/v1/private/stoporder/place",
+            data=data
+        )
+
+        return self.ret_content(res)
+
+    async def cancel_orders(self, order_ids: list[str]):
+        res = await self.client.fetch(
+            "POST",
+            f"{self.api_url}/api/v1/private/order/cancel",
+            data=order_ids,
+        )
+        return self.ret_content(res)
+
+    async def query_orders(
+        self,
+        symbol: str,
+        states: list[Literal["filled", "canceled"]],  # filled:已成交, canceled:已撤销
+        start_time: Optional[int] = None,
+        end_time: Optional[int] = None,
+        page_size: int = 200,
+        page_num: int = 1,
+    ):
+        """查询历史订单
+
+        Args:
+            symbol: 交易对
+            states: 订单状态列表 ["filled":已成交, "canceled":已撤销]
+            start_time: 开始时间戳(毫秒), 可选
+            end_time: 结束时间戳(毫秒), 可选
+            page_size: 每页数量, 默认200
+            page_num: 页码, 默认1
+        """
+        state_map = {"filled": 3, "canceled": 4}
+
+        params = {
+            "symbol": symbol,
+            "states": ",".join(str(state_map[state]) for state in states),
+            "page_size": page_size,
+            "page_num": page_num,
+            "category": 1,
+        }
+
+        if start_time:
+            params["start_time"] = start_time
+        if end_time:
+            params["end_time"] = end_time
+
+        res = await self.client.fetch(
+            "GET",
+            f"{self.api_url}/api/v1/private/order/list/history_orders",
+            params=params,
+        )
+
+        return self.ret_content(res)
+
+    async def query_order(self, order_id: str):
+        """查询单个订单的详细信息
+
+        Args:
+            order_id: 订单ID
+
+        Returns:
+            ..code:python
+
+            订单详情数据，例如:
+            [
+                    {
+                        "id": "38600506",          # 成交ID
+                        "symbol": "SOL_USDT",      # 交易对
+                        "side": 4,                 # 方向(1:买入, 3:卖出, 4:平仓)
+                        "vol": 1,                  # 成交数量
+                        "price": 204.11,          # 成交价格
+                        "fee": 0.00081644,        # 手续费
+                        "feeCurrency": "USDT",    # 手续费币种
+                        "profit": -0.0034,        # 盈亏
+                        "category": 1,            # 品类
+                        "orderId": "219079365441409152",  # 订单ID
+                        "timestamp": 1756270991000,       # 时间戳
+                        "positionMode": 1,        # 持仓模式
+                        "voucher": false,         # 是否使用代金券
+                        "taker": true            # 是否是taker
+                    }
+            ]
+        """
+        res = await self.client.fetch(
+            "GET",
+            f"{self.api_url}/api/v1/private/order/deal_details/{order_id}",
+        )
+        return self.ret_content(res)
+
+
+class OurbitSpot:
+
+    def __init__(self, client: pybotters.Client):
+        """
+        ✅ 完成:
+            下单, 撤单, 查询资金, 查询持有订单, 查询历史订单
+
+        """
+        self.client = client
+        self.store = OurbitSpotDataStore()
+        self.api_url = "https://www.ourbit.com"
+        self.ws_url = "wss://www.ourbit.com/ws"
+
+    async def __aenter__(self) -> "OurbitSpot":
+        client = self.client
+        await self.store.initialize(
+            client.get(f"{self.api_url}/api/platform/spot/market/v2/symbols")
+        )
+        return self
+
+    async def update(self, update_type: Literal["orders", "balance", "ticker", "book", "all"] = "all"):
+
+        all_urls = [
+            f"{self.api_url}/api/platform/spot/order/current/orders/v2?orderTypes=1%2C2%2C3%2C4%2C5%2C100&pageNum=1&pageSize=100&states=0%2C1%2C3",
+            f"{self.api_url}/api/assetbussiness/asset/spot/statistic",
+            f"{self.api_url}/api/platform/spot/market/v2/tickers"
+        ]
+
+        # orderTypes=1%2C2%2C3%2C4%2C5%2C100&pageNum=1&pageSize=100&states=0%2C1%2C3
+        
+        url_map = {
+            "orders": [all_urls[0]],
+            "balance": [all_urls[1]],
+            "ticker": [all_urls[2]],
+            "all": all_urls
+        }
+
+        try:
+            urls = url_map[update_type]
+        except KeyError:
+            raise ValueError(f"Unknown update type: {update_type}")
+        
+        # 直接传协程进去，initialize 会自己 await
+        await self.store.initialize(*(self.client.get(url) for url in urls))
+
+
+    async def sub_personal(self):
+        """订阅个人频道"""
+        # https://www.ourbit.com/ucenter/api/ws_token
+        res = await self.client.fetch(
+            'GET', f"{self.api_url}/ucenter/api/ws_token"
+        )
+
+        token = res.data['data'].get("wsToken")
+
+
+        self.client.ws_connect(
+            f"{self.ws_url}?wsToken={token}&platform=web",
+            send_json={
+                "method": "SUBSCRIPTION",
+                "params": [
+                    "spot@private.orders",
+                    "spot@private.trigger.orders",
+                    "spot@private.balances"
+                ],
+                "id": 1
+            },
+            hdlr_json=self.store.onmessage
+        )
+
+    async def sub_orderbook(self, symbols: str | list[str]):
+        """订阅订单簿深度数据
+        
+        Args:
+            symbols: 交易对符号，可以是单个字符串或字符串列表
+        """
+        if isinstance(symbols, str):
+            symbols = [symbols]
+
+        # 并发获取每个交易对的初始深度数据
+        tasks = [
+            self.client.fetch('GET', f"{self.api_url}/api/platform/spot/market/depth?symbol={symbol}")
+            for symbol in symbols
+        ]
+        
+        # 等待所有请求完成
+        responses = await asyncio.gather(*tasks)
+        
+        # 处理响应数据
+        for response in responses:
+            self.store.book._onresponse(response.data)
+
+        # 构建订阅参数
+        subscription_params = []
+        for symbol in symbols:
+            subscription_params.append(f"spot@public.increase.aggre.depth@{symbol}")
+
+
+        # 一次sub20个，超过需要分开订阅
+        for i in range(0, len(subscription_params), 20):
+            self.client.ws_connect(
+                'wss://www.ourbit.com/ws?platform=web',
+                send_json={
+                    "method": "SUBSCRIPTION",
+                    "params": subscription_params[i:i + 20],
+                    "id": 2
+                },
+                hdlr_json=self.store.onmessage
+            )
+
+    async def place_order(
+        self,
+        symbol: str,
+        side: Literal["buy", "sell"],
+        price: float,
+        quantity: float = None,
+        order_type: Literal["market", "limit"] = "limit",
+        usdt_amount: float = None
+    ):
+        """现货下单
+        
+        Args:
+            symbol: 交易对，如 "SOL_USDT"
+            side: 买卖方向 "buy" 或 "sell"
+            price: 价格
+            quantity: 数量
+            order_type: 订单类型 "market" 或 "limit"
+            usdt_amount: USDT金额，如果指定则根据价格计算数量
+            
+        Returns:
+            订单响应数据
+        """
+        # 解析交易对
+        currency, market = symbol.split("_")
+
+        detail = self.store.detail.get({
+            'name': currency
+        })
+
+        if not detail:
+            raise ValueError(f"Unknown currency: {currency}")
+
+        price_scale = detail.get('price_scale')
+        quantity_scale = detail.get('quantity_scale')
+
+        
+        # 如果指定了USDT金额，重新计算数量
+        if usdt_amount is not None:
+            if side == "buy":
+                quantity = usdt_amount / price
+            else:
+                # 卖出时usdt_amount表示要卖出的币种价值
+                quantity = usdt_amount / price
+        
+        # 格式化价格和数量
+        if price_scale is not None:
+            price = round(price, price_scale)
+        
+        if quantity_scale is not None:
+            quantity = round(quantity, quantity_scale)
+        
+        # 构建请求数据
+        data = {
+            "currency": currency,
+            "market": market,
+            "tradeType": side.upper(),
+            "quantity": str(quantity),
+        }
+        
+        if order_type == "limit":
+            data["orderType"] = "LIMIT_ORDER"
+            data["price"] = str(price)
+        elif order_type == "market":
+            data["orderType"] = "MARKET_ORDER"
+            # 市价单通常不需要价格参数
+        
+        res = await self.client.fetch(
+            "POST", 
+            f"{self.api_url}/api/platform/spot/order/place", 
+            json=data
+        )
+        
+        # 处理响应
+        match res.data:
+            case {"msg": 'success'}:
+                return res.data["data"]
+            case _:
+                raise Exception(f"Failed to place order: {res.data}")

hyperquant/broker/ws.py

@@ -0,0 +1,48 @@
+import asyncio
+import pybotters
+from pybotters.ws import ClientWebSocketResponse, logger
+from pybotters.auth import Hosts
+import yarl
+
+
+class Heartbeat:
+    @staticmethod
+    async def ourbit(ws: pybotters.ws.ClientWebSocketResponse):
+        while not ws.closed:
+            await ws.send_str('{"method":"ping"}')
+            await asyncio.sleep(10.0)
+    
+    async def ourbit_spot(ws: pybotters.ws.ClientWebSocketResponse):
+        while not ws.closed:
+            await ws.send_str('{"method":"ping"}')
+            await asyncio.sleep(10.0)
+
+pybotters.ws.HeartbeatHosts.items['futures.ourbit.com'] = Heartbeat.ourbit
+pybotters.ws.HeartbeatHosts.items['www.ourbit.com'] = Heartbeat.ourbit_spot
+
+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/core.py

@@ -350,7 +350,7 @@ class Exchange(ExchangeBase):
             self.record_history(time)
 
         # 自动更新账户状态
-        self.Update({symbol: price}, time=time)
+        self.Update({symbol: price},  time=time)
 
         return trade
 
@@ -377,41 +377,92 @@ class Exchange(ExchangeBase):
             trades.append(trade)
         return trades
 
-    def Update(self, close_price, symbols=None, **kwargs):
+    def _recalc_aggregates(self):
+        """基于 self.account 中已保存的各 symbol 状态，重算聚合字段。"""
+        usdt = self.account['USDT']
+        usdt['unrealised_profit'] = 0
+        usdt['hold'] = 0
+        usdt['long'] = 0
+        usdt['short'] = 0
+
+        for symbol in self.trade_symbols:
+            if symbol not in self.account:
+                continue
+            sym = self.account[symbol]
+            px = sym.get('price', 0)
+            amt = sym.get('amount', 0)
+            hp = sym.get('hold_price', 0)
+
+            # 仅当价格有效时计入聚合
+            if px is not None and not np.isnan(px) and px != 0:
+                sym['unrealised_profit'] = (px - hp) * amt
+                sym['value'] = amt * px
+
+                if amt > 0:
+                    usdt['long'] += sym['value']
+                elif amt < 0:
+                    usdt['short'] += sym['value']
+
+                usdt['hold'] += abs(sym['value'])
+                usdt['unrealised_profit'] += sym['unrealised_profit']
+
+        usdt['total'] = round(self.account['USDT']['realised_profit'] + self.initial_balance + usdt['unrealised_profit'], 6)
+        usdt['leverage'] = round(usdt['hold'] / usdt['total'] if usdt['total'] != 0 else 0.0, 3)
+
+    def Update(self, close_price=None, symbols=None, partial=True, **kwargs):
+        """
+        更新账户状态。
+        - partial=True：只更新给定 symbols 的逐符号状态，然后对所有符号做一次聚合重算（推荐）。
+        - partial=False：与原逻辑兼容；当提供一部分 symbol 时，也会聚合重算，不会清空未提供符号的信息。
+        
+        支持三种入参形式：
+        1) close_price 为 dict/Series：symbols 自动取其键/索引
+        2) close_price 为标量 + symbols 为单个字符串
+        3) 显式传 symbols=list[...]，close_price 为 dict/Series（从中取价）
+        如果既不传 close_price 也不传 symbols，则只做一次聚合重算（例如你先前已经手动修改了某些 symbol 的 price）。
+        """
         if self.recorded and 'time' not in kwargs:
             raise ValueError("Time parameter is required in recorded mode.")
 
         time = kwargs.get('time', pd.Timestamp.now())
-        self.account['USDT']['unrealised_profit'] = 0
-        self.account['USDT']['hold'] = 0
-        self.account['USDT']['long'] = 0
-        self.account['USDT']['short'] = 0
+
+        # 解析 symbols & 价格获取器
         if symbols is None:
-            # symbols = self.trade_symbols
-            # 如果symbols是dict类型, 则取出所有的key, 如果是Series类型, 则取出所有的index
             if isinstance(close_price, dict):
                 symbols = list(close_price.keys())
             elif isinstance(close_price, pd.Series):
-                symbols = close_price.index
+                symbols = list(close_price.index)
             else:
-                raise ValueError("Symbols should be a list, dict or Series.")
-            
-        for symbol in symbols:
-            if symbol not in self.trade_symbols:
+                symbols = []
+        elif isinstance(symbols, str):
+            symbols = [symbols]
+
+        def get_px(sym):
+            if isinstance(close_price, (int, float, np.floating)) and len(symbols) == 1:
+                return float(close_price)
+            if isinstance(close_price, dict):
+                return close_price.get(sym, np.nan)
+            if isinstance(close_price, pd.Series):
+                return close_price.get(sym, np.nan)
+            return np.nan
+
+        # 仅更新传入的 symbols（部分更新，不动其它符号已保存信息）
+        for sym in symbols:
+            if sym not in self.trade_symbols or sym not in self.account:
+                # 未登记的交易对直接跳过（或可选择自动登记，但此处保持严格）
+                continue
+            px = get_px(sym)
+            if px is None or np.isnan(px):
+                # 价格无效则不覆盖旧价格
                 continue
-            if not np.isnan(close_price[symbol]):
-                self.account[symbol]['unrealised_profit'] = (close_price[symbol] - self.account[symbol]['hold_price']) * self.account[symbol]['amount']
-                self.account[symbol]['price'] = close_price[symbol]
-                self.account[symbol]['value'] = self.account[symbol]['amount'] * close_price[symbol]
-                if self.account[symbol]['amount'] > 0:
-                    self.account['USDT']['long'] += self.account[symbol]['value']
-                if self.account[symbol]['amount'] < 0:
-                    self.account['USDT']['short'] += self.account[symbol]['value']
-                self.account['USDT']['hold'] += abs(self.account[symbol]['value'])
-                self.account['USDT']['unrealised_profit'] += self.account[symbol]['unrealised_profit']
-
-        self.account['USDT']['total'] = round(self.account['USDT']['realised_profit'] + self.initial_balance + self.account['USDT']['unrealised_profit'], 6)
-        self.account['USDT']['leverage'] = round(self.account['USDT']['hold'] / self.account['USDT']['total'], 3)
+
+            self.account[sym]['price'] = float(px)
+            amt = self.account[sym]['amount']
+            self.account[sym]['value'] = amt * float(px)
+            # 不在这里算 unrealised_profit，聚合阶段统一算
+
+        # 无论 partial 与否，最后都用“账户中保存的所有 symbol 当前状态”做一次聚合重算
+        self._recalc_aggregates()
 
         # 记录账户总资产到 history
         if self.recorded: