Skip to content

[ML] improve model downloader robustness #97274

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 30, 2023
Merged

[ML] improve model downloader robustness #97274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eab0ab8
use the resolver from ModelLoaderUtils, fix problems finding the voca…
Jun 30, 2023
0ab1f44
Update docs/changelog/97274.yaml
Jun 30, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/97274.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 97274
summary: Improve model downloader robustness
area: Machine Learning
type: bug
issues: []
4 changes: 2 additions & 2 deletions ...ava/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ protected void masterOperation(Task task, Request request, ClusterState state, A
final long relativeStartNanos = System.nanoTime();
logAndWriteNotificationAtInfo(modelId, "starting model upload");

URI uri = new URI(repository).resolve(packagedModelId + ModelLoaderUtils.MODEL_FILE_EXTENSION);
URI uri = ModelLoaderUtils.resolvePackageLocation(repository, packagedModelId + ModelLoaderUtils.MODEL_FILE_EXTENSION);

// Uploading other artefacts of the model first, that way the model is last and a simple search can be used to check if the
// download is complete
if (Strings.isNullOrEmpty(modelPackageConfig.getVocabularyFile()) == false) {
Tuple<List<String>, List<String>> vocabularyAndMerges = ModelLoaderUtils.loadVocabulary(
new URI(repository).resolve(modelPackageConfig.getVocabularyFile())
ModelLoaderUtils.resolvePackageLocation(repository, modelPackageConfig.getVocabularyFile())
);

PutTrainedModelVocabularyAction.Request r2 = new PutTrainedModelVocabularyAction.Request(
Expand Down