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

json: handle schema from pydantic Optional fields

Browse source
This commit is contained in:
ochafik 2024-03-10 14:55:03 +00:00
parent ba57964f92
commit f37ad0a043
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -314,6 +314,25 @@ class SchemaConverter:
prop_kv_rule_names = {} prop_kv_rule_names = {}
for prop_name, prop_schema in properties: for prop_name, prop_schema in properties:
# Note: this is to handle how Pydantic represents optional properties
# import pydantic, typing
# class Foo(pydantic.BaseModel):
# bar: typing.Optional[str] = None
# print(Foo.model_json_schema())
# {
# "properties": {
# "bar": {"anyOf": [{"type": "string"}, {"type": "null"}]}
# },
# "required": ["bar"]
# }
if 'anyOf' in prop_schema and any(s.get('type') == 'null' for s in prop_schema['anyOf']):
required.remove(prop_name)
alts = [s for s in prop_schema['anyOf'] if s.get('type') != 'null']
if len(alts) == 1:
prop_schema = alts[0]
else:
prop_schema = {'anyOf': alts}
prop_rule_name = self.visit(prop_schema, f'{name}{"-" if name else ""}{prop_name}') prop_rule_name = self.visit(prop_schema, f'{name}{"-" if name else ""}{prop_name}')
prop_kv_rule_names[prop_name] = self._add_rule( prop_kv_rule_names[prop_name] = self._add_rule(
f'{name}{"-" if name else ""}{prop_name}-kv', f'{name}{"-" if name else ""}{prop_name}-kv',