Merge branch 'freqtrade:develop' into partial_sell

freqtrade/persistence/models.py

@@ -120,7 +120,7 @@ class Order(_DECL_BASE):
     ft_pair: str = Column(String(25), nullable=False)
     ft_is_open = Column(Boolean, nullable=False, default=True, index=True)
 
-    order_id = Column(String(255), nullable=False, index=True)
+    order_id: str = Column(String(255), nullable=False, index=True)
     status = Column(String(255), nullable=True)
     symbol = Column(String(25), nullable=True)
     order_type: str = Column(String(50), nullable=True)
@@ -193,6 +193,9 @@ class Order(_DECL_BASE):
 
     def to_json(self) -> Dict[str, Any]:
         return {
+            'pair': self.ft_pair,
+            'order_id': self.order_id,
+            'status': self.status,
             'amount': self.amount,
             'average': round(self.average, 8) if self.average else 0,
             'safe_price': self.safe_price,
@@ -209,10 +212,8 @@ class Order(_DECL_BASE):
             'order_filled_timestamp': int(self.order_filled_date.replace(
                 tzinfo=timezone.utc).timestamp() * 1000) if self.order_filled_date else None,
             'order_type': self.order_type,
-            'pair': self.ft_pair,
             'price': self.price,
             'remaining': self.remaining,
-            'status': self.status,
         }
 
     def close_bt_order(self, close_date: datetime):
@@ -339,14 +340,7 @@ class LocalTrade():
 
     def to_json(self) -> Dict[str, Any]:
         filled_orders = self.select_filled_orders()
-        filled_entries = []
-        filled_exits = []
-        if len(filled_orders) > 0:
-            for order in filled_orders:
-                if order.ft_order_side == 'buy':
-                    filled_entries.append(order.to_json())
-                if order.ft_order_side == 'sell':
-                    filled_exits.append(order.to_json())
+        orders = [order.to_json() for order in filled_orders]
 
         return {
             'trade_id': self.id,
@@ -411,8 +405,7 @@ class LocalTrade():
             'max_rate': self.max_rate,
 
             'open_order_id': self.open_order_id,
-            'filled_entry_orders': filled_entries,
-            'filled_exit_orders': filled_exits,
+            'orders': orders,
         }
 
     @staticmethod

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))