Migrate to github.com/openai/openai-go

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

e2e/cagent_exec_test.go

@@ -12,34 +12,28 @@ import (
 	"github.com/docker/cagent/cmd/root"
 )
 
-func TestExec_BasicOpenAI(t *testing.T) {
-	out := cagentExec(t, "testdata/basic.yaml", "Who's djordje?")
+func TestExec_OpenAI(t *testing.T) {
+	out := cagentExec(t, "testdata/basic.yaml", "What's 2+2?")
 
-	require.Equal(t, `
---- Agent: root ---
-
-Djordje is a common Serbian given name. It may refer to different individuals depending on the context. If you provide more information or details, I can help you identify the specific Djordje you are referring to.`,
-		out)
+	require.Equal(t, "\n--- Agent: root ---\n\n2 + 2 equals 4.", out)
 }
 
-func TestExec_BasicAnthropic(t *testing.T) {
-	out := cagentExec(t, "testdata/basic.yaml", "--model=anthropic/claude-sonnet-4-0", "Who's djordje?. Be super concise.")
-
-	require.Equal(t, `
---- Agent: root ---
+func TestExec_OpenAI_gpt5(t *testing.T) {
+	out := cagentExec(t, "testdata/basic.yaml", "--model=openai/gpt-5", "What's 2+2?")
 
-I need more context. There are many people named Djordje (a Serbian name). Could you specify which Djordje you're asking about?`,
-		out)
+	require.Equal(t, "\n--- Agent: root ---\n\n4", out)
 }
 
-func TestExec_BasicGemini(t *testing.T) {
-	out := cagentExec(t, "testdata/basic.yaml", "--model=google/gemini-2.5-flash", "Who's djordje?. Be super concise.")
+func TestExec_Anthropic(t *testing.T) {
+	out := cagentExec(t, "testdata/basic.yaml", "--model=anthropic/claude-sonnet-4-0", "What's 2+2?")
+
+	require.Equal(t, "\n--- Agent: root ---\n\n2 + 2 = 4", out)
+}
 
-	require.Equal(t, `
---- Agent: root ---
+func TestExec_Gemini(t *testing.T) {
+	out := cagentExec(t, "testdata/basic.yaml", "--model=google/gemini-2.5-flash", "What's 2+2?")
 
-Serbian equivalent of the name George.`,
-		out)
+	require.Equal(t, "\n--- Agent: root ---\n\n2+2=4", out)
 }
 
 func TestExec_ToolCallsNeedAcceptance(t *testing.T) {

e2e/mcp_test.go

@@ -28,7 +28,7 @@ func TestMCP_SingleAgent(t *testing.T) {
 	})
 
 	require.NoError(t, err)
-	assert.Equal(t, "2+2 equals 4.", output.Response)
+	assert.Equal(t, "2 + 2 equals 4.", output.Response)
 }
 
 func TestMCP_MultiAgent(t *testing.T) {
@@ -49,5 +49,5 @@ func TestMCP_MultiAgent(t *testing.T) {
 	})
 
 	require.NoError(t, err)
-	assert.Equal(t, "Hello, nice to meet you.", output.Response)
+	assert.Equal(t, "Hello! How can I assist you today?", output.Response)
 }

e2e/runtime_test.go

