Skip to content

[Fix] google gen ai new key #212

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

Merged
merged 1 commit into from
Jun 21, 2024
Merged
Changes from all 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
2 changes: 1 addition & 1 deletion edenai_apis/apis/google/google_image_api.py
Original file line number Diff line number Diff line change
@@ -442,7 +442,7 @@ def _gemini_pro_vision_qa(
temperature: float,
max_tokens: int,
):
api_key = self.api_settings["genai_api_key"]
api_key = self.api_settings.get("genai_api_key")
url = f"https://generativelanguage.googleapis.com/v1/models/gemini-pro-vision:generateContent?key={api_key}"
payload = {
"contents": {
2 changes: 1 addition & 1 deletion edenai_apis/apis/google/google_multimodal_api.py
Original file line number Diff line number Diff line change
@@ -121,7 +121,7 @@ def multimodal__chat(
stream: bool = False,
provider_params: Optional[dict] = None,
) -> ResponseType[Union[ChatDataClass, StreamChat]]:
api_key = self.api_settings["genai_api_key"]
api_key = self.api_settings.get("genai_api_key")
base_url = "https://generativelanguage.googleapis.com/v1/models/{model}:generateContent?key={api_key}"
url = base_url.format(model=model, api_key=api_key)
formatted_messages = self.__format_google_messages(messages=messages)
8 changes: 5 additions & 3 deletions edenai_apis/apis/google/google_text_api.py
Original file line number Diff line number Diff line change
@@ -327,7 +327,9 @@ def text__generation(
},
}
original_response = gemini_request(
payload=payload, model=model, api_key=self.api_settings["genai_api_key"]
payload=payload,
model=model,
api_key=self.api_settings.get("genai_api_key"),
)
generated_text = original_response["candidates"][0]["content"]["parts"][0][
"text"
@@ -578,7 +580,7 @@ def _handle_non_streaming(
max_tokens,
context,
)
api_key = self.api_settings["genai_api_key"]
api_key = self.api_settings.get("genai_api_key")
base_url = f"https://generativelanguage.googleapis.com/v1/models/{model}:generateContent?key={api_key}"
response = requests.post(url=base_url, json=payload)
try:
@@ -664,7 +666,7 @@ def _handle_streaming(
max_tokens,
context,
)
api_key = self.api_settings["genai_api_key"]
api_key = self.api_settings.get("genai_api_key")
base_url = f"https://generativelanguage.googleapis.com/v1/models/{model}:streamGenerateContent?alt=sse&key={api_key}"
response = requests.post(base_url, json=payload, stream=True)
else:
2 changes: 1 addition & 1 deletion edenai_apis/loaders/data_loader.py
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ def load_key(provider_name, location=False, api_keys: Dict = {}):

if api_keys:
data = api_keys
check_messsing_keys(provider_settings_data, data)
#check_messsing_keys(provider_settings_data, data)

if location:
return data, provider_settings_path