소스 검색

fix sql transaction error in statistic API (#1586)

tags/0.3.31-fix3
waltcow 1 년 전
부모
커밋
3c0fbf3a6a
No account linked to committer's email address
1개의 변경된 파일53개의 추가작업 그리고 60개의 파일을 삭제
  1. 53
    60
      api/controllers/console/app/statistic.py

+ 53
- 60
api/controllers/console/app/statistic.py 파일 보기



sql_query += ' GROUP BY date order by date' 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 = [] response_data = []


for i in rs:
response_data.append({
'date': str(i.date),
'conversation_count': i.conversation_count
})
with db.engine.begin() as conn:
rs = conn.execute(db.text(sql_query), arg_dict)
for i in rs:
response_data.append({
'date': str(i.date),
'conversation_count': i.conversation_count
})


return jsonify({ return jsonify({
'data': response_data 'data': response_data


sql_query += ' GROUP BY date order by date' 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 = [] response_data = []


for i in rs:
response_data.append({
'date': str(i.date),
'terminal_count': i.terminal_count
})
with db.engine.begin() as conn:
rs = conn.execute(db.text(sql_query), arg_dict)
for i in rs:
response_data.append({
'date': str(i.date),
'terminal_count': i.terminal_count
})


return jsonify({ return jsonify({
'data': response_data 'data': response_data


sql_query += ' GROUP BY date order by date' 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 = [] response_data = []


for i in rs:
response_data.append({
'date': str(i.date),
'token_count': i.token_count,
'total_price': i.total_price,
'currency': 'USD'
})
with db.engine.begin() as conn:
rs = conn.execute(db.text(sql_query), arg_dict)
for i in rs:
response_data.append({
'date': str(i.date),
'token_count': i.token_count,
'total_price': i.total_price,
'currency': 'USD'
})


return jsonify({ return jsonify({
'data': response_data 'data': response_data
GROUP BY date GROUP BY date
ORDER BY date""" ORDER BY date"""


response_data = []
with db.engine.begin() as conn: with db.engine.begin() as conn:
rs = conn.execute(db.text(sql_query), arg_dict) 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')))
})
for i in rs:
response_data.append({
'date': str(i.date),
'interactions': float(i.interactions.quantize(Decimal('0.01')))
})


return jsonify({ return jsonify({
'data': response_data 'data': response_data


sql_query += ' GROUP BY date order by date' 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 = [] 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),
})
with db.engine.begin() as conn:
rs = conn.execute(db.text(sql_query), arg_dict)
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({ return jsonify({
'data': response_data
})
'data': response_data
})




class AverageResponseTimeStatistic(Resource): class AverageResponseTimeStatistic(Resource):


sql_query += ' GROUP BY date order by date' 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 = [] response_data = []


for i in rs:
response_data.append({
'date': str(i.date),
'latency': round(i.latency * 1000, 4)
})
with db.engine.begin() as conn:
rs = conn.execute(db.text(sql_query), arg_dict)
for i in rs:
response_data.append({
'date': str(i.date),
'latency': round(i.latency * 1000, 4)
})


return jsonify({ return jsonify({
'data': response_data 'data': response_data


sql_query += ' GROUP BY date order by date' 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 = [] response_data = []


for i in rs:
response_data.append({
'date': str(i.date),
'tps': round(i.tokens_per_second, 4)
})
with db.engine.begin() as conn:
rs = conn.execute(db.text(sql_query), arg_dict)
for i in rs:
response_data.append({
'date': str(i.date),
'tps': round(i.tokens_per_second, 4)
})


return jsonify({ return jsonify({
'data': response_data 'data': response_data

Loading…
취소
저장