diff --git a/api/controllers/console/app/statistic.py b/api/controllers/console/app/statistic.py index 37c3500448..8e4ac51c7f 100644 --- a/api/controllers/console/app/statistic.py +++ b/api/controllers/console/app/statistic.py @@ -1,4 +1,5 @@ # -*- coding:utf-8 -*- +from decimal import Decimal from datetime import datetime import pytz @@ -59,18 +60,20 @@ class DailyConversationStatistic(Resource): arg_dict['end'] = end_datetime_utc sql_query += ' GROUP BY date order by date' - rs = db.session.execute(sql_query, arg_dict) - response_date = [] + with db.engine.begin() as conn: + rs = conn.execute(db.text(sql_query), arg_dict) + + response_data = [] for i in rs: - response_date.append({ + response_data.append({ 'date': str(i.date), 'conversation_count': i.conversation_count }) return jsonify({ - 'data': response_date + 'data': response_data }) @@ -119,18 +122,20 @@ class DailyTerminalsStatistic(Resource): arg_dict['end'] = end_datetime_utc sql_query += ' GROUP BY date order by date' - rs = db.session.execute(sql_query, arg_dict) - response_date = [] + with db.engine.begin() as conn: + rs = conn.execute(db.text(sql_query), arg_dict) + + response_data = [] for i in rs: - response_date.append({ + response_data.append({ 'date': str(i.date), 'terminal_count': i.terminal_count }) return jsonify({ - 'data': response_date + 'data': response_data }) @@ -180,12 +185,14 @@ class DailyTokenCostStatistic(Resource): arg_dict['end'] = end_datetime_utc sql_query += ' GROUP BY date order by date' - rs = db.session.execute(sql_query, arg_dict) - response_date = [] + with db.engine.begin() as conn: + rs = conn.execute(db.text(sql_query), arg_dict) + + response_data = [] for i in rs: - response_date.append({ + response_data.append({ 'date': str(i.date), 'token_count': i.token_count, 'total_price': i.total_price, @@ -193,10 +200,207 @@ class DailyTokenCostStatistic(Resource): }) return jsonify({ - 'data': response_date + 'data': response_data + }) + + +class AverageSessionInteractionStatistic(Resource): + @setup_required + @login_required + @account_initialization_required + def get(self, app_id): + account = current_user + app_id = str(app_id) + app_model = _get_app(app_id, 'chat') + + parser = reqparse.RequestParser() + parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args') + parser.add_argument('end', type=datetime_string('%Y-%m-%d %H:%M'), location='args') + args = parser.parse_args() + + sql_query = """SELECT date(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, +AVG(subquery.message_count) AS interactions +FROM (SELECT m.conversation_id, COUNT(m.id) AS message_count + FROM conversations c + JOIN messages m ON c.id = m.conversation_id + WHERE c.override_model_configs IS NULL AND c.app_id = :app_id""" + arg_dict = {'tz': account.timezone, 'app_id': app_model.id} + + timezone = pytz.timezone(account.timezone) + utc_timezone = pytz.utc + + if args['start']: + start_datetime = datetime.strptime(args['start'], '%Y-%m-%d %H:%M') + start_datetime = start_datetime.replace(second=0) + + start_datetime_timezone = timezone.localize(start_datetime) + start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone) + + sql_query += ' and c.created_at >= :start' + arg_dict['start'] = start_datetime_utc + + if args['end']: + end_datetime = datetime.strptime(args['end'], '%Y-%m-%d %H:%M') + end_datetime = end_datetime.replace(second=0) + + end_datetime_timezone = timezone.localize(end_datetime) + end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone) + + sql_query += ' and c.created_at < :end' + arg_dict['end'] = end_datetime_utc + + sql_query += """ + GROUP BY m.conversation_id) subquery +LEFT JOIN conversations c on c.id=subquery.conversation_id +GROUP BY date +ORDER BY date""" + + with db.engine.begin() as conn: + rs = conn.execute(db.text(sql_query), arg_dict) + + response_data = [] + + for i in rs: + response_data.append({ + 'date': str(i.date), + 'interactions': float(i.interactions.quantize(Decimal('0.01'))) + }) + + return jsonify({ + 'data': response_data + }) + + +class UserSatisfactionRateStatistic(Resource): + @setup_required + @login_required + @account_initialization_required + def get(self, app_id): + account = current_user + app_id = str(app_id) + app_model = _get_app(app_id) + + parser = reqparse.RequestParser() + parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args') + parser.add_argument('end', type=datetime_string('%Y-%m-%d %H:%M'), location='args') + args = parser.parse_args() + + sql_query = ''' + SELECT date(DATE_TRUNC('day', m.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, + COUNT(m.id) as message_count, COUNT(mf.id) as feedback_count + FROM messages m + LEFT JOIN message_feedbacks mf on mf.message_id=m.id + WHERE m.app_id = :app_id + ''' + arg_dict = {'tz': account.timezone, 'app_id': app_model.id} + + timezone = pytz.timezone(account.timezone) + utc_timezone = pytz.utc + + if args['start']: + start_datetime = datetime.strptime(args['start'], '%Y-%m-%d %H:%M') + start_datetime = start_datetime.replace(second=0) + + start_datetime_timezone = timezone.localize(start_datetime) + start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone) + + sql_query += ' and m.created_at >= :start' + arg_dict['start'] = start_datetime_utc + + if args['end']: + end_datetime = datetime.strptime(args['end'], '%Y-%m-%d %H:%M') + end_datetime = end_datetime.replace(second=0) + + end_datetime_timezone = timezone.localize(end_datetime) + end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone) + + sql_query += ' and m.created_at < :end' + arg_dict['end'] = end_datetime_utc + + sql_query += ' GROUP BY date order by date' + + with db.engine.begin() as conn: + rs = conn.execute(db.text(sql_query), arg_dict) + + response_data = [] + + for i in rs: + response_data.append({ + 'date': str(i.date), + 'rate': round((i.feedback_count * 1000 / i.message_count) if i.message_count > 0 else 0, 2), + }) + + return jsonify({ + 'data': response_data + }) + + +class AverageResponseTimeStatistic(Resource): + @setup_required + @login_required + @account_initialization_required + def get(self, app_id): + account = current_user + app_id = str(app_id) + app_model = _get_app(app_id, 'completion') + + parser = reqparse.RequestParser() + parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args') + parser.add_argument('end', type=datetime_string('%Y-%m-%d %H:%M'), location='args') + args = parser.parse_args() + + sql_query = ''' + SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, + AVG(provider_response_latency) as latency + FROM messages + WHERE app_id = :app_id + ''' + arg_dict = {'tz': account.timezone, 'app_id': app_model.id} + + timezone = pytz.timezone(account.timezone) + utc_timezone = pytz.utc + + if args['start']: + start_datetime = datetime.strptime(args['start'], '%Y-%m-%d %H:%M') + start_datetime = start_datetime.replace(second=0) + + start_datetime_timezone = timezone.localize(start_datetime) + start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone) + + sql_query += ' and created_at >= :start' + arg_dict['start'] = start_datetime_utc + + if args['end']: + end_datetime = datetime.strptime(args['end'], '%Y-%m-%d %H:%M') + end_datetime = end_datetime.replace(second=0) + + end_datetime_timezone = timezone.localize(end_datetime) + end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone) + + sql_query += ' and created_at < :end' + arg_dict['end'] = end_datetime_utc + + sql_query += ' GROUP BY date order by date' + + with db.engine.begin() as conn: + rs = conn.execute(db.text(sql_query), arg_dict) + + response_data = [] + + for i in rs: + response_data.append({ + 'date': str(i.date), + 'latency': round(i.latency * 1000, 4) + }) + + return jsonify({ + 'data': response_data }) api.add_resource(DailyConversationStatistic, '/apps//statistics/daily-conversations') api.add_resource(DailyTerminalsStatistic, '/apps//statistics/daily-end-users') api.add_resource(DailyTokenCostStatistic, '/apps//statistics/token-costs') +api.add_resource(AverageSessionInteractionStatistic, '/apps//statistics/average-session-interactions') +api.add_resource(UserSatisfactionRateStatistic, '/apps//statistics/user-satisfaction-rate') +api.add_resource(AverageResponseTimeStatistic, '/apps//statistics/average-response-time') diff --git a/api/controllers/web/wraps.py b/api/controllers/web/wraps.py index c68b8f1cf2..9321c427c2 100644 --- a/api/controllers/web/wraps.py +++ b/api/controllers/web/wraps.py @@ -16,7 +16,7 @@ def validate_token(view=None): def decorated(*args, **kwargs): site = validate_and_get_site() - app_model = db.session.query(App).get(site.app_id) + app_model = db.session.query(App).filter(App.id == site.app_id).first() if not app_model: raise NotFound() diff --git a/api/models/model.py b/api/models/model.py index 68b8417ac2..8650896cad 100644 --- a/api/models/model.py +++ b/api/models/model.py @@ -304,6 +304,10 @@ class Conversation(db.Model): def app(self): return db.session.query(App).filter(App.id == self.app_id).first() + @property + def in_debug_mode(self): + return self.override_model_configs is not None + class Message(db.Model): __tablename__ = 'messages' @@ -370,6 +374,10 @@ class Message(db.Model): return None + @property + def in_debug_mode(self): + return self.override_model_configs is not None + class MessageFeedback(db.Model): __tablename__ = 'message_feedbacks'