Skip to content

Conversation

@davidkyle
Copy link
Member

The code for each inference service is split between 2 main packages which makes the code harder to navigate

  • org.elasticsearch.xpack.inference.external
  • org.elasticsearch.xpack.inference.services.${SERVICE_NAME}

This PR is the first in a series that will move the code from org.elasticsearch.xpack.inference.external into the specific inference service package. Hopefully this will make future refactorings and code deduplication easier.

This PR moves the action classes and tests from

org.elasticsearch.xpack.inference.external.action.${SERVICE_NAME}

to

org.elasticsearch.xpack.inference.services.${SERVICE_NAME}.action.

@davidkyle davidkyle added >refactoring :ml Machine learning auto-backport Automatically create backport pull requests when merged v8.19.0 v9.1.0 labels Mar 25, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/ml-core (Team:ML)

@elasticsearchmachine elasticsearchmachine added the Team:ML Meta label for the ML team label Mar 25, 2025
@davidkyle davidkyle enabled auto-merge (squash) March 28, 2025 15:49
@davidkyle davidkyle merged commit 9f4db73 into elastic:main Mar 28, 2025
16 of 17 checks passed
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.x Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 125567

omricohenn pushed a commit to omricohenn/elasticsearch that referenced this pull request Mar 28, 2025
davidkyle added a commit to davidkyle/elasticsearch that referenced this pull request Mar 31, 2025
…lastic#125567)

(cherry picked from commit 9f4db73)

# Conflicts:
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceSparseEmbeddingsModel.java
#	x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openai/action/OpenAiEmbeddingsActionTests.java
#	x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/voyageai/action/VoyageAIEmbeddingsActionTests.java
@davidkyle
Copy link
Member Author

💚 All backports created successfully

Status Branch Result
8.x

Questions ?

Please refer to the Backport tool documentation

elasticsearchmachine pushed a commit that referenced this pull request Mar 31, 2025
…125567) (#125935)

(cherry picked from commit 9f4db73)

# Conflicts:
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceSparseEmbeddingsModel.java
#	x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openai/action/OpenAiEmbeddingsActionTests.java
#	x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/voyageai/action/VoyageAIEmbeddingsActionTests.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged backport pending :ml Machine learning >refactoring Team:ML Meta label for the ML team v8.19.0 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants