Skip to content

Commit ab4b736

Browse files
encounterGWeale
authored and
copybara-github
committed
fix: Refactor type string update in Anthropic tool param conversion
The _update_type_string function now recursively processes "properties" at any level of the schema, ensuring that all "type" fields within nested objects are correctly lowercased. This improves handling of complex Co-authored-by: George Weale <gweale@google.com> PiperOrigin-RevId: 882050939
1 parent 0ad4de7 commit ab4b736

2 files changed

Lines changed: 273 additions & 20 deletions

File tree

‎src/google/adk/models/anthropic_llm.py‎

Lines changed: 59 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from __future__ import annotations
1818

1919
import base64
20+
import copy
2021
import dataclasses
2122
from functools import cached_property
2223
import json
@@ -250,22 +251,60 @@ def message_to_generate_content_response(
250251
)
251252

252253

253-
def _update_type_string(value_dict: dict[str, Any]):
254-
"""Updates 'type' field to expected JSON schema format."""
255-
if "type" in value_dict:
256-
value_dict["type"] = value_dict["type"].lower()
257-
258-
if "items" in value_dict:
259-
# 'type' field could exist for items as well, this would be the case if
260-
# items represent primitive types.
261-
_update_type_string(value_dict["items"])
262-
263-
if "properties" in value_dict["items"]:
264-
# There could be properties as well on the items, especially if the items
265-
# are complex object themselves. We recursively traverse each individual
266-
# property as well and fix the "type" value.
267-
for _, value in value_dict["items"]["properties"].items():
268-
_update_type_string(value)
254+
def _update_type_string(value: Any):
255+
"""Lowercases nested JSON schema type strings for Anthropic compatibility."""
256+
if isinstance(value, list):
257+
for item in value:
258+
_update_type_string(item)
259+
return
260+
261+
if not isinstance(value, dict):
262+
return
263+
264+
schema_type = value.get("type")
265+
if isinstance(schema_type, str):
266+
value["type"] = schema_type.lower()
267+
268+
for dict_key in (
269+
"$defs",
270+
"defs",
271+
"dependentSchemas",
272+
"patternProperties",
273+
"properties",
274+
):
275+
child_dict = value.get(dict_key)
276+
if isinstance(child_dict, dict):
277+
for child_value in child_dict.values():
278+
_update_type_string(child_value)
279+
280+
for single_key in (
281+
"additionalProperties",
282+
"additional_properties",
283+
"contains",
284+
"else",
285+
"if",
286+
"items",
287+
"not",
288+
"propertyNames",
289+
"then",
290+
"unevaluatedProperties",
291+
):
292+
child_value = value.get(single_key)
293+
if isinstance(child_value, (dict, list)):
294+
_update_type_string(child_value)
295+
296+
for list_key in (
297+
"allOf",
298+
"all_of",
299+
"anyOf",
300+
"any_of",
301+
"oneOf",
302+
"one_of",
303+
"prefixItems",
304+
):
305+
child_list = value.get(list_key)
306+
if isinstance(child_list, list):
307+
_update_type_string(child_list)
269308

270309

