llmage/init.py

@@ -1,5 +1,5 @@
 from llmage.llmclient import (
-	b64media2url,
+	b64media,
 	get_llm, 
 	inference, 
 	get_llmcatelogs,
@@ -17,7 +17,7 @@ from ahserver.serverenv import ServerEnv
 def load_llmage():
 	env = ServerEnv()
 	env.get_llm = get_llm
-	env.b64media2url = b64media2url
+	env.b64media = b64media
 	env.inference = inference
 	env.get_llms_by_catelog = get_llms_by_catelog
 	env.get_llmcatelogs = get_llmcatelogs

llmage/llmclient.py

@@ -4,11 +4,8 @@ from functools import partial
 from traceback import format_exc
 from sqlor.dbpools import DBPools
 from appPublic.log import debug, exception
-from appPublic.uniqueID import getID
-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
-from ahserver.filestorage import FileStorage
 
 async def get_llmcatelogs():
 	db = DBPools()
@@ -96,19 +93,16 @@ async def uapi_request(request, sor, caller_orgid, callerid, uapi, llm, params):
 				yield l
 	debug(f'{d=}, {txt=}')
 	
-def b64media2url(request, mediafile):
+def b64media(mediafile):
-	env = request._run_ns
 	if mediafile.startswith('data:'):
-		fs = FileStorage()
+		return mediafile
-		fname = getFilenameFromBase64(mediafile)
-		fpath = fs._name2path(fname)
-		base64_to_file(mediafile, fpath)
-		path = fs.webpath(fpath)
-		return env.entire_url('/idfile?path=') + env.quota(path)
 	if mediafile.startswith('http://') or mediafile.startswith('https://'):
 		return mediafile
-	url = env.entire_url('/idfile?path=') + env.quota(mediafile)
+	fs = FileStorage()
-	return url
+	fn = fs.realPath(mediafile)
+	with open(fn, 'rb') as f:
+		b = f.read()
+		return base64.b64encode(b).decode('iso-8859-1')
 
 async def inference(request, *args, **kw):
 	env = request._run_ns