httptrading 1.0.0__tar.gz → 1.0.2__tar.gz

{httptrading-1.0.0 → httptrading-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httptrading
-Version: 1.0.0
+Version: 1.0.2
 Summary: 统一交易通道的接口服务
 Author-email: songwei <github@songwei.name>
 License: MIT
@@ -14,6 +14,10 @@ Dynamic: license-file
 
 # httptrading
 
+```shell
+pip install httptrading
+```
+
 项目的用途
 --------
 
@@ -221,34 +225,35 @@ GET /httptrading/api/{instanceId}/market/state
 
 ```json lines
 {
-	"type": "apiResponse",
-	"instanceId": "ggUqPZbSKuQ7Ewsk",
-	"broker": "futu",
-	"brokerDisplay": "富途证券",
-	"time": "2025-05-28T05:33:42.543109+00:00",
-	"ex": null,
-	"marketStatus": {
-		"securities": { // 证券类市场状态, 以 region 为键的结构
-			"US": {
-				"type": "marketStatus",
-				"region": "US",
-				"originStatus": "AFTER_HOURS_END", // 交易通道原始市场状态
-				"unifiedStatus": "CLOSED" // 统一映射的定义
-			},
-			"CN": {
-				"type": "marketStatus",
-				"region": "CN",
-				"originStatus": "AFTERNOON",
-				"unifiedStatus": "RTH"
-			},
-			"HK": {
-				"type": "marketStatus",
-				"region": "HK",
-				"originStatus": "AFTERNOON",
-				"unifiedStatus": "RTH"
-			}
-		}
-	}
+    "type": "apiResponse",
+    "instanceId": "ggUqPZbSKuQ7Ewsk",
+    "broker": "futu",
+    "brokerDisplay": "富途证券",
+    "time": "2025-05-28T05:33:42.543109+00:00",
+    "ex": null,
+    "marketStatus": {
+        "type": "marketStatusMap",
+        "securities": { // 证券类市场状态, 以 region 为键的结构
+            "US": {
+                "type": "marketStatus",
+                "region": "US",
+                "originStatus": "AFTER_HOURS_END", // 交易通道原始市场状态
+                "unifiedStatus": "CLOSED" // 统一映射的定义
+            },
+            "CN": {
+                "type": "marketStatus",
+                "region": "CN",
+                "originStatus": "AFTERNOON",
+                "unifiedStatus": "RTH"
+            },
+            "HK": {
+                "type": "marketStatus",
+                "region": "HK",
+                "originStatus": "AFTERNOON",
+                "unifiedStatus": "RTH"
+            }
+        }
+    }
 }
 ```
 
@@ -402,24 +407,25 @@ GET /httptrading/api/{instanceId}/order/state?orderId={订单号}
 
 ```json lines
 {
-	"type": "apiResponse",
-	"instanceId": "ggUqPZbSKuQ7Ewsk",
-	"broker": "futu",
-	"brokerDisplay": "富途证券",
-	"time": "2025-05-28T05:59:29.984021+00:00",
-	"ex": null,
-	"order": {
-		"type": "order",
-		"orderId": "6278888",
-		"currency": "USD",
-		"qty": 12, // 订单数量
-		"filledQty": 0, // 已成交数量
-		"avgPrice": 0, // 成交价
-		"errorReason": "", // 如果订单异常, 这里记录错误信息
-		"isCanceled": false, // 是否已撤销
-		"isFilled": false, // 是否全部成交
-		"isCompleted": false // 全部成交 或者 有异常 或者 已撤销, 亦等价于不可撤的标志
-	}
+  "type": "apiResponse",
+  "instanceId": "ggUqPZbSKuQ7Ewsk",
+  "broker": "futu",
+  "brokerDisplay": "富途证券",
+  "time": "2025-05-28T05:59:29.984021+00:00",
+  "ex": null,
+  "order": {
+    "type": "order",
+    "orderId": "6278888",
+    "currency": "USD",
+    "qty": 12, // 订单数量
+    "filledQty": 0, // 已成交数量
+    "avgPrice": 0, // 成交价
+    "errorReason": "", // 如果订单异常, 这里记录错误信息
+    "isCanceled": false, // 是否已撤销
+    "isFilled": false, // 是否全部成交
+    "isCompleted": false, // 全部成交 或者 有异常 或者 已撤销
+    "isCancelable": true // 是否可撤的标志
+  }
 }
 ```
 
@@ -498,8 +504,8 @@ from httptrading import *
 from httptrading.model import *
 
 
-@broker_register('myApi', 'XX证券')
-class MyTradingApi(BaseBroker):
+@broker_register('myBroker', 'XX证券')
+class MyBroker(BaseBroker):
     # 根据需要的功能实现接口
     # 如果 sdk 提供的方式会阻塞 eventloop, 需要使用 self.call_sync 方法传入阻塞方法
     async def place_order(
@@ -533,6 +539,64 @@ class MyTradingApi(BaseBroker):
     async def quote(self, contract: Contract) -> Quote:
         raise NotImplementedError
 
-    async def market_status(self) -> dict[str, dict[str, MarketStatus]]:
+    async def market_status(self) -> dict[TradeType, dict[str, MarketStatus] | str]:
         raise NotImplementedError
 ```
+
+
+编写新接口
+--------
+
+```python
+import aiohttp.web
+import httptrading
+
+class MyApi(httptrading.HttpTradingView):
+    async def get(self):
+        broker = self.current_broker()
+        return self.response_api(
+            broker=broker,
+            args={
+                'method': 'GET',
+                'hello': 'world',  
+            },
+        )
+    
+    async def post(self):
+        body_d: dict = await self.request.json()
+        broker = self.current_broker()
+        return self.response_api(
+            broker=broker,
+            args={
+                'method': 'POST',
+                'hello': 'world',  
+                'body': body_d,
+            },
+        )
+
+httptrading.run(
+    host='127.0.0.1',
+    port=8080,
+    brokers=list(),
+    extend_apis=[aiohttp.web.view(r'/httptrading/api/{instance_id:\w{16,32}}/hello/world', MyApi), ],
+)
+```
+
+改变默认的接口
+-----------
+
+```python
+import httptrading
+
+def my_std_apis():
+    std_apis = httptrading.std_api_factory()
+    apis = [api for api in std_apis if 1 == 1]
+    return apis
+
+httptrading.run(
+    host='127.0.0.1',
+    port=8080,
+    brokers=list(),
+    std_apis=my_std_apis,
+)
+```

{httptrading-1.0.0 → httptrading-1.0.2}/README.md

@@ -1,5 +1,9 @@
 # httptrading
 
+```shell
+pip install httptrading
+```
+
 项目的用途
 --------
 
@@ -207,34 +211,35 @@ GET /httptrading/api/{instanceId}/market/state
 
 ```json lines
 {
-	"type": "apiResponse",
-	"instanceId": "ggUqPZbSKuQ7Ewsk",
-	"broker": "futu",
-	"brokerDisplay": "富途证券",
-	"time": "2025-05-28T05:33:42.543109+00:00",
-	"ex": null,
-	"marketStatus": {
-		"securities": { // 证券类市场状态, 以 region 为键的结构
-			"US": {
-				"type": "marketStatus",
-				"region": "US",
-				"originStatus": "AFTER_HOURS_END", // 交易通道原始市场状态
-				"unifiedStatus": "CLOSED" // 统一映射的定义
-			},
-			"CN": {
-				"type": "marketStatus",
-				"region": "CN",
-				"originStatus": "AFTERNOON",
-				"unifiedStatus": "RTH"
-			},
-			"HK": {
-				"type": "marketStatus",
-				"region": "HK",
-				"originStatus": "AFTERNOON",
-				"unifiedStatus": "RTH"
-			}
-		}
-	}
+    "type": "apiResponse",
+    "instanceId": "ggUqPZbSKuQ7Ewsk",
+    "broker": "futu",
+    "brokerDisplay": "富途证券",
+    "time": "2025-05-28T05:33:42.543109+00:00",
+    "ex": null,
+    "marketStatus": {
+        "type": "marketStatusMap",
+        "securities": { // 证券类市场状态, 以 region 为键的结构
+            "US": {
+                "type": "marketStatus",
+                "region": "US",
+                "originStatus": "AFTER_HOURS_END", // 交易通道原始市场状态
+                "unifiedStatus": "CLOSED" // 统一映射的定义
+            },
+            "CN": {
+                "type": "marketStatus",
+                "region": "CN",
+                "originStatus": "AFTERNOON",
+                "unifiedStatus": "RTH"
+            },
+            "HK": {
+                "type": "marketStatus",
+                "region": "HK",
+                "originStatus": "AFTERNOON",
+                "unifiedStatus": "RTH"
+            }
+        }
+    }
 }
 ```
 
@@ -388,24 +393,25 @@ GET /httptrading/api/{instanceId}/order/state?orderId={订单号}
 
 ```json lines
 {
-	"type": "apiResponse",
-	"instanceId": "ggUqPZbSKuQ7Ewsk",
-	"broker": "futu",
-	"brokerDisplay": "富途证券",
-	"time": "2025-05-28T05:59:29.984021+00:00",
-	"ex": null,
-	"order": {
-		"type": "order",
-		"orderId": "6278888",
-		"currency": "USD",
-		"qty": 12, // 订单数量
-		"filledQty": 0, // 已成交数量
-		"avgPrice": 0, // 成交价
-		"errorReason": "", // 如果订单异常, 这里记录错误信息
-		"isCanceled": false, // 是否已撤销
-		"isFilled": false, // 是否全部成交
-		"isCompleted": false // 全部成交 或者 有异常 或者 已撤销, 亦等价于不可撤的标志
-	}
+  "type": "apiResponse",
+  "instanceId": "ggUqPZbSKuQ7Ewsk",
+  "broker": "futu",
+  "brokerDisplay": "富途证券",
+  "time": "2025-05-28T05:59:29.984021+00:00",
+  "ex": null,
+  "order": {
+    "type": "order",
+    "orderId": "6278888",
+    "currency": "USD",
+    "qty": 12, // 订单数量
+    "filledQty": 0, // 已成交数量
+    "avgPrice": 0, // 成交价
+    "errorReason": "", // 如果订单异常, 这里记录错误信息
+    "isCanceled": false, // 是否已撤销
+    "isFilled": false, // 是否全部成交
+    "isCompleted": false, // 全部成交 或者 有异常 或者 已撤销
+    "isCancelable": true // 是否可撤的标志
+  }
 }
 ```
 
@@ -484,8 +490,8 @@ from httptrading import *
 from httptrading.model import *
 
 
-@broker_register('myApi', 'XX证券')
-class MyTradingApi(BaseBroker):
+@broker_register('myBroker', 'XX证券')
+class MyBroker(BaseBroker):
     # 根据需要的功能实现接口
     # 如果 sdk 提供的方式会阻塞 eventloop, 需要使用 self.call_sync 方法传入阻塞方法
     async def place_order(
@@ -519,6 +525,64 @@ class MyTradingApi(BaseBroker):
     async def quote(self, contract: Contract) -> Quote:
         raise NotImplementedError
 
-    async def market_status(self) -> dict[str, dict[str, MarketStatus]]:
+    async def market_status(self) -> dict[TradeType, dict[str, MarketStatus] | str]:
         raise NotImplementedError
-```
+```
+
+
+编写新接口
+--------
+
+```python
+import aiohttp.web
+import httptrading
+
+class MyApi(httptrading.HttpTradingView):
+    async def get(self):
+        broker = self.current_broker()
+        return self.response_api(
+            broker=broker,
+            args={
+                'method': 'GET',
+                'hello': 'world',  
+            },
+        )
+    
+    async def post(self):
+        body_d: dict = await self.request.json()
+        broker = self.current_broker()
+        return self.response_api(
+            broker=broker,
+            args={
+                'method': 'POST',
+                'hello': 'world',  
+                'body': body_d,
+            },
+        )
+
+httptrading.run(
+    host='127.0.0.1',
+    port=8080,
+    brokers=list(),
+    extend_apis=[aiohttp.web.view(r'/httptrading/api/{instance_id:\w{16,32}}/hello/world', MyApi), ],
+)
+```
+
+改变默认的接口
+-----------
+
+```python
+import httptrading
+
+def my_std_apis():
+    std_apis = httptrading.std_api_factory()
+    apis = [api for api in std_apis if 1 == 1]
+    return apis
+
+httptrading.run(
+    host='127.0.0.1',
+    port=8080,
+    brokers=list(),
+    std_apis=my_std_apis,
+)
+```

{httptrading-1.0.0 → httptrading-1.0.2}/httptrading/__init__.py

@@ -1,6 +1,6 @@
 from httptrading.broker.base import *
-from httptrading.broker.futu import *
+from httptrading.broker.futu_sec import *
 from httptrading.broker.longbridge import *
 from httptrading.broker.tiger import *
 from httptrading.broker.interactive_brokers import *
-from httptrading.http_server import run
+from httptrading.http_server import *

{httptrading-1.0.0 → httptrading-1.0.2}/httptrading/broker/base.py

@@ -81,7 +81,13 @@ class BaseBroker(ABC):
     async def quote(self, contract: Contract) -> Quote:
         raise NotImplementedError
 
-    async def market_status(self) -> dict[str, dict[str, MarketStatus]]:
+    async def market_status(self) -> dict[TradeType, dict[str, MarketStatus] | str]:
+        """
+        报告交易通道提供的市场状态,
+        返回一个双层字典,
+        外层字典是以交易品种分类的结构, 比如 TradeType.Securities,
+        内层的字典是按国家代码区分的各个市场状态的结构, 比如 "US".
+        """
         raise NotImplementedError
 
 

httptrading-1.0.0/httptrading/broker/futu.py → httptrading-1.0.2/httptrading/broker/futu_sec.py

@@ -166,7 +166,7 @@ class Futu(SecuritiesBroker):
     async def cash(self) -> Cash:
         return await self.call_sync(lambda : self._cash())
 
-    def _market_status(self) -> dict[str, dict[str, MarketStatus]]:
+    def _market_status(self) -> dict[TradeType, dict[str, MarketStatus] | str]:
         # 各个市场的状态定义见:
         # https://openapi.futunn.com/futu-api-doc/qa/quote.html#2090
         from futu import RET_OK
@@ -204,10 +204,10 @@ class Futu(SecuritiesBroker):
                 unified_status=unified_status,
             )
         return {
-            TradeType.Securities.name.lower(): sec_result,
+            TradeType.Securities: sec_result,
         }
 
-    async def market_status(self) -> dict[str, dict[str, MarketStatus]]:
+    async def market_status(self) -> dict[TradeType, dict[str, MarketStatus] | str]:
         return await self.call_sync(lambda : self._market_status())
 
     def _quote(self, contract: Contract):
@@ -367,8 +367,37 @@ class Futu(SecuritiesBroker):
 
     def _order(self, order_id: str) -> Order:
         from futu import RET_OK, OrderStatus
-        error_set = {OrderStatus.FAILED, OrderStatus.DISABLED, OrderStatus.DELETED, }
-        cancel_set = {OrderStatus.CANCELLED_PART, OrderStatus.CANCELLED_ALL, }
+
+        """
+        富途证券的状态定义
+        NONE = "N/A"                                # 未知状态
+        UNSUBMITTED = "UNSUBMITTED"                 # 未提交
+        WAITING_SUBMIT = "WAITING_SUBMIT"           # 等待提交
+        SUBMITTING = "SUBMITTING"                   # 提交中
+        SUBMIT_FAILED = "SUBMIT_FAILED"             # 提交失败，下单失败
+        TIMEOUT = "TIMEOUT"                         # 处理超时，结果未知
+        SUBMITTED = "SUBMITTED"                     # 已提交，等待成交
+        FILLED_PART = "FILLED_PART"                 # 部分成交
+        FILLED_ALL = "FILLED_ALL"                   # 全部已成
+        CANCELLING_PART = "CANCELLING_PART"         # 正在撤单_部分(部分已成交，正在撤销剩余部分)
+        CANCELLING_ALL = "CANCELLING_ALL"           # 正在撤单_全部
+        CANCELLED_PART = "CANCELLED_PART"           # 部分成交，剩余部分已撤单
+        CANCELLED_ALL = "CANCELLED_ALL"             # 全部已撤单，无成交
+        FAILED = "FAILED"                           # 下单失败，服务拒绝
+        DISABLED = "DISABLED"                       # 已失效
+        DELETED = "DELETED"                         # 已删除，无成交的订单才能删除
+        FILL_CANCELLED = "FILL_CANCELLED"           # 成交被撤销，一般遇不到，意思是已经成交的订单被回滚撤销，成交无效变为废单
+        """
+        canceled_endings = {OrderStatus.CANCELLED_ALL, OrderStatus.CANCELLED_PART, }
+        bad_endings = {
+            OrderStatus.SUBMIT_FAILED,
+            OrderStatus.FAILED,
+            OrderStatus.DISABLED,
+            OrderStatus.DELETED,
+            OrderStatus.FILL_CANCELLED, # 不清楚对于成交数量有何影响.
+        }
+        pending_cancel_sets = {OrderStatus.CANCELLING_PART, OrderStatus.CANCELLING_ALL, }
+
         with self._refresh_order_bucket:
             ret, data = self._trade_client.order_list_query(
                 order_id=order_id,
@@ -382,8 +411,11 @@ class Futu(SecuritiesBroker):
             raise Exception(f'找不到订单(未完成), 订单: {order_id}')
         futu_order = orders[0]
         reason = ''
-        if futu_order['order_status'] in error_set:
-            reason = futu_order['order_status']
+        order_status: str = futu_order['order_status']
+        if order_status in bad_endings:
+            reason = order_status
+        is_canceled = order_status in canceled_endings
+        is_pending_cancel = order_status in pending_cancel_sets
         return Order(
             order_id=order_id,
             currency=futu_order['currency'],
@@ -391,7 +423,8 @@ class Futu(SecuritiesBroker):
             filled_qty=int(futu_order['dealt_qty']),
             avg_price=futu_order['dealt_avg_price'] or 0.0,
             error_reason=reason,
-            is_canceled=futu_order['order_status'] in cancel_set,
+            is_canceled=is_canceled,
+            is_pending_cancel=is_pending_cancel,
         )
 
     async def order(self, order_id: str) -> Order:

{httptrading-1.0.0 → httptrading-1.0.2}/httptrading/broker/interactive_brokers.py

@@ -74,7 +74,6 @@ class InteractiveBrokers(SecuritiesBroker):
         async with self._lock:
             if contract in self._ib_contracts:
                 return self._ib_contracts[contract]
-            print(f'{contract}未命中')
             currency = self.contract_to_currency(contract)
             ib_contract = ib_insync.Stock(contract.ticker, 'SMART', currency=currency)
             client = self._client
@@ -82,6 +81,15 @@ class InteractiveBrokers(SecuritiesBroker):
             self._ib_contracts[contract] = ib_contract
             return ib_contract
 
+    def _when_create_client(self, client):
+        import ib_insync
+        client: ib_insync.IB = client
+
+        def _order_status_changed(trade: ib_insync.Trade):
+            pass
+
+        client.orderStatusEvent += _order_status_changed
+
     async def _try_create_client(self):
         import ib_insync
         async with self._lock:
@@ -101,6 +109,7 @@ class InteractiveBrokers(SecuritiesBroker):
                 ib = ib_socket
             else:
                 ib = ib_insync.IB()
+                self._when_create_client(ib)
             host = self.broker_args.get('host', '127.0.0.1')
             port = self.broker_args.get('port', 4000)
             client_id = self.broker_args.get('client_id', self._client_id)
@@ -222,13 +231,23 @@ class InteractiveBrokers(SecuritiesBroker):
                     case _:
                         raise Exception(f'不支持的订单类型: {order_type}')
 
+            evt = asyncio.Event()
+            def _status_evnet(_trade: ib_insync.Trade):
+                evt.set()
+
             ib_order = _map_order()
             ib_order.tif = _map_time_in_force()
             ib_order.outsideRth = _map_lifecycle()
             trade: ib_insync.Trade = client.placeOrder(ib_contract, ib_order)
-            await asyncio.sleep(2.0)
-            order_id = str(trade.order.permId)
+            trade.statusEvent += _status_evnet
+            try:
+                await asyncio.wait_for(evt.wait(), timeout=2.0)
+            except asyncio.TimeoutError:
+                pass
+            finally:
+                order_id = str(trade.order.permId)
             assert order_id
+            order_id = str(trade.order.permId)
             return order_id
 
     async def place_order(
@@ -271,6 +290,10 @@ class InteractiveBrokers(SecuritiesBroker):
     async def _order(self, order_id: str) -> Order:
         import ib_insync
 
+        canceled_endings = {ib_insync.OrderStatus.Cancelled, ib_insync.OrderStatus.ApiCancelled, }
+        bad_endings = {ib_insync.OrderStatus.Inactive, }
+        pending_cancel_sets = {ib_insync.OrderStatus.PendingCancel, }
+
         def _total_fills(trade) -> int:
             return int(trade.filled())
 
@@ -295,20 +318,21 @@ class InteractiveBrokers(SecuritiesBroker):
             assert qty >= filled_qty
             avg_fill_price = _avg_price(ib_trade)
             reason = ''
-            if ib_trade.orderStatus.status == ib_insync.OrderStatus.Inactive:
-                reason = 'Inactive'
-
-            cancel_status = {ib_insync.OrderStatus.Cancelled, ib_insync.OrderStatus.ApiCancelled, }
-            is_cancelled = ib_trade.orderStatus.status in cancel_status
-            return Order(
+            if ib_trade.orderStatus.status in bad_endings:
+                reason = ib_trade.orderStatus.status
+            is_canceled = ib_trade.orderStatus.status in canceled_endings
+            is_pending_cancel = ib_trade.orderStatus.status in pending_cancel_sets
+            order = Order(
                 order_id=order_id,
                 currency=ib_trade.contract.currency,
                 qty=qty,
                 filled_qty=filled_qty,
                 avg_price=avg_fill_price,
                 error_reason=reason,
-                is_canceled=is_cancelled,
+                is_canceled=is_canceled,
+                is_pending_cancel=is_pending_cancel,
             )
+            return order
         raise Exception(f'查询不到订单{order_id}')
 
     async def order(self, order_id: str) -> Order:

{httptrading-1.0.0 → httptrading-1.0.2}/httptrading/broker/longbridge.py

@@ -344,17 +344,26 @@ class LongBridge(SecuritiesBroker):
         ))
 
     def _order(self, order_id: str) -> Order:
+        # 订单状态定义见
+        # https://open.longportapp.com/zh-CN/docs/trade/trade-definition#orderstatus
         from longport.openapi import OrderStatus
+
+        canceled_endings = {OrderStatus.Canceled, }
+        bad_endings = {
+            OrderStatus.Rejected,
+            OrderStatus.Expired,
+            OrderStatus.PartialWithdrawal,
+        }
+        pending_cancel_sets = {OrderStatus.PendingCancel, }
+
         with self._assets_bucket:
             self._try_refresh()
             resp = self._trade_client.order_detail(order_id=order_id)
         reason = ''
-        if resp.status == OrderStatus.Rejected:
-            reason = '已拒绝'
-        if resp.status == OrderStatus.Expired:
-            reason = '已过期'
-        if resp.status == OrderStatus.PartialWithdrawal:
-            reason = '部分撤单'
+        if resp.status in bad_endings:
+            reason = str(resp.status)
+        is_canceled = resp.status in canceled_endings
+        is_pending_cancel = resp.status in pending_cancel_sets
         return Order(
             order_id=order_id,
             currency=resp.currency,
@@ -362,7 +371,8 @@ class LongBridge(SecuritiesBroker):
             filled_qty=int(resp.executed_quantity),
             avg_price=float(resp.executed_price) if resp.executed_price else 0.0,
             error_reason=reason,
-            is_canceled=resp.status == OrderStatus.Canceled,
+            is_canceled=is_canceled,
+            is_pending_cancel=is_pending_cancel,
         )
 
     async def order(self, order_id: str) -> Order:

{httptrading-1.0.0 → httptrading-1.0.2}/httptrading/broker/tiger.py

@@ -142,7 +142,7 @@ class Tiger(SecuritiesBroker):
     async def cash(self) -> Cash:
         return await self.call_sync(lambda: self._cash())
 
-    def _market_status(self) -> dict[str, dict[str, MarketStatus]]:
+    def _market_status(self) -> dict[TradeType, dict[str, MarketStatus] | str]:
         from tigeropen.common.consts import Market
         from tigeropen.quote.domain.market_status import MarketStatus as TigerMarketStatus
         client = self._quote_client
@@ -172,10 +172,10 @@ class Tiger(SecuritiesBroker):
                 unified_status=unified_status,
             )
         return {
-            TradeType.Securities.name.lower(): sec_result,
+            TradeType.Securities: sec_result,
         }
 
-    async def market_status(self) -> dict[str, dict[str, MarketStatus]]:
+    async def market_status(self) -> dict[TradeType, dict[str, MarketStatus] | str]:
         return await self.call_sync(lambda: self._market_status())
 
     def _quote(self, contract: Contract):
@@ -318,19 +318,36 @@ class Tiger(SecuritiesBroker):
         ))
 
     def _order(self, order_id: str) -> Order:
+        # 订单状态定义见
+        # https://quant.itigerup.com/openapi/zh/python/appendix2/overview.html#%E8%AE%A2%E5%8D%95%E7%8A%B6%E6%80%81
+        # 注意文档比 SDK 定义要少
         from tigeropen.trade.domain.order import Order as TigerOrder, OrderStatus
+
+        canceled_endings = {OrderStatus.CANCELLED, }
+        bad_endings = {
+            OrderStatus.REJECTED,
+            OrderStatus.EXPIRED,
+        }
+        pending_cancel_sets = {OrderStatus.PENDING_CANCEL, }
+
         with self._order_bucket:
             tiger_order: TigerOrder = self._trade_client.get_order(id=int(order_id))
         if tiger_order is None:
             raise Exception(f'查询不到订单{order_id}')
+
+        order_status = tiger_order.status
+        reason = tiger_order.reason or (order_status.name if order_status in bad_endings else None)
+        is_canceled = order_status in canceled_endings
+        is_pending_cancel = order_status in pending_cancel_sets
         return Order(
             order_id=order_id,
             currency=tiger_order.contract.currency,
             qty=tiger_order.quantity or 0,
             filled_qty=tiger_order.filled or 0,
             avg_price=tiger_order.avg_fill_price or 0.0,
-            error_reason=tiger_order.reason,
-            is_canceled=tiger_order.status == OrderStatus.CANCELLED,
+            error_reason=reason,
+            is_canceled=is_canceled,
+            is_pending_cancel=is_pending_cancel,
         )
 
     async def order(self, order_id: str) -> Order:

{httptrading-1.0.0 → httptrading-1.0.2}/httptrading/http_server.py

@@ -1,5 +1,6 @@
 import json
 from datetime import datetime, UTC
+from typing import Callable
 from aiohttp import web
 from httptrading.broker.base import *
 from httptrading.model import *
@@ -19,7 +20,7 @@ class HttpTradingView(web.View):
     def instance_id(self) -> str:
         return self.request.match_info.get('instance_id', '')
 
-    def current_broker(self):
+    def current_broker(self) -> BaseBroker:
         broker = getattr(self.request, '__current_broker__', None)
         if broker is None:
             raise web.HTTPNotFound()
@@ -94,6 +95,7 @@ class HttpTradingView(web.View):
                 'isCanceled': obj.is_canceled,
                 'isFilled': obj.is_filled,
                 'isCompleted': obj.is_completed,
+                'isCancelable': obj.is_cancelable,
             }
         raise TypeError(f"Object of type {obj.__class__.__name__} is not JSON serializable")
 
@@ -106,7 +108,7 @@ class HttpTradingView(web.View):
         return web.Response(text=cls.dumps(obj), content_type='application/json')
 
     @classmethod
-    def response_api(cls, broker: BaseBroker, args: dict = None, ex: Exception = None):
+    def response_api(cls, broker: BaseBroker = None, args: dict = None, ex: Exception = None):
         resp = {
             'type': 'apiResponse',
             'instanceId': broker.instance_id if broker else None,
@@ -212,6 +214,8 @@ class MarketStatusView(HttpTradingView):
     async def get(self):
         broker = self.current_broker()
         ms_dict = await broker.market_status()
+        ms_dict = {t.name.lower(): d for t, d in ms_dict.items()}
+        ms_dict['type'] = 'marketStatusMap'
         return self.response_api(broker, {
             'marketStatus': ms_dict,
         })
@@ -253,29 +257,48 @@ async def exception_middleware(request: web.Request, handler):
         return HttpTradingView.response_api(broker=broker, ex=ex)
 
 
+def std_api_factory() -> list[web.RouteDef]:
+    apis = [
+        web.view(r'/httptrading/api/{instance_id:\w{16,32}}/order/place', PlaceOrderView),
+        web.view(r'/httptrading/api/{instance_id:\w{16,32}}/order/state', OrderStateView),
+        web.view(r'/httptrading/api/{instance_id:\w{16,32}}/order/cancel', CancelOrderView),
+        web.view(r'/httptrading/api/{instance_id:\w{16,32}}/cash/state', CashView),
+        web.view(r'/httptrading/api/{instance_id:\w{16,32}}/position/state', PositionView),
+        web.view(r'/httptrading/api/{instance_id:\w{16,32}}/ping/state', PlugInView),
+        web.view(r'/httptrading/api/{instance_id:\w{16,32}}/market/state', MarketStatusView),
+        web.view(r'/httptrading/api/{instance_id:\w{16,32}}/market/quote', QuoteView),
+    ]
+    return apis
+
 def run(
         host: str,
         port: int,
         brokers: list[BaseBroker],
+        std_apis: Callable[[], list[web.RouteDef]] = None,
+        extend_apis: list[web.RouteDef] = None,
+        **kwargs
 ) -> None:
+    """
+    @param host: 监听地址
+    @param port: 监听端口
+    @param brokers: 需要控制的交易通道对象列表
+    @param std_apis: 如果需要替换默认提供的接口, 这里提供工厂函数的回调
+    @param extend_apis: 如果需要增加自定义接口, 这里传入 RouteDef 列表
+    @param kwargs: 其他的参数将传给 aiohttp.web.run_app 函数
+    """
     app = web.Application(
         middlewares=[
             auth_middleware,
             exception_middleware,
         ],
     )
-    app.add_routes(
-        [
-            web.view(r'/httptrading/api/{instance_id:\w{16,32}}/order/place', PlaceOrderView),
-            web.view(r'/httptrading/api/{instance_id:\w{16,32}}/order/state', OrderStateView),
-            web.view(r'/httptrading/api/{instance_id:\w{16,32}}/order/cancel', CancelOrderView),
-            web.view(r'/httptrading/api/{instance_id:\w{16,32}}/cash/state', CashView),
-            web.view(r'/httptrading/api/{instance_id:\w{16,32}}/position/state', PositionView),
-            web.view(r'/httptrading/api/{instance_id:\w{16,32}}/ping/state', PlugInView),
-            web.view(r'/httptrading/api/{instance_id:\w{16,32}}/market/state', MarketStatusView),
-            web.view(r'/httptrading/api/{instance_id:\w{16,32}}/market/quote', QuoteView),
-        ]
-    )
+
+    apis = (std_api_factory if std_apis is None else std_apis)()
+
+    if extend_apis:
+        apis.extend(extend_apis)
+
+    app.add_routes(apis)
 
     async def _on_startup(app):
         HttpTradingView.set_brokers(brokers)
@@ -292,4 +315,12 @@ def run(
         app,
         host=host,
         port=port,
+        **kwargs
     )
+
+
+__all__ = [
+    'run',
+    'std_api_factory',
+    'HttpTradingView',
+]

{httptrading-1.0.0 → httptrading-1.0.2}/httptrading/model.py

@@ -119,6 +119,9 @@ class Order:
     avg_price: float = field(default=0.0)
     error_reason: str = field(default='')
     is_canceled: bool = field(default=False)
+    # 如果交易通道存在"待取消""已提交取消"的订单状态,
+    # 这里需要改变默认值为 True
+    is_pending_cancel: bool = field(default=False)
 
     @property
     def is_filled(self) -> bool:
@@ -138,6 +141,11 @@ class Order:
             is_completed = True
         return is_completed
 
+    @property
+    def is_cancelable(self) -> bool:
+        is_completed = self.is_completed
+        return not is_completed and not self.is_pending_cancel
+
 
 @dataclass(frozen=True)
 class DetectPkg:

{httptrading-1.0.0 → httptrading-1.0.2}/httptrading.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httptrading
-Version: 1.0.0
+Version: 1.0.2
 Summary: 统一交易通道的接口服务
 Author-email: songwei <github@songwei.name>
 License: MIT
@@ -14,6 +14,10 @@ Dynamic: license-file
 
 # httptrading
 
+```shell
+pip install httptrading
+```
+
 项目的用途
 --------
 
@@ -221,34 +225,35 @@ GET /httptrading/api/{instanceId}/market/state
 
 ```json lines
 {
-	"type": "apiResponse",
-	"instanceId": "ggUqPZbSKuQ7Ewsk",
-	"broker": "futu",
-	"brokerDisplay": "富途证券",
-	"time": "2025-05-28T05:33:42.543109+00:00",
-	"ex": null,
-	"marketStatus": {
-		"securities": { // 证券类市场状态, 以 region 为键的结构
-			"US": {
-				"type": "marketStatus",
-				"region": "US",
-				"originStatus": "AFTER_HOURS_END", // 交易通道原始市场状态
-				"unifiedStatus": "CLOSED" // 统一映射的定义
-			},
-			"CN": {
-				"type": "marketStatus",
-				"region": "CN",
-				"originStatus": "AFTERNOON",
-				"unifiedStatus": "RTH"
-			},
-			"HK": {
-				"type": "marketStatus",
-				"region": "HK",
-				"originStatus": "AFTERNOON",
-				"unifiedStatus": "RTH"
-			}
-		}
-	}
+    "type": "apiResponse",
+    "instanceId": "ggUqPZbSKuQ7Ewsk",
+    "broker": "futu",
+    "brokerDisplay": "富途证券",
+    "time": "2025-05-28T05:33:42.543109+00:00",
+    "ex": null,
+    "marketStatus": {
+        "type": "marketStatusMap",
+        "securities": { // 证券类市场状态, 以 region 为键的结构
+            "US": {
+                "type": "marketStatus",
+                "region": "US",
+                "originStatus": "AFTER_HOURS_END", // 交易通道原始市场状态
+                "unifiedStatus": "CLOSED" // 统一映射的定义
+            },
+            "CN": {
+                "type": "marketStatus",
+                "region": "CN",
+                "originStatus": "AFTERNOON",
+                "unifiedStatus": "RTH"
+            },
+            "HK": {
+                "type": "marketStatus",
+                "region": "HK",
+                "originStatus": "AFTERNOON",
+                "unifiedStatus": "RTH"
+            }
+        }
+    }
 }
 ```
 
@@ -402,24 +407,25 @@ GET /httptrading/api/{instanceId}/order/state?orderId={订单号}
 
 ```json lines
 {
-	"type": "apiResponse",
-	"instanceId": "ggUqPZbSKuQ7Ewsk",
-	"broker": "futu",
-	"brokerDisplay": "富途证券",
-	"time": "2025-05-28T05:59:29.984021+00:00",
-	"ex": null,
-	"order": {
-		"type": "order",
-		"orderId": "6278888",
-		"currency": "USD",
-		"qty": 12, // 订单数量
-		"filledQty": 0, // 已成交数量
-		"avgPrice": 0, // 成交价
-		"errorReason": "", // 如果订单异常, 这里记录错误信息
-		"isCanceled": false, // 是否已撤销
-		"isFilled": false, // 是否全部成交
-		"isCompleted": false // 全部成交 或者 有异常 或者 已撤销, 亦等价于不可撤的标志
-	}
+  "type": "apiResponse",
+  "instanceId": "ggUqPZbSKuQ7Ewsk",
+  "broker": "futu",
+  "brokerDisplay": "富途证券",
+  "time": "2025-05-28T05:59:29.984021+00:00",
+  "ex": null,
+  "order": {
+    "type": "order",
+    "orderId": "6278888",
+    "currency": "USD",
+    "qty": 12, // 订单数量
+    "filledQty": 0, // 已成交数量
+    "avgPrice": 0, // 成交价
+    "errorReason": "", // 如果订单异常, 这里记录错误信息
+    "isCanceled": false, // 是否已撤销
+    "isFilled": false, // 是否全部成交
+    "isCompleted": false, // 全部成交 或者 有异常 或者 已撤销
+    "isCancelable": true // 是否可撤的标志
+  }
 }
 ```
 
@@ -498,8 +504,8 @@ from httptrading import *
 from httptrading.model import *
 
 
-@broker_register('myApi', 'XX证券')
-class MyTradingApi(BaseBroker):
+@broker_register('myBroker', 'XX证券')
+class MyBroker(BaseBroker):
     # 根据需要的功能实现接口
     # 如果 sdk 提供的方式会阻塞 eventloop, 需要使用 self.call_sync 方法传入阻塞方法
     async def place_order(
@@ -533,6 +539,64 @@ class MyTradingApi(BaseBroker):
     async def quote(self, contract: Contract) -> Quote:
         raise NotImplementedError
 
-    async def market_status(self) -> dict[str, dict[str, MarketStatus]]:
+    async def market_status(self) -> dict[TradeType, dict[str, MarketStatus] | str]:
         raise NotImplementedError
 ```
+
+
+编写新接口
+--------
+
+```python
+import aiohttp.web
+import httptrading
+
+class MyApi(httptrading.HttpTradingView):
+    async def get(self):
+        broker = self.current_broker()
+        return self.response_api(
+            broker=broker,
+            args={
+                'method': 'GET',
+                'hello': 'world',  
+            },
+        )
+    
+    async def post(self):
+        body_d: dict = await self.request.json()
+        broker = self.current_broker()
+        return self.response_api(
+            broker=broker,
+            args={
+                'method': 'POST',
+                'hello': 'world',  
+                'body': body_d,
+            },
+        )
+
+httptrading.run(
+    host='127.0.0.1',
+    port=8080,
+    brokers=list(),
+    extend_apis=[aiohttp.web.view(r'/httptrading/api/{instance_id:\w{16,32}}/hello/world', MyApi), ],
+)
+```
+
+改变默认的接口
+-----------
+
+```python
+import httptrading
+
+def my_std_apis():
+    std_apis = httptrading.std_api_factory()
+    apis = [api for api in std_apis if 1 == 1]
+    return apis
+
+httptrading.run(
+    host='127.0.0.1',
+    port=8080,
+    brokers=list(),
+    std_apis=my_std_apis,
+)
+```

{httptrading-1.0.0 → httptrading-1.0.2}/httptrading.egg-info/SOURCES.txt

@@ -11,7 +11,7 @@ httptrading.egg-info/requires.txt
 httptrading.egg-info/top_level.txt
 httptrading/broker/__init__.py
 httptrading/broker/base.py
-httptrading/broker/futu.py
+httptrading/broker/futu_sec.py
 httptrading/broker/interactive_brokers.py
 httptrading/broker/longbridge.py
 httptrading/broker/tiger.py

{httptrading-1.0.0 → httptrading-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "httptrading"
-version = "1.0.0"
+version = "1.0.2"
 description = "统一交易通道的接口服务"
 authors = [
     {name = "songwei", email = "github@songwei.name"},