llama: fix error on bad grammar #12628
Merged
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.
On master passing a bad grammar to either
llama-cli
or the server currently does not result in an error, there is only a print indicating that the grammar could not be parsed and the grammar is otherwise ignored. However, I don't think that this is the intended behavior. The code checks if the return value ofcommon_sampler_init
is null, it's just that the return value is not null when passing a bad grammar. This PR makes it so thatllama_sampler_init_grammar_impl
returns null whengrammar-str
is not empty but could not be passed, this is then propagated upwards to return null withcommon_sampler_init
. When passing a bad grammar to the server the server now returns an error,llama-cli
terminates with an error message.I used the following commands for testing: