Skip to content

fix: only first artifact delta from multiple tool calls is being kept#474

Open
mgmcintyre wants to merge 3 commits intogoogle:mainfrom
mgmcintyre:fix-artifact-delta-merge
Open

fix: only first artifact delta from multiple tool calls is being kept#474
mgmcintyre wants to merge 3 commits intogoogle:mainfrom
mgmcintyre:fix-artifact-delta-merge

Conversation

@mgmcintyre
Copy link

@mgmcintyre mgmcintyre commented Jan 12, 2026

Fixes #493

Problem

Artifact deltas were ignored when aggregating the results of multiple tool calls in mergeParallelFunctionResponseEvents, with the first non-nil ArtifactDelta winning and others discarded.

Fix

Artifact deltas are now merged using "highest-version-wins". Test cases have been added to TestMergeEventActions mirroring the coverage for state delta merging.

The current implementation in adk-python uses "last-write-wins", however "highest-version-wins" preserves more information.

Related

#449 which fixed a similar issue with state deltas.

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @mgmcintyre, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request resolves a critical issue where artifact deltas from parallel function responses were not being properly aggregated, resulting in incomplete data. By implementing a 'highest-version-wins' merge strategy, the system now correctly combines artifact deltas, ensuring that all relevant versioned information is preserved across multiple tool calls. This enhancement improves the robustness and data consistency of the system's event action processing.

Highlights

  • Artifact Delta Merging Fix: Previously, when multiple tool calls returned artifact deltas, only the first non-nil ArtifactDelta was retained, leading to potential data loss. This PR introduces a fix to correctly merge these deltas.
  • Highest-Version-Wins Strategy: The merging logic for artifact deltas now employs a 'highest-version-wins' strategy. This ensures that for any conflicting artifact entries, the one with the highest version number is preserved, maximizing data integrity.
  • Comprehensive Test Coverage: New test cases have been added to TestMergeEventActions to thoroughly validate the ArtifactDelta merging functionality, mirroring the existing coverage for state delta merging and covering various merge scenarios.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request fixes a bug where artifact deltas from multiple parallel tool calls were not merged correctly, with only the first one being kept. The fix introduces a new function mergeArtifactDeltas to merge these deltas using a 'highest-version-wins' strategy, which is a good approach. The changes are well-tested with new unit tests covering various scenarios. I've found one potential issue in the new merge logic related to handling new keys with negative version numbers, and I've provided a suggestion to make it more robust.

@mgmcintyre
Copy link
Author

/gemini review

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request correctly addresses a bug where artifact deltas from multiple tool calls were not being merged, causing data loss. The fix introduces a mergeArtifactDeltas function that implements a "highest-version-wins" strategy, which is a robust approach for this scenario. The new logic is well-supported by a comprehensive set of new unit tests that cover various merging cases, including overlapping and non-overlapping keys. The implementation is sound and consistent with the existing codebase. I have one minor suggestion to improve the conciseness of the new helper function.

@mgmcintyre
Copy link
Author

/gemini review

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request addresses a bug where artifact deltas from multiple tool calls were not being aggregated correctly, with only the first one being preserved. The fix introduces a mergeArtifactDeltas function that merges these deltas using a 'highest-version-wins' strategy, which is a sensible approach to preserve the most recent information. The changes are well-tested with a comprehensive set of new test cases covering various merge scenarios, including overlapping and non-overlapping keys, and edge cases like nil deltas. The implementation is clean and effectively resolves the issue. Overall, this is a solid contribution that improves the correctness of parallel tool call handling.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Only first artifact delta for multiple tool calls is being committed to state

1 participant