From 810a39b236c6e39f7284817a3226650dd28e5e7a Mon Sep 17 00:00:00 2001 From: johnpccd Date: Sat, 24 May 2025 06:54:10 +0200 Subject: [PATCH] cp --- scripts/seed_firestore.py | 7 +++++-- src/db/providers/firestore_provider.py | 13 ++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/seed_firestore.py b/scripts/seed_firestore.py index c643eed..db260f1 100644 --- a/scripts/seed_firestore.py +++ b/scripts/seed_firestore.py @@ -11,8 +11,11 @@ import argparse from datetime import datetime, timedelta import secrets import hashlib -from bson import ObjectId -from pydantic import HttpUrl + +from dotenv import load_dotenv + +# Load environment variables from .env file +load_dotenv() # Add the parent directory to the path so we can import from src sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))) diff --git a/src/db/providers/firestore_provider.py b/src/db/providers/firestore_provider.py index cca02d6..89a965a 100644 --- a/src/db/providers/firestore_provider.py +++ b/src/db/providers/firestore_provider.py @@ -29,9 +29,16 @@ class FirestoreProvider: """Connect to Firestore""" try: if settings.GCS_CREDENTIALS_FILE and os.path.exists(settings.GCS_CREDENTIALS_FILE): - self.client = firestore.Client.from_service_account_json( - settings.GCS_CREDENTIALS_FILE, - settings.FIRESTORE_DATABASE_NAME + # Get credentials from file but don't initialize client yet + from google.oauth2 import service_account + credentials = service_account.Credentials.from_service_account_file( + settings.GCS_CREDENTIALS_FILE + ) + + # Create client with credentials and database name + self.client = firestore.Client( + credentials=credentials, + database=settings.FIRESTORE_DATABASE_NAME ) else: # Use application default credentials with specific database