yumoqing/llmage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2026-01-05 11:41:49 +08:00
parent c925516941
commit 2ce81e48c7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llmage/accounting.py
View File

@ -5,7 +5,7 @@ from sqlor.dbpools import get_sor_context
from pricing.pricing import pricing_program_charging from pricing.pricing import pricing_program_charging
from accounting.consume import consume_accounting from accounting.consume import consume_accounting
async def build_accounting_config(request, llmid, async def llm_accounting(request, llmid,
usage, customerid, userid, orderid=None): usage, customerid, userid, orderid=None):
env = request._run_ns env = request._run_ns
async with get_sor_context(request._run_ns, 'llmage') as sor: async with get_sor_context(request._run_ns, 'llmage') as sor:

6
llmage/llmclient.py
View File

@ -13,6 +13,7 @@ from appPublic.base64_to_file import base64_to_file, getFilenameFromBase64
from uapi.appapi import UAPI, sor_get_callerid, sor_get_uapi from uapi.appapi import UAPI, sor_get_callerid, sor_get_uapi
from ahserver.serverenv import get_serverenv from ahserver.serverenv import get_serverenv
from ahserver.filestorage import FileStorage from ahserver.filestorage import FileStorage
from llmage.accounting import llm_accounting
def erase_apikey(e): def erase_apikey(e):
e = str(e) e = str(e)
@ -175,6 +176,7 @@ async def uapi_request(request, llm, sor, params_kw=None):
cnt += len(params_kw.negitive_promot) cnt += len(params_kw.negitive_promot)
usage['prompt_tokens'] = cnt usage['prompt_tokens'] = cnt
u = await write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor) u = await write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor)
await llm_accounting(request, llm.id, usage, llm.ownerid, callerid)
except Exception as e: except Exception as e:
exception(f'{e=},{format_exc()}') exception(f'{e=},{format_exc()}')
estr = erase_apikey(e) estr = erase_apikey(e)
@ -221,9 +223,10 @@ async def sync_uapi_request(request, llm, sor, params_kw=None):
usage = d.get('usage', {}) usage = d.get('usage', {})
usage['response_time'] = t2 - t1 usage['response_time'] = t2 - t1
usage['finish_time'] = t3 - t1 usage['finish_time'] = t3 - t1
await write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor)
b = json.dumps(d, ensure_ascii=False) b = json.dumps(d, ensure_ascii=False)
yield b yield b
await write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor)
await llm_accounting(request, llm.id, usage, llm.ownerid, callerid)
async def async_uapi_request(request, llm, sor, params_kw=None): async def async_uapi_request(request, llm, sor, params_kw=None):
env = request._run_ns.copy() env = request._run_ns.copy()
@ -295,6 +298,7 @@ async def async_uapi_request(request, llm, sor, params_kw=None):
usage['response_time'] = t2 - t1 usage['response_time'] = t2 - t1
usage['finish_time'] = t3 -t1 usage['finish_time'] = t3 -t1
await write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor) await write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor)
await llm_accounting(request, llm.id, usage, llm.ownerid, callerid)
d = rzt d = rzt
break break
period = llm.query_period or 30 period = llm.query_period or 30