Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So this is a pretty substantial PR - happy to get some feedback on it, but basically getting trustcall working with Gemini was a fair bit of work.
Gemini Support
schema_json = schema.model_json_schema()
, we now instead run a check to see if the we are using Gemini, and if we are we create a Gemini compatible schema from the Pydantic model.Attempt count handling:
Minor update to the _ExtendValidationNode to pass the attempt count to the validation tool. This enables conditional fail-over: For example, if a field is required and should be in the JSON response but isn't, then on the first attempt we can ask for a patch (which often works), but if for some reason the data is actually missing from the source, then we can accept 'Not found' on the second attempt.
This can also be used to provide different instructions on different attempts, first attempt tell the LLM where it should look, second attempt: tell it to look in a different area, third attempt: tell it to look in another different area.
Overall Refactor
The
_base.py
was getting really big after these changes (>2000 lines), so I refactored it into components to be more manageable.