This commit is contained in:
yumoqing 2026-04-07 13:45:27 +08:00
parent eca05848da
commit f56141c4db
3 changed files with 9 additions and 6 deletions

View File

@ -10,7 +10,7 @@ from appPublic.uniqueID import getID
from appPublic.dictObject import DictObject from appPublic.dictObject import DictObject
from appPublic.timeUtils import curDateString, timestampstr from appPublic.timeUtils import curDateString, timestampstr
from appPublic.base64_to_file import base64_to_file, getFilenameFromBase64 from appPublic.base64_to_file import base64_to_file, getFilenameFromBase64
from uapi.appapi import UAPI, sor_get_callerid, sor_get_uapi # from uapi.appapi import UAPI, sor_get_callerid, sor_get_uapi
from ahserver.serverenv import get_serverenv, ServerEnv from ahserver.serverenv import get_serverenv, ServerEnv
from ahserver.filestorage import FileStorage from ahserver.filestorage import FileStorage
from .accounting import llm_accounting, llm_charging from .accounting import llm_accounting, llm_charging
@ -59,7 +59,8 @@ async def async_uapi_request(request, llm, sor,
params_kw = env.params_kw params_kw = env.params_kw
# callerorgid = 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)
uapi = UpAppApi()
userid = await get_owner_userid(sor, llm) userid = await get_owner_userid(sor, llm)
b = None b = None
luid = getID() luid = getID()

View File

@ -10,7 +10,7 @@ from appPublic.uniqueID import getID
from appPublic.dictObject import DictObject from appPublic.dictObject import DictObject
from appPublic.timeUtils import curDateString, timestampstr from appPublic.timeUtils import curDateString, timestampstr
from appPublic.base64_to_file import base64_to_file, getFilenameFromBase64 from appPublic.base64_to_file import base64_to_file, getFilenameFromBase64
from uapi.appapi import UAPI, sor_get_callerid, sor_get_uapi # from uapi.appapi import UAPI, sor_get_callerid, sor_get_uapi
from ahserver.serverenv import get_serverenv, ServerEnv from ahserver.serverenv import get_serverenv, ServerEnv
from ahserver.filestorage import FileStorage from ahserver.filestorage import FileStorage
from .asyncinference import async_uapi_request from .asyncinference import async_uapi_request
@ -24,7 +24,8 @@ async def uapi_request(request, llm, sor, callerid, callerorgid, params_kw=None)
params_kw = env.params_kw params_kw = env.params_kw
# callerorgid = 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 = env.UpAppApi()
# uapi = UAPI(request, sor=sor)
userid = await get_owner_userid(sor, llm) userid = await get_owner_userid(sor, llm)
outlines = [] outlines = []
txt = '' txt = ''

View File

@ -10,7 +10,7 @@ from appPublic.uniqueID import getID
from appPublic.dictObject import DictObject from appPublic.dictObject import DictObject
from appPublic.timeUtils import curDateString, timestampstr from appPublic.timeUtils import curDateString, timestampstr
from appPublic.base64_to_file import base64_to_file, getFilenameFromBase64 from appPublic.base64_to_file import base64_to_file, getFilenameFromBase64
from uapi.appapi import UAPI, sor_get_callerid, sor_get_uapi # from uapi.appapi import UAPI, sor_get_callerid, sor_get_uapi
from ahserver.serverenv import get_serverenv, ServerEnv from ahserver.serverenv import get_serverenv, ServerEnv
from ahserver.filestorage import FileStorage from ahserver.filestorage import FileStorage
from .accounting import llm_accounting, llm_charging from .accounting import llm_accounting, llm_charging
@ -22,7 +22,8 @@ async def sync_uapi_request(request, llm, sor, callerid, callerorgid, params_kw=
params_kw = env.params_kw params_kw = env.params_kw
# callerid = await env.get_user() # callerid = await env.get_user()
# callerorgid = await env.get_userorgid() # callerorgid = await env.get_userorgid()
uapi = UAPI(request, sor=sor) # uapi = UAPI(request, sor=sor)
uapi = UpAppApi()
userid = await get_owner_userid(sor, llm) userid = await get_owner_userid(sor, llm)
outlines = [] outlines = []
b = None b = None