Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 106 commits into from
Mar 21, 2024
Merged

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

merged 106 commits into from
Mar 21, 2024

Commits on Mar 1, 2024

  1. json: fix arrays (disallow [,1])

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    09248e0 View commit details
    Browse the repository at this point in the history

  2. json: support tuple types ([number, string])

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    2d9580a View commit details
    Browse the repository at this point in the history

  3. json: support additionalProperties ({[k: string]: [string,number][]})

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    3c339ce View commit details
    Browse the repository at this point in the history

  4. json: support required / optional properties

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    1daaf30 View commit details
    Browse the repository at this point in the history

  5. json: add support for pattern

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    1428a85 View commit details
    Browse the repository at this point in the history

  6. json: resolve $ref (and support https schema urls)

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    12f0d7e View commit details
    Browse the repository at this point in the history

  7. json: fix $ref resolution

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    ea4244e View commit details
    Browse the repository at this point in the history

  8. join: support union types (mostly for nullable types I think)

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    82ade9f View commit details
    Browse the repository at this point in the history

  9. json: support allOf + nested anyOf

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f6f851b View commit details
    Browse the repository at this point in the history

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

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    bc0e0d9 View commit details
    Browse the repository at this point in the history

  11. json: fix merge

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    148555c View commit details
    Browse the repository at this point in the history

  12. json: temp fix for escapes

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    ed24688 View commit details
    Browse the repository at this point in the history

  13. json: spaces in output and unrestricted output spaces

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    c5bc154 View commit details
    Browse the repository at this point in the history

  14. json: add typings

    @ochafik
    ochafik committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    5827ff4 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Merge remote-tracking branch 'origin/master' into json-fixes

    @ochafik
    ochafik committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    be13247 View commit details
    Browse the repository at this point in the history

  2. json:fix typo

    @ochafik
    ochafik committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    06b04e9 View commit details
    Browse the repository at this point in the history

  3. Create ts-type-to-grammar.sh

    @ochafik
    ochafik committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    21ac451 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. json: fix _format_literal (json.dumps already escapes quotes)

    @ochafik
    ochafik committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    a78eb4a View commit details
    Browse the repository at this point in the history

  2. json: merge lit sequences and handle negatives 

    {"type": "string", "pattern": "^({\"question\": \"[^\"]+\", \"response\": \"[^\"]+\"}\\n)+$"}
    @ochafik
    ochafik committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    d5ef412 View commit details
    Browse the repository at this point in the history

  3. json: handle pattern repetitions

    @ochafik
    ochafik committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    4e7c26c View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Update json-schema-to-grammar.mjs

    @ochafik
    ochafik committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    660e832 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2024

  1. Create regex-to-grammar.py

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    add8fee View commit details
    Browse the repository at this point in the history

  2. json: extract repeated regexp patterns to subrule

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    1cde8de View commit details
    Browse the repository at this point in the history

  3. Update json-schema-to-grammar.py

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    259f350 View commit details
    Browse the repository at this point in the history

  4. Update json-schema-to-grammar.py

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    b061de5 View commit details
    Browse the repository at this point in the history

  5. Update json-schema-to-grammar.py

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    ba57964 View commit details
    Browse the repository at this point in the history

  6. json: handle schema from pydantic Optional fields

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    f37ad0a View commit details
    Browse the repository at this point in the history

  7. Update json-schema-to-grammar.py

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    307110a View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/master' into json-fixes

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    ee492c9 View commit details
    Browse the repository at this point in the history

  9. Update json-schema-to-grammar.py

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    5764d9f View commit details
    Browse the repository at this point in the history

  10. Update ts-type-to-grammar.sh

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    364bf9e View commit details
    Browse the repository at this point in the history

  11. Update ts-type-to-grammar.sh

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    8597caa View commit details
    Browse the repository at this point in the history

  12. json: simplify nullable fields handling

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    dab2ea9 View commit details
    Browse the repository at this point in the history

  13. json: accept duplicate identical rules

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    ade339d View commit details
    Browse the repository at this point in the history

  14. json: revert space to 1 at most

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    e8b78c2 View commit details
    Browse the repository at this point in the history

  15. json: reuse regexp pattern subrules

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    37b59d1 View commit details
    Browse the repository at this point in the history

  16. json: handle uuid string format

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    e8f25d6 View commit details
    Browse the repository at this point in the history

  17. json: fix literal escapes

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    54291e1 View commit details
    Browse the repository at this point in the history

  18. json: add --allow-fetch

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    f57b467 View commit details
    Browse the repository at this point in the history

  19. json: simplify range escapes

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    d1fda6f View commit details
    Browse the repository at this point in the history

  20. json: support negative ranges in patterns

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    478f62e View commit details
    Browse the repository at this point in the history

  21. Delete commit.txt

    @ochafik
    ochafik committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    27b1fef View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. json: custom regex parser, adds dot support & JS-portable

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    0e94941 View commit details
    Browse the repository at this point in the history

  2. json: rm trailing spaces

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    11813a6 View commit details
    Browse the repository at this point in the history

  3. Update json-schema-to-grammar.mjs

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    5389820 View commit details
    Browse the repository at this point in the history

  4. json: updated server & chat ( cd examples/server && ./deps.sh )

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    4e2d06c View commit details
    Browse the repository at this point in the history

  5. json: port fixes from mjs to python

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    c8254e5 View commit details
    Browse the repository at this point in the history

  6. Update ts-type-to-grammar.sh

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    56b8744 View commit details
    Browse the repository at this point in the history

  7. json: support prefixItems alongside array items

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    d736e92 View commit details
    Browse the repository at this point in the history

  8. json: add date format + fix uuid

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    9a61802 View commit details
    Browse the repository at this point in the history

  9. json: add date, time, date-time formats

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    e1ed7a0 View commit details
    Browse the repository at this point in the history

  10. json: preserve order of props from TS defs

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    b816734 View commit details
    Browse the repository at this point in the history

  11. json: port schema converter to C++, wire in ./server

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    d0dd75c View commit details
    Browse the repository at this point in the history

  12. json: nits

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    51ca7cb View commit details
    Browse the repository at this point in the history

  13. Merge branch 'json-fixes' into json-fixes-cpp

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    cb364ef View commit details
    Browse the repository at this point in the history

  14. Update json-schema-to-grammar.cpp

    @ochafik
    ochafik committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    d934adc View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Update json-schema-to-grammar.cpp

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8caaf16 View commit details
    Browse the repository at this point in the history

  2. Update json-schema-to-grammar.cpp

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8fee84b View commit details
    Browse the repository at this point in the history

  3. json: fix mjs implementation + align outputs

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    0be059d View commit details
    Browse the repository at this point in the history

  4. Update json-schema-to-grammar.mjs.hpp

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    a740bfa View commit details
    Browse the repository at this point in the history

  5. json: test C++, JS & Python versions

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    192a58a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'json-fixes-cpp' into json-fixes

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    7e1440c View commit details
    Browse the repository at this point in the history

  7. json: nits + regen deps

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    917b5d2 View commit details
    Browse the repository at this point in the history

  8. json: cleanup test

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    ee6166a View commit details
    Browse the repository at this point in the history

  9. json: revert from c++17 to 11

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    6165c55 View commit details
    Browse the repository at this point in the history

  10. json: nit fixes

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    bed826f View commit details
    Browse the repository at this point in the history

  11. json: dirty include for test

    @ochafik
    ochafik committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    59c899d View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Merge remote-tracking branch 'origin/master' into json-fixes

    @ochafik
    ochafik committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    3feac66 View commit details
    Browse the repository at this point in the history

  2. json: fix zig build

    @ochafik
    ochafik committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    f216550 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. json: pass static command to std::system in tests (fixed temp files)

    @ochafik
    ochafik committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    5a7deb2 View commit details
    Browse the repository at this point in the history

  2. json: fix top-level $refs

    @ochafik
    ochafik committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    3b3ad94 View commit details
    Browse the repository at this point in the history

  3. json: don't use c++20 designated initializers

    @ochafik
    ochafik committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    235ff68 View commit details
    Browse the repository at this point in the history

  4. nit

    @ochafik
    ochafik committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    daceced View commit details
    Browse the repository at this point in the history

  5. json: basic support for reserved names {number:{number:{root:number}}}

    @ochafik
    ochafik committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    5714487 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. Revamp test cmake to allow args (WORKING_DIRECTORY needed for JSON test)

    @ochafik
    ochafik committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    af31aa2 View commit details
    Browse the repository at this point in the history

  2. json: re-ran server deps.sh

    @ochafik
    ochafik committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    842eb83 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into json-fixes

    @ochafik
    ochafik committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    5602a8b View commit details
    Browse the repository at this point in the history

  4. json: simplify test

    @ochafik
    ochafik committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    f30d6c2 View commit details
    Browse the repository at this point in the history

  5. json: support mix of additional props & required/optional

    @ochafik
    ochafik committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    391b17e View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. json: add tests for some expected failures

    @ochafik
    ochafik committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    64799ba View commit details
    Browse the repository at this point in the history

  2. json: fix type=const in c++, add failure expectations for non-str con… 

    …st&enum
    @ochafik
    ochafik committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    5c50ffa View commit details
    Browse the repository at this point in the history

  3. json: test (& simplify output of) empty schema

    @ochafik
    ochafik committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    84e383c View commit details
    Browse the repository at this point in the history

  4. json: check parsing in test + fix value & string refs

    @ochafik
    ochafik committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    3e1bf44 View commit details
    Browse the repository at this point in the history

  5. json: add server tests for OAI JSON response_format

    @ochafik
    ochafik committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    edbd2e9 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/master' into json-fixes

    @ochafik
    ochafik committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    20869ed View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. json: test/fix top-level anyOf

    @ochafik
    ochafik committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    6182478 View commit details
    Browse the repository at this point in the history

  2. json: improve grammar parsing failures

    @ochafik
    ochafik committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    bbd7080 View commit details
    Browse the repository at this point in the history

  3. json: test/fix additional props corner cases

    @ochafik
    ochafik committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    dd922a4 View commit details
    Browse the repository at this point in the history

  4. json: fix string patterns (was missing quotes)

    @ochafik
    ochafik committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    24f0b94 View commit details
    Browse the repository at this point in the history

  5. json: ws nit

    @ochafik
    ochafik committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    bd96df4 View commit details
    Browse the repository at this point in the history

  6. json: fix json handling in server when there's no response_format

    @ochafik
    ochafik committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    05fd7e3 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. json: catch schema conversion errors in server

    @ochafik
    ochafik committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    e7de643 View commit details
    Browse the repository at this point in the history

  2. json: don't complain about unknown format type in server if unset

    @ochafik
    ochafik committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    02e3bde View commit details
    Browse the repository at this point in the history

  3. json: cleaner build of test

    @ochafik
    ochafik committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    263a86e View commit details
    Browse the repository at this point in the history

  4. json: create examples/json-schema-pydantic-example.py

    @ochafik
    ochafik committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    874599e View commit details
    Browse the repository at this point in the history

  5. json: fix date pattern

    @ochafik
    ochafik committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    7fc759b View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. json: move json.hpp & json-schema-to-grammar.{cpp,h} to common

    @ochafik
    ochafik committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    7628bd8 View commit details
    Browse the repository at this point in the history

  2. json: indent 4 spaces

    @ochafik
    ochafik committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    10ee30f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into json-fixes

    @ochafik
    ochafik committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    6dcf856 View commit details
    Browse the repository at this point in the history

  4. json: fix naming of top-level c++ function (+ drop unused one)

    @ochafik
    ochafik committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    df00efb View commit details
    Browse the repository at this point in the history

  5. json: avoid using namespace std

    @ochafik
    ochafik committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    d0600d9 View commit details
    Browse the repository at this point in the history

  6. json: fix zig build

    @ochafik
    ochafik committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    9260350 View commit details
    Browse the repository at this point in the history

  7. Update server.feature

    @ochafik
    ochafik committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    b8c0025 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. json: iostream -> fprintf

    @ochafik
    ochafik committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    ad6c475 View commit details
    Browse the repository at this point in the history

  2. json: space before & refs for consistency

    @ochafik
    ochafik committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    c26e7b8 View commit details
    Browse the repository at this point in the history

  3. json: nits

    @ochafik
    ochafik committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    4c46aec View commit details
    Browse the repository at this point in the history