Browse Source

removed unnecessary GCS_PROJECT_ID variable

kahghi 3 months ago
parent
commit
44574c434d
2 changed files with 4 additions and 6 deletions
  1. 0 1
      backend/open_webui/config.py
  2. 4 5
      backend/open_webui/storage/provider.py

+ 0 - 1
backend/open_webui/config.py

@@ -590,7 +590,6 @@ S3_BUCKET_NAME = os.environ.get("S3_BUCKET_NAME", None)
 S3_ENDPOINT_URL = os.environ.get("S3_ENDPOINT_URL", None)
 
 GCS_BUCKET_NAME = os.environ.get("GCS_BUCKET_NAME", None)
-GCS_PROJECT_ID = os.environ.get("GCS_PROJECT_ID", None)
 GOOGLE_APPLICATION_CREDENTIALS_JSON = os.environ.get("GOOGLE_APPLICATION_CREDENTIALS_JSON", None)
 
 ####################################

+ 4 - 5
backend/open_webui/storage/provider.py

@@ -13,7 +13,6 @@ from open_webui.config import (
     S3_REGION_NAME,
     S3_SECRET_ACCESS_KEY,
     GCS_BUCKET_NAME,
-    GCS_PROJECT_ID, 
     GOOGLE_APPLICATION_CREDENTIALS_JSON,
     STORAGE_PROVIDER,
     UPLOAD_DIR,
@@ -145,11 +144,11 @@ class S3StorageProvider(StorageProvider):
 
 class GCSStorageProvider(StorageProvider):
     def __init__(self):
-        if GCS_PROJECT_ID:
-            self.gcs_client = storage.Client(project=GCS_PROJECT_ID)
-        if GOOGLE_APPLICATION_CREDENTIALS_JSON:
+        if GCS_BUCKET_NAME and GOOGLE_APPLICATION_CREDENTIALS_JSON:
             self.gcs_client = storage.Client.from_service_account_info(info=json.loads(GOOGLE_APPLICATION_CREDENTIALS_JSON))
-
+        if GCS_BUCKET_NAME and not GOOGLE_APPLICATION_CREDENTIALS_JSON:
+            # defaults to environment, be it GCE VM or user credentials
+            self.gcs_client = storage.Client()
         self.bucket_name = GCS_BUCKET_NAME
         self.bucket = self.gcs_client.bucket(GCS_BUCKET_NAME)