Merge pull request #8245 from eSAMTrade/bugfix-8244

Fix last_process related bug in RPC.health (BUG-#8231)

freqtrade/freqtradebot.py

@@ -127,7 +127,7 @@ class FreqtradeBot(LoggingMixin):
                 for minutes in [0, 15, 30, 45]:
                     t = str(time(time_slot, minutes, 2))
                     self._schedule.every().day.at(t).do(update)
-        self.last_process = datetime(1970, 1, 1, tzinfo=timezone.utc)
+        self.last_process: Optional[datetime] = None
 
         self.strategy.ft_bot_start()
         # Initialize protections AFTER bot start - otherwise parameters are not loaded.

freqtrade/rpc/api_server/api_schemas.py

@@ -457,5 +457,5 @@ class SysInfo(BaseModel):
 
 
 class Health(BaseModel):
-    last_process: datetime
+    last_process: Optional[datetime]
-    last_process_ts: int
+    last_process_ts: Optional[int]

freqtrade/rpc/api_server/api_v1.py

@@ -346,4 +346,4 @@ def sysinfo():
 
 @router.get('/health', response_model=Health, tags=['info'])
 def health(rpc: RPC = Depends(get_rpc)):
-    return rpc._health()
+    return rpc.health()

freqtrade/rpc/rpc.py

@@ -1198,12 +1198,19 @@ class RPC:
             "ram_pct": psutil.virtual_memory().percent
         }
 
-    def _health(self) -> Dict[str, Union[str, int]]:
+    def health(self) -> Dict[str, Optional[Union[str, int]]]:
         last_p = self._freqtrade.last_process
+        if last_p is None:
             return {
-            'last_process': str(last_p),
+                "last_process": None,
-            'last_process_loc': last_p.astimezone(tzlocal()).strftime(DATETIME_PRINT_FORMAT),
+                "last_process_loc": None,
-            'last_process_ts': int(last_p.timestamp()),
+                "last_process_ts": None,
+            }
+
+        return {
+            "last_process": str(last_p),
+            "last_process_loc": last_p.astimezone(tzlocal()).strftime(DATETIME_PRINT_FORMAT),
+            "last_process_ts": int(last_p.timestamp()),
         }
 
     def _update_market_direction(self, direction: MarketDirection) -> None:

freqtrade/rpc/telegram.py

@@ -1540,7 +1540,7 @@ class Telegram(RPCHandler):
         Handler for /health
         Shows the last process timestamp
         """
-        health = self._rpc._health()
+        health = self._rpc.health()
         message = f"Last process: `{health['last_process_loc']}`"
         self._send_msg(message)
 

tests/rpc/test_rpc.py

@@ -1252,6 +1252,6 @@ def test_rpc_health(mocker, default_conf) -> None:
 
     freqtradebot = get_patched_freqtradebot(mocker, default_conf)
     rpc = RPC(freqtradebot)
-    result = rpc._health()
+    result = rpc.health()
-    assert result['last_process'] == '1970-01-01 00:00:00+00:00'
+    assert result['last_process'] is None
-    assert result['last_process_ts'] == 0
+    assert result['last_process_ts'] is None

tests/rpc/test_rpc_apiserver.py

@@ -1803,8 +1803,8 @@ def test_health(botclient):
 
     assert_response(rc)
     ret = rc.json()
-    assert ret['last_process_ts'] == 0
+    assert ret["last_process_ts"] is None
-    assert ret['last_process'] == '1970-01-01T00:00:00+00:00'
+    assert ret["last_process"] is None
 
 
 def test_api_ws_subscribe(botclient, mocker):