bugfix

llmage/asyncinference.py

@@ -60,7 +60,7 @@ async def async_uapi_request(request, llm,
 	# callerorgid = await env.get_userorgid()
 	# callerid = await env.get_user()
 	uapi = env.UpAppApi(request)
-	userid = await get_owner_userid(llm)
+	userid = await env.uapi_data.get_calluserid(llm.upappid, orgid=llm.ownerid)
 	b = None
 	luid = getID()
 	try:

llmage/init.py

@@ -7,7 +7,6 @@ from .jimeng import jimeng_auth_headers
 from .utils import (
 	llm_query_orders,
 	read_webpath,
-	get_owner_userid,
 	llm_query_price,
 	get_llm_by_model
 )
@@ -61,7 +60,6 @@ def load_llmage():
 	env.get_llms_sort_by_provider = get_llms_sort_by_provider
 	env.keling_token = keling_token
 	env.llm_query_price = llm_query_price
-	env.get_owner_userid = get_owner_userid
 	rf = RegisterFunction()
 	rf.register('jimeng_auth_headers', jimeng_auth_headers)
 	add_cleanupctx(start_backend)

llmage/llmclient.py

@@ -23,7 +23,7 @@ async def uapi_request(request, llm, callerid, callerorgid, params_kw=None):
 	# callerorgid = await env.get_userorgid()
 	# callerid = await env.get_user()
 	uapi = env.UpAppApi(request)
-	userid = await get_owner_userid(llm)
+	userid = await env.uapi_data.get_calluserid(llm.upappid, orgid=llm.ownerid)
 	outlines = []
 	txt = ''
 	luid = getID()

llmage/syncinference.py

@@ -24,7 +24,7 @@ async def sync_uapi_request(request, llm, callerid, callerorgid, params_kw=None)
 	# callerorgid = await env.get_userorgid()
 	# uapi = UAPI(request, sor=sor)
 	uapi = env.UpAppApi(request)
-	userid = await get_owner_userid(llm)
+	userid = await env.uapi_data.get_calluserid(llm.upappid, orgid=llm.ownerid)
 	outlines = []
 	b = None
 	d = None

llmage/utils.py

@@ -219,11 +219,6 @@ async def get_llm(llmid):
 	bllms = BufferedLLMs()
 	return await bllms.get_llm(llmid)
 
-async def get_owner_userid(llm):
-	env = ServerEnv()
-	userid = await env.uapi_data.get_calluserid(llm.upappid, orgid=llm.ownerid)
-	return userid
-
 async def write_llmusage(llmusage):
 	env = ServerEnv()
 	async with get_sor_context(env, 'llmage') as sor: