httptrading 1.0.3__tar.gz → 1.0.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httptrading
-Version: 1.0.3
+Version: 1.0.5
 Summary: 统一交易通道的接口服务
 Author-email: songwei <github@songwei.name>
 License: MIT

{httptrading-1.0.3 → httptrading-1.0.5}/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.5}/httptrading/broker/futu_sec.py

@@ -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.5}/httptrading/broker/interactive_brokers.py

@@ -205,6 +205,7 @@ class InteractiveBrokers(SecuritiesBroker):
             direction: str,
             qty: int,
             price: float = None,
+            full_args: dict = None,
             **kwargs
     ) -> str:
         import ib_insync
@@ -274,6 +275,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 +286,7 @@ class InteractiveBrokers(SecuritiesBroker):
             direction=direction,
             qty=qty,
             price=price,
+            full_args=full_args,
             **kwargs
         ))
 

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

@@ -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.5}/httptrading/broker/tiger.py

@@ -281,6 +281,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 +361,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 +372,7 @@ class Tiger(SecuritiesBroker):
             direction=direction,
             qty=qty,
             price=price,
+            full_args=full_args,
             **kwargs
         ))
 

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

@@ -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.5}/httptrading.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httptrading
-Version: 1.0.3
+Version: 1.0.5
 Summary: 统一交易通道的接口服务
 Author-email: songwei <github@songwei.name>
 License: MIT

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

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