History

Merge branch 'pr-454'

# Conflicts: # cmd/server/main.go # internal/translator/claude/openai/chat-completions/claude_openai_response.go

Luis Pater committed 7 months agov6.9.0-0

Commit f3c59162 parents 7c2ad4c f81acd087 files · +3259 −3117Browse files

Showing the changes to internal/runtime/executor/github_copilot_executor.go (1 of 87 files). Show all

Unified · Split

internal/runtime/executor/github_copilot_executor.go+24−21
@@ -221,13 +221,13 @@ func (e *GitHubCopilotExecutor) Execute(ctx context.Context, auth *cliproxyauth. · 220 unmodified lines
221221 }
222222
223223 var param any
224− converted := ""
224+ var converted []byte
225225 if useResponses && from.String() == "claude" {
226226 converted = translateGitHubCopilotResponsesNonStreamToClaude(data)
227227 } else {
228228 converted = sdktranslator.TranslateNonStream(ctx, to, from, req.Model, bytes.Clone(opts.OriginalRequest), body, data, &param)
229229 }
230− resp = cliproxyexecutor.Response{Payload: []byte(converted)}
230+ resp = cliproxyexecutor.Response{Payload: converted}
231231 reporter.ensurePublished(ctx)
232232 return resp, nil
233233 }
@@ -374,14 +374,14 @@ func (e *GitHubCopilotExecutor) ExecuteStream(ctx context.Context, auth *cliprox · 140 unmodified lines
374374 }
375375 }
376376
377− var chunks []string
377+ var chunks [][]byte
378378 if useResponses && from.String() == "claude" {
379379 chunks = translateGitHubCopilotResponsesStreamToClaude(bytes.Clone(line), &param)
380380 } else {
381381 chunks = sdktranslator.TranslateStream(ctx, to, from, req.Model, bytes.Clone(opts.OriginalRequest), body, bytes.Clone(line), &param)
382382 }
383383 for i := range chunks {
384− out <- cliproxyexecutor.StreamChunk{Payload: []byte(chunks[i])}
384+ out <- cliproxyexecutor.StreamChunk{Payload: bytes.Clone(chunks[i])}
385385 }
386386 }
387387
@@ -977,7 +977,7 @@ type githubCopilotResponsesStreamState struct { · 589 unmodified lines
977977 ItemIDToTool map[string]*githubCopilotResponsesStreamToolState
978978 }
979979
980−func translateGitHubCopilotResponsesNonStreamToClaude(data []byte) string {
980+func translateGitHubCopilotResponsesNonStreamToClaude(data []byte) []byte {
981981 root := gjson.ParseBytes(data)
982982 out := `{"id":"","type":"message","role":"assistant","model":"","content":[],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":0,"output_tokens":0}}`
983983 out, _ = sjson.Set(out, "id", root.Get("id").String())
@@ -1067,10 +1067,10 @@ func translateGitHubCopilotResponsesNonStreamToClaude(data []byte) string { · 83 unmodified lines
10671067 } else {
10681068 out, _ = sjson.Set(out, "stop_reason", "end_turn")
10691069 }
1070− return out
1070+ return []byte(out)
10711071 }
10721072
1073−func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []string {
1073+func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) [][]byte {
10741074 if *param == nil {
10751075 *param = &githubCopilotResponsesStreamState{
10761076 TextBlockIndex: -1,
@@ -1092,7 +1092,10 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 15 unmodified lines
10921092 }
10931093
10941094 event := gjson.GetBytes(payload, "type").String()
1095− results := make([]string, 0, 4)
1095+ results := make([][]byte, 0, 4)
1096+ appendResult := func(chunk string) {
1097+ results = append(results, []byte(chunk))
1098+ }
10961099 ensureMessageStart := func() {
10971100 if state.MessageStarted {
10981101 return
@@ -1100,7 +1103,7 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 1 unmodified line
11001103 messageStart := `{"type":"message_start","message":{"id":"","type":"message","role":"assistant","model":"","content":[],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":0,"output_tokens":0}}}`
11011104 messageStart, _ = sjson.Set(messageStart, "message.id", gjson.GetBytes(payload, "response.id").String())
11021105 messageStart, _ = sjson.Set(messageStart, "message.model", gjson.GetBytes(payload, "response.model").String())
1103− results = append(results, "event: message_start\ndata: "+messageStart+"\n\n")
1106+ appendResult("event: message_start\ndata: " + messageStart + "\n\n")
11041107 state.MessageStarted = true
11051108 }
11061109 startTextBlockIfNeeded := func() {
@@ -1113,7 +1116,7 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 6 unmodified lines
11131116 }
11141117 contentBlockStart := `{"type":"content_block_start","index":0,"content_block":{"type":"text","text":""}}`
11151118 contentBlockStart, _ = sjson.Set(contentBlockStart, "index", state.TextBlockIndex)
1116− results = append(results, "event: content_block_start\ndata: "+contentBlockStart+"\n\n")
1119+ appendResult("event: content_block_start\ndata: " + contentBlockStart + "\n\n")
11171120 state.TextBlockStarted = true
11181121 }
11191122 stopTextBlockIfNeeded := func() {
@@ -1122,7 +1125,7 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 2 unmodified lines
11221125 }
11231126 contentBlockStop := `{"type":"content_block_stop","index":0}`
11241127 contentBlockStop, _ = sjson.Set(contentBlockStop, "index", state.TextBlockIndex)
1125− results = append(results, "event: content_block_stop\ndata: "+contentBlockStop+"\n\n")
1128+ appendResult("event: content_block_stop\ndata: " + contentBlockStop + "\n\n")
11261129 state.TextBlockStarted = false
11271130 state.TextBlockIndex = -1
11281131 }
@@ -1152,7 +1155,7 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 23 unmodified lines
11521155 contentDelta := `{"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":""}}`
11531156 contentDelta, _ = sjson.Set(contentDelta, "index", state.TextBlockIndex)
11541157 contentDelta, _ = sjson.Set(contentDelta, "delta.text", delta)
1155− results = append(results, "event: content_block_delta\ndata: "+contentDelta+"\n\n")
1158+ appendResult("event: content_block_delta\ndata: " + contentDelta + "\n\n")
11561159 }
11571160 case "response.reasoning_summary_part.added":
11581161 ensureMessageStart()
@@ -1161,7 +1164,7 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 2 unmodified lines
11611164 state.NextContentIndex++
11621165 thinkingStart := `{"type":"content_block_start","index":0,"content_block":{"type":"thinking","thinking":""}}`
11631166 thinkingStart, _ = sjson.Set(thinkingStart, "index", state.ReasoningIndex)
1164− results = append(results, "event: content_block_start\ndata: "+thinkingStart+"\n\n")
1167+ appendResult("event: content_block_start\ndata: " + thinkingStart + "\n\n")
11651168 case "response.reasoning_summary_text.delta":
11661169 if state.ReasoningActive {
11671170 delta := gjson.GetBytes(payload, "delta").String()
@@ -1169,14 +1172,14 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 1 unmodified line
11691172 thinkingDelta := `{"type":"content_block_delta","index":0,"delta":{"type":"thinking_delta","thinking":""}}`
11701173 thinkingDelta, _ = sjson.Set(thinkingDelta, "index", state.ReasoningIndex)
11711174 thinkingDelta, _ = sjson.Set(thinkingDelta, "delta.thinking", delta)
1172− results = append(results, "event: content_block_delta\ndata: "+thinkingDelta+"\n\n")
1175+ appendResult("event: content_block_delta\ndata: " + thinkingDelta + "\n\n")
11731176 }
11741177 }
11751178 case "response.reasoning_summary_part.done":
11761179 if state.ReasoningActive {
11771180 thinkingStop := `{"type":"content_block_stop","index":0}`
11781181 thinkingStop, _ = sjson.Set(thinkingStop, "index", state.ReasoningIndex)
1179− results = append(results, "event: content_block_stop\ndata: "+thinkingStop+"\n\n")
1182+ appendResult("event: content_block_stop\ndata: " + thinkingStop + "\n\n")
11801183 state.ReasoningActive = false
11811184 }
11821185 case "response.output_item.added":
@@ -1204,7 +1207,7 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 21 unmodified lines
12041207 contentBlockStart, _ = sjson.Set(contentBlockStart, "index", tool.Index)
12051208 contentBlockStart, _ = sjson.Set(contentBlockStart, "content_block.id", tool.ID)
12061209 contentBlockStart, _ = sjson.Set(contentBlockStart, "content_block.name", tool.Name)
1207− results = append(results, "event: content_block_start\ndata: "+contentBlockStart+"\n\n")
1210+ appendResult("event: content_block_start\ndata: " + contentBlockStart + "\n\n")
12081211 case "response.output_item.delta":
12091212 item := gjson.GetBytes(payload, "item")
12101213 if item.Get("type").String() != "function_call" {
@@ -1224,7 +1227,7 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 13 unmodified lines
12241227 inputDelta := `{"type":"content_block_delta","index":0,"delta":{"type":"input_json_delta","partial_json":""}}`
12251228 inputDelta, _ = sjson.Set(inputDelta, "index", tool.Index)
12261229 inputDelta, _ = sjson.Set(inputDelta, "delta.partial_json", partial)
1227− results = append(results, "event: content_block_delta\ndata: "+inputDelta+"\n\n")
1230+ appendResult("event: content_block_delta\ndata: " + inputDelta + "\n\n")
12281231 case "response.function_call_arguments.delta":
12291232 // Copilot sends tool call arguments via this event type (not response.output_item.delta).
12301233 // Data format: {"delta":"...", "item_id":"...", "output_index":N, ...}
@@ -1241,7 +1244,7 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 10 unmodified lines
12411244 inputDelta := `{"type":"content_block_delta","index":0,"delta":{"type":"input_json_delta","partial_json":""}}`
12421245 inputDelta, _ = sjson.Set(inputDelta, "index", tool.Index)
12431246 inputDelta, _ = sjson.Set(inputDelta, "delta.partial_json", partial)
1244− results = append(results, "event: content_block_delta\ndata: "+inputDelta+"\n\n")
1247+ appendResult("event: content_block_delta\ndata: " + inputDelta + "\n\n")
12451248 case "response.output_item.done":
12461249 if gjson.GetBytes(payload, "item.type").String() != "function_call" {
12471250 break
@@ -1252,7 +1255,7 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 4 unmodified lines
12521255 }
12531256 contentBlockStop := `{"type":"content_block_stop","index":0}`
12541257 contentBlockStop, _ = sjson.Set(contentBlockStop, "index", tool.Index)
1255− results = append(results, "event: content_block_stop\ndata: "+contentBlockStop+"\n\n")
1258+ appendResult("event: content_block_stop\ndata: " + contentBlockStop + "\n\n")
12561259 case "response.completed":
12571260 ensureMessageStart()
12581261 stopTextBlockIfNeeded()
@@ -1276,8 +1279,8 @@ func translateGitHubCopilotResponsesStreamToClaude(line []byte, param *any) []st · 17 unmodified lines
12761279 if cachedTokens > 0 {
12771280 messageDelta, _ = sjson.Set(messageDelta, "usage.cache_read_input_tokens", cachedTokens)
12781281 }
1279− results = append(results, "event: message_delta\ndata: "+messageDelta+"\n\n")
1280− results = append(results, "event: message_stop\ndata: {\"type\":\"message_stop\"}\n\n")
1282+ appendResult("event: message_delta\ndata: " + messageDelta + "\n\n")
1283+ appendResult("event: message_stop\ndata: {\"type\":\"message_stop\"}\n\n")
12811284 state.MessageStopSent = true
12821285 }
12831286 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t