httptrading 1.0.3__tar.gz → 1.0.6__tar.gz

{httptrading-1.0.3 → httptrading-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httptrading
-Version: 1.0.3
+Version: 1.0.6
 Summary: 统一交易通道的接口服务
 Author-email: songwei <github@songwei.name>
 License: MIT
@@ -187,10 +187,10 @@ GET /httptrading/api/{instanceId}/market/quote
 | 参数        | 说明      | 举例                 |
 |-----------|---------|--------------------|
 | tradeType | 说明标的的品种 | Securities: 证券     |
-| ticker    | 代码      | QQQ, 00700, 000001 |
+| symbol    | 代码      | QQQ, 00700, 000001 |
 | region    | 以国家区分代码 | US, HK, CN         |
 
-举例 ?tradeType=Securities&region=CN&ticker=000001 参数的结果:
+举例 ?tradeType=Securities&region=CN&symbol=000001 参数的结果:
 ```json lines
 {
 	"type": "apiResponse",
@@ -205,7 +205,7 @@ GET /httptrading/api/{instanceId}/market/quote
 			"type": "contract",
 			"tradeType": "Securities",
 			"region": "CN",
-			"ticker": "000001"
+			"symbol": "000001"
 		},
 		"currency": "CNY",  // 币种
 		"isTradable": true,  // 此时是否可交易, 比如受到停牌熔断影响
@@ -313,7 +313,7 @@ GET /httptrading/api/{instanceId}/position/state
 				"type": "contract",
 				"tradeType": "Securities",
 				"region": "US",
-				"ticker": "QQQ"
+				"symbol": "QQQ"
 			},
 			"unit": "Share",
 			"currency": "USD",
@@ -333,7 +333,7 @@ POST /httptrading/api/{instanceId}/order/place
 | 参数          | 说明       | 举例                                               |
 |-------------|----------|--------------------------------------------------|
 | tradeType   | 说明标的的品种  | Securities: 证券                                   |
-| ticker      | 代码       | QQQ, 00700, 000001                               |
+| symbol      | 代码       | QQQ, 00700, 000001                               |
 | region      | 以国家区分代码  | US, HK, CN                                       |
 | price       | 限价       | 市价单不填此项                                          |
 | qty         | 订单数量, 整数 |                                                  |
@@ -346,7 +346,7 @@ POST /httptrading/api/{instanceId}/order/place
 ```json lines
 {
 	"tradeType": "Securities",
-	"ticker": "AAPL",
+	"symbol": "AAPL",
 	"region": "US",
 	"price": 200.00,
 	"qty": 12,
@@ -369,7 +369,7 @@ POST /httptrading/api/{instanceId}/order/place
 	"orderId": "69788888", // 订单号
 	"args": { // 传递的参数
 		"tradeType": "Securities",
-		"ticker": "AAPL",
+		"symbol": "AAPL",
 		"region": "US",
 		"price": 200,
 		"qty": 12,

{httptrading-1.0.3 → httptrading-1.0.6}/README.md

@@ -172,10 +172,10 @@ GET /httptrading/api/{instanceId}/market/quote
 | 参数        | 说明      | 举例                 |
 |-----------|---------|--------------------|
 | tradeType | 说明标的的品种 | Securities: 证券     |
-| ticker    | 代码      | QQQ, 00700, 000001 |
+| symbol    | 代码      | QQQ, 00700, 000001 |
 | region    | 以国家区分代码 | US, HK, CN         |
 
-举例 ?tradeType=Securities&region=CN&ticker=000001 参数的结果:
+举例 ?tradeType=Securities&region=CN&symbol=000001 参数的结果:
 ```json lines
 {
 	"type": "apiResponse",
@@ -190,7 +190,7 @@ GET /httptrading/api/{instanceId}/market/quote
 			"type": "contract",
 			"tradeType": "Securities",
 			"region": "CN",
-			"ticker": "000001"
+			"symbol": "000001"
 		},
 		"currency": "CNY",  // 币种
 		"isTradable": true,  // 此时是否可交易, 比如受到停牌熔断影响
@@ -298,7 +298,7 @@ GET /httptrading/api/{instanceId}/position/state
 				"type": "contract",
 				"tradeType": "Securities",
 				"region": "US",
-				"ticker": "QQQ"
+				"symbol": "QQQ"
 			},
 			"unit": "Share",
 			"currency": "USD",
@@ -318,7 +318,7 @@ POST /httptrading/api/{instanceId}/order/place
 | 参数          | 说明       | 举例                                               |
 |-------------|----------|--------------------------------------------------|
 | tradeType   | 说明标的的品种  | Securities: 证券                                   |
-| ticker      | 代码       | QQQ, 00700, 000001                               |
+| symbol      | 代码       | QQQ, 00700, 000001                               |
 | region      | 以国家区分代码  | US, HK, CN                                       |
 | price       | 限价       | 市价单不填此项                                          |
 | qty         | 订单数量, 整数 |                                                  |
@@ -331,7 +331,7 @@ POST /httptrading/api/{instanceId}/order/place
 ```json lines
 {
 	"tradeType": "Securities",
-	"ticker": "AAPL",
+	"symbol": "AAPL",
 	"region": "US",
 	"price": 200.00,
 	"qty": 12,
@@ -354,7 +354,7 @@ POST /httptrading/api/{instanceId}/order/place
 	"orderId": "69788888", // 订单号
 	"args": { // 传递的参数
 		"tradeType": "Securities",
-		"ticker": "AAPL",
+		"symbol": "AAPL",
 		"region": "US",
 		"price": 200,
 		"qty": 12,

{httptrading-1.0.3 → httptrading-1.0.6}/httptrading/broker/base.py

@@ -82,6 +82,7 @@ class BaseBroker(ABC):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         raise NotImplementedError

{httptrading-1.0.3 → httptrading-1.0.6}/httptrading/broker/futu_sec.py

@@ -106,24 +106,24 @@ class Futu(SecuritiesBroker):
     @classmethod
     def code_to_contract(cls, code) -> Contract | None:
         region = ''
-        ticker = ''
+        symbol = ''
         if m := re.match(r'^US\.(\S+)$', code):
             region = 'US'
-            ticker = m.groups()[0]
+            symbol = m.groups()[0]
         if m := re.match(r'^HK\.(\d{5})$', code):
             region = 'HK'
-            ticker = m.groups()[0]
+            symbol = m.groups()[0]
         if m := re.match(r'^SH\.(\d{6})$', code):
             region = 'CN'
-            ticker = m.groups()[0]
+            symbol = m.groups()[0]
         if m := re.match(r'^SZ\.(\d{6})$', code):
             region = 'CN'
-            ticker = m.groups()[0]
-        if not region or not ticker:
+            symbol = m.groups()[0]
+        if not region or not symbol:
             return None
         return Contract(
             trade_type=TradeType.Securities,
-            ticker=ticker,
+            symbol=symbol,
             region=region,
         )
 
@@ -131,16 +131,16 @@ class Futu(SecuritiesBroker):
     def contract_to_code(cls, contract: Contract) -> str | None:
         if contract.trade_type != TradeType.Securities:
             return None
-        region, ticker = contract.region, contract.ticker
+        region, symbol = contract.region, contract.symbol
         code = None
-        if region == 'CN' and re.match(r'^[56]\d{5}$', ticker):
-            code = f'SH.{ticker}'
-        elif region == 'CN' and re.match(r'^[013]\d{5}$', ticker):
-            code = f'SZ.{ticker}'
-        elif region == 'HK' and re.match(r'^\d{5}$', ticker):
-            code = f'HK.{ticker}'
-        elif region == 'US' and re.match(r'^\w+$', ticker):
-            code = f'US.{ticker}'
+        if region == 'CN' and re.match(r'^[56]\d{5}$', symbol):
+            code = f'SH.{symbol}'
+        elif region == 'CN' and re.match(r'^[013]\d{5}$', symbol):
+            code = f'SZ.{symbol}'
+        elif region == 'HK' and re.match(r'^\d{5}$', symbol):
+            code = f'HK.{symbol}'
+        elif region == 'US' and re.match(r'^\w+$', symbol):
+            code = f'US.{symbol}'
         return code
 
     @classmethod
@@ -320,6 +320,7 @@ class Futu(SecuritiesBroker):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         from futu import RET_OK, TrdSide, OrderType as FutuOrderType, TimeInForce as FutuTimeInForce, Session
@@ -398,6 +399,7 @@ class Futu(SecuritiesBroker):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         return await self.call_sync(lambda : self._place_order(
@@ -408,6 +410,7 @@ class Futu(SecuritiesBroker):
             direction=direction,
             qty=qty,
             price=price,
+            full_args=full_args,
             **kwargs
         ))
 

{httptrading-1.0.3 → httptrading-1.0.6}/httptrading/broker/interactive_brokers.py

@@ -62,21 +62,17 @@ class InteractiveBrokers(SecuritiesBroker):
         symbol = contract.symbol
         trade_type = TradeType.Securities
         region = ''
-        ticker = ''
         if re.match(r'^[01356]\d{5}$', symbol):
             region = 'CN'
-            ticker = symbol
         if re.match(r'^\d{5}$', symbol):
             region = 'HK'
-            ticker = symbol
         if re.match(r'^\w{1,5}$', symbol):
             region = 'US'
-            ticker = symbol
-        if not region or not ticker:
+        if not region:
             return None
         return Contract(
             trade_type=trade_type,
-            ticker=ticker,
+            symbol=symbol,
             region=region,
         )
 
@@ -86,7 +82,7 @@ class InteractiveBrokers(SecuritiesBroker):
             if contract in self._ib_contracts:
                 return self._ib_contracts[contract]
             currency = self.contract_to_currency(contract)
-            ib_contract = ib_insync.Stock(contract.ticker, 'SMART', currency=currency)
+            ib_contract = ib_insync.Stock(contract.symbol, 'SMART', currency=currency)
             client = self._client
             client.qualifyContracts(*[ib_contract, ])
             self._ib_contracts[contract] = ib_contract
@@ -205,6 +201,7 @@ class InteractiveBrokers(SecuritiesBroker):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         import ib_insync
@@ -274,6 +271,7 @@ class InteractiveBrokers(SecuritiesBroker):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         return await self.call_async(self._place_order(
@@ -284,6 +282,7 @@ class InteractiveBrokers(SecuritiesBroker):
             direction=direction,
             qty=qty,
             price=price,
+            full_args=full_args,
             **kwargs
         ))
 

{httptrading-1.0.3 → httptrading-1.0.6}/httptrading/broker/longbridge.py

@@ -188,24 +188,24 @@ class LongBridge(SecuritiesBroker):
     @classmethod
     def symbol_to_contract(cls, symbol: str) -> Contract | None:
         region = ''
-        ticker = ''
+        contract_symbol = ''
         if m := re.match(r'^(\S+)\.US$', symbol):
             region = 'US'
-            ticker = m.groups()[0]
+            contract_symbol = m.groups()[0]
         if m := re.match(r'^(\d{5})\.HK$', symbol):
             region = 'HK'
-            ticker = m.groups()[0]
+            contract_symbol = m.groups()[0]
         if m := re.match(r'^(\d{6})\.SH$', symbol):
             region = 'CN'
-            ticker = m.groups()[0]
+            contract_symbol = m.groups()[0]
         if m := re.match(r'^(\d{6})\.SZ$', symbol):
             region = 'CN'
-            ticker = m.groups()[0]
-        if not region or not ticker:
+            contract_symbol = m.groups()[0]
+        if not region or not contract_symbol:
             return None
         return Contract(
             trade_type=TradeType.Securities,
-            ticker=ticker,
+            symbol=contract_symbol,
             region=region,
         )
 
@@ -213,16 +213,16 @@ class LongBridge(SecuritiesBroker):
     def contract_to_symbol(cls, contract: Contract) -> str:
         if contract.trade_type != TradeType.Securities:
             raise Exception(f'不能支持的交易品种{contract}映射为交易代码')
-        region, ticker = contract.region, contract.ticker
+        region, symbol = contract.region, contract.symbol
         code = None
-        if region == 'CN' and re.match(r'^[56]\d{5}$', ticker):
-            code = f'{ticker}.SH'
-        elif region == 'CN' and re.match(r'^[013]\d{5}$', ticker):
-            code = f'{ticker}.SZ'
-        elif region == 'HK' and re.match(r'^\d{5}$', ticker):
-            code = f'{ticker}.HK'
-        elif region == 'US' and re.match(r'^\w+$', ticker):
-            code = f'{ticker}.US'
+        if region == 'CN' and re.match(r'^[56]\d{5}$', symbol):
+            code = f'{symbol}.SH'
+        elif region == 'CN' and re.match(r'^[013]\d{5}$', symbol):
+            code = f'{symbol}.SZ'
+        elif region == 'HK' and re.match(r'^\d{5}$', symbol):
+            code = f'{symbol}.HK'
+        elif region == 'US' and re.match(r'^\w+$', symbol):
+            code = f'{symbol}.US'
         if not code:
             raise Exception(f'不能映射{contract}为交易代码')
         return code
@@ -310,6 +310,7 @@ class LongBridge(SecuritiesBroker):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         from longport.openapi import OrderType as LbOrderType, OrderSide, TimeInForceType, OutsideRTH
@@ -382,6 +383,7 @@ class LongBridge(SecuritiesBroker):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         return await self.call_sync(lambda : self._place_order(
@@ -392,6 +394,7 @@ class LongBridge(SecuritiesBroker):
             direction=direction,
             qty=qty,
             price=price,
+            full_args=full_args,
             **kwargs
         ))
 

{httptrading-1.0.3 → httptrading-1.0.6}/httptrading/broker/tiger.py

@@ -120,21 +120,17 @@ class Tiger(SecuritiesBroker):
     @classmethod
     def symbol_to_contract(cls, symbol) -> Contract | None:
         region = ''
-        ticker = ''
         if re.match(r'^[01356]\d{5}$', symbol):
             region = 'CN'
-            ticker = symbol
         if re.match(r'^\d{5}$', symbol):
             region = 'HK'
-            ticker = symbol
         if re.match(r'^\w{1,5}$', symbol):
             region = 'US'
-            ticker = symbol
-        if not region or not ticker:
+        if not region:
             return None
         return Contract(
             trade_type=TradeType.Securities,
-            ticker=ticker,
+            symbol=symbol,
             region=region,
         )
 
@@ -142,14 +138,14 @@ class Tiger(SecuritiesBroker):
     def contract_to_symbol(cls, contract: Contract) -> str | None:
         if contract.trade_type != TradeType.Securities:
             return None
-        region, ticker = contract.region, contract.ticker
+        region, contract_symbol = contract.region, contract.symbol
         symbol = None
-        if region == 'CN' and re.match(r'^[01356]\d{5}$', ticker):
-            symbol = ticker
-        elif region == 'HK' and re.match(r'^\d{5}$', ticker):
-            symbol = ticker
-        elif region == 'US' and re.match(r'^\w{1,5}$', ticker):
-            symbol = ticker
+        if region == 'CN' and re.match(r'^[01356]\d{5}$', contract_symbol):
+            symbol = contract_symbol
+        elif region == 'HK' and re.match(r'^\d{5}$', contract_symbol):
+            symbol = contract_symbol
+        elif region == 'US' and re.match(r'^\w{1,5}$', contract_symbol):
+            symbol = contract_symbol
         return symbol
 
     def _positions(self):
@@ -281,6 +277,7 @@ class Tiger(SecuritiesBroker):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         if contract.trade_type != TradeType.Securities:
@@ -360,6 +357,7 @@ class Tiger(SecuritiesBroker):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         return await self.call_sync(lambda: self._place_order(
@@ -370,6 +368,7 @@ class Tiger(SecuritiesBroker):
             direction=direction,
             qty=qty,
             price=price,
+            full_args=full_args,
             **kwargs
         ))
 

{httptrading-1.0.3 → httptrading-1.0.6}/httptrading/http_server.py

@@ -31,11 +31,11 @@ class HttpTradingView(web.View):
         params: dict = await self.request.json() if from_json else self.request.query
         trade_type = TradeType[params.get('tradeType', '--')]
         region = params.get('region', '--')
-        ticker = params.get('ticker', '--')
+        symbol = params.get('symbol', '--')
         contract = Contract(
             trade_type=trade_type,
             region=region,
-            ticker=ticker,
+            symbol=symbol,
         )
         return contract
 
@@ -84,6 +84,7 @@ class PlaceOrderView(HttpTradingView):
             qty=qty,
             price=price,
             json=body_d,
+            full_args=body_d,
         )
         return self.response_api(broker, {
             'orderId': order_id,
@@ -162,28 +163,33 @@ class MarketStatusView(HttpTradingView):
         })
 
 
-@web.middleware
-async def auth_middleware(request: web.Request, handler):
-    instance_id = request.match_info.get('instance_id', '')
-    token = request.headers.get('HT-TOKEN', '')
-    if not instance_id:
-        raise web.HTTPNotFound
-    if not token:
-        raise web.HTTPNotFound
-    if len(token) < 16 or len(token) > 64:
-        raise web.HTTPNotFound
-    for broker in HttpTradingView.brokers():
-        if broker.instance_id != instance_id:
-            continue
-        if token not in broker.tokens:
+def create_auth_middleware(token_header: str):
+    assert isinstance(token_header, str)
+    assert token_header
+
+    @web.middleware
+    async def _auth_middleware(request: web.Request, handler):
+        instance_id = request.match_info.get('instance_id', '')
+        token = request.headers.get(token_header, '')
+        if not instance_id:
+            raise web.HTTPNotFound
+        if not token:
+            raise web.HTTPNotFound
+        if len(token) < 16 or len(token) > 64:
             raise web.HTTPNotFound
-        setattr(request, '__current_broker__', broker)
-        break
-    else:
-        raise web.HTTPNotFound
-    response: web.Response = await handler(request)
-    delattr(request, '__current_broker__')
-    return response
+        for broker in HttpTradingView.brokers():
+            if broker.instance_id != instance_id:
+                continue
+            if token not in broker.tokens:
+                raise web.HTTPNotFound
+            setattr(request, '__current_broker__', broker)
+            break
+        else:
+            raise web.HTTPNotFound
+        response: web.Response = await handler(request)
+        delattr(request, '__current_broker__')
+        return response
+    return _auth_middleware
 
 
 @web.middleware
@@ -218,6 +224,7 @@ def run(
         brokers: list[BaseBroker],
         std_apis: Callable[[], list[web.RouteDef]] = None,
         extend_apis: list[web.RouteDef] = None,
+        token_header: str = 'HT-TOKEN',
         **kwargs
 ) -> None:
     """
@@ -226,11 +233,12 @@ def run(
     @param brokers: 需要控制的交易通道对象列表
     @param std_apis: 如果需要替换默认提供的接口, 这里提供工厂函数的回调
     @param extend_apis: 如果需要增加自定义接口, 这里传入 RouteDef 列表
+    @param token_header: 定制 token 凭据的 header 键名
     @param kwargs: 其他的参数将传给 aiohttp.web.run_app 函数
     """
     app = web.Application(
         middlewares=[
-            auth_middleware,
+            create_auth_middleware(token_header=token_header),
             exception_middleware,
         ],
     )

{httptrading-1.0.3 → httptrading-1.0.6}/httptrading/model.py

@@ -55,16 +55,16 @@ class Contract:
     """
     Contract 定义了交易品种的精确描述.
     根据交易种类, 区分为证券和加密货币;
-    根据 ticker 设置交易标的的代码;
+    根据 symbol 设置交易标的的代码;
     对于支持多个市场的交易通道, 例如证券, 需要额外提供 region 加以区分标的的所属市场.
     """
     trade_type: TradeType
-    ticker: str
+    symbol: str
     region: str
 
     @property
     def unique_pair(self):
-        return self.trade_type, self.ticker, self.region,
+        return self.trade_type, self.symbol, self.region,
 
     def __hash__(self):
         return self.unique_pair.__hash__()
@@ -183,7 +183,7 @@ class JsonDefault:
                 'type': 'contract',
                 'tradeType': obj.trade_type.name,
                 'region': obj.region,
-                'ticker': obj.ticker,
+                'symbol': obj.symbol,
             }
         if isinstance(obj, Cash):
             return {

{httptrading-1.0.3 → httptrading-1.0.6}/httptrading.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httptrading
-Version: 1.0.3
+Version: 1.0.6
 Summary: 统一交易通道的接口服务
 Author-email: songwei <github@songwei.name>
 License: MIT
@@ -187,10 +187,10 @@ GET /httptrading/api/{instanceId}/market/quote
 | 参数        | 说明      | 举例                 |
 |-----------|---------|--------------------|
 | tradeType | 说明标的的品种 | Securities: 证券     |
-| ticker    | 代码      | QQQ, 00700, 000001 |
+| symbol    | 代码      | QQQ, 00700, 000001 |
 | region    | 以国家区分代码 | US, HK, CN         |
 
-举例 ?tradeType=Securities&region=CN&ticker=000001 参数的结果:
+举例 ?tradeType=Securities&region=CN&symbol=000001 参数的结果:
 ```json lines
 {
 	"type": "apiResponse",
@@ -205,7 +205,7 @@ GET /httptrading/api/{instanceId}/market/quote
 			"type": "contract",
 			"tradeType": "Securities",
 			"region": "CN",
-			"ticker": "000001"
+			"symbol": "000001"
 		},
 		"currency": "CNY",  // 币种
 		"isTradable": true,  // 此时是否可交易, 比如受到停牌熔断影响
@@ -313,7 +313,7 @@ GET /httptrading/api/{instanceId}/position/state
 				"type": "contract",
 				"tradeType": "Securities",
 				"region": "US",
-				"ticker": "QQQ"
+				"symbol": "QQQ"
 			},
 			"unit": "Share",
 			"currency": "USD",
@@ -333,7 +333,7 @@ POST /httptrading/api/{instanceId}/order/place
 | 参数          | 说明       | 举例                                               |
 |-------------|----------|--------------------------------------------------|
 | tradeType   | 说明标的的品种  | Securities: 证券                                   |
-| ticker      | 代码       | QQQ, 00700, 000001                               |
+| symbol      | 代码       | QQQ, 00700, 000001                               |
 | region      | 以国家区分代码  | US, HK, CN                                       |
 | price       | 限价       | 市价单不填此项                                          |
 | qty         | 订单数量, 整数 |                                                  |
@@ -346,7 +346,7 @@ POST /httptrading/api/{instanceId}/order/place
 ```json lines
 {
 	"tradeType": "Securities",
-	"ticker": "AAPL",
+	"symbol": "AAPL",
 	"region": "US",
 	"price": 200.00,
 	"qty": 12,
@@ -369,7 +369,7 @@ POST /httptrading/api/{instanceId}/order/place
 	"orderId": "69788888", // 订单号
 	"args": { // 传递的参数
 		"tradeType": "Securities",
-		"ticker": "AAPL",
+		"symbol": "AAPL",
 		"region": "US",
 		"price": 200,
 		"qty": 12,

{httptrading-1.0.3 → httptrading-1.0.6}/pyproject.toml

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