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

json: spaces in output and unrestricted output spaces

Browse source
This commit is contained in:
ochafik 2024-03-01 19:10:04 +00:00
parent ed24688af8
commit c5bc1540d8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/json-schema-to-grammar.py
View file

@ -6,7 +6,7 @@ import sys
# whitespace is constrained to a single space char to prevent model "running away" in # whitespace is constrained to a single space char to prevent model "running away" in
# whitespace. Also maybe improves generation quality? # whitespace. Also maybe improves generation quality?
SPACE_RULE = '" "?' SPACE_RULE = '" "*'
PRIMITIVE_RULES = { PRIMITIVE_RULES = {
'boolean': '("true" | "false") space', 'boolean': '("true" | "false") space',
@ -201,7 +201,7 @@ class SchemaConverter:
' "]" space') ' "]" space')
else: else:
item_rule_name = self.visit(items, f'{name}{"-" if name else ""}item') item_rule_name = self.visit(items, f'{name}{"-" if name else ""}item')
list_item_operator = f'("," space {item_rule_name})' list_item_operator = f'( "," space {item_rule_name} )'
successive_items = "" successive_items = ""
min_items = schema.get("minItems", 0) min_items = schema.get("minItems", 0)
max_items = schema.get("maxItems") max_items = schema.get("maxItems")
@ -213,7 +213,7 @@ class SchemaConverter:
else: else:
successive_items += list_item_operator + "*" successive_items += list_item_operator + "*"
if min_items == 0: if min_items == 0:
rule = f'"[" space ({item_rule_name} {successive_items})? "]" space' rule = f'"[" space ( {item_rule_name} {successive_items} )? "]" space'
else: else:
rule = f'"[" space {item_rule_name} {successive_items} "]" space' rule = f'"[" space {item_rule_name} {successive_items} "]" space'
return self._add_rule(rule_name, rule) return self._add_rule(rule_name, rule)