From 8c2b3a7ab6e6c2563dfe63a97201480781c06330 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 23 Jan 2025 09:34:33 +0800 Subject: [PATCH] drift Signed-off-by: Adrian Cole --- .../java/co/elastic/otel/openai/ChatTest.java | 18 +++++++++--------- .../openai/LiveAPIChatIntegrationTest.java | 11 +++++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/instrumentation/openai-client-instrumentation/src/test/java/co/elastic/otel/openai/ChatTest.java b/instrumentation/openai-client-instrumentation/src/test/java/co/elastic/otel/openai/ChatTest.java index 591e12f1..1e6a7ec2 100644 --- a/instrumentation/openai-client-instrumentation/src/test/java/co/elastic/otel/openai/ChatTest.java +++ b/instrumentation/openai-client-instrumentation/src/test/java/co/elastic/otel/openai/ChatTest.java @@ -255,7 +255,7 @@ void allTheClientOptions() { .topP(1.0) .stopOfStrings(Collections.singletonList("foo")) .seed(100L) - .responseFormat(ResponseFormatText.builder().type(ResponseFormatText.Type.TEXT).build()) + .responseFormat(ResponseFormatText.builder().type(JsonValue.from("text")).build()) .build(); long startTimeNanos = System.nanoTime(); @@ -1374,7 +1374,7 @@ void streamAllTheClientOptions() throws Exception { .topP(1.0) .stopOfStrings(Collections.singletonList("foo")) .seed(100L) - .responseFormat(ResponseFormatText.builder().type(ResponseFormatText.Type.TEXT).build()) + .responseFormat(ResponseFormatText.builder().type(JsonValue.from("text")).build()) .build(); long startTimeNanos = System.nanoTime(); @@ -2048,7 +2048,7 @@ void toolsWithFollowupAndCaptureContent() { ChatCompletionMessageParam assistantMessage = ChatCompletionMessageParam.ofChatCompletionAssistantMessageParam( ChatCompletionAssistantMessageParam.builder() - .role(ChatCompletionAssistantMessageParam.Role.ASSISTANT) + .role(JsonValue.from("assistant")) .content(ChatCompletionAssistantMessageParam.Content.ofTextContent("")) .toolCalls(toolCalls) .build()); @@ -2301,7 +2301,7 @@ private static ChatCompletionTool buildGetWeatherToolDefinition() { properties.put("location", JsonObject.of(location)); return ChatCompletionTool.builder() - .type(ChatCompletionTool.Type.FUNCTION) + .type(JsonValue.from("function")) .function( FunctionDefinition.builder() .name("get_weather") @@ -2326,7 +2326,7 @@ static ChatCompletionTool buildGetDeliveryDateToolDefinition() { properties.put("order_id", JsonObject.of(orderId)); return ChatCompletionTool.builder() - .type(ChatCompletionTool.Type.FUNCTION) + .type(JsonValue.from("function")) .function( FunctionDefinition.builder() .name("get_delivery_date") @@ -2349,7 +2349,7 @@ static ChatCompletionTool buildGetDeliveryDateToolDefinition() { private static ChatCompletionMessageParam createAssistantMessage(String content) { return ChatCompletionMessageParam.ofChatCompletionAssistantMessageParam( ChatCompletionAssistantMessageParam.builder() - .role(ChatCompletionAssistantMessageParam.Role.ASSISTANT) + .role(JsonValue.from("assistant")) .content(ChatCompletionAssistantMessageParam.Content.ofTextContent(content)) .build()); } @@ -2357,7 +2357,7 @@ private static ChatCompletionMessageParam createAssistantMessage(String content) private static ChatCompletionMessageParam createUserMessage(String content) { return ChatCompletionMessageParam.ofChatCompletionUserMessageParam( ChatCompletionUserMessageParam.builder() - .role(ChatCompletionUserMessageParam.Role.USER) + .role(JsonValue.from("user")) .content(ChatCompletionUserMessageParam.Content.ofTextContent(content)) .build()); } @@ -2365,7 +2365,7 @@ private static ChatCompletionMessageParam createUserMessage(String content) { private static ChatCompletionMessageParam createSystemMessage(String content) { return ChatCompletionMessageParam.ofChatCompletionSystemMessageParam( ChatCompletionSystemMessageParam.builder() - .role(ChatCompletionSystemMessageParam.Role.SYSTEM) + .role(JsonValue.from("system")) .content(ChatCompletionSystemMessageParam.Content.ofTextContent(content)) .build()); } @@ -2373,7 +2373,7 @@ private static ChatCompletionMessageParam createSystemMessage(String content) { private static ChatCompletionMessageParam createToolMessage(String response, String id) { return ChatCompletionMessageParam.ofChatCompletionToolMessageParam( ChatCompletionToolMessageParam.builder() - .role(ChatCompletionToolMessageParam.Role.TOOL) + .role(JsonValue.from("tool")) .toolCallId(id) .content(ChatCompletionToolMessageParam.Content.ofTextContent(response)) .build()); diff --git a/instrumentation/openai-client-instrumentation/src/test/java/co/elastic/otel/openai/LiveAPIChatIntegrationTest.java b/instrumentation/openai-client-instrumentation/src/test/java/co/elastic/otel/openai/LiveAPIChatIntegrationTest.java index fb45cd34..2293bbcb 100644 --- a/instrumentation/openai-client-instrumentation/src/test/java/co/elastic/otel/openai/LiveAPIChatIntegrationTest.java +++ b/instrumentation/openai-client-instrumentation/src/test/java/co/elastic/otel/openai/LiveAPIChatIntegrationTest.java @@ -35,6 +35,7 @@ import co.elastic.otel.openai.wrappers.InstrumentationSettingsAccessor; import com.openai.client.OpenAIClient; import com.openai.client.okhttp.OpenAIOkHttpClient; +import com.openai.core.JsonValue; import com.openai.core.http.StreamResponse; import com.openai.models.ChatCompletion; import com.openai.models.ChatCompletionAssistantMessageParam; @@ -42,11 +43,13 @@ import com.openai.models.ChatCompletionCreateParams; import com.openai.models.ChatCompletionMessageParam; import com.openai.models.ChatCompletionMessageToolCall; +import com.openai.models.ChatCompletionRole; import com.openai.models.ChatCompletionStreamOptions; import com.openai.models.ChatCompletionSystemMessageParam; import com.openai.models.ChatCompletionToolMessageParam; import com.openai.models.ChatCompletionUserMessageParam; import com.openai.models.CompletionUsage; +import com.openai.models.Message; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.sdk.metrics.data.HistogramPointData; @@ -578,7 +581,7 @@ void streamWithCaptureMessageContent() throws Exception { private static ChatCompletionMessageParam createAssistantMessage(String content) { return ChatCompletionMessageParam.ofChatCompletionAssistantMessageParam( ChatCompletionAssistantMessageParam.builder() - .role(ChatCompletionAssistantMessageParam.Role.ASSISTANT) + .role(JsonValue.from("assistant")) .content(ChatCompletionAssistantMessageParam.Content.ofTextContent(content)) .build()); } @@ -586,7 +589,7 @@ private static ChatCompletionMessageParam createAssistantMessage(String content) private static ChatCompletionMessageParam createUserMessage(String content) { return ChatCompletionMessageParam.ofChatCompletionUserMessageParam( ChatCompletionUserMessageParam.builder() - .role(ChatCompletionUserMessageParam.Role.USER) + .role(JsonValue.from("user")) .content(ChatCompletionUserMessageParam.Content.ofTextContent(content)) .build()); } @@ -594,7 +597,7 @@ private static ChatCompletionMessageParam createUserMessage(String content) { private static ChatCompletionMessageParam createSystemMessage(String content) { return ChatCompletionMessageParam.ofChatCompletionSystemMessageParam( ChatCompletionSystemMessageParam.builder() - .role(ChatCompletionSystemMessageParam.Role.SYSTEM) + .role(JsonValue.from("system")) .content(ChatCompletionSystemMessageParam.Content.ofTextContent(content)) .build()); } @@ -602,7 +605,7 @@ private static ChatCompletionMessageParam createSystemMessage(String content) { private static ChatCompletionMessageParam createToolMessage(String response, String id) { return ChatCompletionMessageParam.ofChatCompletionToolMessageParam( ChatCompletionToolMessageParam.builder() - .role(ChatCompletionToolMessageParam.Role.TOOL) + .role(JsonValue.from("tool")) .toolCallId(id) .content(ChatCompletionToolMessageParam.Content.ofTextContent(response)) .build());