baalajimaestro/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Don't change order of json schema object properties unless prop_order is passed, Closes #1180

Browse source
This commit is contained in:
Andrei Betlen 2024-02-13 02:44:00 -05:00
parent 5efc45bdfd
commit d1822fed6b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
llama_cpp/llama_grammar.py
View file

@ -1471,12 +1471,15 @@ class SchemaConverter:
if schema_type == "object" and "properties" in schema: if schema_type == "object" and "properties" in schema:
# TODO: `required` keyword # TODO: `required` keyword
if self._prop_order:
prop_order = self._prop_order prop_order = self._prop_order
prop_pairs = sorted( prop_pairs = sorted(
schema["properties"].items(), schema["properties"].items(),
# sort by position in prop_order (if specified) then by key # sort by position in prop_order (if specified) then by key
key=lambda kv: (prop_order.get(kv[0], len(prop_order)), kv[0]), key=lambda kv: (prop_order.get(kv[0], len(prop_order)), kv[0]),
) )
else:
prop_pairs = schema["properties"].items()
rule = '"{" space' rule = '"{" space'
for i, (prop_name, prop_schema) in enumerate(prop_pairs): for i, (prop_name, prop_schema) in enumerate(prop_pairs):