remove jsonscheme helper

examples/custom-tool/main.go

@@ -8,7 +8,6 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/adrianliechti/llama/pkg/jsonschema"
 	"github.com/adrianliechti/llama/pkg/tool/custom"
 
 	"google.golang.org/grpc"
@@ -38,19 +37,20 @@ func (s *server) Info(context.Context, *custom.InfoRequest) (*custom.Definition,
 	name := "kubectl"
 	description := "invoke the Kubernetes CLI kubectl with the given arguments"
 
-	schema, _ := json.Marshal(jsonschema.Definition{
-		Type: "object",
+	schema, _ := json.Marshal(map[string]any{
+		"type": "object",
 
-		Properties: map[string]jsonschema.Definition{
-			"args": {
-				Type: "array",
-				Items: &jsonschema.Definition{
-					Type: "string",
+		"properties": map[string]any{
+			"args": map[string]any{
+				"type": "array",
+
+				"itmes": map[string]any{
+					"type": "string",
 				},
 			},
 		},
 
-		Required: []string{"args"},
+		"required": []string{"args"},
 	})
 
 	return &custom.Definition{

pkg/tool/bing/client.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/adrianliechti/llama/pkg/jsonschema"
 	"github.com/adrianliechti/llama/pkg/tool"
 )
 
@@ -46,17 +45,17 @@ func (t *Tool) Description() string {
 }
 
 func (*Tool) Parameters() any {
-	return jsonschema.Definition{
-		Type: jsonschema.DataTypeObject,
+	return map[string]any{
+		"type": "object",
 
-		Properties: map[string]jsonschema.Definition{
-			"query": {
-				Type:        jsonschema.DataTypeString,
-				Description: "the text to search online to get the necessary information",
+		"properties": map[string]any{
+			"query": map[string]any{
+				"type":        "string",
+				"description": "the text to search online to get the necessary information",
 			},
 		},
 
-		Required: []string{"query"},
+		"required": []string{"query"},
 	}
 }
 

pkg/tool/custom/client.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/adrianliechti/llama/pkg/jsonschema"
 	"github.com/adrianliechti/llama/pkg/tool"
 
 	"google.golang.org/grpc"
@@ -77,13 +76,13 @@ func (c *Client) Parameters() any {
 	data, err := c.client.Info(context.Background(), &InfoRequest{})
 
 	if err != nil {
-		return jsonschema.Definition{}
+		return nil
 	}
 
-	var result jsonschema.Definition
+	var result map[string]any
 
 	if err := json.Unmarshal([]byte(data.Schema), &result); err != nil {
-		return jsonschema.Definition{}
+		return nil
 	}
 
 	return result

pkg/tool/draw/client.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/adrianliechti/llama/pkg/jsonschema"
 	"github.com/adrianliechti/llama/pkg/provider"
 	"github.com/adrianliechti/llama/pkg/tool"
 )
@@ -40,17 +39,17 @@ func (t *Tool) Description() string {
 }
 
 func (*Tool) Parameters() any {
-	return jsonschema.Definition{
-		Type: jsonschema.DataTypeObject,
+	return map[string]any{
+		"type": "object",
 
-		Properties: map[string]jsonschema.Definition{
-			"prompt": {
-				Type:        jsonschema.DataTypeString,
-				Description: "The prompt to create the image based from. Must be in English - Translate to English if needed.",
+		"properties": map[string]any{
+			"prompt": map[string]any{
+				"type":        "string",
+				"description": "the prompt to create the image based from. must be in english - translate to english if needed.",
 			},
 		},
 
-		Required: []string{"prompt"},
+		"required": []string{"prompt"},
 	}
 }
 

pkg/tool/duckduckgo/client.go

@@ -9,7 +9,6 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/adrianliechti/llama/pkg/jsonschema"
 	"github.com/adrianliechti/llama/pkg/text"
 	"github.com/adrianliechti/llama/pkg/tool"
 )
@@ -41,17 +40,17 @@ func (t *Tool) Description() string {
 }
 
 func (*Tool) Parameters() any {
-	return jsonschema.Definition{
-		Type: jsonschema.DataTypeObject,
+	return map[string]any{
+		"type": "object",
 
-		Properties: map[string]jsonschema.Definition{
-			"query": {
-				Type:        jsonschema.DataTypeString,
-				Description: "the text to search online to get the necessary information",
+		"properties": map[string]any{
+			"query": map[string]any{
+				"type":        "string",
+				"description": "the text to search online to get the necessary information",
 			},
 		},
 
-		Required: []string{"query"},
+		"required": []string{"query"},
 	}
 }
 

pkg/tool/searxng/client.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/adrianliechti/llama/pkg/jsonschema"
 	"github.com/adrianliechti/llama/pkg/tool"
 )
 
@@ -42,17 +41,17 @@ func (t *Tool) Description() string {
 }
 
 func (*Tool) Parameters() any {
-	return jsonschema.Definition{
-		Type: jsonschema.DataTypeObject,
+	return map[string]any{
+		"type": "object",
 
-		Properties: map[string]jsonschema.Definition{
-			"query": {
-				Type:        jsonschema.DataTypeString,
-				Description: "the text to search online to get the necessary information",
+		"properties": map[string]any{
+			"query": map[string]any{
+				"type":        "string",
+				"description": "the text to search online to get the necessary information",
 			},
 		},
 
-		Required: []string{"query"},
+		"required": []string{"query"},
 	}
 }
 

pkg/tool/tavily/client.go

@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/adrianliechti/llama/pkg/jsonschema"
 	"github.com/adrianliechti/llama/pkg/tool"
 )
 
@@ -48,17 +47,17 @@ func (t *Tool) Description() string {
 }
 
 func (*Tool) Parameters() any {
-	return jsonschema.Definition{
-		Type: jsonschema.DataTypeObject,
+	return map[string]any{
+		"type": "object",
 
-		Properties: map[string]jsonschema.Definition{
-			"query": {
-				Type:        jsonschema.DataTypeString,
-				Description: "the text to search online to get the necessary information",
+		"properties": map[string]any{
+			"query": map[string]any{
+				"type":        "string",
+				"description": "the text to search online to get the necessary information",
 			},
 		},
 
-		Required: []string{"query"},
+		"required": []string{"query"},
 	}
 }