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

Port guidance's JSON implementation #48

Merged
merged 76 commits into from
Nov 20, 2024
Merged

Port guidance's JSON implementation #48

merged 76 commits into from
Nov 20, 2024

Commits on Nov 7, 2024

  1. implement schema JSON -> llgrammar JSON

    @hudson-ai
    hudson-ai committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    09d8d59 View commit details
    Browse the repository at this point in the history

  2. Return GrammarWithLexer instead of TopLevelGrammar

    @hudson-ai
    hudson-ai committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    78ccc30 View commit details
    Browse the repository at this point in the history

  3. refactor json into mod

    @hudson-ai
    hudson-ai committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    b30d5e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. default to all types if type unspecified

    @hudson-ai
    hudson-ai committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    5f836ae View commit details
    Browse the repository at this point in the history

  2. basic formats

    @hudson-ai
    hudson-ai committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    e67ed0f View commit details
    Browse the repository at this point in the history

  3. format parity

    @hudson-ai
    hudson-ai committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    261d27e View commit details
    Browse the repository at this point in the history

  4. initial port of numeric ranges

    @hudson-ai
    hudson-ai committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    4d89e81 View commit details
    Browse the repository at this point in the history

  5. fix right inclusivity

    @hudson-ai
    hudson-ai committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    9d58157 View commit details
    Browse the repository at this point in the history

  6. fix integer bounds from floats

    @hudson-ai
    hudson-ai committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    c777deb View commit details
    Browse the repository at this point in the history

  7. more fixes for ints

    @hudson-ai
    hudson-ai committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    1c6be00 View commit details
    Browse the repository at this point in the history

  8. whitespace_flexible and separators

    @hudson-ai
    hudson-ai committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    a85000f View commit details
    Browse the repository at this point in the history

  9. whitespace flexible consts and enums

    @hudson-ai
    hudson-ai committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    ba817e4 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2024

  1. required

    @hudson-ai
    hudson-ai committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    8bbd244 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into json_extension

    @hudson-ai
    hudson-ai committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    6f1c35e View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2024

  1. types is wonky

    @hudson-ai
    hudson-ai committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    f85598a View commit details
    Browse the repository at this point in the history

  2. substring (may pull out into separate PR)

    @hudson-ai
    hudson-ai committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    9aa5db5 View commit details
    Browse the repository at this point in the history

  3. drop non-test

    @hudson-ai
    hudson-ai committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    49d2ca6 View commit details
    Browse the repository at this point in the history

  4. clean up

    @hudson-ai
    hudson-ai committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    729425f View commit details
    Browse the repository at this point in the history

  5. null test

    @hudson-ai
    hudson-ai committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    46bad35 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. impl Default for JsonCompileOptions

    @hudson-ai
    hudson-ai committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    a898bf3 View commit details
    Browse the repository at this point in the history

  2. taken names

    @hudson-ai
    hudson-ai committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    49b8b6b View commit details
    Browse the repository at this point in the history

  3. type inference

    @hudson-ai
    hudson-ai committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    d576962 View commit details
    Browse the repository at this point in the history

  4. json_dumps

    @hudson-ai
    hudson-ai committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    5b924aa View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. cache recursive calls of ordered_sequence

    @hudson-ai
    hudson-ai committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    e8eb74a View commit details
    Browse the repository at this point in the history

  2. check number bounds

    @hudson-ai
    hudson-ai committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    f648ebe View commit details
    Browse the repository at this point in the history

  3. a few UnsatisfiableSchemaError propagation cases

    @hudson-ai
    hudson-ai committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    b2fc186 View commit details
    Browse the repository at this point in the history

  4. ignore unsatisfiable schemas in anyOf

    @hudson-ai
    hudson-ai committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    faa6162 View commit details
    Browse the repository at this point in the history

  5. remove substring.rs (for separate PR)

    @hudson-ai
    hudson-ai committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    aeff512 View commit details
    Browse the repository at this point in the history

  6. type inference

    @hudson-ai
    hudson-ai committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    a3b0912 View commit details
    Browse the repository at this point in the history

  7. drop todo

    @hudson-ai
    hudson-ai committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    ce89057 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. normalize

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    b94a085 View commit details
    Browse the repository at this point in the history

  2. filter

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    ef6c066 View commit details
    Browse the repository at this point in the history

  3. silence for now

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    e462084 View commit details
    Browse the repository at this point in the history

  4. start cleaning up a bit

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    6c694ad View commit details
    Browse the repository at this point in the history

  5. delete code!

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    7f2a74e View commit details
    Browse the repository at this point in the history

  6. testish

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    42f526d View commit details
    Browse the repository at this point in the history

  7. normalize in try_from

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    0279fc5 View commit details
    Browse the repository at this point in the history

  8. fmt normalize

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    64607e4 View commit details
    Browse the repository at this point in the history

  9. fix merged prefixItems by applying other schema's items

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    cf3fe91 View commit details
    Browse the repository at this point in the history

  10. required as IndexSet

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    80f9ead View commit details
    Browse the repository at this point in the history

  11. refactor and flesh out try_type

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    bdd7b46 View commit details
    Browse the repository at this point in the history

  12. fix merge in case that a schema is unsat

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    91e9a6c View commit details
    Browse the repository at this point in the history

  13. simple ref without siblings

    @hudson-ai
    hudson-ai committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    3c38375 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2024

  1. use referencing

    @hudson-ai
    hudson-ai committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    e3ef006 View commit details
    Browse the repository at this point in the history

  2. abspath

    @hudson-ai
    hudson-ai committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    fa080a8 View commit details
    Browse the repository at this point in the history

  3. attempt at recursive refs

    @hudson-ai
    hudson-ai committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    b7af4f3 View commit details
    Browse the repository at this point in the history

  4. simplify refs

    @hudson-ai
    hudson-ai committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    063d0a1 View commit details
    Browse the repository at this point in the history

  5. explicit default root uri

    @hudson-ai
    hudson-ai committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    c8bc68a View commit details
    Browse the repository at this point in the history

  6. comment

    @hudson-ai
    hudson-ai committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    e0f5832 View commit details
    Browse the repository at this point in the history

  7. allow sibling keys on refs as long as they aren't too recursive

    @hudson-ai
    hudson-ai committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    87203f9 View commit details
    Browse the repository at this point in the history

  8. from bool

    @hudson-ai
    hudson-ai committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    6f0d336 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2024

  1. use schema.rs

    @hudson-ai
    hudson-ai committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    32b1cc0 View commit details
    Browse the repository at this point in the history

  2. cargo fmt

    @hudson-ai
    hudson-ai committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    fb8744e View commit details
    Browse the repository at this point in the history

  3. comment out block for a minute

    @hudson-ai
    hudson-ai committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    1c89413 View commit details
    Browse the repository at this point in the history

  4. fix defs

    @hudson-ai
    hudson-ai committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    66df303 View commit details
    Browse the repository at this point in the history

  5. fix optional items

    @hudson-ai
    hudson-ai committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    ea3a395 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2024

  1. validate enums and consts

    @hudson-ai
    hudson-ai committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    6e09951 View commit details
    Browse the repository at this point in the history

  2. check keyword validity

    @hudson-ai
    hudson-ai committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    6421707 View commit details
    Browse the repository at this point in the history

  3. cargo fmt

    @hudson-ai
    hudson-ai committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    f050eba View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. make @mmoskal less sad

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    0e971cc View commit details
    Browse the repository at this point in the history

  2. rename merge -> intersect and have it take ownership

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    be74d89 View commit details
    Browse the repository at this point in the history

  3. mark seen

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    31c3ba0 View commit details
    Browse the repository at this point in the history

  4. make normalize shallow so we don't recursively re-normalize schemas t… 

    …hat have already been normalized
    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    ee592b0 View commit details
    Browse the repository at this point in the history

  5. fix all but the most degenerate refs-with-sibling-keys

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    fd2e166 View commit details
    Browse the repository at this point in the history

  6. cargo fmt

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    86c2bf3 View commit details
    Browse the repository at this point in the history

  7. encapsulate shared context

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    2aa4d87 View commit details
    Browse the repository at this point in the history

  8. rough limit on total schema size

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    63507a9 View commit details
    Browse the repository at this point in the history

  9. fix sample_parser JsonCompileOptions

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    5a884e5 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into json_extension

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    d822980 View commit details
    Browse the repository at this point in the history

  11. take Value as value

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    a3a1847 View commit details
    Browse the repository at this point in the history

  12. use shallow clone

    @mmoskal
    mmoskal committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    6b9762f View commit details
    Browse the repository at this point in the history

  13. Merge branch 'json_extension' of https://github.com/hudson-ai/llguidance 

     into json_extension
    @mmoskal
    mmoskal committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    6249e2c View commit details
    Browse the repository at this point in the history

  14. anyhow-ify numeric regex builders

    @hudson-ai
    hudson-ai committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    6cbfa13 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2024

  1. cargo fmt

    @hudson-ai
    hudson-ai committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    20004c3 View commit details
    Browse the repository at this point in the history

  2. depend on jsonschema_validation feature

    @hudson-ai
    hudson-ai committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    ba50642 View commit details
    Browse the repository at this point in the history

  3. remove non-tests

    @hudson-ai
    hudson-ai committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    adac6bc View commit details
    Browse the repository at this point in the history