fix: Annotate response type as None for transfer_to_agent tool and set empty Schema as response schema when tool has no response annotation

1. if a function has no return type annotation, we should treat it as returning any type
2. we use empty schema (with `type` as None) to indicate no type constraints and this is already supported by model server

PiperOrigin-RevId: 789808104

tests/unittests/tools/test_build_function_declaration.py

@@ -298,9 +298,10 @@ def test_function_no_return_annotation_vertex_ai():
   assert function_decl.name == 'function_no_return'
   assert function_decl.parameters.type == 'OBJECT'
   assert function_decl.parameters.properties['param'].type == 'STRING'
-  # VERTEX_AI should have response schema for None return
+  # VERTEX_AI should have response schema for functions with no return annotation
+  # Changed: Now uses Any type instead of NULL for no return annotation
   assert function_decl.response is not None
-  assert function_decl.response.type == types.Type.NULL
+  assert function_decl.response.type is None  # Any type maps to None in schema
 
 
 def test_function_explicit_none_return_vertex_ai():
@@ -359,8 +360,8 @@ def test_function_regular_return_type_vertex_ai():
   assert function_decl.response.type == types.Type.STRING
 
 
-def test_transfer_to_agent_like_function():
-  """Test a function similar to transfer_to_agent that caused the original issue."""
+def test_fucntion_with_no_response_annotations():
+  """Test a function that has no response annotations."""
 
   def transfer_to_agent(agent_name: str, tool_context: ToolContext):
     """Transfer the question to another agent."""
@@ -376,6 +377,7 @@ def test_transfer_to_agent_like_function():
   assert function_decl.parameters.type == 'OBJECT'
   assert function_decl.parameters.properties['agent_name'].type == 'STRING'
   assert 'tool_context' not in function_decl.parameters.properties
-  # This should now have a response schema for VERTEX_AI variant
+  # This function has no return annotation, so it gets Any type instead of NULL
+  # Changed: Now uses Any type instead of NULL for no return annotation
   assert function_decl.response is not None
-  assert function_decl.response.type == types.Type.NULL
+  assert function_decl.response.type is None  # Any type maps to None in schema

tests/unittests/tools/test_from_function_with_options.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import Any
 from typing import Dict
 
 from google.adk.tools import _automatic_function_calling_util
@@ -51,9 +52,10 @@ def test_from_function_with_options_no_return_annotation_vertex():
   assert declaration.name == 'test_function'
   assert declaration.parameters.type == 'OBJECT'
   assert declaration.parameters.properties['param'].type == 'STRING'
-  # VERTEX_AI should have response schema for None return
+  # VERTEX_AI should have response schema for functions with no return annotation
+  # Changed: Now uses Any type instead of NULL for no return annotation
   assert declaration.response is not None
-  assert declaration.response.type == types.Type.NULL
+  assert declaration.response.type is None  # Any type maps to None in schema
 
 
 def test_from_function_with_options_explicit_none_return_vertex():
@@ -150,6 +152,26 @@ def test_from_function_with_options_int_return_vertex():
   assert declaration.response.type == types.Type.INTEGER
 
 
+def test_from_function_with_options_any_annotation_vertex():
+  """Test from_function_with_options with Any type annotation for VERTEX_AI."""
+
+  def test_function(param: Any) -> Any:
+    """A test function that uses Any type annotations."""
+    return param
+
+  declaration = _automatic_function_calling_util.from_function_with_options(
+      test_function, GoogleLLMVariant.VERTEX_AI
+  )
+
+  assert declaration.name == 'test_function'
+  assert declaration.parameters.type == 'OBJECT'
+  # Any type should map to None in schema (TYPE_UNSPECIFIED behavior)
+  assert declaration.parameters.properties['param'].type is None
+  # VERTEX_AI should have response schema for Any return
+  assert declaration.response is not None
+  assert declaration.response.type is None  # Any type maps to None in schema
+
+
 def test_from_function_with_options_no_params():
   """Test from_function_with_options with no parameters."""
 

tests/unittests/tools/test_function_tool_with_import_annotations.py

