This commit is contained in:
yumoqing 2026-04-09 11:21:40 +08:00
parent 146753a2c9
commit 9e9a6e4e02
2 changed files with 9 additions and 4 deletions

View File

@ -10,7 +10,6 @@ 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 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 +58,6 @@ async def async_uapi_request(request, llm,
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(request) uapi = env.UpAppApi(request)
userid = await get_owner_userid(llm) userid = await get_owner_userid(llm)
b = None b = None
@ -138,7 +136,7 @@ async def add_new_llmusage_output(luid, newd):
r.ioinfo = json.dumps(io, ensure_ascii=False) r.ioinfo = json.dumps(io, ensure_ascii=False)
r.update(newd) r.update(newd)
await sor.U('llmusage', r) await sor.U('llmusage', r)
debug(f'llmuasage update to {r}') # debug(f'llmuasage update to {r}')
return return
else: else:
exception(f'add_new_llmusage_output({luid}, {newd}) llmusage not found') exception(f'add_new_llmusage_output({luid}, {newd}) llmusage not found')
@ -174,7 +172,7 @@ async def query_task_status(request, upappid, apiname, luid, userid, taskid):
raise e raise e
llm = llms[0] llm = llms[0]
lastoutout = get_llmusage_last_output(llmusage) lastoutout = get_llmusage_last_output(llmusage)
uapi = UAPI(request, sor) uapi = UpAppApi(request)
apinames = apiname.split(',') apinames = apiname.split(',')
for apiname in apinames: for apiname in apinames:
status = 'unknown' status = 'unknown'

View File

@ -13,6 +13,13 @@ 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
async def write_llmio(luid, io_dic):
fs = FileStorage()
s = json.dumps(io_dic, ensure_ascii=False, indent=4)
name = f'{luid}.json'
webpath = await fs.save(name, s, userid='llmio')
return webpath
async def llm_query_orders(userorgid, page, pagerows=80): async def llm_query_orders(userorgid, page, pagerows=80):
env = ServerEnv() env = ServerEnv()
async with get_sor_context(env, 'llmage') as sor: async with get_sor_context(env, 'llmage') as sor: