Skip to content

Adding Support for Literal types #89

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adding Support for Literal types #89

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c8a3a7
Add support for literals
Dakantz Apr 1, 2025
1959e03
Merge branch 'Maximilian-Winter:master' into fix-gbnf-generation-trai…
Dakantz Apr 1, 2025
96553d7
simplify logic, fix int types
Dakantz Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/llama_cpp_agent/gbnf_grammar_generator/gbnf_grammar_from_pydantic_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
get_args,
get_origin,
get_type_hints,
Literal,
)

from docstring_parser import parse
Expand Down Expand Up @@ -65,6 +66,7 @@ class PydanticDataType(Enum):
CUSTOM_CLASS = "custom-class"
CUSTOM_DICT = "custom-dict"
SET = "set"
LITERAL = "literal"


def map_pydantic_type_to_gbnf(pydantic_type: type[Any]) -> str:
Expand Down Expand Up @@ -540,6 +542,11 @@ def generate_gbnf_rule_for_type(
gbnf_type, rules = generate_gbnf_integer_rules(
max_digit=max_digits, min_digit=min_digits
)
elif get_origin(field_type) is Literal:
literal_types = get_args(field_type)
literal_types_str = [json.dumps(lt).replace('"', '\\"') for lt in literal_types]
literal_types_str = [f'"{lt}"' for lt in literal_types_str]
gbnf_type = f"({'|'.join(literal_types_str)})"
else:
gbnf_type, rules = gbnf_type, []

Expand Down Expand Up @@ -763,9 +770,9 @@ def generate_gbnf_grammar_from_pydantic_models(
model, processed_models, created_rules
)
if add_request_heartbeat and model.__name__ in request_heartbeat_models:
model_rules[
0
] += rf' "," ws "\"{request_heartbeat_field_name}\"" ":" ws boolean '
model_rules[0] += (
rf' "," ws "\"{request_heartbeat_field_name}\"" ":" ws boolean '
)
# if not has_special_string:
# model_rules[0] += r' ws "}"'

Expand Down