-
Notifications
You must be signed in to change notification settings - Fork 25k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
EIS integration #111154
Merged
demjened
merged 32 commits into
elastic:main
from
timgrein:timgrein/inference-api-integrate-eis
Aug 9, 2024
Merged
EIS integration #111154
demjened
merged 32 commits into
elastic:main
from
timgrein:timgrein/inference-api-integrate-eis
Aug 9, 2024
Conversation
This file contains 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
prwhelan
reviewed
Jul 29, 2024
...sticsearch/xpack/inference/external/action/elastic/ElasticInferenceServiceActionCreator.java
Outdated
Show resolved
Hide resolved
demjened
force-pushed
the
timgrein/inference-api-integrate-eis
branch
from
August 6, 2024 19:26
49a755c
to
9eb637f
Compare
elasticsearchmachine
added
the
needs:triage
Requires assignment of a team area label
label
Aug 6, 2024
elasticsearchmachine
added
Team:SearchOrg
Meta label for the Search Org (Enterprise Search)
Team:Search - Inference
and removed
needs:triage
Requires assignment of a team area label
labels
Aug 6, 2024
Pinging @elastic/search-inference-team (Team:Search - Inference) |
Pinging @elastic/ent-search-eng (Team:SearchOrg) |
Hi @timgrein, I've created a changelog YAML for you. |
davidkyle
approved these changes
Aug 8, 2024
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.
LGTM
...sticsearch/xpack/inference/external/elastic/ElasticInferenceServiceResponseHandlerTests.java
Show resolved
Hide resolved
prwhelan
approved these changes
Aug 8, 2024
...ch/xpack/inference/external/response/elastic/ElasticInferenceServiceErrorResponseEntity.java
Outdated
Show resolved
Hide resolved
...in/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceModel.java
Outdated
Show resolved
Hide resolved
demjened
force-pushed
the
timgrein/inference-api-integrate-eis
branch
from
August 9, 2024 14:14
74ddbcb
to
d3ef457
Compare
weizijun
added a commit
to weizijun/elasticsearch
that referenced
this pull request
Aug 9, 2024
* upstream/main: (22 commits) Prune changelogs after 8.15.0 release Bump versions after 8.15.0 release EIS integration (elastic#111154) Skip LOOKUP/INLINESTATS cases unless on snapshot (elastic#111755) Always enforce strict role validation (elastic#111056) Mute org.elasticsearch.xpack.esql.analysis.VerifierTests testUnsupportedAndMultiTypedFields elastic#111753 [ML] Force time shift integration test (elastic#111620) ESQL: Add tests for sort, where with unsupported type (elastic#111737) [ML] Force time shift documentation (elastic#111668) Fix remote cluster credential secure settings reload (elastic#111535) ESQL: Fix for overzealous validation in case of invalid mapped fields (elastic#111475) Pass allow security manager flag in gradle test policy setup plugin (elastic#111725) Rename streamContent/Separator to bulkContent/Separator (elastic#111716) Mute org.elasticsearch.tdigest.ComparisonTests testSparseGaussianDistribution elastic#111721 Remove 8.14 from branches.json Only emit product origin in deprecation log if present (elastic#111683) Forward port release notes for v8.15.0 (elastic#111714) [ES|QL] Combine Disjunctive CIDRMatch (elastic#111501) ESQL: Remove qualifier from attrs (elastic#110581) Force using the last centroid during merging (elastic#111644) ... # Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java # x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceNamedWriteablesProvider.java
cbuescher
pushed a commit
to cbuescher/elasticsearch
that referenced
this pull request
Sep 4, 2024
* WIP * Add ElasticInferenceServiceTests TODOs * Add ElasticInferenceServiceActionCreatorTests TODOs * Add ElasticInferenceServiceResponseHandlerTests TODOs * Add ElasticInferenceServiceSparseEmbeddingsRequestTests TODOs * Add ElasticInferenceServiceSparseEmbeddingsModelTests TODOs * spotless apply * Fix conflicts * Add EmptySecretSettingsTests * Add named writeables to InferenceNamedWriteablesProvider * Remove addressed todos * Translate model to correct endpoint * Remove addressed TODO * Add docs to ElasticInferenceServiceFeature * Implement and test truncation/request * Add some EIS tests * Support chunked inference * Check model config * Add more tests * Add response handler * Add more tests + HTTP 413 handling * Fix some tests * Spotless * Fixes * Switch back to original response structure * Implement pass-through chunking * Spotless * Fix after rebase * Spotless * Log error upon failing to parse error response * Remove TODOs * Update docs/changelog/111154.yaml --------- Co-authored-by: Adam Demjen <[email protected]>
davidkyle
pushed a commit
to davidkyle/elasticsearch
that referenced
this pull request
Sep 5, 2024
* WIP * Add ElasticInferenceServiceTests TODOs * Add ElasticInferenceServiceActionCreatorTests TODOs * Add ElasticInferenceServiceResponseHandlerTests TODOs * Add ElasticInferenceServiceSparseEmbeddingsRequestTests TODOs * Add ElasticInferenceServiceSparseEmbeddingsModelTests TODOs * spotless apply * Fix conflicts * Add EmptySecretSettingsTests * Add named writeables to InferenceNamedWriteablesProvider * Remove addressed todos * Translate model to correct endpoint * Remove addressed TODO * Add docs to ElasticInferenceServiceFeature * Implement and test truncation/request * Add some EIS tests * Support chunked inference * Check model config * Add more tests * Add response handler * Add more tests + HTTP 413 handling * Fix some tests * Spotless * Fixes * Switch back to original response structure * Implement pass-through chunking * Spotless * Fix after rebase * Spotless * Log error upon failing to parse error response * Remove TODOs * Update docs/changelog/111154.yaml --------- Co-authored-by: Adam Demjen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
>feature
:SearchOrg/Inference
Label for the Search Inference team
Team:Search - Inference
Team:SearchOrg
Meta label for the Search Org (Enterprise Search)
v8.16.0
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.
This PR integrates EIS (Elastic Inference Service) with Elasticsearch behind a feature flag.
Useful ES commands:
./gradlew run
./gradlew run --debug-jvm
(you can attach a debugger on the debug port, which will be logged)./gradlew run -Dtests.es.xpack.inference.eis.gateway.url=http://localhost:8000
./gradlew ':x-pack:plugin:inference:test'
./gradlew ':x-pack:plugin:inference:test' --tests "org.elasticsearch.xpack.inference.external.response.elastic.ElasticInferenceServiceSparseEmbeddingsResponseEntityTests"
(specify--tests
and package + class name)./gradlew ':x-pack:plugin:inference:test' --tests "org.elasticsearch.xpack.inference.external.response.elastic.ElasticInferenceServiceSparseEmbeddingsResponseEntityTests.testSparseEmbeddingsResponse_SingleEmbeddingInData_NoMeta_NoTruncation"
(specify--tests
and package + class + method name)./gradlew ':x-pack:plugin:inference:checkstyleTest'
./gradlew spotlessApply
Testing locally:
eis-model-server
(oreis-gateway
, ifELSERv2
endpoint is integrated) on port{PORT}
eis-gateway
:./gradlew run -Dtests.es.xpack.inference.eis.gateway.url=http://localhost:{PORT}
Testing in serverless:
jvmOptions
:"-Des.eis_feature_flag_enabled=true"
Testing locally
TODOs:
ElasticInferenceService
ElasticInferenceServiceActionCreator
ElasticInferenceServiceResponseHandler
ElasticInferenceServiceSparseEmbeddingsRequest
checkModelConfig
inElasticInferenceService
doChunkedInfer
inElasticInferenceService
ElasticInferenceServiceSparseEmbeddingsRequest
ElasticInferenceServiceFeature
ElasticInferenceServiceResponseHandler
TODOs
, which I forgot here, I usually mark them with//TODO:
)When ready for review:
>non-issue
:ml
Team:ML
Out of scope for this PR:
elastic
upfront)