Merge pull request #3150 from ushuz/anthropic-vertex-adc

Load google ADC before init AnthropicVertex
This commit is contained in:
Krish Dholakia 2024-04-20 13:00:10 -07:00 • committed by GitHub
commit a9828b1e13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -123,7 +123,7 @@ class VertexAIAnthropicConfig:
"""
- Run client init
- Run client init
- Support async completion, streaming
"""
@ -236,17 +236,19 @@ def completion(
if client is None:
if vertex_credentials is not None and isinstance(vertex_credentials, str):
import google.oauth2.service_account
json_obj = json.loads(vertex_credentials)
creds = (
google.oauth2.service_account.Credentials.from_service_account_info(
json_obj,
json.loads(vertex_credentials),
scopes=["https://www.googleapis.com/auth/cloud-platform"],
)
)
### CHECK IF ACCESS
access_token = refresh_auth(credentials=creds)
else:
import google.auth
creds, _ = google.auth.default()
### CHECK IF ACCESS
access_token = refresh_auth(credentials=creds)
vertex_ai_client = AnthropicVertex(
project_id=vertex_project,