@@ -364,17 +364,25 @@ class ToolCallItem(RunItemBase[Any]):
364364
365365 @property
366366 def tool_name (self ) -> str | None :
367- """Return the tool name from the raw item, if available."""
367+ """Return the tool name from the raw item when available."""
368368 if isinstance (self .raw_item , dict ):
369- return self .raw_item .get ("name" )
370- return getattr (self .raw_item , "name" , None )
369+ candidate = self .raw_item .get ("name" ) or self .raw_item .get ("tool_name" )
370+ else :
371+ candidate = getattr (self .raw_item , "name" , None ) or getattr (
372+ self .raw_item , "tool_name" , None
373+ )
374+ return str (candidate ) if candidate is not None else None
371375
372376 @property
373377 def call_id (self ) -> str | None :
374- """Return the call identifier from the raw item, if available."""
378+ """Return the call identifier from the raw item when available."""
375379 if isinstance (self .raw_item , dict ):
376- return self .raw_item .get ("call_id" ) or self .raw_item .get ("id" )
377- return getattr (self .raw_item , "call_id" , None ) or getattr (self .raw_item , "id" , None )
380+ candidate = self .raw_item .get ("call_id" ) or self .raw_item .get ("id" )
381+ else :
382+ candidate = getattr (self .raw_item , "call_id" , None ) or getattr (
383+ self .raw_item , "id" , None
384+ )
385+ return str (candidate ) if candidate is not None else None
378386
379387
380388ToolCallOutputTypes : TypeAlias = (
@@ -405,11 +413,14 @@ class ToolCallOutputItem(RunItemBase[Any]):
405413
406414 @property
407415 def call_id (self ) -> str | None :
408- """Return the call identifier from the raw item, if available."""
416+ """Return the call identifier from the raw item when available."""
409417 if isinstance (self .raw_item , dict ):
410- cid = self .raw_item .get ("call_id" ) or self .raw_item .get ("id" )
411- return str (cid ) if cid is not None else None
412- return getattr (self .raw_item , "call_id" , None ) or getattr (self .raw_item , "id" , None )
418+ candidate = self .raw_item .get ("call_id" ) or self .raw_item .get ("id" )
419+ else :
420+ candidate = getattr (self .raw_item , "call_id" , None ) or getattr (
421+ self .raw_item , "id" , None
422+ )
423+ return str (candidate ) if candidate is not None else None
413424
414425 def to_input_item (self ) -> TResponseInputItem :
415426 """Converts the tool output into an input item for the next model turn.
0 commit comments