Merge 78c59f4f28 into e5b2a872d3

zhenxun/services/llm/adapters/gemini.py

@@ -119,8 +119,7 @@ class GeminiAdapter(BaseAdapter):
                     system_instruction_parts = [{"text": msg.content}]
                 elif isinstance(msg.content, list):
                     system_instruction_parts = [
-                        await converter.convert_part(part)
+                        await converter.convert_part(part) for part in msg.content
-                        for part in msg.content
                     ]
                 continue
 

zhenxun/services/llm/api.py

@@ -30,6 +30,7 @@ from .types import (
     ToolChoice,
 )
 from .types.exceptions import get_user_friendly_error_message
+from .types.models import GeminiGoogleSearch
 from .utils import create_multimodal_message
 
 T = TypeVar("T", bound=BaseModel)
@@ -182,7 +183,7 @@ async def embed_documents(
 
 
 async def generate_structured(
-    message: str | LLMMessage | list[LLMContentPart],
+    message: str | UniMessage | LLMMessage | list[LLMContentPart],
     response_model: type[T],
     *,
     model: ModelName = None,
@@ -302,7 +303,6 @@ async def _generate_image_from_message(
         messages = await normalize_to_llm_messages(message)
 
         async with await get_model_instance(model) as model_instance:
-
             response = await model_instance.generate_response(messages, config=config)
 
             if not response.images:
@@ -403,4 +403,5 @@ async def search(
         model=model,
         instruction=instruction,
         config=final_config,
+        tools=[GeminiGoogleSearch()],
     )

zhenxun/services/llm/session.py

@@ -445,11 +445,12 @@ class AI:
             instruction=instruction,
             template_vars=template_vars,
             config=search_config,
+            tools=[GeminiGoogleSearch()],
         )
 
     async def generate_structured(
         self,
-        message: str | LLMMessage | list[LLMContentPart] | None,
+        message: str | UniMessage | LLMMessage | list[LLMContentPart] | None,
         response_model: type[T],
         *,
         model: ModelName = None,