271310
def function_declaration_to_tool_param(
@@ -276,16 +315,15 @@ def function_declaration_to_tool_param(
276315

277316
# Use parameters_json_schema if available, otherwise convert from parameters
278317
if function_declaration.parameters_json_schema:
279-
input_schema = function_declaration.parameters_json_schema
318+
input_schema = copy.deepcopy(function_declaration.parameters_json_schema)
319+
_update_type_string(input_schema)
280320
else:
281321
properties = {}
282322
required_params = []
283323
if function_declaration.parameters:
284324
if function_declaration.parameters.properties:
285325
for key, value in function_declaration.parameters.properties.items():
286-
value_dict = value.model_dump(exclude_none=True)
287-
_update_type_string(value_dict)
288-
properties[key] = value_dict
326+
properties[key] = value.model_dump(by_alias=True, exclude_none=True)
289327
if function_declaration.parameters.required:
290328
required_params = function_declaration.parameters.required
291329

@@ -295,6 +333,7 @@ def function_declaration_to_tool_param(
295333
}
296334
if required_params:
297335
input_schema["required"] = required_params
336+
_update_type_string(input_schema)
298337

299338
return anthropic_types.ToolParam(
300339
name=function_declaration.name,

‎tests/unittests/models/test_anthropic_llm.py‎

Lines changed: 214 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,220 @@ def test_supported_models():
280280
},
281281
),
282282
),
283+
(
284+
"function_with_nested_object_parameter",
285+
types.FunctionDeclaration(
286+
name="update_profile",
287+
description="Updates a user profile.",
288+
parameters=types.Schema(
289+
type=types.Type.OBJECT,
290+
properties={
291+
"profile": types.Schema(
292+
type=types.Type.OBJECT,
293+
description="The profile data",
294+
properties={
295+
"name": types.Schema(
296+
type=types.Type.STRING,
297+
description="Full name",
298+
),
299+
"address": types.Schema(
300+
type=types.Type.OBJECT,
301+
description="Mailing address",
302+
properties={
303+
"city": types.Schema(
304+
type=types.Type.STRING,
305+
),
306+
"state": types.Schema(
307+
type=types.Type.STRING,
308+
),
309+
},
310+
),
311+
},
312+
),
313+
},
314+
required=["profile"],
315+
),
316+
),
317+
anthropic_types.ToolParam(
318+
name="update_profile",
319+
description="Updates a user profile.",
320+
input_schema={
321+
"type": "object",
322+
"properties": {
323+
"profile": {
324+
"type": "object",
325+
"description": "The profile data",
326+
"properties": {
327+
"name": {
328+
"type": "string",
329+
"description": "Full name",
330+
},
331+
"address": {
332+
"type": "object",
333+
"description": "Mailing address",
334+
"properties": {
335+
"city": {"type": "string"},
336+
"state": {"type": "string"},
337+
},
338+
},
339+
},
340+
},
341+
},
342+
"required": ["profile"],
343+
},
344+
),
345+
),
346+
(
347+
"function_with_any_of_parameter",
348+
types.FunctionDeclaration(
349+
name="set_value",
350+
description="Sets a value that can be a string or integer.",
351+
parameters=types.Schema(
352+
type=types.Type.OBJECT,
353+
properties={
354+
"value": types.Schema(
355+
description="A string or integer value",
356+
any_of=[
357+
types.Schema(type=types.Type.STRING),
358+
types.Schema(type=types.Type.INTEGER),
359+
],
360+
),
361+
},
362+
required=["value"],
363+
),
364+
),
365+
anthropic_types.ToolParam(
366+
name="set_value",
367+
description="Sets a value that can be a string or integer.",
368+
input_schema={
369+
"type": "object",
370+
"properties": {
371+
"value": {
372+
"description": "A string or integer value",
373+
"anyOf": [
374+
{"type": "string"},
375+
{"type": "integer"},
376+
],
377+
},
378+
},
379+
"required": ["value"],
380+
},
381+
),
382+
),
383+
(
384+
"function_with_additional_properties_parameter",
385+
types.FunctionDeclaration(
386+
name="store_metadata",
387+
description="Stores arbitrary key-value metadata.",
388+
parameters=types.Schema(
389+
type=types.Type.OBJECT,
390+
properties={
391+
"metadata": types.Schema(
392+
type=types.Type.OBJECT,
393+
description="Arbitrary metadata",
394+
additional_properties=types.Schema(
395+
type=types.Type.STRING,
396+
),
397+
),
398+
},
399+
required=["metadata"],
400+
),
401+
),
402+
anthropic_types.ToolParam(
403+
name="store_metadata",
404+
description="Stores arbitrary key-value metadata.",
405+
input_schema={
406+
"type": "object",
407+
"properties": {
408+
"metadata": {
409+
"type": "object",
410+
"description": "Arbitrary metadata",
411+
"additionalProperties": {"type": "string"},
412+
},
413+
},
414+
"required": ["metadata"],
415+
},
416+
),
417+
),
418+
(
419+
"function_with_parameters_json_schema_combinators",
420+
types.FunctionDeclaration(
421+
name="validate_payload",
422+
description="Validates a payload with schema combinators.",
423+
parameters_json_schema={
424+
"type": "OBJECT",
425+
"properties": {
426+
"choice": {
427+
"oneOf": [
428+
{"type": "STRING"},
429+
{"type": "INTEGER"},
430+
],
431+
},
432+
"config": {
433+
"allOf": [
434+
{
435+
"type": "OBJECT",
436+
"properties": {
437+
"enabled": {"type": "BOOLEAN"},
438+
},
439+
},
440+
],
441+
},
442+
"blocked": {
443+
"not": {
444+
"type": "NULL",
445+
},
446+
},
447+
"tuple_value": {
448+
"type": "ARRAY",
449+
"items": [
450+
{"type": "STRING"},
451+
{"type": "INTEGER"},
452+
],
453+
},
454+
},
455+
"required": ["choice"],
456+
},
457+
),
458+
anthropic_types.ToolParam(
459+
name="validate_payload",
460+
description="Validates a payload with schema combinators.",
461+
input_schema={
462+
"type": "object",
463+
"properties": {
464+
"choice": {
465+
"oneOf": [
466+
{"type": "string"},
467+
{"type": "integer"},
468+
],
469+
},
470+
"config": {
471+
"allOf": [
472+
{
473+
"type": "object",
474+
"properties": {
475+
"enabled": {"type": "boolean"},
476+
},
477+
},
478+
],
479+
},
480+
"blocked": {
481+
"not": {
482+
"type": "null",
483+
},
484+
},
485+
"tuple_value": {
486+
"type": "array",
487+
"items": [
488+
{"type": "string"},
489+
{"type": "integer"},
490+
],
491+
},
492+
},
493+
"required": ["choice"],
494+
},
495+
),
496+
),
283497
(
284498
"function_with_parameters_json_schema",
285499
types.FunctionDeclaration(

0 commit comments

Comments
 (0)