This commit is contained in:
yumoqing 2026-04-02 13:40:29 +08:00
parent df3257ef14
commit f6b9f305a3
3 changed files with 8 additions and 8 deletions

View File

@ -229,7 +229,7 @@ async def add_new_llmusage_output(luid, newd):
out.append(rzt) out.append(rzt)
newd = {k:v for k,v in newd.items() if k != 'output'} newd = {k:v for k,v in newd.items() if k != 'output'}
io['output'] = out io['output'] = out
r.ioinfo = json.dumps(io) r.ioinfo = json.dumps(io, ensure_ascii=False)
r.update(newd) r.update(newd)
await sor.U('llmusage', r) await sor.U('llmusage', r)
debug(f'llmuasage update to {r}') debug(f'llmuasage update to {r}')

View File

@ -64,7 +64,7 @@ async def uapi_request(request, llm, sor, callerid, callerorgid, params_kw=None)
usage = d['usage'] usage = d['usage']
d['llmusageid'] = luid d['llmusageid'] = luid
outlines.append(d) outlines.append(d)
yield json.dumps(d) + '\n' yield json.dumps(d, ensure_ascii=False) + '\n'
if usage is None: if usage is None:
error(f'{llm=} response has not usage') error(f'{llm=} response has not usage')
finish_seconds = time.time() - start_timestamp finish_seconds = time.time() - start_timestamp
@ -85,11 +85,11 @@ async def uapi_request(request, llm, sor, callerid, callerorgid, params_kw=None)
llmusage.use_date = curDateString() llmusage.use_date = curDateString()
llmusage.use_time = timestampstr() llmusage.use_time = timestampstr()
llmusage.userid = callerid llmusage.userid = callerid
llmusage.usage = json.dumps(usage) llmusage.usage = json.dumps(usage, ensure_ascii=False)
llmusage.ioinfo = json.dumps({ llmusage.ioinfo = json.dumps({
"input": params_kw, "input": params_kw,
"output": outlines "output": outlines
}) }, ensure_ascii=False)
llmusage.transno = params_kw.transno llmusage.transno = params_kw.transno
llmusage.responsed_seconds = responsed_seconds llmusage.responsed_seconds = responsed_seconds
llmusage.finish_seconds = finish_seconds llmusage.finish_seconds = finish_seconds
@ -120,7 +120,7 @@ async def uapi_request(request, llm, sor, callerid, callerorgid, params_kw=None)
exception(f'{e=},{format_exc()}') exception(f'{e=},{format_exc()}')
estr = erase_apikey(e) estr = erase_apikey(e)
ed = {"error": f"ERROR:{estr}", "status": "FAILED" ,"llmusageid": luid} ed = {"error": f"ERROR:{estr}", "status": "FAILED" ,"llmusageid": luid}
s = json.dumps(ed) s = json.dumps(ed, ensure_ascii=False)
s = ''.join(s.split('\n')) s = ''.join(s.split('\n'))
outlines.append(ed) outlines.append(ed)
yield f'{s}\n' yield f'{s}\n'

View File

@ -48,11 +48,11 @@ async def sync_uapi_request(request, llm, sor, callerid, callerorgid, params_kw=
llmusage.use_date = curDateString() llmusage.use_date = curDateString()
llmusage.use_time = timestampstr() llmusage.use_time = timestampstr()
llmusage.userid = callerid llmusage.userid = callerid
llmusage.usage = json.dumps(usage) llmusage.usage = json.dumps(usage, ensure_ascii=False)
llmusage.ioinfo = json.dumps({ llmusage.ioinfo = json.dumps({
"input": params_kw, "input": params_kw,
"output": [d] "output": [d]
}) }, ensure_ascii=False)
llmusage.transno = params_kw.transno llmusage.transno = params_kw.transno
llmusage.responsed_seconds = responsed_seconds llmusage.responsed_seconds = responsed_seconds
llmusage.finish_seconds = finish_seconds llmusage.finish_seconds = finish_seconds
@ -84,7 +84,7 @@ async def sync_uapi_request(request, llm, sor, callerid, callerorgid, params_kw=
exception(f'{e=},{format_exc()}') exception(f'{e=},{format_exc()}')
estr = erase_apikey(e) estr = erase_apikey(e)
ed = {"error": f"ERROR:{estr}", "status": "FAILED" ,"llmusageid": luid} ed = {"error": f"ERROR:{estr}", "status": "FAILED" ,"llmusageid": luid}
s = json.dumps(ed) s = json.dumps(ed, ensure_ascii=False)
s = ''.join(s.split('\n')) s = ''.join(s.split('\n'))
outlines.append(ed) outlines.append(ed)
yield f'{s}\n' yield f'{s}\n'