Skip to content

Conversation

maxhniebergall
Copy link
Contributor

@maxhniebergall maxhniebergall commented Sep 19, 2024

This change adds a deprecation warning for the elser service on Put and Infer and copies the elser service files so we can simply delete the elser service after 8.16

This change maintains BWC with the elser service.

@elasticsearchmachine elasticsearchmachine added the Team:ML Meta label for the ML team label Sep 19, 2024
@elasticsearchmachine
Copy link
Collaborator

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

@elasticsearchmachine
Copy link
Collaborator

Hi @maxhniebergall, I've created a changelog YAML for you. Note that since this PR is labelled >deprecation, you need to update the changelog YAML to fill out the extended information sections.

Copy link
Member

@davidkyle davidkyle left a comment

Choose a reason for hiding this comment

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

Now that the elasticsearch service can run the elser model can we remove the elser service in this PR? The elasticsearch service can be an alias to the elser service, adding some logic to the InferenceServiceRegistry lookup code would simply return the elasticsearch service when elser is requested.

@maxhniebergall maxhniebergall marked this pull request as draft September 20, 2024 20:38
@maxhniebergall maxhniebergall marked this pull request as ready for review September 23, 2024 17:22
@maxhniebergall maxhniebergall marked this pull request as draft September 23, 2024 20:40
@maxhniebergall
Copy link
Contributor Author

@elasticmachine merge upstream

@elasticmachine
Copy link
Collaborator

merge conflict between base and head

@maxhniebergall maxhniebergall changed the base branch from main to mute-65048-master September 27, 2024 16:38
@maxhniebergall maxhniebergall changed the base branch from mute-65048-master to main September 27, 2024 16:38
Copy link
Member

@davidkyle davidkyle left a comment

Choose a reason for hiding this comment

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

LGTM

Max Hniebergall added 2 commits October 2, 2024 13:43
…erService

# Conflicts:
#	x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/BaseElasticsearchInternalService.java
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalService.java
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elser/ElserInternalService.java
#	x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalServiceTests.java
#	x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elser/ElserInternalServiceTests.java
@maxhniebergall maxhniebergall changed the base branch from main to ppf2-improve-slack-setup October 2, 2024 21:23
@maxhniebergall maxhniebergall changed the base branch from ppf2-improve-slack-setup to main October 2, 2024 21:23
@maxhniebergall maxhniebergall merged commit fa06764 into main Oct 3, 2024
17 checks passed
@maxhniebergall maxhniebergall deleted the mergeElserService branch October 3, 2024 14:36
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

The backport operation could not be completed due to the following error:

An unexpected error occurred when attempting to backport this PR.

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

matthewabbott pushed a commit to matthewabbott/elasticsearch that referenced this pull request Oct 4, 2024
* merging

* copy elser service files into elasticsearch service

* Add deprecation log message for elser service

* improve deprecation warning

* change elasticsearch internal service elser case to use elser model

* switch elasticsearch elser tests to use elasticsearch elser

* Update docs/changelog/113216.yaml

* alias elser service to elasticsearch

* delete elser service package now that elasticsearch service supports it and has aliased it

* Add deprecation warning to infer API for elser

* Fix accidentally introduced NPE and retain BWC support for null model ID (with deprecation message)

* change "area" to "REST API" because "Machine Learning" isn't an option for deprecation

* change elser literals to static variable

* change Put and Elasticsearch Internal service

 to pass the service name if it is elser or elasticsearch this will allow the elasticsearch service to maintain BWC for null model IDs if the service was elser.

* fix up tests to match new elasticsearch service semantics regarding elser.

* Move passing of service name

* add persistence for elser models in elasticsearch

* copy elser service files into elasticsearch service

* Add deprecation log message for elser service

* Add deprecation warning to infer API for elser

* fix merge conflicts

* fix merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants