Merge branch 'freqtrade:develop' into partial_sell

freqtrade/rpc/api_server/api_schemas.py

@@ -177,6 +177,22 @@ class ShowConfig(BaseModel):
     max_entry_position_adjustment: int
 
 
+class OrderSchema(BaseModel):
+    pair: str
+    order_id: str
+    status: str
+    remaining: float
+    amount: float
+    safe_price: float
+    cost: float
+    filled: float
+    ft_order_side: str
+    order_type: str
+    is_open: bool
+    order_timestamp: Optional[int]
+    order_filled_timestamp: Optional[int]
+
+
 class TradeSchema(BaseModel):
     trade_id: int
     pair: str
@@ -224,6 +240,7 @@ class TradeSchema(BaseModel):
     min_rate: Optional[float]
     max_rate: Optional[float]
     open_order_id: Optional[str]
+    orders: List[OrderSchema]
 
 
 class OpenTradeSchema(TradeSchema):

freqtrade/rpc/api_server/api_v1.py

@@ -32,7 +32,8 @@ logger = logging.getLogger(__name__)
 # 1.11: forcebuy and forcesell accept ordertype
 # 1.12: add blacklist delete endpoint
 # 1.13: forcebuy supports stake_amount
-API_VERSION = 1.13
+# 1.14: Add entry/exit orders to trade response
+API_VERSION = 1.14
 
 # Public API, requires no auth.
 router_public = APIRouter()

freqtrade/rpc/telegram.py

@@ -406,6 +406,8 @@ class Telegram(RPCHandler):
             first_avg = filled_orders[0]["safe_price"]
 
         for x, order in enumerate(filled_orders):
+            if order['ft_order_side'] != 'buy':
+                continue
             cur_entry_datetime = arrow.get(order["order_filled_date"])
             cur_entry_amount = order["filled"] or order["amount"]
             cur_entry_average = order["safe_price"]
@@ -472,7 +474,7 @@ class Telegram(RPCHandler):
             messages = []
             for r in results:
                 r['open_date_hum'] = arrow.get(r['open_date']).humanize()
-                r['num_entries'] = len(r['filled_entry_orders'])
+                r['num_entries'] = len([o for o in r['orders'] if o['ft_order_side'] == 'buy'])
                 r['sell_reason'] = r.get('sell_reason', "")
                 lines = [
                     "*Trade ID:* `{trade_id}`" +
@@ -516,8 +518,8 @@ class Telegram(RPCHandler):
                             lines.append("*Open Order:* `{open_order}`")
 
                 lines_detail = self._prepare_entry_details(
-                    r['filled_entry_orders'], r['base_currency'], r['is_open'])
-                lines.extend((lines_detail if (len(r['filled_entry_orders']) > 1) else ""))
+                    r['orders'], r['base_currency'], r['is_open'])
+                lines.extend(lines_detail if lines_detail else "")
 
                 # Filter empty lines using list-comprehension
                 messages.append("\n".join([line for line in lines if line]).format(**r))