@@ -23,13 +23,13 @@ func TestRuntime_OpenAI_Basic(t *testing.T) {
 	rt, err := runtime.New(team)
 	require.NoError(t, err)
 
-	sess := session.New(session.WithUserMessage("", "Who's djordje?"))
+	sess := session.New(session.WithUserMessage("", "What's 2+2?"))
 	_, err = rt.Run(ctx, sess)
 	require.NoError(t, err)
 
 	response := sess.GetLastAssistantMessageContent()
-	assert.Equal(t, "Djordje is a popular given name in some Eastern European countries, such as Serbia. If you have more specific information or context, I'd be happy to help further.", response)
-	assert.Equal(t, "Understanding identity: Who is Djordje?", sess.Title)
+	assert.Equal(t, "2 + 2 equals 4.", response)
+	assert.Equal(t, "Basic Arithmetic: Addition of 2 and 2", sess.Title)
 }
 
 func TestRuntime_Mistral_Basic(t *testing.T) {
@@ -44,11 +44,11 @@ func TestRuntime_Mistral_Basic(t *testing.T) {
 	rt, err := runtime.New(team)
 	require.NoError(t, err)
 
-	sess := session.New(session.WithUserMessage("", "Who's djordje?"))
+	sess := session.New(session.WithUserMessage("", "What's 2+2?"))
 	_, err = rt.Run(ctx, sess)
 	require.NoError(t, err)
 
 	response := sess.GetLastAssistantMessageContent()
-	assert.Equal(t, `It seems like "djordje" is a name, most likely of Slavic origin. It is commonly spelled as "Đorđe" in Serbian language, and it means "farmer" or "earthworker". It is a masculine given name, and it is quite popular in Serbia, Montenegro, and other countries in the region. Without more context, it's hard to say exactly who "djordje" is, as it could refer to any person by that name.`, response)
-	assert.Equal(t, `"Inquiry About the Identity of 'Djordje'"`, sess.Title)
+	assert.Equal(t, "The sum of 2 + 2 is 4.", response)
+	assert.Equal(t, "Math Basics: Simple Addition", sess.Title)
 }

e2e/testdata/cassettes/TestExec_Anthropic.yaml

@@ -0,0 +1,43 @@
+---
+version: 2
+interactions:
+- id: 0
+  request:
+    proto: HTTP/1.1
+    proto_major: 1
+    proto_minor: 1
+    content_length: 0
+    host: api.anthropic.com
+    body: "{\"messages\":[{\"content\":[{\"text\":\"What's 2+2?\",\"type\":\"text\"}],\"role\":\"user\"}],\"model\":\"claude-sonnet-4-0\",\"system\":[{\"text\":\"You are a knowledgeable assistant that helps users with various tasks.\\nBe helpful, accurate, and concise in your responses.\",\"type\":\"text\"}]}"
+    url: https://api.anthropic.com/v1/messages/count_tokens
+    method: POST
+  response:
+    proto: HTTP/2.0
+    proto_major: 2
+    proto_minor: 0
+    content_length: 19
+    body: "{\"input_tokens\":42}"
+    headers: {}
+    status: 200 OK
+    code: 200
+    duration: 230.075958ms
+- id: 1
+  request:
+    proto: HTTP/1.1
+    proto_major: 1
+    proto_minor: 1
+    content_length: 0
+    host: api.anthropic.com
+    body: "{\"max_tokens\":8192,\"messages\":[{\"content\":[{\"text\":\"What's 2+2?\",\"type\":\"text\"}],\"role\":\"user\"}],\"model\":\"claude-sonnet-4-0\",\"system\":[{\"text\":\"You are a knowledgeable assistant that helps users with various tasks.\\nBe helpful, accurate, and concise in your responses.\",\"type\":\"text\"}],\"tools\":[],\"stream\":true}"
+    url: https://api.anthropic.com/v1/messages
+    method: POST
+  response:
+    proto: HTTP/2.0
+    proto_major: 2
+    proto_minor: 0
+    content_length: -1
+    body: "event: message_start\ndata: {\"type\":\"message_start\",\"message\":{\"model\":\"claude-sonnet-4-20250514\",\"id\":\"msg_01DR37NtN4R23L1CbJQqUshY\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[],\"stop_reason\":null,\"stop_sequence\":null,\"usage\":{\"input_tokens\":42,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":1,\"service_tier\":\"standard\"}}             }\n\nevent: content_block_start\ndata: {\"type\":\"content_block_start\",\"index\":0,\"content_block\":{\"type\":\"text\",\"text\":\"\"}}\n\nevent: content_block_delta\ndata: {\"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"text_delta\",\"text\":\"2 + 2 = 4\"}          }\n\nevent: ping\ndata: {\"type\": \"ping\"}\n\nevent: content_block_stop\ndata: {\"type\":\"content_block_stop\",\"index\":0         }\n\nevent: ping\ndata: {\"type\": \"ping\"}\n\nevent: ping\ndata: {\"type\": \"ping\"}\n\nevent: message_delta\ndata: {\"type\":\"message_delta\",\"delta\":{\"stop_reason\":\"end_turn\",\"stop_sequence\":null},\"usage\":{\"input_tokens\":42,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"output_tokens\":13}              }\n\nevent: message_stop\ndata: {\"type\":\"message_stop\"             }\n\n"
+    headers: {}
+    status: 200 OK
+    code: 200
+    duration: 1.904056709s

e2e/testdata/cassettes/TestExec_BasicAnthropic.yaml

@@ -8,7 +8,7 @@ interactions:
     proto_minor: 1
     content_length: 0
     host: generativelanguage.googleapis.com
-    body: "{\"contents\":[{\"parts\":[{\"text\":\"You are a knowledgeable assistant that helps users with various tasks.\\nBe helpful, accurate, and concise in your responses.\\n\"}],\"role\":\"user\"},{\"parts\":[{\"text\":\"Who's djordje?. Be super concise.\"}],\"role\":\"user\"}],\"generationConfig\":{\"frequencyPenalty\":0,\"presencePenalty\":0,\"temperature\":0,\"topP\":0}}\n"
+    body: "{\"contents\":[{\"parts\":[{\"text\":\"You are a knowledgeable assistant that helps users with various tasks.\\nBe helpful, accurate, and concise in your responses.\\n\"}],\"role\":\"user\"},{\"parts\":[{\"text\":\"What's 2+2?\"}],\"role\":\"user\"}],\"generationConfig\":{}}\n"
     form:
       alt:
       - sse
@@ -19,8 +19,8 @@ interactions:
     proto_major: 2
     proto_minor: 0
     content_length: -1
-    body: "data: {\"candidates\": [{\"content\": {\"parts\": [{\"text\": \"Serbian equivalent of the name George.\"}],\"role\": \"model\"},\"finishReason\": \"STOP\",\"index\": 0}],\"usageMetadata\": {\"promptTokenCount\": 38,\"candidatesTokenCount\": 8,\"totalTokenCount\": 105,\"promptTokensDetails\": [{\"modality\": \"TEXT\",\"tokenCount\": 38}],\"thoughtsTokenCount\": 59},\"modelVersion\": \"gemini-2.5-flash\",\"responseId\": \"Z7wIadPPD73BnsEPk-SmgAU\"}\r\n\r\n"
+    body: "data: {\"candidates\": [{\"content\": {\"parts\": [{\"text\": \"2+2=4\"}],\"role\": \"model\"},\"finishReason\": \"STOP\",\"index\": 0}],\"usageMetadata\": {\"promptTokenCount\": 35,\"candidatesTokenCount\": 5,\"totalTokenCount\": 86,\"promptTokensDetails\": [{\"modality\": \"TEXT\",\"tokenCount\": 35}],\"thoughtsTokenCount\": 46},\"modelVersion\": \"gemini-2.5-flash\",\"responseId\": \"WM4NaY27K_fqkdUP3_q7iA8\"}\r\n\r\n"
     headers: {}
     status: 200 OK
     code: 200
-    duration: 692.427375ms
+    duration: 700.886458ms

e2e/testdata/cassettes/TestExec_BasicOpenAI.yaml

@@ -0,0 +1,23 @@
+---
+version: 2
+interactions:
+- id: 0
+  request:
+    proto: HTTP/1.1
+    proto_major: 1
+    proto_minor: 1
+    content_length: 0
+    host: api.openai.com
+    body: "{\"messages\":[{\"content\":\"You are a knowledgeable assistant that helps users with various tasks.\\nBe helpful, accurate, and concise in your responses.\\n\",\"role\":\"system\"},{\"content\":\"What's 2+2?\",\"role\":\"user\"}],\"model\":\"gpt-3.5-turbo\",\"stream_options\":{\"include_usage\":true},\"stream\":true}"
+    url: https://api.openai.com/v1/chat/completions
+    method: POST
+  response:
+    proto: HTTP/2.0
+    proto_major: 2
+    proto_minor: 0
+    content_length: -1
+    body: "data: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"refusal\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"MfhikzAX\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"content\":\"2\"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"fC37t4UAx\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"content\":\" +\"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"PfLRw4oY\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"content\":\" \"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"1q5rpQiCb\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"content\":\"2\"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"v05gclnta\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"content\":\" equals\"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"aAa\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"content\":\" \"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"jTM4v8YZ7\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"content\":\"4\"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"N12COihd5\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"content\":\".\"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"cERVljx9R\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{},\"logprobs\":null,\"finish_reason\":\"stop\"}],\"usage\":null,\"obfuscation\":\"UnnX\"}\n\ndata: {\"id\":\"chatcmpl-CZEIJqJbOML9fooYQTOSrJOZ2aJj5\",\"object\":\"chat.completion.chunk\",\"created\":1762512463,\"model\":\"gpt-3.5-turbo-0125\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[],\"usage\":{\"prompt_tokens\":41,\"completion_tokens\":8,\"total_tokens\":49,\"prompt_tokens_details\":{\"cached_tokens\":0,\"audio_tokens\":0},\"completion_tokens_details\":{\"reasoning_tokens\":0,\"audio_tokens\":0,\"accepted_prediction_tokens\":0,\"rejected_prediction_tokens\":0}},\"obfuscation\":\"sRPYvSflJj\"}\n\ndata: [DONE]\n\n"
+    headers: {}
+    status: 200 OK
+    code: 200
+    duration: 931.787875ms

e2e/testdata/cassettes/TestExec_BasicGemini.yaml renamed to e2e/testdata/cassettes/TestExec_Gemini.yaml

@@ -0,0 +1,23 @@
+---
+version: 2
+interactions:
+- id: 0
+  request:
+    proto: HTTP/1.1
+    proto_major: 1
+    proto_minor: 1
+    content_length: 0
+    host: api.openai.com
+    body: "{\"messages\":[{\"content\":\"You are a knowledgeable assistant that helps users with various tasks.\\nBe helpful, accurate, and concise in your responses.\\n\",\"role\":\"system\"},{\"content\":\"What's 2+2?\",\"role\":\"user\"}],\"model\":\"gpt-5\",\"stream_options\":{\"include_usage\":true},\"stream\":true}"
+    url: https://api.openai.com/v1/chat/completions
+    method: POST
+  response:
+    proto: HTTP/2.0
+    proto_major: 2
+    proto_minor: 0
+    content_length: -1
+    body: "data: {\"id\":\"chatcmpl-CZEIM0llqf375Rns0C5Z4jkatmFvv\",\"object\":\"chat.completion.chunk\",\"created\":1762512466,\"model\":\"gpt-5-2025-08-07\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"refusal\":null},\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"BrPWUDKRvM\"}\n\ndata: {\"id\":\"chatcmpl-CZEIM0llqf375Rns0C5Z4jkatmFvv\",\"object\":\"chat.completion.chunk\",\"created\":1762512466,\"model\":\"gpt-5-2025-08-07\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{\"content\":\"4\"},\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"svsI0HB4ryx\"}\n\ndata: {\"id\":\"chatcmpl-CZEIM0llqf375Rns0C5Z4jkatmFvv\",\"object\":\"chat.completion.chunk\",\"created\":1762512466,\"model\":\"gpt-5-2025-08-07\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[{\"index\":0,\"delta\":{},\"finish_reason\":\"stop\"}],\"usage\":null,\"obfuscation\":\"nk6dep\"}\n\ndata: {\"id\":\"chatcmpl-CZEIM0llqf375Rns0C5Z4jkatmFvv\",\"object\":\"chat.completion.chunk\",\"created\":1762512466,\"model\":\"gpt-5-2025-08-07\",\"service_tier\":\"default\",\"system_fingerprint\":null,\"choices\":[],\"usage\":{\"prompt_tokens\":39,\"completion_tokens\":10,\"total_tokens\":49,\"prompt_tokens_details\":{\"cached_tokens\":0,\"audio_tokens\":0},\"completion_tokens_details\":{\"reasoning_tokens\":0,\"audio_tokens\":0,\"accepted_prediction_tokens\":0,\"rejected_prediction_tokens\":0}},\"obfuscation\":\"BAuo50K34JH\"}\n\ndata: [DONE]\n\n"
+    headers: {}
+    status: 200 OK
+    code: 200
+    duration: 1.868136792s