diff --git a/cmd/gadfly/model.go b/cmd/gadfly/model.go index fc0d8e5..05ba4d8 100644 --- a/cmd/gadfly/model.go +++ b/cmd/gadfly/model.go @@ -104,7 +104,7 @@ func resolveModel() (llm.Model, error) { } return google.New(opts...).Model(model) default: - return nil, fmt.Errorf("GADFLY_BASE_URL is set but GADFLY_PROVIDER %q has no endpoint-override support (use openai/ollama/llamaswap/foreman/anthropic/google, or unset GADFLY_BASE_URL to resolve via majordomo)", provider) + return nil, fmt.Errorf("GADFLY_BASE_URL is set but GADFLY_PROVIDER %q has no endpoint-override support (use openai/openai-compatible/ollama/llamaswap/foreman/anthropic/google, or unset GADFLY_BASE_URL to resolve via majordomo)", provider) } } @@ -252,6 +252,6 @@ func endpointProvider(name, raw string) (llm.Provider, error) { } return google.New(opts...), nil default: - return nil, fmt.Errorf("unknown provider %q (use ollama/llamaswap/foreman/openai/anthropic/google)", provider) + return nil, fmt.Errorf("unknown provider %q (use ollama/llamaswap/foreman/openai/openai-compatible/anthropic/google)", provider) } } diff --git a/cmd/gadfly/model_test.go b/cmd/gadfly/model_test.go index 559c9c5..6b36a5c 100644 --- a/cmd/gadfly/model_test.go +++ b/cmd/gadfly/model_test.go @@ -32,6 +32,20 @@ func TestEndpointProvider(t *testing.T) { t.Fatalf("unexpected error: %v", err) } }) + t.Run("llamaswap registers under its name", func(t *testing.T) { + p, err := endpointProvider("ls", "llamaswap|http://swap.lan:8080|tok") + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + if p.Name() != "ls" { + t.Errorf("Name() = %q, want %q", p.Name(), "ls") + } + }) + t.Run("llamaswap without token", func(t *testing.T) { + if _, err := endpointProvider("ls2", "llamaswap|http://swap.lan:8080"); err != nil { + t.Fatalf("unexpected error: %v", err) + } + }) for _, bad := range []string{"", "ollama", "noprovider-no-pipe", "mystery|http://x"} { t.Run("rejects "+bad, func(t *testing.T) { if _, err := endpointProvider("n", bad); err == nil {