Add from_json_schema to LlamaGrammar

abetlen · abetlen · commit c647f016097e · 2023-11-23T00:27:00.000-05:00
diff --git a/llama_cpp/llama_grammar.py b/llama_cpp/llama_grammar.py
@@ -64,6 +64,7 @@ def __init__(
 
     @classmethod
     def from_string(cls, grammar: str, verbose: bool = True) -> "LlamaGrammar":
+        """Convert a GBNF grammar to a Llama grammar."""
         parsed_grammar = parse(const_char_p(grammar))  # type: parse_state
         if parsed_grammar.rules.empty():
             raise ValueError(
@@ -75,6 +76,15 @@ def from_string(cls, grammar: str, verbose: bool = True) -> "LlamaGrammar":
             print(file=sys.stderr)
         return cls(parsed_grammar)
 
+    @classmethod
+    def from_json_schema(
+        cls,
+        json_schema: str,
+        verbose: bool = True,
+    ) -> "LlamaGrammar":
+        """Convert a JSON schema to a Llama grammar."""
+        return cls.from_string(json_schema_to_gbnf(json_schema), verbose=verbose)
+
     @classmethod
     def from_file(cls, file: Union[str, Path], verbose: bool = True) -> "LlamaGrammar":
         try:
