update
This commit is contained in:
parent
d93a1a9cf1
commit
8e6cd7051a
@ -178,7 +178,7 @@ async def _query_model_usage_rows(sor, conditions, limit=None, offset=None):
|
||||
sql = """
|
||||
SELECT id, userid, llmid, original_price, orderid, bill_status, usage_content, created_at
|
||||
FROM model_usage
|
||||
WHERE %s
|
||||
WHERE %s AND bill_status = '0'
|
||||
ORDER BY created_at DESC
|
||||
""" % where_clause
|
||||
if limit is not None:
|
||||
@ -188,7 +188,7 @@ async def _query_model_usage_rows(sor, conditions, limit=None, offset=None):
|
||||
|
||||
async def _count_model_usage(sor, conditions):
|
||||
where_clause = ' AND '.join(conditions) if conditions else '1 = 1'
|
||||
sql = 'SELECT COUNT(*) AS total_count FROM model_usage WHERE %s' % where_clause
|
||||
sql = 'SELECT COUNT(*) AS total_count FROM model_usage WHERE %s AND bill_status = "0"' % where_clause
|
||||
return (await sor.sqlExe(sql, {}))[0]['total_count']
|
||||
|
||||
|
||||
|
||||
@ -95,7 +95,7 @@ def _normalize_usage_row(row, bill_amount_map=None):
|
||||
'prompt_tokens': int(usage.get('prompt_tokens') or 0),
|
||||
'completion_tokens': int(usage.get('completion_tokens') or 0),
|
||||
'total_tokens': int(usage.get('total_tokens') or 0),
|
||||
'amount': round(amount, 4),
|
||||
'amount': round(amount, 2),
|
||||
'bill_status': row.get('bill_status'),
|
||||
'orderid': orderid,
|
||||
'usage_time': row.get('created_at'),
|
||||
@ -155,7 +155,7 @@ async def _query_model_usage_rows(sor, conditions, limit=None, offset=None):
|
||||
sql = """
|
||||
SELECT id, userid, llmid, original_price, orderid, bill_status, usage_content, created_at
|
||||
FROM model_usage
|
||||
WHERE %s
|
||||
WHERE %s AND bill_status = '0'
|
||||
ORDER BY created_at DESC
|
||||
""" % where_clause
|
||||
if limit is not None:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user