jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llama: enable JSON schema key ordering for generating grammars (#8055)

Browse Source
This commit is contained in:
Parth Sareen 2024-12-11 17:17:36 -08:00 committed by GitHub
parent b1fd7fef86
commit 18f6a98bd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llama/grammar_test.go
View File

@ -30,8 +30,6 @@ const issue7978JSONSchema = `{
}` }`
func TestIssue7978(t *testing.T) { func TestIssue7978(t *testing.T) {
t.Skip("schema_to_grammar is broken; skipping until fixed")
g := SchemaToGrammar([]byte(issue7978JSONSchema)) g := SchemaToGrammar([]byte(issue7978JSONSchema))
if g == nil { if g == nil {
t.Fatal("failed to convert JSON schema to grammar") t.Fatal("failed to convert JSON schema to grammar")
@ -54,8 +52,6 @@ func TestIssue7978(t *testing.T) {
} }
func TestSchemaToGrammer(t *testing.T) { func TestSchemaToGrammer(t *testing.T) {
t.Skip("schema_to_grammar is broken; skipping until fixed")
cases := []struct { cases := []struct {
schema string schema string
prefix []byte // nil is check as nil prefix []byte // nil is check as nil
@ -63,7 +59,7 @@ func TestSchemaToGrammer(t *testing.T) {
{`invalid`, nil}, {`invalid`, nil},
// Simple heuristic/smoke test // Simple heuristic/smoke test
{`{"type":"object"}`, []byte("object ::=")}, {`{"type":"object"}`, []byte("root ::= object")},
} }
for _, c := range cases { for _, c := range cases {

2
llama/json-schema-to-grammar.cpp vendored
View File

@ -417,7 +417,7 @@ class SchemaConverter {
private: private:
std::function<json(const std::string &)> _fetch_json; std::function<json(const std::string &)> _fetch_json;
bool _dotall; bool _dotall;
std::map<std::string, std::string> _rules; std::unordered_map<std::string, std::string> _rules;
std::unordered_map<std::string, json> _refs; std::unordered_map<std::string, json> _refs;
std::unordered_set<std::string> _refs_being_resolved; std::unordered_set<std::string> _refs_being_resolved;
std::vector<std::string> _errors; std::vector<std::string> _errors;

22
llama/patches/0012-Maintain-ordering-for-rules-for-grammar.patch Normal file
View File

@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: ParthSareen <parth.sareen@ollama.com>
Date: Wed, 11 Dec 2024 15:37:32 -0800
Subject: [PATCH] Maintain ordering for rules for grammar
---
common/json-schema-to-grammar.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/json-schema-to-grammar.cpp b/common/json-schema-to-grammar.cpp
index dadc18c8..2a8dbd22 100644
--- a/common/json-schema-to-grammar.cpp
+++ b/common/json-schema-to-grammar.cpp
@@ -391,7 +391,7 @@ class SchemaConverter {
private:
std::function<json(const std::string &)> _fetch_json;
bool _dotall;
- std::map<std::string, std::string> _rules;
+ std::unordered_map<std::string, std::string> _rules;
std::unordered_map<std::string, json> _refs;
std::unordered_set<std::string> _refs_being_resolved;
std::vector<std::string> _errors;