Skip to content

Commit 45d13df

Browse files
committed
[HWORKS-250] Add compatibility with hsml 3.0.*
1 parent 1b3f093 commit 45d13df

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

hopsworks-api/src/main/java/io/hops/hopsworks/api/modelregistry/models/dto/ModelDTO.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ public ModelDTO() {
7676
private Integer modelRegistryId;
7777

7878
private TagsDTO tags;
79+
80+
private String type = "modelDTO";
7981

8082
public String getName() {
8183
return name;
@@ -216,11 +218,13 @@ public void setModelRegistryId(Integer modelRegistryId) {
216218
public TagsDTO getTags() {
217219
return tags;
218220
}
219-
221+
220222
public void setTags(TagsDTO tags) {
221223
this.tags = tags;
222224
}
223-
225+
226+
public String getType() { return type; }
227+
224228
@Override
225229
public String toString() {
226230
return "ModelDTO{" +

hopsworks-api/src/main/java/io/hops/hopsworks/api/serving/ServingUtil.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,11 @@ private void validateModelVersion(Serving serving) {
145145

146146
private void validateModelFramework(Serving serving) {
147147
if (serving.getModelFramework() == null) {
148-
throw new IllegalArgumentException("Model framework not provided");
148+
serving.setModelFramework(serving.getModelServer() == ModelServer.TENSORFLOW_SERVING ?
149+
ModelFramework.TENSORFLOW : ModelFramework.SKLEARN);
150+
// backward compatibility with hsml 3.0 (which does not send model framework value)
151+
// greater versions hsml and UI should not send null values
152+
return;
149153
}
150154
if (serving.getModelFramework() == ModelFramework.TENSORFLOW
151155
&& serving.getModelServer() != ModelServer.TENSORFLOW_SERVING) {

0 commit comments

Comments
 (0)