From 062b173c664633098a85d30e2e1a76e9389a215a Mon Sep 17 00:00:00 2001 From: jiangbo721 Date: Sat, 20 Sep 2025 10:47:59 +0800 Subject: [PATCH] fix: Statistics, like workflows, do not include debug data. (#25979) --- api/controllers/console/app/statistic.py | 35 ++++++++++++++---------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/api/controllers/console/app/statistic.py b/api/controllers/console/app/statistic.py index 6894458578..6471b843c6 100644 --- a/api/controllers/console/app/statistic.py +++ b/api/controllers/console/app/statistic.py @@ -50,8 +50,9 @@ class DailyMessageStatistic(Resource): FROM messages WHERE - app_id = :app_id""" - arg_dict = {"tz": account.timezone, "app_id": app_model.id} + app_id = :app_id + AND invoke_from != :invoke_from""" + arg_dict = {"tz": account.timezone, "app_id": app_model.id, "invoke_from": InvokeFrom.DEBUGGER.value} timezone = pytz.timezone(account.timezone) utc_timezone = pytz.utc @@ -187,8 +188,9 @@ class DailyTerminalsStatistic(Resource): FROM messages WHERE - app_id = :app_id""" - arg_dict = {"tz": account.timezone, "app_id": app_model.id} + app_id = :app_id + AND invoke_from != :invoke_from""" + arg_dict = {"tz": account.timezone, "app_id": app_model.id, "invoke_from": InvokeFrom.DEBUGGER.value} timezone = pytz.timezone(account.timezone) utc_timezone = pytz.utc @@ -259,8 +261,9 @@ class DailyTokenCostStatistic(Resource): FROM messages WHERE - app_id = :app_id""" - arg_dict = {"tz": account.timezone, "app_id": app_model.id} + app_id = :app_id + AND invoke_from != :invoke_from""" + arg_dict = {"tz": account.timezone, "app_id": app_model.id, "invoke_from": InvokeFrom.DEBUGGER.value} timezone = pytz.timezone(account.timezone) utc_timezone = pytz.utc @@ -340,8 +343,9 @@ FROM messages m ON c.id = m.conversation_id WHERE - c.app_id = :app_id""" - arg_dict = {"tz": account.timezone, "app_id": app_model.id} + c.app_id = :app_id + AND m.invoke_from != :invoke_from""" + arg_dict = {"tz": account.timezone, "app_id": app_model.id, "invoke_from": InvokeFrom.DEBUGGER.value} timezone = pytz.timezone(account.timezone) utc_timezone = pytz.utc @@ -426,8 +430,9 @@ LEFT JOIN message_feedbacks mf ON mf.message_id=m.id AND mf.rating='like' WHERE - m.app_id = :app_id""" - arg_dict = {"tz": account.timezone, "app_id": app_model.id} + m.app_id = :app_id + AND m.invoke_from != :invoke_from""" + arg_dict = {"tz": account.timezone, "app_id": app_model.id, "invoke_from": InvokeFrom.DEBUGGER.value} timezone = pytz.timezone(account.timezone) utc_timezone = pytz.utc @@ -502,8 +507,9 @@ class AverageResponseTimeStatistic(Resource): FROM messages WHERE - app_id = :app_id""" - arg_dict = {"tz": account.timezone, "app_id": app_model.id} + app_id = :app_id + AND invoke_from != :invoke_from""" + arg_dict = {"tz": account.timezone, "app_id": app_model.id, "invoke_from": InvokeFrom.DEBUGGER.value} timezone = pytz.timezone(account.timezone) utc_timezone = pytz.utc @@ -576,8 +582,9 @@ class TokensPerSecondStatistic(Resource): FROM messages WHERE - app_id = :app_id""" - arg_dict = {"tz": account.timezone, "app_id": app_model.id} + app_id = :app_id + AND invoke_from != :invoke_from""" + arg_dict = {"tz": account.timezone, "app_id": app_model.id, "invoke_from": InvokeFrom.DEBUGGER.value} timezone = pytz.timezone(account.timezone) utc_timezone = pytz.utc