Merge branch 'develop' into feat/short

freqtrade/rpc/api_server/api_backtest.py

@@ -8,7 +8,7 @@ from freqtrade.configuration.config_validation import validate_config_consistenc
 from freqtrade.enums import BacktestState
 from freqtrade.exceptions import DependencyException
 from freqtrade.rpc.api_server.api_schemas import BacktestRequest, BacktestResponse
-from freqtrade.rpc.api_server.deps import get_config
+from freqtrade.rpc.api_server.deps import get_config, is_webserver_mode
 from freqtrade.rpc.api_server.webserver import ApiServer
 from freqtrade.rpc.rpc import RPCException
 
@@ -22,7 +22,7 @@ router = APIRouter()
 @router.post('/backtest', response_model=BacktestResponse, tags=['webserver', 'backtest'])
 # flake8: noqa: C901
 async def api_start_backtest(bt_settings: BacktestRequest, background_tasks: BackgroundTasks,
-                             config=Depends(get_config)):
+                             config=Depends(get_config), ws_mode=Depends(is_webserver_mode)):
     """Start backtesting if not done so already"""
     if ApiServer._bgtask_running:
         raise RPCException('Bot Background task already running')
@@ -121,7 +121,7 @@ async def api_start_backtest(bt_settings: BacktestRequest, background_tasks: Bac
 
 
 @router.get('/backtest', response_model=BacktestResponse, tags=['webserver', 'backtest'])
-def api_get_backtest():
+def api_get_backtest(ws_mode=Depends(is_webserver_mode)):
     """
     Get backtesting result.
     Returns Result after backtesting has been ran.
@@ -157,7 +157,7 @@ def api_get_backtest():
 
 
 @router.delete('/backtest', response_model=BacktestResponse, tags=['webserver', 'backtest'])
-def api_delete_backtest():
+def api_delete_backtest(ws_mode=Depends(is_webserver_mode)):
     """Reset backtesting"""
     if ApiServer._bgtask_running:
         return {
@@ -183,7 +183,7 @@ def api_delete_backtest():
 
 
 @router.get('/backtest/abort', response_model=BacktestResponse, tags=['webserver', 'backtest'])
-def api_backtest_abort():
+def api_backtest_abort(ws_mode=Depends(is_webserver_mode)):
     if not ApiServer._bgtask_running:
         return {
             "status": "not_running",

freqtrade/rpc/api_server/api_schemas.py

@@ -184,6 +184,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
@@ -233,6 +249,7 @@ class TradeSchema(BaseModel):
     min_rate: Optional[float]
     max_rate: Optional[float]
     open_order_id: Optional[str]
+    orders: List[OrderSchema]
 
     leverage: Optional[float]
     interest_rate: Optional[float]

freqtrade/rpc/api_server/api_v1.py

@@ -34,8 +34,8 @@ logger = logging.getLogger(__name__)
 # 1.12: add blacklist delete endpoint
 # 1.13: forcebuy supports stake_amount
 # versions 2.xx -> futures/short branch
-# 2.13: addition of Forceenter
-API_VERSION = 2.13
+# 2.14: Add entry/exit orders to trade response
+API_VERSION = 2.14
 
 # Public API, requires no auth.
 router_public = APIRouter()

freqtrade/rpc/api_server/deps.py

@@ -2,6 +2,7 @@ from typing import Any, Dict, Iterator, Optional
 
 from fastapi import Depends
 
+from freqtrade.enums import RunMode
 from freqtrade.persistence import Trade
 from freqtrade.rpc.rpc import RPC, RPCException
 
@@ -38,3 +39,9 @@ def get_exchange(config=Depends(get_config)):
         ApiServer._exchange = ExchangeResolver.load_exchange(
             config['exchange']['name'], config)
     return ApiServer._exchange
+
+
+def is_webserver_mode(config=Depends(get_config)):
+    if config['runmode'] != RunMode.WEBSERVER:
+        raise RPCException('Bot is not in the correct state')
+    return None