Reapply "Updates dependencies and fixes errors and warnings" (#334) (#…

…335)

This reverts commit 6bc4d42.

assistants/explorer-assistant/assistant/response/model.py

@@ -1,7 +1,7 @@
 from typing import Any, Protocol, Sequence
 
-from assistant_extensions.ai_clients.model import CompletionMessage
 from attr import dataclass
+from llm_client.model import CompletionMessage
 from semantic_workbench_api_model.workbench_model import (
     MessageType,
 )

assistants/explorer-assistant/assistant/response/response.py

@@ -11,9 +11,9 @@
 from typing import Any, Awaitable, Callable, Sequence
 
 import deepmerge
-from assistant_extensions.ai_clients.model import CompletionMessage
 from assistant_extensions.artifacts import ArtifactsExtension
 from assistant_extensions.attachments import AttachmentsExtension
+from llm_client.model import CompletionMessage
 from semantic_workbench_api_model.workbench_model import (
     ConversationMessage,
     ConversationParticipant,

assistants/explorer-assistant/assistant/response/response_anthropic.py

@@ -8,7 +8,7 @@
 from anthropic import NotGiven
 from anthropic.types import Message, MessageParam, TextBlock, ToolUseBlock
 from assistant_extensions.ai_clients.config import AnthropicClientConfigModel
-from assistant_extensions.ai_clients.model import CompletionMessage
+from llm_client.model import CompletionMessage
 from semantic_workbench_api_model.workbench_model import (
     MessageType,
 )

assistants/explorer-assistant/assistant/response/response_openai.py

@@ -6,8 +6,8 @@
 import deepmerge
 import openai_client
 from assistant_extensions.ai_clients.config import AzureOpenAIClientConfigModel, OpenAIClientConfigModel
-from assistant_extensions.ai_clients.model import CompletionMessage
 from assistant_extensions.artifacts import ArtifactsExtension
+from llm_client.model import CompletionMessage
 from openai.types.chat import (
     ChatCompletion,
     ChatCompletionDeveloperMessageParam,

assistants/prospector-assistant/assistant/chat.py

@@ -14,10 +14,10 @@
 
 import deepmerge
 import openai_client
-from assistant_extensions.ai_clients.model import CompletionMessageImageContent
 from assistant_extensions.attachments import AttachmentsExtension
 from content_safety.evaluators import CombinedContentSafetyEvaluator
 from openai.types.chat import ChatCompletionMessageParam
+from llm_client.model import CompletionMessageImageContent
 from pydantic import BaseModel, ConfigDict
 from semantic_workbench_api_model.workbench_model import (
     AssistantStateEvent,

examples/python/python-03-multimodel-chatbot/assistant/config.py

@@ -3,11 +3,11 @@
 from enum import StrEnum
 from typing import Annotated, Any, Literal
 
-import google.generativeai as genai
 import openai
 import openai_client
 from anthropic import AsyncAnthropic
 from content_safety.evaluators import CombinedContentSafetyEvaluatorConfig
+from google import genai
 from pydantic import BaseModel, ConfigDict, Field
 from semantic_workbench_assistant.config import ConfigSecretStr, UISchema
 
@@ -180,9 +180,8 @@ class GeminiServiceConfig(ServiceConfig):
         Field(title="Gemini Model", description="The Gemini model to use for generating responses."),
     ] = "gemini-1.5-pro"
 
-    def new_client(self, **kwargs) -> genai.GenerativeModel:
-        genai.configure(api_key=self.gemini_api_key)
-        return genai.GenerativeModel(self.gemini_model)
+    def new_client(self, **kwargs) -> genai.Client:
+        return genai.Client(api_key=self.gemini_api_key)
 
 
 # endregion

examples/python/python-03-multimodel-chatbot/assistant/model_adapters.py

@@ -6,7 +6,7 @@
 
 import anthropic
 import deepmerge
-import google.generativeai as genai
+from google.genai.types import Content
 from openai.types.chat import (
     ChatCompletion,
     ChatCompletionAssistantMessageParam,
@@ -16,7 +16,7 @@
     ChatCompletionUserMessageParam,
 )
 from openai.types.chat.chat_completion import Choice
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 from .config import (
     AnthropicServiceConfig,
@@ -42,8 +42,7 @@ class GenerateResponseResult(BaseModel):
 
 
 class ModelAdapter(BaseModel):
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     @abstractmethod
     def _format_messages(self, messages: List[Message]) -> Any:
@@ -230,7 +229,7 @@ async def generate_response(
 #
 
 
-GeminiFormattedMessages: TypeAlias = Iterable[genai.types.StrictContentType]
+GeminiFormattedMessages: TypeAlias = Iterable[Content]
 
 
 class GeminiAdapter(ModelAdapter):
@@ -265,10 +264,12 @@ async def generate_response(
         }
 
         try:
-            model = service_config.new_client()
-            chat = model.start_chat(history=list(formatted_messages)[:-1])
-            response = await chat.send_message_async(list(formatted_messages)[-1])
-            deepmerge.always_merger.merge(metadata, {"debug": {"response": response.to_dict()}})
+            client = service_config.new_client()
+            chat = client.aio.chats.create(model=service_config.gemini_model, history=list(formatted_messages)[:-1])
+            latest_message = list(formatted_messages)[-1]
+            message = (latest_message.parts or [""])[0]
+            response = await chat.send_message(message)
+            deepmerge.always_merger.merge(metadata, {"debug": {"response": response.model_dump(mode="json")}})
             return GenerateResponseResult(
                 response=response.text,
                 metadata=metadata,

examples/python/python-03-multimodel-chatbot/pyproject.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "anthropic>=0.34.2",
-    "google-generativeai>=0.8.1",
+    "google-genai>=1.2.0",
     "openai>=1.61.0",
     "tiktoken>=0.8.0",
     "semantic-workbench-assistant>=0.1.0",