This commit is contained in:
yumoqing 2026-04-09 07:55:13 +08:00
parent d94ce38a24
commit 146753a2c9
2 changed files with 0 additions and 32 deletions

View File

@ -1,5 +1,4 @@
import asyncio import asyncio
from appPublic.base64_to_file import hex2base64
from appPublic.registerfunction import RegisterFunction from appPublic.registerfunction import RegisterFunction
from ahserver.serverenv import ServerEnv from ahserver.serverenv import ServerEnv
from ahserver.configuredServer import add_cleanupctx from ahserver.configuredServer import add_cleanupctx
@ -12,7 +11,6 @@ from .utils import (
) )
from .llmclient import ( from .llmclient import (
b64media2url,
get_llm, get_llm,
inference_generator, inference_generator,
inference, inference,
@ -51,8 +49,6 @@ def load_llmage():
env.get_asynctask_status = get_asynctask_status env.get_asynctask_status = get_asynctask_status
env.query_task_status = query_task_status env.query_task_status = query_task_status
env.get_llm = get_llm env.get_llm = get_llm
env.b64media2url = b64media2url
env.hex2base64 = hex2base64
env.inference = inference env.inference = inference
env.inference_generator = inference_generator env.inference_generator = inference_generator
env.get_llms_by_catelog = get_llms_by_catelog env.get_llms_by_catelog = get_llms_by_catelog

View File

@ -9,38 +9,10 @@ from appPublic.log import debug, exception, error
from appPublic.uniqueID import getID 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 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
def b64media2url(request, mediafile):
# env = request._run_ns
# entire_url = env.entire_url
env = ServerEnv()
if request:
entire_url = request._run_ns.entire_url
if mediafile.startswith('data:'):
try:
fs = FileStorage()
fname = getFilenameFromBase64(mediafile)
fpath = fs._name2path(fname)
base64_to_file(mediafile, fpath)
path = fs.webpath(fpath)
return entire_url('/idfile?path=') + env.quote(path)
except Exception as e:
e = Exception(f'{e}\n{format_exc()}')
exception(f'{e}')
return ''
elif len(mediafile) > 8000:
e = Exception(f'mediafile is not a media file')
exception(f'{e}')
return ''
if mediafile.startswith('http://') or mediafile.startswith('https://'):
return mediafile
url = entire_url('/idfile?path=') + env.quote(mediafile)
return url
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: