|
@@ -9,8 +9,8 @@ import google.ai.generativelanguage as glm
|
|
|
import google.generativeai as genai
|
|
|
import requests
|
|
|
from google.api_core import exceptions
|
|
|
-from google.generativeai import client
|
|
|
-from google.generativeai.types import ContentType, GenerateContentResponse, HarmBlockThreshold, HarmCategory
|
|
|
+from google.generativeai.client import _ClientManager
|
|
|
+from google.generativeai.types import ContentType, GenerateContentResponse
|
|
|
from google.generativeai.types.content_types import to_part
|
|
|
from PIL import Image
|
|
|
|
|
@@ -200,24 +200,16 @@ class GoogleLargeLanguageModel(LargeLanguageModel):
|
|
|
history.append(content)
|
|
|
|
|
|
# Create a new ClientManager with tenant's API key
|
|
|
- new_client_manager = client._ClientManager()
|
|
|
+ new_client_manager = _ClientManager()
|
|
|
new_client_manager.configure(api_key=credentials["google_api_key"])
|
|
|
new_custom_client = new_client_manager.make_client("generative")
|
|
|
|
|
|
google_model._client = new_custom_client
|
|
|
|
|
|
- safety_settings = {
|
|
|
- HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_NONE,
|
|
|
- HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_NONE,
|
|
|
- HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_NONE,
|
|
|
- HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_NONE,
|
|
|
- }
|
|
|
-
|
|
|
response = google_model.generate_content(
|
|
|
contents=history,
|
|
|
generation_config=genai.types.GenerationConfig(**config_kwargs),
|
|
|
stream=stream,
|
|
|
- safety_settings=safety_settings,
|
|
|
tools=self._convert_tools_to_glm_tool(tools) if tools else None,
|
|
|
request_options={"timeout": 600},
|
|
|
)
|