OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-05-31 11:00:49 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Refactor upload function

Browse Source
This commit is contained in:
Rodrigo Agundez 2025-02-07 08:12:04 +09:00
parent 7e97e9dcc9
commit 4974c9cbb0
1 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
backend/open_webui/routers/images.py
View File

@ -410,6 +410,24 @@ def load_url_image_data(url, headers=None):
return None return None
def upload_image(request, data, image_data, content_type, user):
file = UploadFile(
file=io.BytesIO(image_data),
filename="image", # will be converted to a unique ID on upload_file
headers={
"content-type": content_type,
},
)
file_item = upload_file(request, file, user)
file_body_path = IMAGE_CACHE_DIR.joinpath(f"{file_item.id}.json")
with open(file_body_path, "w") as f:
json.dump(data, f)
url = request.app.url_path_for("get_file_content_by_id", id=file_item.id)
return url
@router.post("/generations") @router.post("/generations")
async def image_generations( async def image_generations(
request: Request, request: Request,
@ -464,22 +482,8 @@ async def image_generations(
for image in res["data"]: for image in res["data"]:
image_data, content_type = load_b64_image_data(image["b64_json"]) image_data, content_type = load_b64_image_data(image["b64_json"])
file = UploadFile( url = upload_image(request, data, image_data, content_type, user)
file=io.BytesIO(image_data),
filename="image", # will be converted to a unique ID on upload_file
headers={
"content-type": content_type,
},
)
file_item = upload_file(request, file, user)
url = request.app.url_path_for(
"get_file_content_by_id", id=file_item.id
)
images.append({"url": url}) images.append({"url": url})
file_body_path = IMAGE_CACHE_DIR.joinpath(f"{file_item.id}.json")
with open(file_body_path, "w") as f:
json.dump(data, f)
return images return images
elif request.app.state.config.IMAGE_GENERATION_ENGINE == "comfyui": elif request.app.state.config.IMAGE_GENERATION_ENGINE == "comfyui":
@ -526,24 +530,14 @@ async def image_generations(
} }
image_data, content_type = load_url_image_data(image["url"], headers) image_data, content_type = load_url_image_data(image["url"], headers)
file = UploadFile( url = upload_image(
file=io.BytesIO(image_data), request,
filename="image", # will be converted to a unique ID on upload_file form_data.model_dump(exclude_none=True),
headers={ image_data,
"content-type": content_type, content_type,
}, user,
)
file_item = upload_file(request, file, user)
url = request.app.url_path_for(
"get_file_content_by_id", id=file_item.id
) )
images.append({"url": url}) images.append({"url": url})
file_body_path = IMAGE_CACHE_DIR.joinpath(f"{file_item.id}.json")
with open(file_body_path, "w") as f:
json.dump(form_data.model_dump(exclude_none=True), f)
log.debug(f"images: {images}")
return images return images
elif ( elif (
request.app.state.config.IMAGE_GENERATION_ENGINE == "automatic1111" request.app.state.config.IMAGE_GENERATION_ENGINE == "automatic1111"
@ -589,23 +583,14 @@ async def image_generations(
for image in res["images"]: for image in res["images"]:
image_data, content_type = load_b64_image_data(image) image_data, content_type = load_b64_image_data(image)
file = UploadFile( url = upload_image(
file=io.BytesIO(image_data), request,
filename="image", # will be converted to a unique ID on upload_file {**data, "info": res["info"]},
headers={ image_data,
"content-type": content_type, content_type,
}, user,
)
file_item = upload_file(request, file, user)
url = request.app.url_path_for(
"get_file_content_by_id", id=file_item.id
) )
images.append({"url": url}) images.append({"url": url})
file_body_path = IMAGE_CACHE_DIR.joinpath(f"{file_item.id}.json")
with open(file_body_path, "w") as f:
json.dump({**data, "info": res["info"]}, f)
return images return images
except Exception as e: except Exception as e:
error = e error = e