mirror of
https://github.com/mudler/LocalAI.git
synced 2025-05-20 10:35:01 +00:00
feat(functions): relax mixedgrammars (#2365)
* feat(functions): relax mixedgrammars
Extend even more the functionalities and when mixed mode is enabled,
tolerate also both strings and JSON in the result - in this case we make
sure that the JSON can be correctly parsed.
This also updates the examples and the gallery model to configure the
grammar.
The changeset also breaks current function/grammar configuration as it
reserves now a stanza in the YAML config.
For example:
```yaml
function:
grammar:
# This allows the grammar to also return messages
mixed_mode: true
# Suffix to add to the grammar
# prefix: '<tool_call>\n'
# Force parallel calls in the grammar
# parallel_calls: true
```
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
* refactor, add a way to disable mixed json and freestring
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
* Fix linting issues
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
---------
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
This commit is contained in:
Ettore Di Giacinto
GitHub
parent
1542c58466
commit
491e1d752b
10 changed files with 469 additions and 149 deletions
|
|
@ -3,6 +3,7 @@ package functions_test
|
|||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/go-skynet/LocalAI/pkg/functions"
|
||||
. "github.com/go-skynet/LocalAI/pkg/functions"
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
|
@ -248,7 +249,7 @@ root-1-name ::= "\"search\""`
|
|||
var _ = Describe("JSON schema grammar tests", func() {
|
||||
Context("JSON", func() {
|
||||
It("generates a valid grammar from JSON schema", func() {
|
||||
grammar := NewJSONSchemaConverter("").GrammarFromBytes("", []byte(testInput1), false, false)
|
||||
grammar := NewJSONSchemaConverter("").GrammarFromBytes([]byte(testInput1))
|
||||
results := strings.Split(inputResult1, "\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
|
|
@ -258,7 +259,7 @@ var _ = Describe("JSON schema grammar tests", func() {
|
|||
Expect(len(results)).To(Equal(len(strings.Split(grammar, "\n"))))
|
||||
})
|
||||
It("generates a valid grammar from JSON schema", func() {
|
||||
grammar := NewJSONSchemaConverter("").GrammarFromBytes("", []byte(testInput2), false, false)
|
||||
grammar := NewJSONSchemaConverter("").GrammarFromBytes([]byte(testInput2))
|
||||
results := strings.Split(inputResult3, "\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
|
|
@ -272,7 +273,7 @@ var _ = Describe("JSON schema grammar tests", func() {
|
|||
structuredGrammar := JSONFunctionStructureFunction{
|
||||
OneOf: testFunctions}
|
||||
|
||||
grammar := structuredGrammar.Grammar("", "", false, false)
|
||||
grammar := structuredGrammar.Grammar()
|
||||
results := strings.Split(inputResult1, "\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
|
|
@ -286,8 +287,12 @@ var _ = Describe("JSON schema grammar tests", func() {
|
|||
structuredGrammar := JSONFunctionStructureFunction{
|
||||
OneOf: testFunctions}
|
||||
|
||||
grammar := structuredGrammar.Grammar("", "", true, false)
|
||||
results := strings.Split(inputResult2, "\n")
|
||||
grammar := structuredGrammar.Grammar(functions.EnableMaybeArray)
|
||||
results := strings.Split(
|
||||
strings.Join([]string{
|
||||
inputResult2,
|
||||
"mixedstring ::= freestring | freestring arr | freestring realvalue"}, "\n"),
|
||||
"\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
Expect(grammar).To(ContainSubstring(r))
|
||||
|
|
@ -300,8 +305,12 @@ var _ = Describe("JSON schema grammar tests", func() {
|
|||
structuredGrammar := JSONFunctionStructureName{
|
||||
OneOf: testFunctionsName}
|
||||
|
||||
grammar := structuredGrammar.Grammar("", "", true, false)
|
||||
results := strings.Split(inputResult4, "\n")
|
||||
grammar := structuredGrammar.Grammar(functions.EnableMaybeArray)
|
||||
results := strings.Split(
|
||||
strings.Join([]string{
|
||||
inputResult4,
|
||||
"mixedstring ::= freestring | freestring arr | freestring realvalue"}, "\n"),
|
||||
"\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
Expect(grammar).To(ContainSubstring(r))
|
||||
|
|
@ -314,8 +323,15 @@ var _ = Describe("JSON schema grammar tests", func() {
|
|||
structuredGrammar := JSONFunctionStructureName{
|
||||
OneOf: testFunctionsName}
|
||||
|
||||
grammar := structuredGrammar.Grammar("suffix", "", true, false)
|
||||
results := strings.Split(rootResult(`"suffix" arr | realvalue`), "\n")
|
||||
grammar := structuredGrammar.Grammar(
|
||||
functions.SetPrefix("suffix"),
|
||||
functions.EnableMaybeArray,
|
||||
)
|
||||
results := strings.Split(
|
||||
strings.Join([]string{
|
||||
rootResult(`"suffix" arr | realvalue`),
|
||||
"mixedstring ::= freestring | freestring arr | freestring realvalue"}, "\n"),
|
||||
"\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
Expect(grammar).To(ContainSubstring(r))
|
||||
|
|
@ -327,8 +343,12 @@ var _ = Describe("JSON schema grammar tests", func() {
|
|||
structuredGrammar := JSONFunctionStructureName{
|
||||
OneOf: testFunctionsName}
|
||||
|
||||
grammar := structuredGrammar.Grammar("suffix", "", false, false)
|
||||
results := strings.Split(rootResult(`"suffix" realvalue`), "\n")
|
||||
grammar := structuredGrammar.Grammar(functions.SetPrefix("suffix"))
|
||||
results := strings.Split(
|
||||
strings.Join([]string{
|
||||
rootResult(`"suffix" realvalue`),
|
||||
"mixedstring ::= freestring | freestring realvalue"}, "\n"),
|
||||
"\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
Expect(grammar).To(ContainSubstring(r))
|
||||
|
|
@ -340,8 +360,12 @@ var _ = Describe("JSON schema grammar tests", func() {
|
|||
structuredGrammar := JSONFunctionStructureName{
|
||||
OneOf: testFunctionsName}
|
||||
|
||||
grammar := structuredGrammar.Grammar("suffix", "", false, true)
|
||||
results := strings.Split(rootResult(`( "suffix" realvalue | freestring )`), "\n")
|
||||
grammar := structuredGrammar.Grammar(functions.SetPrefix("suffix"), functions.EnableMaybeString)
|
||||
results := strings.Split(
|
||||
strings.Join([]string{
|
||||
rootResult(`( "suffix" realvalue | mixedstring )`),
|
||||
"mixedstring ::= freestring | freestring realvalue"}, "\n"),
|
||||
"\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
Expect(grammar).To(ContainSubstring(r))
|
||||
|
|
@ -353,8 +377,13 @@ var _ = Describe("JSON schema grammar tests", func() {
|
|||
structuredGrammar := JSONFunctionStructureName{
|
||||
OneOf: testFunctionsName}
|
||||
|
||||
grammar := structuredGrammar.Grammar("suffix", "", true, true)
|
||||
results := strings.Split(rootResult(`( "suffix" (arr | realvalue) | freestring )`), "\n")
|
||||
grammar := structuredGrammar.Grammar(functions.SetPrefix("suffix"), functions.EnableMaybeString, functions.EnableMaybeArray)
|
||||
results := strings.Split(
|
||||
strings.Join([]string{
|
||||
rootResult(`( "suffix" (arr | realvalue) | mixedstring )`),
|
||||
"mixedstring ::= freestring | freestring arr | freestring realvalue"}, "\n"),
|
||||
"\n")
|
||||
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
Expect(grammar).To(ContainSubstring(r))
|
||||
|
|
@ -367,8 +396,30 @@ var _ = Describe("JSON schema grammar tests", func() {
|
|||
structuredGrammar := JSONFunctionStructureName{
|
||||
OneOf: testFunctionsName}
|
||||
|
||||
grammar := structuredGrammar.Grammar("", "", true, true)
|
||||
results := strings.Split(rootResult(`freestring | arr | realvalue`), "\n")
|
||||
grammar := structuredGrammar.Grammar(functions.EnableMaybeString, functions.EnableMaybeArray)
|
||||
results := strings.Split(
|
||||
strings.Join([]string{
|
||||
rootResult(`mixedstring | arr | realvalue`),
|
||||
"mixedstring ::= freestring | freestring arr | freestring realvalue"}, "\n"),
|
||||
"\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
Expect(grammar).To(ContainSubstring(r))
|
||||
}
|
||||
}
|
||||
Expect(len(results)).To(Equal(len(strings.Split(grammar, "\n"))), grammar)
|
||||
})
|
||||
|
||||
It("generates a valid grammar from JSON Objects without a suffix that could return text or an array of tools or just string. Disables mixedstring", func() {
|
||||
structuredGrammar := JSONFunctionStructureName{
|
||||
OneOf: testFunctionsName}
|
||||
|
||||
grammar := structuredGrammar.Grammar(functions.EnableMaybeString, functions.EnableMaybeArray, functions.NoMixedFreeString)
|
||||
results := strings.Split(
|
||||
strings.Join([]string{
|
||||
rootResult(`freestring | arr | realvalue`),
|
||||
"mixedstring ::= freestring | freestring arr | freestring realvalue"}, "\n"),
|
||||
"\n")
|
||||
for _, r := range results {
|
||||
if r != "" {
|
||||
Expect(grammar).To(ContainSubstring(r))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue