OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-06-26 18:26:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated to use credentials json, tested with local built image and upload to gcs works

Browse Source
This commit is contained in:
kahghi
2025-01-17 21:53:41 +08:00
parent 8efc543f49
commit 1764de41f3
5 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/open_webui/config.py
View File

@@ -582,15 +582,15 @@ if CUSTOM_NAME:
####################################
STORAGE_PROVIDER = os.environ.get("STORAGE_PROVIDER", "local") # defaults to local, s3
print(f"storage provider: {STORAGE_PROVIDER}")
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_REGION_NAME = os.environ.get("S3_REGION_NAME", None)
S3_BUCKET_NAME = os.environ.get("S3_BUCKET_NAME", None)
S3_ENDPOINT_URL = os.environ.get("S3_ENDPOINT_URL", None)
GCS_PROJECT_ID = os.environ.get("GCS_PROJECT_ID", None)
GCS_BUCKET_NAME = os.environ.get("GCS_BUCKET_NAME", FileNotFoundError)
GCS_BUCKET_NAME = os.environ.get("GCS_BUCKET_NAME", None)
GOOGLE_APPLICATION_CREDENTIALS_JSON = os.environ.get("GOOGLE_APPLICATION_CREDENTIALS_JSON", None)
####################################
# File Upload DIR

18
backend/open_webui/storage/provider.py
View File

@@ -1,7 +1,9 @@
import os
import shutil
import json
from abc import ABC, abstractmethod
from typing import BinaryIO, Tuple
from io import BytesIO
import boto3
from botocore.exceptions import ClientError
@@ -11,8 +13,8 @@ from open_webui.config import (
S3_ENDPOINT_URL,
S3_REGION_NAME,
S3_SECRET_ACCESS_KEY,
GCS_PROJECT_ID,
GCS_BUCKET_NAME,
GOOGLE_APPLICATION_CREDENTIALS_JSON,
STORAGE_PROVIDER,
UPLOAD_DIR,
)
@@ -143,7 +145,7 @@ class S3StorageProvider(StorageProvider):
class GCSStorageProvider(StorageProvider):
def __init__(self):
self.gcs_client = storage.Client(project=GCS_PROJECT_ID)
self.gcs_client = storage.Client.from_service_account_info(info=json.loads(GOOGLE_APPLICATION_CREDENTIALS_JSON))
self.bucket_name = self.gcs_client.bucket(GCS_BUCKET_NAME)
def upload_file(self, file: BinaryIO, filename: str):
@@ -154,26 +156,28 @@ class GCSStorageProvider(StorageProvider):
blob = self.bucket_name.blob(filename)
# Upload the file to the bucket
blob.upload_from_file(BytesIO(contents))
print("file successfully uploaded")
return contents, _
except GoogleCloudError as e:
raise RuntimeError(f"Error uploading file to GCS: {e}")
def get_file(self, file_path:str) -> str:
"""Handles downloading of the file from GCS storage."""
try:
local_file_path = f"{UPLOAD_DIR}/{file_path}"
local_file_path=file_path.removeprefix(UPLOAD_DIR + "/")
# Get the blob (object in the bucket)
blob = self.bucket_name.blob(file_path)
blob = self.bucket_name.blob(local_file_path)
# Download the file to a local destination
blob.download_to_filename(local_file_path)
blob.download_to_filename(file_path)
return file_path
except NotFound as e:
raise RuntimeError(f"Error downloading file from GCS: {e}")
def delete_file(self, file_path:str) -> None:
"""Handles deletion of the file from GCS storage."""
try:
local_file_path = file_path.removeprefix(UPLOAD_DIR + "/")
# Get the blob (object in the bucket)
blob = self.bucket_name.blob(file_path)
blob = self.bucket_name.blob(local_file_path)
# Delete the file
blob.delete()