1b17517 Fix GitHub Copilot completions path · zut

M packages/provider/github_copilot.go +5 -4


@@ -190,9 +190,10 @@ func NewGithubCopilotClient(pat string) Client {
190	190		// Initial baseURL is a sane default; copilotRefreshTransport rewrites
191	191		// the host on every request based on the freshly-issued token.
192	192		return &openaiClient{
193		-	apiKey: pat, // unused at the wire level (transport overrides Auth) but kept for parity
194		-	baseURL: "https://api.individual.githubcopilot.com",
195		-	name: "github-copilot",
196		-	http: httpClient,
	193	+	apiKey: pat, // unused at the wire level (transport overrides Auth) but kept for parity
	194	+	baseURL: "https://api.individual.githubcopilot.com",
	195	+	chatCompletionsPath: "/chat/completions",
	196	+	name: "github-copilot",
	197	+	http: httpClient,
197	198		}
198	199		}

 	// Initial baseURL is a sane default; copilotRefreshTransport rewrites
 	// the host on every request based on the freshly-issued token.
 	return &openaiClient{
-		apiKey:  pat, // unused at the wire level (transport overrides Auth) but kept for parity
+		apiKey:              pat, // unused at the wire level (transport overrides Auth) but kept for parity
-		baseURL: "https://api.individual.githubcopilot.com",
+		baseURL:             "https://api.individual.githubcopilot.com",
-		name:    "github-copilot",
+		chatCompletionsPath: "/chat/completions",
-		http:    httpClient,
+		name:                "github-copilot",
+		http:                httpClient,
 	}
 }

M packages/provider/openai.go +15 -7


@@ -35,12 +35,13 @@ func chatCompletionsURL(baseURL string) string {
35	35		}
36	36
37	37		type openaiClient struct {
38		-	apiKey string
39		-	baseURL string
40		-	name string
41		-	oauth bool // when true, apiKey actually holds an OAuth access token
42		-	headers map[string]string
43		-	http *http.Client
	38	+	apiKey string
	39	+	baseURL string
	40	+	chatCompletionsPath string
	41	+	name string
	42	+	oauth bool // when true, apiKey actually holds an OAuth access token
	43	+	headers map[string]string
	44	+	http *http.Client
44	45		}
45	46
46	47		// NewOpenAI creates an OpenAI client using an API key. baseURL may be empty.

@@ -431,8 +432,15 @@ func buildOAIContentBlocks(blocks []Content, isError bool) []interface{} {
431	432
432	433		// ---- streaming ----
433	434
	435	+	func (c *openaiClient) chatCompletionsURL() string {
	436	+	if c.chatCompletionsPath != "" {
	437	+	return strings.TrimRight(c.baseURL, "/") + "/" + strings.TrimLeft(c.chatCompletionsPath, "/")
	438	+	}
	439	+	return chatCompletionsURL(c.baseURL)
	440	+	}
	441	+
434	442		func (c *openaiClient) Stream(ctx context.Context, req Request) (<-chan Event, error) {
435		-	endpoint := chatCompletionsURL(c.baseURL)
	443	+	endpoint := c.chatCompletionsURL()
436	444		wire, err := c.buildRequest(req)
437	445		if err != nil {
438	446		return nil, err

 }
 type openaiClient struct {
-	apiKey  string
+	apiKey              string
-	baseURL string
+	baseURL             string
-	name    string
+	chatCompletionsPath string
-	oauth   bool // when true, apiKey actually holds an OAuth access token
+	name                string
-	headers map[string]string
+	oauth               bool // when true, apiKey actually holds an OAuth access token
-	http    *http.Client
+	headers             map[string]string
+	http                *http.Client
 }
 // NewOpenAI creates an OpenAI client using an API key. baseURL may be empty.
 // ---- streaming ----
+func (c *openaiClient) chatCompletionsURL() string {
+	if c.chatCompletionsPath != "" {
+		return strings.TrimRight(c.baseURL, "/") + "/" + strings.TrimLeft(c.chatCompletionsPath, "/")
+	}
+	return chatCompletionsURL(c.baseURL)
+}
 func (c *openaiClient) Stream(ctx context.Context, req Request) (<-chan Event, error) {
-	endpoint := chatCompletionsURL(c.baseURL)
+	endpoint := c.chatCompletionsURL()
 	wire, err := c.buildRequest(req)
 	if err != nil {
 		return nil, err

M packages/provider/openai_url_test.go +12 -0


@@ -38,3 +38,15 @@ func TestChatCompletionsURL(t *testing.T) {
38	38		})
39	39		}
40	40		}
	41	+
	42	+	func TestGithubCopilotChatCompletionsURL(t *testing.T) {
	43	+	client, ok := NewGithubCopilotClient("test-token").(*openaiClient)
	44	+	if !ok {
	45	+	t.Fatal("NewGithubCopilotClient did not return an openaiClient")
	46	+	}
	47	+
	48	+	const want = "https://api.individual.githubcopilot.com/chat/completions"
	49	+	if got := client.chatCompletionsURL(); got != want {
	50	+	t.Errorf("GitHub Copilot chat completions URL = %q, want %q", got, want)
	51	+	}
	52	+	}


@@ -38,3 +38,15 @@ func TestChatCompletionsURL(t *testing.T) {
38	})	38		})
39	}	39		}
40	}	40		}
		41	+
		42	+	func TestGithubCopilotChatCompletionsURL(t *testing.T) {
		43	+	client, ok := NewGithubCopilotClient("test-token").(*openaiClient)
		44	+	if !ok {
		45	+	t.Fatal("NewGithubCopilotClient did not return an openaiClient")
		46	+	}
		47	+
		48	+	const want = "https://api.individual.githubcopilot.com/chat/completions"
		49	+	if got := client.chatCompletionsURL(); got != want {
		50	+	t.Errorf("GitHub Copilot chat completions URL = %q, want %q", got, want)
		51	+	}
		52	+	}