1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.model.application.validation.change;
import com.yahoo.config.application.api.ApplicationFile;
import com.yahoo.config.model.api.ConfigChangeAction;
import com.yahoo.config.model.api.OnnxModelCost;
import com.yahoo.config.model.api.OnnxModelOptions;
import com.yahoo.config.model.deploy.DeployState;
import com.yahoo.config.model.deploy.TestProperties;
import com.yahoo.vespa.model.VespaModel;
import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
import org.junit.jupiter.api.Test;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author hmusum
*/
public class RestartOnDeployForOnnxModelChangesValidatorTest {
@Test
void validate_no_changes() {
VespaModel current = createModel();
VespaModel next = createModel();
List<ConfigChangeAction> result = validateModel(current, next);
assertEquals(0, result.size());
}
@Test
void validate_changed_estimated_cost() {
VespaModel current = createModel();
VespaModel next = createModel(onnxModelCost(123, 0));
List<ConfigChangeAction> result = validateModel(current, next);
assertEquals(1, result.size());
assertTrue(result.get(0).validationId().isEmpty());
assertEquals("Onnx model 'https://my/url/e5-base-v2.onnx' has changed (estimated cost), need to restart services in container cluster 'cluster1'", result.get(0).getMessage());
assertStartsWith("Onnx model 'https://my/url/e5-base-v2.onnx' has changed (estimated cost)", result);
}
@Test
void validate_changed_hash() {
VespaModel current = createModel();
VespaModel next = createModel(onnxModelCost(0, 123));
List<ConfigChangeAction> result = validateModel(current, next);
assertEquals(1, result.size());
assertStartsWith("Onnx model 'https://my/url/e5-base-v2.onnx' has changed (model hash)", result);
}
@Test
void validate_changed_option() {
VespaModel current = createModel();
VespaModel next = createModel(onnxModelCost(0, 0), "sequential");
List<ConfigChangeAction> result = validateModel(current, next);
assertEquals(1, result.size());
assertStartsWith("Onnx model 'https://my/url/e5-base-v2.onnx' has changed (model option(s))", result);
}
@Test
void validate_changed_model_set() {
VespaModel current = createModel();
VespaModel next = createModel(onnxModelCost(0, 0), "parallel", "e5-small-v2");
List<ConfigChangeAction> result = validateModel(current, next);
assertEquals(1, result.size());
assertStartsWith("Onnx model set has changed from [https://my/url/e5-base-v2.onnx] to [https://my/url/e5-small-v2.onnx", result);
}
private static List<ConfigChangeAction> validateModel(VespaModel current, VespaModel next) {
return new RestartOnDeployForOnnxModelChangesValidator().validate(current, next, deployStateBuilder().build());
}
private static OnnxModelCost onnxModelCost() {
return onnxModelCost(0, 0);
}
private static OnnxModelCost onnxModelCost(long estimatedCost, long hash) {
return (appPkg, applicationId) -> new OnnxModelCost.Calculator() {
private final Map<String, OnnxModelCost.ModelInfo> models = new HashMap<>();
private boolean restartOnDeploy = false;
@Override
public long aggregatedModelCostInBytes() { return estimatedCost; }
@Override
public void registerModel(ApplicationFile path) {}
@Override
public void registerModel(ApplicationFile path, OnnxModelOptions onnxModelOptions) {}
@Override
public void registerModel(URI uri) {}
@Override
public void registerModel(URI uri, OnnxModelOptions onnxModelOptions) {
models.put(uri.toString(), new OnnxModelCost.ModelInfo(uri.toString(), estimatedCost, hash, Optional.ofNullable(onnxModelOptions)));
}
@Override
public Map<String, OnnxModelCost.ModelInfo> models() { return models; }
@Override
public void setRestartOnDeploy() { restartOnDeploy = true; }
@Override
public boolean restartOnDeploy() { return restartOnDeploy; }
};
}
private static VespaModel createModel() {
return createModel(onnxModelCost());
}
private static VespaModel createModel(OnnxModelCost onnxModelCost) {
return createModel(onnxModelCost, "parallel");
}
private static VespaModel createModel(OnnxModelCost onnxModelCost, String executionMode) {
return createModel(onnxModelCost, executionMode, "e5-base-v2");
}
private static VespaModel createModel(OnnxModelCost onnxModelCost, String executionMode, String modelId) {
DeployState.Builder builder = deployStateBuilder();
builder.onnxModelCost(onnxModelCost);
return createModel(builder, executionMode, modelId);
}
private static VespaModel createModel(DeployState.Builder builder, String executionMode, String modelId) {
String xml = """
<services version='1.0'>
<container id='cluster1' version='1.0'>
<http>
<server id='server1' port='8080'/>
</http>
<component id="hf-embedder" type="hugging-face-embedder">
<transformer-model model-id="%s" url="https://my/url/%s.onnx"/>
<tokenizer-model model-id="e5-base-v2-vocab" path="app/tokenizer.json"/>
<onnx-execution-mode>%s</onnx-execution-mode>
</component>
</container>
<container id='cluster2' version='1.0'>
<http>
<server id='server1' port='8081'/>
</http>
</container>
</services>
""".formatted(modelId, modelId, executionMode);
return new VespaModelCreatorWithMockPkg(null, xml).create(builder);
}
private static DeployState.Builder deployStateBuilder() {
return new DeployState.Builder()
.properties((new TestProperties()).setRestartOnDeployForOnnxModelChanges(true));
}
private static void assertStartsWith(String expected, List<ConfigChangeAction> result) {
assertTrue(result.get(0).getMessage().startsWith(expected));
}
}
|
