[ML] Refactor OpenAI to use ConstructingObjectParser and consolidate class locations #124380
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
|
Contributor
Author
There was a problem hiding this comment. This class was moved and transitioned to use the |
||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.inference.external.openai; | ||
|
|
||
| import org.elasticsearch.xcontent.ConstructingObjectParser; | ||
| import org.elasticsearch.xcontent.ParseField; | ||
| import org.elasticsearch.xcontent.XContentFactory; | ||
| import org.elasticsearch.xcontent.XContentParserConfiguration; | ||
| import org.elasticsearch.xcontent.XContentType; | ||
| import org.elasticsearch.xpack.core.inference.results.TextEmbeddingFloatResults; | ||
| import org.elasticsearch.xpack.inference.external.http.HttpResult; | ||
| import org.elasticsearch.xpack.inference.external.request.Request; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg; | ||
|
|
||
| public class OpenAiEmbeddingsResponseEntity { | ||
| /** | ||
| * Parses the OpenAI json response. | ||
| * For a request like: | ||
| * | ||
| * <pre> | ||
| * <code> | ||
| * { | ||
| * "inputs": ["hello this is my name", "I wish I was there!"] | ||
| * } | ||
| * </code> | ||
| * </pre> | ||
| * | ||
| * The response would look like: | ||
| * | ||
| * <pre> | ||
| * <code> | ||
| * { | ||
| * "object": "list", | ||
| * "data": [ | ||
| * { | ||
| * "object": "embedding", | ||
| * "embedding": [ | ||
| * -0.009327292, | ||
| * .... (1536 floats total for ada-002) | ||
| * -0.0028842222, | ||
| * ], | ||
| * "index": 0 | ||
| * }, | ||
| * { | ||
| * "object": "embedding", | ||
| * "embedding": [ ... ], | ||
| * "index": 1 | ||
| * } | ||
| * ], | ||
| * "model": "text-embedding-ada-002", | ||
| * "usage": { | ||
| * "prompt_tokens": 8, | ||
| * "total_tokens": 8 | ||
| * } | ||
| * } | ||
| * </code> | ||
| * </pre> | ||
| */ | ||
| public static TextEmbeddingFloatResults fromResponse(Request request, HttpResult response) throws IOException { | ||
| try (var p = XContentFactory.xContent(XContentType.JSON).createParser(XContentParserConfiguration.EMPTY, response.body())) { | ||
| return EmbeddingFloatResult.PARSER.apply(p, null).toTextEmbeddingFloatResults(); | ||
| } | ||
| } | ||
|
|
||
| public record EmbeddingFloatResult(List<EmbeddingFloatResultEntry> embeddingResults) { | ||
| @SuppressWarnings("unchecked") | ||
| public static final ConstructingObjectParser<EmbeddingFloatResult, Void> PARSER = new ConstructingObjectParser<>( | ||
| EmbeddingFloatResult.class.getSimpleName(), | ||
| true, | ||
| args -> new EmbeddingFloatResult((List<EmbeddingFloatResultEntry>) args[0]) | ||
| ); | ||
|
|
||
| static { | ||
| PARSER.declareObjectArray(constructorArg(), EmbeddingFloatResultEntry.PARSER::apply, new ParseField("data")); | ||
| } | ||
|
|
||
| public TextEmbeddingFloatResults toTextEmbeddingFloatResults() { | ||
| return new TextEmbeddingFloatResults( | ||
| embeddingResults.stream().map(entry -> TextEmbeddingFloatResults.Embedding.of(entry.embedding)).toList() | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| public record EmbeddingFloatResultEntry(List<Float> embedding) { | ||
| @SuppressWarnings("unchecked") | ||
| public static final ConstructingObjectParser<EmbeddingFloatResultEntry, Void> PARSER = new ConstructingObjectParser<>( | ||
| EmbeddingFloatResultEntry.class.getSimpleName(), | ||
| true, | ||
| args -> new EmbeddingFloatResultEntry((List<Float>) args[0]) | ||
| ); | ||
|
|
||
| static { | ||
| PARSER.declareFloatArray(constructorArg(), new ParseField("embedding")); | ||
| } | ||
| } | ||
|
|
||
| private OpenAiEmbeddingsResponseEntity() {} | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The major changes here are to use the
ConstructingObjectParserinstead of iterating by token.