Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(wren-ai-service): sql2answer-minor-update #691

Merged
merged 4 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 105 additions & 1 deletion wren-ai-service/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions wren-ai-service/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ sqlglot = "==25.18.0"
cachetools = "==5.5.0"
pyyaml = "==6.0.2"
pydantic-settings = "==2.5.2"
google-auth = "==2.35.0"

[tool.poetry.group.dev.dependencies]
pre-commit = "==3.7.1"
Expand Down
26 changes: 24 additions & 2 deletions wren-ai-service/src/providers/llm/openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
from typing import Any, Callable, Dict, List, Optional, Union

import backoff
import google.auth
import google.auth.transport.requests
import openai
import orjson
from haystack import component
Expand Down Expand Up @@ -57,6 +59,26 @@ def __init__(
base_url=api_base_url,
)

# check if the model is actually Vertex AI model
self._vertexai_creds = None
if model.startswith("google/"):
self._vertexai_creds, _ = google.auth.default(
scopes=["https://www.googleapis.com/auth/cloud-platform"]
)

def __getattr__(self, name: str) -> Any:
# dealing with auto-refreshing expired credential
# https://cloud.google.com/vertex-ai/generative-ai/docs/multimodal/call-vertex-using-openai-library#refresh_your_credentials
if self._vertexai_creds and not self._vertexai_creds.valid:
auth_req = google.auth.transport.requests.Request()
self._vertexai_creds.refresh(auth_req)

if not self._vertexai_creds.valid:
raise RuntimeError("Unable to refresh auth")

self.client.api_key = self._vertexai_creds.token
return getattr(self.client, name)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a bit curious, why did we validate the credit of vertexai in the openai provider?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

left comment

@component.output_types(replies=List[str], meta=List[Dict[str, Any]])
@backoff.on_exception(backoff.expo, openai.RateLimitError, max_time=60, max_tries=3)
async def run(
Expand Down Expand Up @@ -151,11 +173,11 @@ def get_generator(
):
if self._api_base == LLM_OPENAI_API_BASE:
logger.info(
f"Creating OpenAI generator with model kwargs: {self._model_kwargs}"
f"Creating OpenAI generator {self._generation_model} with model kwargs: {self._model_kwargs}"
)
else:
logger.info(
f"Creating OpenAI API-compatible generator with model kwargs: {self._model_kwargs}"
f"Creating OpenAI API-compatible generator {self._generation_model} with model kwargs: {self._model_kwargs}"
)

return AsyncGenerator(
Expand Down
Loading