Skip to content

Conversation

@jonathan-buttner
Copy link
Contributor

@jonathan-buttner jonathan-buttner commented Jan 14, 2025

Backport

This will backport the following commits from main to 8.x:

Questions ?

Please refer to the Backport tool documentation

…ompletions Integration (elastic#118871)

(cherry picked from commit 18345c4)

# Conflicts:
#	server/src/main/java/org/elasticsearch/TransportVersions.java
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/openai/OpenAiUnifiedChatCompletionRequestEntity.java
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceSparseEmbeddingsModel.java
for (UnifiedCompletionRequest.Message message : unifiedRequest.messages()) {
builder.startObject();
{
if (message.content() == null) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section is different from what's in main only in that we use an if-else here instead of a switch-case because the jdk version is older in 8.x

Copy link
Member

@jaybcee jaybcee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, would appreciate another review from someone given that I partially authored this initially. Thanks for taking care of this!

@jonathan-buttner jonathan-buttner merged commit ce49bfa into elastic:8.x Jan 15, 2025
15 checks passed
@jonathan-buttner jonathan-buttner deleted the backport/8.x/pr-118871 branch January 15, 2025 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants