json-schema-to-grammar improvements (+ added to server)#5978

Merged

ochafik merged 106 commits intoggml-org:masterfrom

ochafik:json-fixes

Mar 21, 2024

Commits on Mar 1, 2024

json: fix arrays (disallow `[,1]`)
ochafik
committed
json: support tuple types (`[number, string]`)
ochafik
committed
json: support additionalProperties (`{[k: string]: [string,number][]}`)
ochafik
committed
json: support required / optional properties
ochafik
committed
json: add support for pattern
ochafik
committed
json: resolve $ref (and support https schema urls)
ochafik
committed
json: fix $ref resolution
ochafik
committed
join: support union types (mostly for nullable types I think)
ochafik
committed
json: support allOf + nested anyOf
ochafik
committed
json: support any (`{}` or `{type: object}`)
ochafik
committed
json: fix merge
ochafik
committed
json: temp fix for escapes
ochafik
committed
json: spaces in output and unrestricted output spaces
ochafik
committed
json: add typings
ochafik
committed

Commits on Mar 3, 2024

Merge remote-tracking branch 'origin/master' into json-fixes
ochafik
committed
json:fix typo
ochafik
committed
Create ts-type-to-grammar.sh
ochafik
committed

Commits on Mar 5, 2024

json: fix _format_literal (json.dumps already escapes quotes)
ochafik
committed
json: merge lit sequences and handle negatives
ochafik
committed
json: handle pattern repetitions
ochafik
committed

Commits on Mar 8, 2024

Update json-schema-to-grammar.mjs
ochafik
committed

Commits on Mar 10, 2024

Create regex-to-grammar.py
ochafik
committed
json: extract repeated regexp patterns to subrule
ochafik
committed
Update json-schema-to-grammar.py
ochafik
committed
Update json-schema-to-grammar.py
ochafik
committed
Update json-schema-to-grammar.py
ochafik
committed
json: handle schema from pydantic Optional fields
ochafik
committed
Update json-schema-to-grammar.py
ochafik
committed
Merge remote-tracking branch 'origin/master' into json-fixes
ochafik
committed
Update json-schema-to-grammar.py
ochafik
committed
Update ts-type-to-grammar.sh
ochafik
committed
Update ts-type-to-grammar.sh
ochafik
committed
json: simplify nullable fields handling
ochafik
committed
json: accept duplicate identical rules
ochafik
committed
json: revert space to 1 at most
ochafik
committed
json: reuse regexp pattern subrules
ochafik
committed
json: handle uuid string format
ochafik
committed
json: fix literal escapes
ochafik
committed
json: add --allow-fetch
ochafik
committed
json: simplify range escapes
ochafik
committed
json: support negative ranges in patterns
ochafik
committed
Delete commit.txt
ochafik
committed

Commits on Mar 11, 2024

json: custom regex parser, adds dot support & JS-portable
ochafik
committed
json: rm trailing spaces
ochafik
committed
Update json-schema-to-grammar.mjs
ochafik
committed
json: updated server & chat `( cd examples/server && ./deps.sh )`
ochafik
committed
json: port fixes from mjs to python
ochafik
committed
Update ts-type-to-grammar.sh
ochafik
committed
json: support prefixItems alongside array items
ochafik
committed
json: add date format + fix uuid
ochafik
committed
json: add date, time, date-time formats
ochafik
committed
json: preserve order of props from TS defs
Olivier Chafik
committed
json: port schema converter to C++, wire in ./server
Olivier Chafik
committed
json: nits
Olivier Chafik
committed
Merge branch 'json-fixes' into json-fixes-cpp
ochafik
committed
Update json-schema-to-grammar.cpp
ochafik
committed

Commits on Mar 12, 2024

Update json-schema-to-grammar.cpp
ochafik
committed
Update json-schema-to-grammar.cpp
ochafik
committed
json: fix mjs implementation + align outputs
ochafik
committed
Update json-schema-to-grammar.mjs.hpp
ochafik
committed
json: test C++, JS & Python versions
ochafik
committed
Merge branch 'json-fixes-cpp' into json-fixes
ochafik
committed
json: nits + regen deps
ochafik
committed
json: cleanup test
ochafik
committed
json: revert from c++17 to 11
ochafik
committed
json: nit fixes
ochafik
committed
json: dirty include for test
ochafik
committed

Commits on Mar 14, 2024

Merge remote-tracking branch 'origin/master' into json-fixes
ochafik
committed
json: fix zig build
ochafik
committed

Commits on Mar 15, 2024

json: pass static command to std::system in tests (fixed temp files)
ochafik
committed
json: fix top-level $refs
ochafik
committed
json: don't use c++20 designated initializers
ochafik
committed
nit
ochafik
committed
json: basic support for reserved names `{number:{number:{root:number}}}`
ochafik
committed

Commits on Mar 16, 2024

Revamp test cmake to allow args (WORKING_DIRECTORY needed for JSON test)
ochafik
committed
json: re-ran server deps.sh
ochafik
committed
Merge remote-tracking branch 'origin/master' into json-fixes
ochafik
committed
json: simplify test
ochafik
committed
json: support mix of additional props & required/optional
ochafik
committed

Commits on Mar 17, 2024

json: add tests for some expected failures
ochafik
committed
json: fix type=const in c++, add failure expectations for non-str const&enum
ochafik
committed
json: test (& simplify output of) empty schema
ochafik
committed
json: check parsing in test + fix value & string refs
ochafik
committed
json: add server tests for OAI JSON response_format
ochafik
committed
Merge remote-tracking branch 'origin/master' into json-fixes
ochafik
committed

Commits on Mar 18, 2024

json: test/fix top-level anyOf
ochafik
committed
json: improve grammar parsing failures
ochafik
committed
json: test/fix additional props corner cases
ochafik
committed
json: fix string patterns (was missing quotes)
ochafik
committed
json: ws nit
ochafik
committed
json: fix json handling in server when there's no response_format
ochafik
committed

Commits on Mar 19, 2024

json: catch schema conversion errors in server
ochafik
committed
json: don't complain about unknown format type in server if unset
ochafik
committed
json: cleaner build of test
ochafik
committed
json: create examples/json-schema-pydantic-example.py
ochafik
committed
json: fix date pattern
Olivier Chafik
committed

Commits on Mar 20, 2024

json: move json.hpp & json-schema-to-grammar.{cpp,h} to common
Olivier Chafik
committed
json: indent 4 spaces
Olivier Chafik
committed
Merge remote-tracking branch 'origin/master' into json-fixes
ochafik
committed
json: fix naming of top-level c++ function (+ drop unused one)
ochafik
committed
json: avoid using namespace std
ochafik
committed
json: fix zig build
ochafik
committed
Update server.feature
ochafik
committed

Commits on Mar 21, 2024

json: iostream -> fprintf
ochafik
committed
json: space before & refs for consistency
ochafik
committed
json: nits
ochafik
committed