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

Fix built in GBNF grammar rules

Browse source
This commit is contained in:
Andrei Betlen 2023-11-08 00:06:22 -05:00
parent 64f5153c35
commit 4852a6a39c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
llama_cpp/llama_grammar.py
View file

@ -1188,7 +1188,7 @@ def print_grammar(file: TextIO, state: parse_state) -> None:
"""llama.cpp gbnf rules from vendor/llama.cpp/grammars""" """llama.cpp gbnf rules from vendor/llama.cpp/grammars"""
ARITHMETIC_GBNF = """\ ARITHMETIC_GBNF = r"""
root ::= (expr "=" ws term "\n")+ root ::= (expr "=" ws term "\n")+
expr ::= term ([-+*/] term)* expr ::= term ([-+*/] term)*
term ::= ident | num | "(" ws expr ")" ws term ::= ident | num | "(" ws expr ")" ws
@ -1197,7 +1197,7 @@ num ::= [0-9]+ ws
ws ::= [ \t\n]* ws ::= [ \t\n]*
""" """
C_GBNF = """\ C_GBNF = r"""
root ::= (declaration)* root ::= (declaration)*
declaration ::= dataType identifier "(" parameter? ")" "{" statement* "}" declaration ::= dataType identifier "(" parameter? ")" "{" statement* "}"
@ -1242,7 +1242,7 @@ multiLineComment ::= "/*" ( [^*] | ("*" [^/]) )* "*/"
ws ::= ([ \t\n]+) ws ::= ([ \t\n]+)
""" """
CHESS_GBNF = """\ CHESS_GBNF = r"""
root ::= object root ::= object
value ::= object | array | string | number | ("true" | "false" | "null") ws value ::= object | array | string | number | ("true" | "false" | "null") ws
@ -1270,7 +1270,7 @@ number ::= ("-"? ([0-9] | [1-9] [0-9]*)) ("." [0-9]+)? ([eE] [-+]? [0-9]+)? ws
ws ::= ([ \t\n] ws)? ws ::= ([ \t\n] ws)?
""" """
JAPANESE_GBNF = """\ JAPANESE_GBNF = r"""
root ::= object root ::= object
value ::= object | array | string | number | ("true" | "false" | "null") ws value ::= object | array | string | number | ("true" | "false" | "null") ws
@ -1298,7 +1298,7 @@ number ::= ("-"? ([0-9] | [1-9] [0-9]*)) ("." [0-9]+)? ([eE] [-+]? [0-9]+)? ws
ws ::= ([ \t\n] ws)? ws ::= ([ \t\n] ws)?
""" """
JSON_ARR_GBNF = """\ JSON_ARR_GBNF = r"""
# This is the same as json.gbnf but we restrict whitespaces at the end of the root array # This is the same as json.gbnf but we restrict whitespaces at the end of the root array
# Useful for generating JSON arrays # Useful for generating JSON arrays
@ -1336,7 +1336,7 @@ ws ::= ([ \t\n] ws)?
""" """
JSON_GBNF = """\ JSON_GBNF = r"""
root ::= object root ::= object
value ::= object | array | string | number | ("true" | "false" | "null") ws value ::= object | array | string | number | ("true" | "false" | "null") ws
@ -1360,10 +1360,10 @@ string ::=
number ::= ("-"? ([0-9] | [1-9] [0-9]*)) ("." [0-9]+)? ([eE] [-+]? [0-9]+)? ws number ::= ("-"? ([0-9] | [1-9] [0-9]*)) ("." [0-9]+)? ([eE] [-+]? [0-9]+)? ws
# Optional space: by convention, applied in this grammar after literal chars when allowed ws ::= ([ \t\n] ws)?
ws ::= ([ \t\n] ws)?""" """
LIST_GBNF = """\ LIST_GBNF = r"""
root ::= item+ root ::= item+
# Excludes various line break characters # Excludes various line break characters