From fd65b5a59ebe2f70d749b357dbab6a1463508ac1 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Thu, 9 Jul 2026 11:38:43 +0800 Subject: [PATCH] feat: write tenantid to llmusage from API request params Populate llmusage.tenantid from params_kw.tenantid in all 6 inference paths: syncinference, product_interface, llmclient, asyncinference --- llmage/asyncinference.py | 2 ++ llmage/llmclient.py | 1 + llmage/product_interface.py | 2 ++ llmage/syncinference.py | 2 ++ 4 files changed, 7 insertions(+) diff --git a/llmage/asyncinference.py b/llmage/asyncinference.py index e4e3919..9e79af1 100644 --- a/llmage/asyncinference.py +++ b/llmage/asyncinference.py @@ -107,6 +107,7 @@ async def async_uapi_request(request, llm, llmusage.finish_seconds = finish_seconds llmusage.status = d.status llmusage.userorgid = callerorgid + llmusage.tenantid = params_kw.get('tenantid', params_kw.get('tentantid')) llmusage.ownerid = llm.ownerid llmusage.accounting_status = 'created' b = json.dumps(d, ensure_ascii=False) @@ -258,6 +259,7 @@ async def async_uapi_request_product(llm, api_userid, user_id, user_org_id, para llmusage.finish_seconds = finish_seconds llmusage.status = d.status llmusage.userorgid = user_org_id + llmusage.tenantid = params_kw.get('tenantid', params_kw.get('tentantid')) llmusage.ownerid = llm.ownerid llmusage.accounting_status = 'created' await write_llmusage(llmusage) diff --git a/llmage/llmclient.py b/llmage/llmclient.py index 3d43338..79db6c4 100644 --- a/llmage/llmclient.py +++ b/llmage/llmclient.py @@ -87,6 +87,7 @@ async def uapi_request(request, llm, callerid, callerorgid, params_kw=None): llmusage.finish_seconds = finish_seconds llmusage.status = 'SUCCEEDED' llmusage.userorgid = callerorgid + llmusage.tenantid = params_kw.get('tenantid', params_kw.get('tentantid')) llmusage.ownerid = llm.ownerid llmusage.accounting_status = 'created' await write_llmusage(llmusage) diff --git a/llmage/product_interface.py b/llmage/product_interface.py index 864d22f..a18dde2 100644 --- a/llmage/product_interface.py +++ b/llmage/product_interface.py @@ -299,6 +299,7 @@ async def _collect_stream(llm, api_userid, user_id, user_org_id, params_kw, luid llmusage.finish_seconds = finish_seconds llmusage.status = 'SUCCEEDED' llmusage.userorgid = user_org_id + llmusage.tenantid = params_kw.get('tenantid', params_kw.get('tentantid')) llmusage.ownerid = llm.ownerid llmusage.accounting_status = 'created' await write_llmusage(llmusage) @@ -401,6 +402,7 @@ async def execute_product_service_stream(resource_ref_id, user_id, user_org_id, llmusage.finish_seconds = finish_seconds llmusage.status = 'SUCCEEDED' llmusage.userorgid = user_org_id + llmusage.tenantid = params_kw.get('tenantid', params_kw.get('tentantid')) llmusage.ownerid = full_llm.ownerid llmusage.accounting_status = 'created' await write_llmusage(llmusage) diff --git a/llmage/syncinference.py b/llmage/syncinference.py index 8d365ab..f41e6ef 100644 --- a/llmage/syncinference.py +++ b/llmage/syncinference.py @@ -78,6 +78,7 @@ async def sync_uapi_request(request, llm, callerid, callerorgid, params_kw=None) llmusage.cost = 0 """ llmusage.userorgid = callerorgid + llmusage.tenantid = params_kw.get('tenantid', params_kw.get('tentantid')) llmusage.ownerid = llm.ownerid llmusage.accounting_status = 'created' b = json.dumps(d, ensure_ascii=False) @@ -134,6 +135,7 @@ async def sync_uapi_request_product(llm, api_userid, user_id, user_org_id, param llmusage.status = 'SUCCEEDED' llmusage.amount = 0.00 llmusage.userorgid = user_org_id + llmusage.tenantid = params_kw.get('tenantid', params_kw.get('tentantid')) llmusage.ownerid = llm.ownerid llmusage.accounting_status = 'created' await write_llmusage(llmusage)