admin/Akern-Genai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

explicit project_id

Browse Source
This commit is contained in:
Matteo Rosati
2026-01-29 15:02:18 +01:00
parent da726dc777
commit f14c56ddd3
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib.py
View File

@@ -23,14 +23,15 @@ load_dotenv()
def get_credentials(): def get_credentials():
"""Get Google Cloud credentials from environment. """Get Google Cloud credentials and project ID from environment.
Supports two methods: Supports two methods:
1. GOOGLE_CREDENTIALS_JSON: Direct JSON content as string (production) 1. GOOGLE_CREDENTIALS_JSON: Direct JSON content as string (production)
2. GOOGLE_APPLICATION_CREDENTIALS: Path to JSON file (local development) 2. GOOGLE_APPLICATION_CREDENTIALS: Path to JSON file (local development)
Returns: Returns:
service_account.Credentials: The loaded credentials tuple: (credentials, project_id) where credentials is a
service_account.Credentials object and project_id is the Google Cloud project
""" """
# OAuth scopes required for Vertex AI API # OAuth scopes required for Vertex AI API
SCOPES = ["https://www.googleapis.com/auth/cloud-platform"] SCOPES = ["https://www.googleapis.com/auth/cloud-platform"]
@@ -44,10 +45,12 @@ def get_credentials():
try: try:
credentials_info = json.loads(credentials_json) credentials_info = json.loads(credentials_json)
logger.info(f"creds JSON parsed: {credentials_info}") logger.info(f"creds JSON parsed: {credentials_info}")
project_id = credentials_info.get("project_id")
return service_account.Credentials.from_service_account_info( credentials = service_account.Credentials.from_service_account_info(
credentials_info, scopes=SCOPES credentials_info, scopes=SCOPES
) )
return credentials, project_id
except json.JSONDecodeError as e: except json.JSONDecodeError as e:
raise ValueError(f"Invalid JSON in GOOGLE_CREDENTIALS_JSON: {e}") raise ValueError(f"Invalid JSON in GOOGLE_CREDENTIALS_JSON: {e}")
@@ -57,13 +60,18 @@ def get_credentials():
logger.info(f"creds path: {credentials_path}") logger.info(f"creds path: {credentials_path}")
if credentials_path and os.path.exists(credentials_path): if credentials_path and os.path.exists(credentials_path):
return service_account.Credentials.from_service_account_file( with open(credentials_path) as f:
credentials_info = json.load(f)
project_id = credentials_info.get("project_id")
credentials = service_account.Credentials.from_service_account_file(
credentials_path, scopes=SCOPES credentials_path, scopes=SCOPES
) )
return credentials, project_id
# If neither is provided, return None to let the client use default credentials # If neither is provided, return None to let the client use default credentials
# (useful when running on Google Cloud with service account attached) # (useful when running on Google Cloud with service account attached)
return None return None, None
# Gemini model name # Gemini model name
@@ -92,11 +100,16 @@ async def generate(prompt: str):
def run_streaming(): def run_streaming():
"""Run the synchronous streaming in a separate thread.""" """Run the synchronous streaming in a separate thread."""
try: try:
credentials = get_credentials() credentials, project_id = get_credentials()
logger.info(f"credentials: {credentials}") logger.info(f"credentials: {credentials}")
logger.info(f"project_id: {project_id}")
client = genai.Client(vertexai=True, credentials=credentials) client = genai.Client(
vertexai=True,
credentials=credentials,
project=project_id
)
contents = [ contents = [
types.Content(role="user", parts=[ types.Content(role="user", parts=[