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 14:34:57 +08:00
parent c994784255
commit 9e87a9f902
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llmage/llmclient.py
View File

@ -122,7 +122,7 @@ async def uapi_request(request, llm, sor, params_kw=None):
env = request._run_ns.copy() env = request._run_ns.copy()
if not params_kw: if not params_kw:
params_kw = env.params_kw params_kw = env.params_kw
caller_orgid = await env.get_userorgid() callerorgid = await env.get_userorgid()
callerid = await env.get_user() callerid = await env.get_user()
uapi = UAPI(request, sor=sor) uapi = UAPI(request, sor=sor)
userid = await get_owner_userid(sor, llm) userid = await get_owner_userid(sor, llm)
@ -176,8 +176,8 @@ 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)
if llm.ppid: if llm.ppid and callerorgid != llm.ownerid:
await llm_accounting(request, llm.id, usage, llm.ownerid, callerid) await llm_accounting(request, llm.id, usage, callerorgid, 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)
@ -193,8 +193,8 @@ async def sync_uapi_request(request, llm, sor, params_kw=None):
env = request._run_ns.copy() env = request._run_ns.copy()
if not params_kw: if not params_kw:
params_kw = env.params_kw params_kw = env.params_kw
caller_orgid = await env.get_userorgid()
callerid = await env.get_user() callerid = await env.get_user()
callerorgid = await env.get_userorgid()
uapi = UAPI(request, sor=sor) uapi = UAPI(request, sor=sor)
userid = await get_owner_userid(sor, llm) userid = await get_owner_userid(sor, llm)
outlines = [] outlines = []
@ -227,14 +227,14 @@ async def sync_uapi_request(request, llm, sor, params_kw=None):
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 write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor)
if llm.ppid: if llm.ppid and callerorgid != llm.ownerid:
await llm_accounting(request, llm.id, usage, llm.ownerid, callerid) await llm_accounting(request, llm.id, usage, callerorgid, 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()
if not params_kw: if not params_kw:
params_kw = env.params_kw params_kw = env.params_kw
caller_orgid = await env.get_userorgid() callerorgid = await env.get_userorgid()
callerid = await env.get_user() callerid = await env.get_user()
uapi = UAPI(request, sor=sor) uapi = UAPI(request, sor=sor)
userid = await get_owner_userid(sor, llm) userid = await get_owner_userid(sor, llm)
@ -300,8 +300,9 @@ 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)
if llm.ppid: if llm.ppid and callerorgid != llm.ownerid:
await llm_accounting(request, llm.id, usage, llm.ownerid, callerid) await llm_accounting(request, llm.id, usage, callerorgid, callerid)
d = rzt d = rzt
break break
period = llm.query_period or 30 period = llm.query_period or 30