Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(provider): preserve complete Anthropic Messages endpoints
  • Loading branch information
SivanCola committed Nov 3, 2026
commit 8a725dd3b5c5682c1d6e500e0e0132ce38c49dfc
3 changes: 3 additions & 0 deletions desktop/frontend/src/__tests__/provider-endpoint.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ console.log("\nprovider endpoint");

eq(providerRequestURLFromConfig("openai", "https://proxy.example.com/v1", ""), "https://proxy.example.com/v1/chat/completions", "OpenAI base URLs expose their effective request URL");
eq(providerRequestURLFromConfig("anthropic", "https://proxy.example.com/v1", ""), "https://proxy.example.com/v1/messages", "Anthropic base URLs expose their effective request URL");
eq(providerRequestURLFromConfig("anthropic", "https://api.deepseek.com/anthropic/messages", ""), "https://api.deepseek.com/anthropic/messages", "complete DeepSeek Messages URL is not appended again");
eq(providerRequestURLFromConfig("anthropic", "https://api.deepseek.com/anthropic/v1/messages/", ""), "https://api.deepseek.com/anthropic/v1/messages", "complete versioned Messages URL is not appended again");
eq(providerBaseURLFromRequestURL("anthropic", "https://api.deepseek.com/anthropic/messages"), "https://api.deepseek.com/anthropic", "unversioned Messages URL derives the SDK base for discovery");
eq(providerRequestURLFromConfig("responses", "https://proxy.example.com/v1", ""), "https://proxy.example.com/v1/responses", "Responses base URLs expose their effective request URL");
eq(providerRequestURLFromConfig("openai", "", "https://proxy.example.com/custom/chat/?token=1"), "https://proxy.example.com/custom/chat/?token=1", "explicit request URLs remain unchanged and take priority");
eq(providerBaseURLFromRequestURL("openai", "https://proxy.example.com/v1/chat/completions?token=1"), "https://proxy.example.com/v1", "request URLs derive a query-free base URL for model discovery");
Expand Down
3 changes: 2 additions & 1 deletion desktop/frontend/src/lib/providerEndpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export function providerRequestURLFromConfig(
if (!base) return "";
switch (kind.trim().toLowerCase()) {
case "anthropic":
if (base.endsWith("/messages")) return base;
return base.endsWith("/v1") ? `${base}/messages` : `${base}/v1/messages`;
case "responses":
case "dashscope-responses":
Expand All @@ -35,7 +36,7 @@ export function providerBaseURLFromRequestURL(kind: string, requestUrl: string):
if (!exactRequestURL) return "";
const normalizedKind = kind.trim().toLowerCase();
const suffixes = normalizedKind === "anthropic"
? ["/v1/messages"]
? ["/v1/messages", "/messages"]
: normalizedKind === "responses" || normalizedKind === "dashscope-responses"
? ["/responses"]
: ["/chat/completions"];
Expand Down
61 changes: 61 additions & 0 deletions desktop/provider_settings_probe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,72 @@ import (
"net/http/httptest"
"os"
"path/filepath"
"reflect"
"testing"

"deepzora/internal/config"
)

func TestDeepSeekDiscoveryIDsSurviveSaveAndMessagesProbe(t *testing.T) {
isolateDesktopUserDirs(t)
t.Chdir(t.TempDir())
var sentModel, sentPath string
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Header.Get("Authorization") != "Bearer draft-key" {
http.Error(w, "wrong credential", http.StatusUnauthorized)
return
}
if r.Method == http.MethodGet && r.URL.Path == "/models" {
fmt.Fprint(w, `{"object":"list","data":[{"id":"deepseek-flash","name":"DeepSeek-V4.1-Flash","input_modalities":["text","image"]},{"id":"deepseek-v4-pro","name":"DeepSeek-V4-Pro","input_modalities":["text"]}]}`)
return
}
if r.Method != http.MethodPost || r.URL.Path != "/anthropic/messages" {
http.NotFound(w, r)
return
}
var body struct{ Model string }
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
t.Error(err)
return
}
sentModel, sentPath = body.Model, r.URL.Path
w.Header().Set("Content-Type", "text/event-stream")
fmt.Fprint(w, "event: message_start\ndata: {\"type\":\"message_start\",\"message\":{\"id\":\"m\",\"role\":\"assistant\",\"usage\":{\"input_tokens\":1}}}\n\nevent: message_delta\ndata: {\"type\":\"message_delta\",\"delta\":{\"stop_reason\":\"end_turn\"},\"usage\":{\"output_tokens\":1}}\n\nevent: message_stop\ndata: {\"type\":\"message_stop\"}\n\n")
}))
defer srv.Close()
app := NewApp()
// v0.0.4 derives this same base_url when the user enters the documented
// unversioned /anthropic/messages address in the full request URL field.
view := ProviderView{Name: "deepseek-test", Kind: "anthropic", BaseURL: srv.URL + "/anthropic/messages", RequestURL: srv.URL + "/anthropic/messages", AuthHeader: true, NoProxy: true}
catalog, err := app.FetchProviderModelCatalogDraft(view, "draft-key")
if err != nil || len(catalog) != 2 {
t.Fatalf("discovery = %+v, %v", catalog, err)
}
for _, model := range catalog {
view.Models = append(view.Models, model.Model)
}
if !reflect.DeepEqual(view.Models, []string{"deepseek-flash", "deepseek-v4-pro"}) {
t.Fatalf("discovery replaced wire IDs with display names: %v", view.Models)
}
if err := app.SaveProvider(view); err != nil {
t.Fatal(err)
}
cfg, err := config.LoadForRootWithoutCredentialsReadOnly(".")
if err != nil {
t.Fatal(err)
}
saved, ok := cfg.Provider(view.Name)
if !ok || !reflect.DeepEqual(saved.ModelList(), view.Models) || config.ProviderEffectiveRequestURL(saved) != srv.URL+"/anthropic/messages" {
t.Fatalf("saved connection lost IDs or request target: %+v", saved)
}
if err := app.TestProviderModel(view, "deepseek-flash", "draft-key"); err != nil {
t.Fatal(err)
}
if sentModel != "deepseek-flash" || sentPath != "/anthropic/messages" {
t.Fatalf("sent model=%q path=%q", sentModel, sentPath)
}
}

