yumoqing/llmage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2026-04-09 15:18:12 +08:00
parent b3e520ea29
commit 3364d28ee6
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llmage/llmclient.py
View File

@ -33,6 +33,7 @@ async def uapi_request(request, llm, callerid, callerorgid, params_kw=None):
finish_seconds = None finish_seconds = None
first = True first = True
usage = None usage = None
output = []
async for l in uapi.stream_linify(llm.upappid, llm.apiname, userid, async for l in uapi.stream_linify(llm.upappid, llm.apiname, userid,
params=params_kw): params=params_kw):
if first: if first:
@ -68,15 +69,6 @@ async def uapi_request(request, llm, callerid, callerorgid, params_kw=None):
finish_seconds = time.time() - start_timestamp finish_seconds = time.time() - start_timestamp
if responsed_seconds is None: if responsed_seconds is None:
responsed_seconds = finish_seconds responsed_seconds = finish_seconds
if not usage.get('completion_tokens'):
usage['completion_tokens'] = len(txt)
if not usage.get('prompt_tokens'):
cnt = 0
if params_kw.prompt:
cnt += len(params_kw.prompt)
if params_kw.negitive_prompt:
cnt += len(params_kw.negitive_promot)
usage['prompt_tokens'] = cnt
llmusage = DictObject() llmusage = DictObject()
llmusage.id = luid llmusage.id = luid
llmusage.llmid = llm.id llmusage.llmid = llm.id
@ -84,10 +76,10 @@ async def uapi_request(request, llm, callerid, callerorgid, params_kw=None):
llmusage.use_time = timestampstr() llmusage.use_time = timestampstr()
llmusage.userid = callerid llmusage.userid = callerid
llmusage.usages = json.dumps(usage, ensure_ascii=False) llmusage.usages = json.dumps(usage, ensure_ascii=False)
ioinfo = json.dumps({ ioinfo = {
"input": params_kw, "input": params_kw,
'output': [d] 'output': outlines
}, ensure_ascii=False) }
webpath = await write_llmio(llmusage.id, ioinfo) webpath = await write_llmio(llmusage.id, ioinfo)
llmusage.ioinfo = webpath llmusage.ioinfo = webpath
debug(f'webpath={webpath}:') debug(f'webpath={webpath}:')

2
llmage/utils.py
View File

@ -39,6 +39,8 @@ async def read_webpath(webpath):
async def write_llmio(luid, io_dic): async def write_llmio(luid, io_dic):
fs = FileStorage() fs = FileStorage()
s = io_dic
if not isinstance(io_dic, str):
s = json.dumps(io_dic, ensure_ascii=False, indent=4) s = json.dumps(io_dic, ensure_ascii=False, indent=4)
name = f'{luid}.json' name = f'{luid}.json'
webpath = await fs.save(name, s, userid='llmio') webpath = await fs.save(name, s, userid='llmio')