Don't throw error if no GOOGLE_APPLICATION_CREDENTIALS set

harmonydata · May 31, 2024 · f8995c6 · f8995c6
1 parent f15a92c
commit f8995c6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/harmony_api/core/settings.py b/harmony_api/core/settings.py
@@ -24,15 +24,17 @@
 SOFTWARE.
 """
 
-import os
 import json
+import os
 from typing import Union
 
 from pydantic import BaseSettings
 
-GOOGLE_APPLICATION_CREDENTIALS = os.getenv("GOOGLE_APPLICATION_CREDENTIALS", {})
+GOOGLE_APPLICATION_CREDENTIALS = os.getenv("GOOGLE_APPLICATION_CREDENTIALS", '{}')
 if GOOGLE_APPLICATION_CREDENTIALS:
-    GOOGLE_APPLICATION_CREDENTIALS = json.loads(GOOGLE_APPLICATION_CREDENTIALS)
+    if GOOGLE_APPLICATION_CREDENTIALS.startswith(
+            "{"):  # only load JSON if it's JSON format
+        GOOGLE_APPLICATION_CREDENTIALS = json.loads(GOOGLE_APPLICATION_CREDENTIALS)
 
 
 class Settings(BaseSettings):