Skip to content

Fix tool call ID in message object #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gurvinder-dhillon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix tool call ID in message object #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/ell/providers/openai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ def translate_to_provider(self, ell_call : EllCallParams) -> Dict[str, Any]:
role=message.role,
content=[_content_block_to_openai_format(c) for c in message.content]
if message.role != "system"
else message.text_only
else message.text_only,
tool_call_id=message.tool_call_id
)))

final_call_params["messages"] = openai_messages
Expand Down Expand Up @@ -159,7 +160,7 @@ def translate_from_provider(
)
)
if logger: logger(repr(tool_call))
messages.append(Message(role=role, content=content_blocks))
messages.append(Message(role=role, content=content_blocks, tool_call_id=message.tool_call_id))
return messages, metadata


Expand All @@ -181,4 +182,4 @@ def _content_block_to_openai_format(content_block: ContentBlock) -> Dict[str, An
elif ((text := content_block.text) is not None): return dict(type="text", text=text)
elif (parsed := content_block.parsed): return dict(type="text", text=parsed.model_dump_json())
else:
raise ValueError(f"Unsupported content block type for openai: {content_block}")
raise ValueError(f"Unsupported content block type for openai: {content_block}")
9 changes: 5 additions & 4 deletions src/ell/types/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,12 +312,11 @@ def to_content_blocks(
class Message(BaseModel):
role: str
content: List[ContentBlock]

tool_call_id: Optional[_lstr_generic] = Field(default=None)

def __init__(self, role: str, content: Union[AnyContent, List[AnyContent], None] = None, **content_block_kwargs):
def __init__(self, role: str, content: Union[AnyContent, List[AnyContent], None] = None, tool_call_id: Optional[_lstr_generic] = None, **content_block_kwargs):
content_blocks = to_content_blocks(content, **content_block_kwargs)

super().__init__(role=role, content=content_blocks)
super().__init__(role=role, content=content_blocks, tool_call_id=tool_call_id)

# XXX: This choice of naming is unfortunate, but it is what it is.
@property
Expand Down Expand Up @@ -452,6 +451,8 @@ def model_validate(cls, obj: Any) -> 'Message':
else:
content_blocks.append(ContentBlock.coerce(block))
obj['content'] = content_blocks
if 'tool_call_id' in obj:
obj['tool_call_id'] = _lstr(obj['tool_call_id'])
return super().model_validate(obj)

@classmethod
Expand Down