Repository: ollama/ollama
Pull request: llama: move grammar tests to llama_test.go


Changed files:
filename: llama/grammar/grammar_test.go
patch: @@ -1,107 +0,0 @@
-package grammar
-
-import (
-	"bufio"
-	"bytes"
-	"strings"
-	"testing"
-
-	"github.com/ollama/ollama/llama"
-)
-
-// https://github.com/ollama/ollama/issues/7978
-const issue7978JSONSchema = `{
-  "type": "object",
-  "properties": {
-    "steps": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "explanation": { "type": "string" },
-          "output": { "type": "string" },
-          "nested": {
-            "type": "object",
-            "properties": {
-              "deep": { "type": "string" }
-            }
-          }
-        },
-        "required": ["explanation", "output"],
-        "additionalProperties": false
-      }
-    },
-    "final_answer": { "type": "string" },
-    "01_numbered_key": { "type": "string" },
-    "numbers": {
-      "type": "array",
-      "items": { "type": "number" }
-    },
-    "booleans": {
-      "type": "array", 
-      "items": { "type": "boolean" }
-    },
-    "mixed": {
-      "type": "array",
-      "items": {
-        "oneOf": [
-          { "type": "string" },
-          { "type": "number" },
-          { "type": "boolean" }
-        ]
-      }
-    }
-  },
-  "required": ["steps", "final_answer"],
-  "additionalProperties": false
-}`
-
-func TestIssue7978(t *testing.T) {
-	g := llama.SchemaToGrammar([]byte(issue7978JSONSchema))
-	if g == nil {
-		t.Fatal("failed to convert JSON schema to grammar")
-	}
-
-	t.Logf("grammar:\n%s", g)
-	t.Log()
-
-	var got string
-	s := bufio.NewScanner(bytes.NewReader(g))
-	for s.Scan() {
-		line := strings.TrimSpace(s.Text())
-		step, _, _ := strings.Cut(line, " ::= ")
-		step = strings.TrimSpace(step)
-		if step == "root" {
-			got = line
-		}
-	}
-
-	want := `root ::= "{" space steps-kv "," space final-answer-kv ( "," space ( 01-numbered-key-kv 01-numbered-key-rest | numbers-kv numbers-rest | booleans-kv booleans-rest | mixed-kv ) )? "}" space`
-	if got != want {
-		t.Errorf("root =\n%qwant:\n%q", got, want)
-	}
-}
-
-func TestSchemaToGrammer(t *testing.T) {
-	cases := []struct {
-		schema string
-		prefix []byte // nil is check as nil
-	}{
-		{`invalid`, nil},
-
-		// Simple heuristic/smoke test
-		{`{"type":"object"}`, []byte("root ::= object")},
-	}
-
-	for _, c := range cases {
-		t.Run("x", func(t *testing.T) {
-			g := llama.SchemaToGrammar([]byte(c.schema))
-			if c.prefix == nil && g != nil {
-				t.Fatalf("grammar = %v, want nil", g)
-			}
-			if !bytes.HasPrefix(g, c.prefix) {
-				t.Errorf("grammar = %q, want %q", g, c.prefix)
-			}
-		})
-	}
-}

filename: llama/llama_test.go
patch: @@ -1 +1,105 @@
 package llama
+
+import (
+	"bufio"
+	"bytes"
+	"strings"
+	"testing"
+)
+
+// https://github.com/ollama/ollama/issues/7978
+const issue7978JSONSchema = `{
+  "type": "object",
+  "properties": {
+    "steps": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "explanation": { "type": "string" },
+          "output": { "type": "string" },
+          "nested": {
+            "type": "object",
+            "properties": {
+              "deep": { "type": "string" }
+            }
+          }
+        },
+        "required": ["explanation", "output"],
+        "additionalProperties": false
+      }
+    },
+    "final_answer": { "type": "string" },
+    "01_numbered_key": { "type": "string" },
+    "numbers": {
+      "type": "array",
+      "items": { "type": "number" }
+    },
+    "booleans": {
+      "type": "array", 
+      "items": { "type": "boolean" }
+    },
+    "mixed": {
+      "type": "array",
+      "items": {
+        "oneOf": [
+          { "type": "string" },
+          { "type": "number" },
+          { "type": "boolean" }
+        ]
+      }
+    }
+  },
+  "required": ["steps", "final_answer"],
+  "additionalProperties": false
+}`
+
+func TestIssue7978(t *testing.T) {
+	g := SchemaToGrammar([]byte(issue7978JSONSchema))
+	if g == nil {
+		t.Fatal("failed to convert JSON schema to grammar")
+	}
+
+	t.Logf("grammar:\n%s", g)
+	t.Log()
+
+	var got string
+	s := bufio.NewScanner(bytes.NewReader(g))
+	for s.Scan() {
+		line := strings.TrimSpace(s.Text())
+		step, _, _ := strings.Cut(line, " ::= ")
+		step = strings.TrimSpace(step)
+		if step == "root" {
+			got = line
+		}
+	}
+
+	want := `root ::= "{" space steps-kv "," space final-answer-kv ( "," space ( 01-numbered-key-kv 01-numbered-key-rest | numbers-kv numbers-rest | booleans-kv booleans-rest | mixed-kv ) )? "}" space`
+	if got != want {
+		t.Errorf("root =\n%qwant:\n%q", got, want)
+	}
+}
+
+func TestSchemaToGrammer(t *testing.T) {
+	cases := []struct {
+		schema string
+		prefix []byte // nil is check as nil
+	}{
+		{`invalid`, nil},
+
+		// Simple heuristic/smoke test
+		{`{"type":"object"}`, []byte("root ::= object")},
+	}
+
+	for _, c := range cases {
+		t.Run("x", func(t *testing.T) {
+			g := SchemaToGrammar([]byte(c.schema))
+			if c.prefix == nil && g != nil {
+				t.Fatalf("grammar = %v, want nil", g)
+			}
+			if !bytes.HasPrefix(g, c.prefix) {
+				t.Errorf("grammar = %q, want %q", g, c.prefix)
+			}
+		})
+	}
+}