@@ -0,0 +1,179 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+from typing import Any
+from typing import Dict
+
+from google.adk.tools import _automatic_function_calling_util
+from google.adk.utils.variant_utils import GoogleLLMVariant
+from google.genai import types
+
+
+def test_string_annotation_none_return_vertex():
+  """Test function with string annotation 'None' return for VERTEX_AI."""
+
+  def test_function(_param: str) -> None:
+    """A test function that returns None with string annotation."""
+    pass
+
+  declaration = _automatic_function_calling_util.from_function_with_options(
+      test_function, GoogleLLMVariant.VERTEX_AI
+  )
+
+  assert declaration.name == 'test_function'
+  assert declaration.parameters.type == 'OBJECT'
+  assert declaration.parameters.properties['_param'].type == 'STRING'
+  # VERTEX_AI should have response schema for None return (stored as string)
+  assert declaration.response is not None
+  assert declaration.response.type == types.Type.NULL
+
+
+def test_string_annotation_none_return_gemini():
+  """Test function with string annotation 'None' return for GEMINI_API."""
+
+  def test_function(_param: str) -> None:
+    """A test function that returns None with string annotation."""
+    pass
+
+  declaration = _automatic_function_calling_util.from_function_with_options(
+      test_function, GoogleLLMVariant.GEMINI_API
+  )
+
+  assert declaration.name == 'test_function'
+  assert declaration.parameters.type == 'OBJECT'
+  assert declaration.parameters.properties['_param'].type == 'STRING'
+  # GEMINI_API should not have response schema
+  assert declaration.response is None
+
+
+def test_string_annotation_str_return_vertex():
+  """Test function with string annotation 'str' return for VERTEX_AI."""
+
+  def test_function(_param: str) -> str:
+    """A test function that returns a string with string annotation."""
+    return _param
+
+  declaration = _automatic_function_calling_util.from_function_with_options(
+      test_function, GoogleLLMVariant.VERTEX_AI
+  )
+
+  assert declaration.name == 'test_function'
+  assert declaration.parameters.type == 'OBJECT'
+  assert declaration.parameters.properties['_param'].type == 'STRING'
+  # VERTEX_AI should have response schema for string return (stored as string)
+  assert declaration.response is not None
+  assert declaration.response.type == types.Type.STRING
+
+
+def test_string_annotation_int_return_vertex():
+  """Test function with string annotation 'int' return for VERTEX_AI."""
+
+  def test_function(_param: str) -> int:
+    """A test function that returns an int with string annotation."""
+    return 42
+
+  declaration = _automatic_function_calling_util.from_function_with_options(
+      test_function, GoogleLLMVariant.VERTEX_AI
+  )
+
+  assert declaration.name == 'test_function'
+  assert declaration.parameters.type == 'OBJECT'
+  assert declaration.parameters.properties['_param'].type == 'STRING'
+  # VERTEX_AI should have response schema for int return (stored as string)
+  assert declaration.response is not None
+  assert declaration.response.type == types.Type.INTEGER
+
+
+def test_string_annotation_dict_return_vertex():
+  """Test function with string annotation Dict return for VERTEX_AI."""
+
+  def test_function(_param: str) -> Dict[str, str]:
+    """A test function that returns a dict with string annotation."""
+    return {'result': _param}
+
+  declaration = _automatic_function_calling_util.from_function_with_options(
+      test_function, GoogleLLMVariant.VERTEX_AI
+  )
+
+  assert declaration.name == 'test_function'
+  assert declaration.parameters.type == 'OBJECT'
+  assert declaration.parameters.properties['_param'].type == 'STRING'
+  # VERTEX_AI should have response schema for dict return (stored as string)
+  assert declaration.response is not None
+  assert declaration.response.type == types.Type.OBJECT
+
+
+def test_string_annotation_any_return_vertex():
+  """Test function with string annotation 'Any' return for VERTEX_AI."""
+
+  def test_function(_param: Any) -> Any:
+    """A test function that uses Any type with string annotations."""
+    return _param
+
+  declaration = _automatic_function_calling_util.from_function_with_options(
+      test_function, GoogleLLMVariant.VERTEX_AI
+  )
+
+  assert declaration.name == 'test_function'
+  assert declaration.parameters.type == 'OBJECT'
+  # Any type should map to None in schema (TYPE_UNSPECIFIED behavior)
+  assert declaration.parameters.properties['_param'].type is None
+  # VERTEX_AI should have response schema for Any return (stored as string)
+  assert declaration.response is not None
+  assert declaration.response.type is None  # Any type maps to None in schema
+
+
+def test_string_annotation_mixed_parameters_vertex():
+  """Test function with mixed string annotations for parameters."""
+
+  def test_function(str_param: str, int_param: int, any_param: Any) -> str:
+    """A test function with mixed parameter types as string annotations."""
+    return f'{str_param}-{int_param}-{any_param}'
+
+  declaration = _automatic_function_calling_util.from_function_with_options(
+      test_function, GoogleLLMVariant.VERTEX_AI
+  )
+
+  assert declaration.name == 'test_function'
+  assert declaration.parameters.type == 'OBJECT'
+  assert declaration.parameters.properties['str_param'].type == 'STRING'
+  assert declaration.parameters.properties['int_param'].type == 'INTEGER'
+  assert declaration.parameters.properties['any_param'].type is None  # Any type
+  # VERTEX_AI should have response schema for string return (stored as string)
+  assert declaration.response is not None
+  assert declaration.response.type == types.Type.STRING
+
+
+def test_string_annotation_no_params_vertex():
+  """Test function with no parameters but string annotation return."""
+
+  def test_function() -> str:
+    """A test function with no parameters that returns string (string annotation)."""
+    return 'hello'
+
+  declaration = _automatic_function_calling_util.from_function_with_options(
+      test_function, GoogleLLMVariant.VERTEX_AI
+  )
+
+  assert declaration.name == 'test_function'
+  # No parameters should result in no parameters field or empty parameters
+  assert (
+      declaration.parameters is None
+      or len(declaration.parameters.properties) == 0
+  )
+  # VERTEX_AI should have response schema for string return (stored as string)
+  assert declaration.response is not None
+  assert declaration.response.type == types.Type.STRING