fix: more complete fix for freqtrade#12451

Author: xmatthias

freqtrade/rpc/rpc.py

@@ -1009,12 +1009,16 @@ def _rpc_force_exit(
                 return {"result": "Created exit orders for all open trades."}
 
             # Query for trade
-            trade = Trade.get_trades(
-                trade_filter=[
-                    Trade.id == int(trade_id),
-                    Trade.is_open.is_(True),
-                ]
-            ).first()
+            trade = (
+                Trade.get_trades(
+                    trade_filter=[
+                        Trade.id == int(trade_id),
+                        Trade.is_open.is_(True),
+                    ]
+                ).first()
+                if trade_id.isdigit()
+                else None
+            )
             if not trade:
                 logger.warning("force_exit: Invalid argument received")
                 raise RPCException("invalid argument")

freqtrade/rpc/telegram.py

@@ -1455,7 +1455,11 @@ async def _force_exit_inline(self, update: Update, _: CallbackContext) -> None:
                     await query.answer()
                     await query.edit_message_text(text="Force exit canceled.")
                     return
-                trade: Trade | None = Trade.get_trades(trade_filter=Trade.id == trade_id).first()
+                trade: Trade | None = (
+                    Trade.get_trades(trade_filter=Trade.id == int(trade_id)).first()
+                    if trade_id.isdigit()
+                    else None
+                )
                 await query.answer()
                 if trade:
                     await query.edit_message_text(