From 3364d28ee62e887ed3b1dd8258becd658d14b50d Mon Sep 17 00:00:00 2001 From: yumoqing Date: Thu, 9 Apr 2026 15:18:12 +0800 Subject: [PATCH] bugfix --- llmage/llmclient.py | 16 ++++------------ llmage/utils.py | 4 +++- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/llmage/llmclient.py b/llmage/llmclient.py index faf7686..9963cbd 100644 --- a/llmage/llmclient.py +++ b/llmage/llmclient.py @@ -33,6 +33,7 @@ async def uapi_request(request, llm, callerid, callerorgid, params_kw=None): finish_seconds = None first = True usage = None + output = [] async for l in uapi.stream_linify(llm.upappid, llm.apiname, userid, params=params_kw): if first: @@ -68,15 +69,6 @@ async def uapi_request(request, llm, callerid, callerorgid, params_kw=None): finish_seconds = time.time() - start_timestamp if responsed_seconds is None: 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.id = luid llmusage.llmid = llm.id @@ -84,10 +76,10 @@ async def uapi_request(request, llm, callerid, callerorgid, params_kw=None): llmusage.use_time = timestampstr() llmusage.userid = callerid llmusage.usages = json.dumps(usage, ensure_ascii=False) - ioinfo = json.dumps({ + ioinfo = { "input": params_kw, - 'output': [d] - }, ensure_ascii=False) + 'output': outlines + } webpath = await write_llmio(llmusage.id, ioinfo) llmusage.ioinfo = webpath debug(f'webpath={webpath}:') diff --git a/llmage/utils.py b/llmage/utils.py index e8d0fce..f4c393f 100644 --- a/llmage/utils.py +++ b/llmage/utils.py @@ -39,7 +39,9 @@ async def read_webpath(webpath): async def write_llmio(luid, io_dic): fs = FileStorage() - s = json.dumps(io_dic, ensure_ascii=False, indent=4) + s = io_dic + if not isinstance(io_dic, str): + s = json.dumps(io_dic, ensure_ascii=False, indent=4) name = f'{luid}.json' webpath = await fs.save(name, s, userid='llmio') return webpath