func TestProviderDraftProbesDoNotPersistCredentialsOrConfiguration(t *testing.T) {
isolateDesktopUserDirs(t)
const keyEnv = "DEEPZORA_DRAFT_PROBE_TEST_KEY"
Expand Down
3 changes: 2 additions & 1 deletion internal/config/fetch.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ func BuildModelFetchURLs(baseURL, override string) ([]string, error) {
return []string{canonical}, nil
}
base := strings.TrimRight(strings.TrimSpace(baseURL), "/")
base = strings.TrimSuffix(base, "/messages")
if base == "" {
return nil, fmt.Errorf("fetch models: base_url is required")
}
Expand All @@ -136,7 +137,7 @@ func BuildModelFetchURLs(baseURL, override string) ([]string, error) {
} else {
candidates = append(candidates, base+"/models", base+"/v1/models")
}
if stripped := stripModelFetchCompatSuffix(base); stripped != "" {
if stripped := stripModelFetchCompatSuffix(strings.TrimSuffix(base, "/v1")); stripped != "" {
root := strings.TrimRight(stripped, "/")
candidates = append(candidates, root+"/models", root+"/v1/models")
}
Expand Down
10 changes: 10 additions & 0 deletions internal/config/fetch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ func TestBuildModelFetchURLs(t *testing.T) {
"https://api.deepseek.com/v1/models",
},
},
{
name: "complete compatible messages URL derives discovery bases",
base: "https://gateway.example/anthropic/messages",
want: []string{
"https://gateway.example/anthropic/models",
"https://gateway.example/anthropic/v1/models",
"https://gateway.example/models",
"https://gateway.example/v1/models",
},
},
{
name: "override wins",
base: "https://api.deepseek.com",
Expand Down
3 changes: 3 additions & 0 deletions internal/config/provider_endpoint_contract.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ func ProviderRequestURL(kind, baseURL string) string {
}
switch normalizedProviderProtocol(kind) {
case "anthropic":
if strings.HasSuffix(base, "/messages") {
return base
}
if strings.HasSuffix(base, "/v1") {
return base + "/messages"
}
Expand Down
8 changes: 8 additions & 0 deletions internal/config/provider_endpoint_contract_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ func TestDeepSeekEndpointContract(t *testing.T) {
}
}

func TestAnthropicCompleteRequestURLAsBase(t *testing.T) {
for _, request := range []string{"https://api.deepseek.com/anthropic/messages", "https://api.deepseek.com/anthropic/v1/messages"} {
if got := ProviderRequestURL("anthropic", request+"/"); got != request {
t.Fatalf("complete URL was appended again: %s", got)
}
}
}

func TestProviderEndpointMismatchIsConservative(t *testing.T) {
cases := []struct {
name string
Expand Down
9 changes: 8 additions & 1 deletion internal/provider/anthropic/endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@ import (
// /models probes expect, and appending /v1/messages to it would 404. A
// request_url that only repeats the root, with or without /v1, is unset.
func resolveEndpoints(baseURL string, extra map[string]any) (root, requestURL string) {
root = strings.TrimSuffix(strings.TrimRight(baseURL, "/"), "/v1")
base := strings.TrimRight(strings.TrimSpace(baseURL), "/")
// A complete Messages URL is sometimes pasted into base_url. Keep it as
// the request target instead of appending another /v1/messages.
complete := strings.HasSuffix(base, "/messages")
root = strings.TrimSuffix(strings.TrimSuffix(base, "/messages"), "/v1")
if root == "" {
root = defaultBaseURL
}
requestURL, _ = extra["request_url"].(string)
requestURL = strings.TrimSpace(requestURL)
if requestURL == "" || provider.EndpointOverrideRepeatsBase(requestURL, root, root+"/v1") {
requestURL = root + "/v1/messages"
if complete {
requestURL = base
}
}
return root, requestURL
}
24 changes: 24 additions & 0 deletions internal/provider/anthropic/endpoint_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package anthropic

import "testing"

func TestCompleteMessagesBaseURL(t *testing.T) {
for _, base := range []string{
"https://api.deepseek.com/anthropic/messages",
"https://api.deepseek.com/anthropic/v1/messages",
} {
root, request := resolveEndpoints(base+"/", nil)
if root != "https://api.deepseek.com/anthropic" || request != base {
t.Fatalf("resolveEndpoints(%s) = %s, %s", base, root, request)
}
_, request = resolveEndpoints(base, map[string]any{"request_url": base})
if request != base {
t.Fatalf("complete request URL mistaken for a repeated API root: %s", request)
}
const override = "https://gateway.example/custom/messages?route=1"
_, request = resolveEndpoints(base, map[string]any{"request_url": override})
if request != override {
t.Fatalf("explicit request override changed: %s", request)
}
}
}