json-schema-to-grammar: fix order of props in C++, support non-string const/enum #6232
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ggerganov
approved these changes
Mar 22, 2024
Closed
4 tasks
hodlen
pushed a commit
to hodlen/llama.cpp
that referenced
this pull request
Apr 1, 2024
…rganov#6232) * json: ordered json in server/schema converter to respect orig order * json: ws nits * json: support non-string const / enums
hodlen
pushed a commit
to hodlen/llama.cpp
that referenced
this pull request
Apr 3, 2024
…rganov#6232) * json: ordered json in server/schema converter to respect orig order * json: ws nits * json: support non-string const / enums
9 tasks
tybalex
pushed a commit
to tybalex/function.cpp
that referenced
this pull request
Apr 17, 2024
…rganov#6232) * json: ordered json in server/schema converter to respect orig order * json: ws nits * json: support non-string const / enums
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Tiny follow-ups to #5978.
Had to switch server to
using json = nlohmann::ordered_json, which should otherwise be inconsequential.(respecting the schema's order is important as it allows "output engineering", e.g. ask the structured output to start with the model's "thoughts" before giving its answer)