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 2025-11-13 16:42:58 +08:00
parent 0684c1641c
commit 4c82deb0a4
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
llmage/llmclient.py
View File

@ -178,9 +178,11 @@ async def uapi_request(request, llm, sor, params_kw=None):
except Exception as e: except Exception as e:
exception(f'{e=},{format_exc()}') exception(f'{e=},{format_exc()}')
estr = erase_apikey(e) estr = erase_apikey(e)
ed = {"error": f"ERROR:{estr}:{format_exc()}", "status": "FAILED" ,"llmusageid": luid}
outlines.append({f"error": "ERROR:{estr}", "status": "FAILED" ,"llmusageid": luid}) s = json.dumps(ed)
yield f'{{"error": "ERROR:{estr}", "status": "SUCCEEDED" ,"llmusageid": luid}}\n' s = ''.join(s.split('\n'))
outlines.append(ed)
yield f'{s}\n')
await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor) await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor)
return return
@ -206,8 +208,11 @@ async def sync_uapi_request(request, llm, sor, params_kw=None):
except Exception as e: except Exception as e:
exception(f'{e=},{format_exc()}') exception(f'{e=},{format_exc()}')
estr = erase_apikey(e) estr = erase_apikey(e)
yield f'{{"error": "ERROR:{estr}", "status": "SUCCEEDED", "llmusageid": luid }}\n' ed = {"error": f"ERROR:{estr}:{format_exc()}", "status": "FAILED" ,"llmusageid": luid}
outlines.append({"error": "ERROR:{estr}", "status": "FAILED" ,"llmusageid": luid}) s = json.dumps(ed)
s = ''.join(s.split('\n'))
outlines.append(ed)
yield f'{s}\n')
await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor) await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor)
return return
d['llmusageid'] = luid d['llmusageid'] = luid
@ -237,8 +242,11 @@ async def async_uapi_request(request, llm, sor, params_kw=None):
except Exception as e: except Exception as e:
exception(f'{e=},{format_exc()}') exception(f'{e=},{format_exc()}')
estr = erase_apikey(e) estr = erase_apikey(e)
yield f'{{"error": "ERROR:{estr}", "status": "SUCCEEDED" ,"llmusageid": luid}}\n' ed = {"error": f"ERROR:{estr}:{format_exc()}", "status": "FAILED" ,"llmusageid": luid}
outlines.append({"error": "ERROR:{estr}", "status": "FAILED" ,"llmusageid": luid}) s = json.dumps(ed)
s = ''.join(s.split('\n'))
outlines.append(ed)
yield f'{s}\n')
await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor) await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor)
return return
if isinstance(b, bytes): if isinstance(b, bytes):
@ -257,8 +265,11 @@ async def async_uapi_request(request, llm, sor, params_kw=None):
except Exception as e: except Exception as e:
exception(f'{e=},{format_exc()}') exception(f'{e=},{format_exc()}')
estr = erase_apikey(e) estr = erase_apikey(e)
yield f'{{"error": "ERROR:{estr}", "status": "SUCCEEDED" ,"llmusageid": luid}}\n' ed = {"error": f"ERROR:{estr}:{format_exc()}", "status": "FAILED" ,"llmusageid": luid}
outlines.append({"error": "ERROR:{estr}", "status": "FAILED" ,"llmusageid": luid}) s = json.dumps(ed)
s = ''.join(s.split('\n'))
outlines.append(ed)
yield f'{s}\n')
await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor) await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor)
return return
@ -273,8 +284,11 @@ async def async_uapi_request(request, llm, sor, params_kw=None):
yield b + '\n' yield b + '\n'
if not rzt.status or rzt.status == 'FAILED': if not rzt.status or rzt.status == 'FAILED':
debug(f'{b=} return error') debug(f'{b=} return error')
yield f'{{"error": "ERROR:upapp return failed", "status": "SUCCEEDED" ,"llmusageid": luid}}\n' ed = {"error": f"ERROR:{estr}:{format_exc()}", "status": "FAILED" ,"llmusageid": luid}
outlines.append({"error": "ERROR:{estr}", "status": "FAILED" ,"llmusageid": luid}) s = json.dumps(ed)
s = ''.join(s.split('\n'))
outlines.append(ed)
yield f'{s}\n')
await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor) await write_llmusage(luid, llm, callerid, None, params_kw, outlines, sor)
return return
if rzt.status == 'SUCCEEDED': if rzt.status == 'SUCCEEDED':