From 9e87a9f902c4d21f4a148cc9ac4777840c0433ed Mon Sep 17 00:00:00 2001 From: yumoqing Date: Mon, 5 Jan 2026 14:34:57 +0800 Subject: [PATCH] bugfix --- llmage/llmclient.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/llmage/llmclient.py b/llmage/llmclient.py index fbaf313..729f97c 100644 --- a/llmage/llmclient.py +++ b/llmage/llmclient.py @@ -122,7 +122,7 @@ async def uapi_request(request, llm, sor, params_kw=None): env = request._run_ns.copy() if not params_kw: params_kw = env.params_kw - caller_orgid = await env.get_userorgid() + callerorgid = await env.get_userorgid() callerid = await env.get_user() uapi = UAPI(request, sor=sor) 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) usage['prompt_tokens'] = cnt u = await write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor) - if llm.ppid: - await llm_accounting(request, llm.id, usage, llm.ownerid, callerid) + if llm.ppid and callerorgid != llm.ownerid: + await llm_accounting(request, llm.id, usage, callerorgid, callerid) except Exception as e: exception(f'{e=},{format_exc()}') estr = erase_apikey(e) @@ -193,8 +193,8 @@ async def sync_uapi_request(request, llm, sor, params_kw=None): env = request._run_ns.copy() if not params_kw: params_kw = env.params_kw - caller_orgid = await env.get_userorgid() callerid = await env.get_user() + callerorgid = await env.get_userorgid() uapi = UAPI(request, sor=sor) userid = await get_owner_userid(sor, llm) outlines = [] @@ -227,14 +227,14 @@ async def sync_uapi_request(request, llm, sor, params_kw=None): b = json.dumps(d, ensure_ascii=False) yield b await write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor) - if llm.ppid: - await llm_accounting(request, llm.id, usage, llm.ownerid, callerid) + if llm.ppid and callerorgid != llm.ownerid: + await llm_accounting(request, llm.id, usage, callerorgid, callerid) async def async_uapi_request(request, llm, sor, params_kw=None): env = request._run_ns.copy() if not params_kw: params_kw = env.params_kw - caller_orgid = await env.get_userorgid() + callerorgid = await env.get_userorgid() callerid = await env.get_user() uapi = UAPI(request, sor=sor) 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['finish_time'] = t3 -t1 await write_llmusage(luid, llm, callerid, usage, params_kw, outlines, sor) - if llm.ppid: - await llm_accounting(request, llm.id, usage, llm.ownerid, callerid) + if llm.ppid and callerorgid != llm.ownerid: + await llm_accounting(request, llm.id, usage, callerorgid, callerid) + d = rzt break period = llm.query_period or 30