remove ollama tools workaround

config/config_model.go

@@ -100,6 +100,7 @@ func DetectModelType(id string) ModelType {
 		"o1",
 		"orca",
 		"phi",
+		"pixtral",
 		"qwen",
 		"stable-code",
 		"stablelm",

pkg/provider/azure/completer.go

@@ -11,11 +11,11 @@ func NewCompleter(url, model string, options ...Option) (*Completer, error) {
 		url = "https://models.inference.ai.azure.com"
 	}
 
-	c := &Config{}
+	cfg := &Config{}
 
 	for _, option := range options {
-		option(c)
+		option(cfg)
 	}
 
-	return openai.NewCompleter(url, model, c.options...)
+	return openai.NewCompleter(url, model, cfg.options...)
 }

pkg/provider/azure/embedder.go

@@ -11,11 +11,11 @@ func NewEmbedder(url, model string, options ...Option) (*Embedder, error) {
 		url = "https://models.inference.ai.azure.com"
 	}
 
-	c := &Config{}
+	cfg := &Config{}
 
 	for _, option := range options {
-		option(c)
+		option(cfg)
 	}
 
-	return openai.NewEmbedder(url, model, c.options...)
+	return openai.NewEmbedder(url, model, cfg.options...)
 }

pkg/provider/custom/completer.go

@@ -27,15 +27,15 @@ func NewCompleter(url string, options ...Option) (*Completer, error) {
 		return nil, errors.New("invalid url")
 	}
 
-	c := &Config{
+	cfg := &Config{
 		url: url,
 	}
 
 	for _, option := range options {
-		option(c)
+		option(cfg)
 	}
 
-	client, err := grpc.NewClient(strings.TrimPrefix(c.url, "grpc://"),
+	client, err := grpc.NewClient(strings.TrimPrefix(cfg.url, "grpc://"),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 	)
 
@@ -44,7 +44,7 @@ func NewCompleter(url string, options ...Option) (*Completer, error) {
 	}
 
 	return &Completer{
-		Config: c,
+		Config: cfg,
 		client: NewCompleterClient(client),
 	}, nil
 }

pkg/provider/groq/completer.go

@@ -9,11 +9,11 @@ type Completer = openai.Completer
 func NewCompleter(model string, options ...Option) (*Completer, error) {
 	url := "https://api.groq.com/openai/v1"
 
-	c := &Config{}
+	cfg := &Config{}
 
 	for _, option := range options {
-		option(c)
+		option(cfg)
 	}
 
-	return openai.NewCompleter(url, model, c.options...)
+	return openai.NewCompleter(url, model, cfg.options...)
 }

pkg/provider/groq/transcriber.go

@@ -11,11 +11,11 @@ func NewTranscriber(url, model string, options ...Option) (*Transcriber, error)
 		url = "https://api.groq.com/openai/v1"
 	}
 
-	c := &Config{}
+	cfg := &Config{}
 
 	for _, option := range options {
-		option(c)
+		option(cfg)
 	}
 
-	return openai.NewTranscriber(url, model, c.options...)
+	return openai.NewTranscriber(url, model, cfg.options...)
 }

pkg/provider/huggingface/completer.go

