mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-12 12:25:20 +00:00
add s3 key prefix support
This commit is contained in:
parent
e9d6ada25c
commit
5ca6afc0fc
2 changed files with 4 additions and 1 deletions
|
|
@ -660,6 +660,7 @@ S3_ACCESS_KEY_ID = os.environ.get("S3_ACCESS_KEY_ID", None)
|
||||||
S3_SECRET_ACCESS_KEY = os.environ.get("S3_SECRET_ACCESS_KEY", None)
|
S3_SECRET_ACCESS_KEY = os.environ.get("S3_SECRET_ACCESS_KEY", None)
|
||||||
S3_REGION_NAME = os.environ.get("S3_REGION_NAME", None)
|
S3_REGION_NAME = os.environ.get("S3_REGION_NAME", None)
|
||||||
S3_BUCKET_NAME = os.environ.get("S3_BUCKET_NAME", None)
|
S3_BUCKET_NAME = os.environ.get("S3_BUCKET_NAME", None)
|
||||||
|
S3_KEY_PREFIX = os.environ.get("S3_KEY_PREFIX", None)
|
||||||
S3_ENDPOINT_URL = os.environ.get("S3_ENDPOINT_URL", None)
|
S3_ENDPOINT_URL = os.environ.get("S3_ENDPOINT_URL", None)
|
||||||
|
|
||||||
GCS_BUCKET_NAME = os.environ.get("GCS_BUCKET_NAME", None)
|
GCS_BUCKET_NAME = os.environ.get("GCS_BUCKET_NAME", None)
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ from open_webui.config import (
|
||||||
S3_ACCESS_KEY_ID,
|
S3_ACCESS_KEY_ID,
|
||||||
S3_BUCKET_NAME,
|
S3_BUCKET_NAME,
|
||||||
S3_ENDPOINT_URL,
|
S3_ENDPOINT_URL,
|
||||||
|
S3_KEY_PREFIX,
|
||||||
S3_REGION_NAME,
|
S3_REGION_NAME,
|
||||||
S3_SECRET_ACCESS_KEY,
|
S3_SECRET_ACCESS_KEY,
|
||||||
GCS_BUCKET_NAME,
|
GCS_BUCKET_NAME,
|
||||||
|
|
@ -98,7 +99,8 @@ class S3StorageProvider(StorageProvider):
|
||||||
"""Handles uploading of the file to S3 storage."""
|
"""Handles uploading of the file to S3 storage."""
|
||||||
_, file_path = LocalStorageProvider.upload_file(file, filename)
|
_, file_path = LocalStorageProvider.upload_file(file, filename)
|
||||||
try:
|
try:
|
||||||
self.s3_client.upload_file(file_path, self.bucket_name, filename)
|
s3_key = os.path.join(S3_KEY_PREFIX, filename)
|
||||||
|
self.s3_client.upload_file(file_path, self.bucket_name, s3_key)
|
||||||
return (
|
return (
|
||||||
open(file_path, "rb").read(),
|
open(file_path, "rb").read(),
|
||||||
"s3://" + self.bucket_name + "/" + filename,
|
"s3://" + self.bucket_name + "/" + filename,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue