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

json: support any ({} or {type: object})

Browse source
This commit is contained in:
ochafik 2024-03-01 19:06:19 +00:00
parent f6f851ba87
commit bc0e0d9f55
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,9 @@ PRIMITIVE_RULES = {
'boolean': '("true" | "false") space', 'boolean': '("true" | "false") space',
'number': '("-"? ([0-9] | [1-9] [0-9]*)) ("." [0-9]+)? ([eE] [-+]? [0-9]+)? space', 'number': '("-"? ([0-9] | [1-9] [0-9]*)) ("." [0-9]+)? ([eE] [-+]? [0-9]+)? space',
'integer': '("-"? ([0-9] | [1-9] [0-9]*)) space', 'integer': '("-"? ([0-9] | [1-9] [0-9]*)) space',
'value' : 'object | array | string | number | boolean',
'object' : '"{" space ( string ":" space value ("," space string ":" space value)* )? "}" space',
'array' : '"[" space ( value ("," space value)* )? "]" space',
'string': r''' "\"" ( 'string': r''' "\"" (
[^"\\] | [^"\\] |
"\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F])
@ -228,6 +231,12 @@ class SchemaConverter:
ref_schema = requests.get(ref).json() ref_schema = requests.get(ref).json()
return self.visit(ref_schema, ref) return self.visit(ref_schema, ref)
elif schema_type == 'object' and len(schema) == 1 or schema_type is None and len(schema) == 0:
# return 'object'
for t, r in PRIMITIVE_RULES.items():
self._add_rule(t, r)
return 'object'
else: else:
assert schema_type in PRIMITIVE_RULES, f'Unrecognized schema: {schema}' assert schema_type in PRIMITIVE_RULES, f'Unrecognized schema: {schema}'
return self._add_rule( return self._add_rule(