@@ -17,7 +17,7 @@ func NewCompleter(url, model string, options ...Option) (*Completer, error) {
 	url = strings.TrimRight(url, "/")
 	url = strings.TrimRight(url, "/v1")
 
-	c := &Config{
+	cfg := &Config{
 		client: http.DefaultClient,
 
 		url:   url,
@@ -27,17 +27,17 @@ func NewCompleter(url, model string, options ...Option) (*Completer, error) {
 	}
 
 	for _, option := range options {
-		option(c)
+		option(cfg)
 	}
 
 	ops := []openai.Option{}
 
-	if c.client != nil {
-		ops = append(ops, openai.WithClient(c.client))
+	if cfg.client != nil {
+		ops = append(ops, openai.WithClient(cfg.client))
 	}
 
-	if c.token != "" {
-		ops = append(ops, openai.WithToken(c.token))
+	if cfg.token != "" {
+		ops = append(ops, openai.WithToken(cfg.token))
 	}
 
 	return openai.NewCompleter(url+"/v1", model, ops...)

pkg/provider/mistralrs/completer.go

@@ -17,11 +17,11 @@ func NewCompleter(url, model string, options ...Option) (*Completer, error) {
 	url = strings.TrimRight(url, "/")
 	url = strings.TrimSuffix(url, "/v1")
 
-	c := &Config{}
+	cfg := &Config{}
 
 	for _, option := range options {
-		option(c)
+		option(cfg)
 	}
 
-	return openai.NewCompleter(url+"/v1", model, c.options...)
+	return openai.NewCompleter(url+"/v1", model, cfg.options...)
 }

pkg/provider/mistralrs/embedder.go

@@ -17,11 +17,11 @@ func NewEmbedder(url, model string, options ...Option) (*Embedder, error) {
 	url = strings.TrimRight(url, "/")
 	url = strings.TrimSuffix(url, "/v1")
 
-	c := &Config{}
+	cfg := &Config{}
 
 	for _, option := range options {
-		option(c)
+		option(cfg)
 	}
 
-	return openai.NewEmbedder(url+"/v1", model, c.options...)
+	return openai.NewEmbedder(url+"/v1", model, cfg.options...)
 }

pkg/provider/ollama/completer.go

@@ -1,18 +1,12 @@
 package ollama
 
 import (
-	"context"
 	"strings"
 
-	"github.com/adrianliechti/llama/pkg/provider"
 	"github.com/adrianliechti/llama/pkg/provider/openai"
 )
 
-var _ provider.Completer = (*Completer)(nil)
-
-type Completer struct {
-	completer *openai.Completer
-}
+type Completer = openai.Completer
 
 func NewCompleter(url, model string, options ...Option) (*Completer, error) {
 	if url == "" {
@@ -28,55 +22,5 @@ func NewCompleter(url, model string, options ...Option) (*Completer, error) {
 		option(cfg)
 	}
 
-	opts := []openai.Option{}
-
-	if cfg.client != nil {
-		opts = append(opts, openai.WithClient(cfg.client))
-	}
-
-	completer, err := openai.NewCompleter(url+"/v1", model, opts...)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return &Completer{
-		completer: completer,
-	}, nil
-}
-
-func (c *Completer) Complete(ctx context.Context, messages []provider.Message, options *provider.CompleteOptions) (*provider.Completion, error) {
-	if options == nil {
-		options = new(provider.CompleteOptions)
-	}
-
-	inputOptions := &provider.CompleteOptions{
-		Stream: options.Stream,
-
-		Stop:  options.Stop,
-		Tools: options.Tools,
-
-		MaxTokens:   options.MaxTokens,
-		Temperature: options.Temperature,
-
-		Format: options.Format,
-	}
-
-	if len(options.Tools) > 0 {
-		inputOptions.Stream = nil
-	}
-
-	result, err := c.completer.Complete(ctx, messages, inputOptions)
-
-	if err != nil {
-		return nil, err
-	}
-
-	if inputOptions.Stream == nil && options.Stream != nil {
-		if err := options.Stream(ctx, *result); err != nil {
-			return nil, err
-		}
-	}
-
-	return result, nil
+	return openai.NewCompleter(url+"/v1", model, cfg.options...)
 }

pkg/provider/ollama/config.go

@@ -2,16 +2,18 @@ package ollama
 
 import (
 	"net/http"
+
+	"github.com/adrianliechti/llama/pkg/provider/openai"
 )
 
 type Config struct {
-	client *http.Client
+	options []openai.Option
 }
 
 type Option func(*Config)
 
 func WithClient(client *http.Client) Option {
 	return func(c *Config) {
-		c.client = client
+		c.options = append(c.options, openai.WithClient(client))
 	}
 }

pkg/provider/ollama/embedder.go

@@ -22,11 +22,5 @@ func NewEmbedder(url, model string, options ...Option) (*Embedder, error) {
 		option(cfg)
 	}
 
-	opts := []openai.Option{}
-
-	if cfg.client != nil {
-		opts = append(opts, openai.WithClient(cfg.client))
-	}
-
-	return openai.NewEmbedder(url+"/v1", model, opts...)
+	return openai.NewEmbedder(url+"/v1", model, cfg.options...)
 }