Merge pull request #296 from alpacahq/feature/trailing-stop

Feature/trailing stop

Author: Shlomi Kushchi

.gitignore

@@ -97,5 +97,6 @@ ENV/
 # vim swap file
 *.swp
 
-# vscode
-/.vscode/
+# IDE
+/.vscode/
+.idea/

README.md

@@ -109,7 +109,7 @@ Calls `GET /account` and returns an `Account` entity.
 Calls `GET /orders` and returns a list of `Order` entities.
 `after` and `until` need to be string format, which you can obtain by `pd.Timestamp().isoformat()`
 
-### REST.submit_order(symbol, qty, side, type, time_in_force, limit_price=None, stop_price=None, client_order_id=None, order_class=None, take_profit=None, stop_loss=None)
+### REST.submit_order(symbol, qty, side, type, time_in_force, limit_price=None, stop_price=None, client_order_id=None, order_class=None, take_profit=None, stop_loss=None, trail_price=None, trail_percent=None)
 Calls `POST /orders` and returns an `Order` entity.
 
 Below is an example of submitting a bracket order.

alpaca_trade_api/rest.py

@@ -257,7 +257,8 @@ def submit_order(self,
                      order_class: str = None,
                      take_profit: dict = None,
                      stop_loss: dict = None,
-                     **kwargs):
+                     trail_price: str = None,
+                     trail_percent: str = None):
         """
         :param symbol: symbol or asset ID
         :param qty: int
@@ -274,15 +275,16 @@ def submit_order(self,
                {"limit_price": "298.95"}
         :param stop_loss: dict with fields "stop_price" and "limit_price" e.g
                {"stop_price": "297.95", "limit_price": "298.95"}
+        :param trail_price: str of float
+        :param trail_percent: str of float
         """
         """Request a new order"""
         params = {
             'symbol':        symbol,
             'qty':           qty,
             'side':          side,
             'type':          type,
-            'time_in_force': time_in_force,
-            **kwargs
+            'time_in_force': time_in_force
         }
         if limit_price is not None:
             params['limit_price'] = FLOAT(limit_price)
@@ -304,6 +306,10 @@ def submit_order(self,
             if 'stop_price' in stop_loss:
                 stop_loss['stop_price'] = FLOAT(stop_loss['stop_price'])
             params['stop_loss'] = stop_loss
+        if trail_price is not None:
+            params['trail_price'] = trail_price
+        if trail_percent is not None:
+            params['trail_percent'] = trail_percent
         resp = self.post('/orders', params)
         return Order(resp)
 

requirements/requirements.txt

@@ -2,5 +2,4 @@ pandas  # pyup: ignore
 requests>2,<3
 urllib3>1.24,<1.26
 websocket-client>=0.56.0,<1
-websockets>=8.0,<9
-
+websockets>=8.0,<9