chore(controller): add flatten properties for artifact vo (#2613)

star-whale · Aug 14, 2023 · 554a6a9 · 554a6a9
1 parent 3f92e91
commit 554a6a9
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 3 deletions.
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/dataset/DatasetInfoVo.java b/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/dataset/DatasetInfoVo.java
@@ -38,6 +38,29 @@ public class DatasetInfoVo implements Serializable {
     @JsonProperty("name")
     private String name;
 
+    @JsonProperty("versionId")
+    private String versionId;
+
+    @JsonProperty("versionName")
+    private String versionName;
+
+    @JsonProperty("versionAlias")
+    private String versionAlias;
+
+    /**
+     * the table name for index in DataStore
+     */
+    String indexTable;
+
+    @JsonProperty("versionTag")
+    private String versionTag;
+
+    @JsonProperty("shared")
+    private Integer shared;
+
+    @JsonProperty("createdTime")
+    private Long createdTime;
+
     @JsonProperty("files")
     @Valid
     private List<FlattenFileVo> files;

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/model/ModelInfoVo.java b/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/model/ModelInfoVo.java
@@ -35,5 +35,24 @@ public class ModelInfoVo implements Serializable {
     @JsonProperty("name")
     private String name;
 
+    @JsonProperty("versionAlias")
+    private String versionAlias;
+
+    @JsonProperty("versionId")
+    private String versionId;
+
+    @JsonProperty("versionName")
+    private String versionName;
+
+    @JsonProperty("versionTag")
+    private String versionTag;
+
+    @JsonProperty("createdTime")
+    private Long createdTime;
+
+    @JsonProperty("shared")
+    private Integer shared;
+
     private ModelVersionVo versionInfo;
+
 }
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/runtime/RuntimeInfoVo.java b/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/runtime/RuntimeInfoVo.java
@@ -38,6 +38,30 @@ public class RuntimeInfoVo implements Serializable {
     @JsonProperty("name")
     private String name;
 
+    @JsonProperty("versionId")
+    private String versionId;
+
+    @JsonProperty("versionName")
+    private String versionName;
+
+    @JsonProperty("versionAlias")
+    private String versionAlias;
+
+    @JsonProperty("versionTag")
+    private String versionTag;
+
+    @JsonProperty("versionMeta")
+    private String versionMeta;
+
+    @JsonProperty("manifest")
+    private String manifest;
+
+    @JsonProperty("shared")
+    private Integer shared;
+
+    @JsonProperty("createdTime")
+    private Long createdTime;
+
     private RuntimeVersionVo versionInfo;
 
     @JsonProperty("files")

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/DatasetService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/DatasetService.java
@@ -307,7 +307,14 @@ private DatasetInfoVo toDatasetInfoVo(DatasetEntity ds, DatasetVersionEntity ver
             return DatasetInfoVo.builder()
                     .id(idConvertor.convert(ds.getId()))
                     .name(ds.getDatasetName())
+                    .versionId(idConvertor.convert(versionEntity.getId()))
+                    .versionName(versionEntity.getVersionName())
+                    .versionAlias(versionAliasConvertor.convert(versionEntity.getVersionOrder()))
+                    .versionTag(versionEntity.getVersionTag())
                     .versionMeta(versionEntity.getVersionMeta())
+                    .createdTime(versionEntity.getCreatedTime().getTime())
+                    .indexTable(versionEntity.getIndexTable())
+                    .shared(toInt(versionEntity.getShared()))
                     .versionInfo(versionConvertor.convert(
                             versionEntity,
                             versionEntity,

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/model/ModelService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/model/ModelService.java
@@ -315,6 +315,12 @@ private ModelInfoVo toModelInfoVo(ModelEntity model, ModelVersionEntity version)
         return ModelInfoVo.builder()
                 .id(idConvertor.convert(model.getId()))
                 .name(model.getModelName())
+                .versionId(idConvertor.convert(version.getId()))
+                .versionAlias(versionAliasConvertor.convert(version.getVersionOrder()))
+                .versionName(version.getVersionName())
+                .versionTag(version.getVersionTag())
+                .createdTime(version.getCreatedTime().getTime())
+                .shared(toInt(version.getShared()))
                 .versionInfo(versionConvertor.convert(version, version, tags.get(version.getId())))
                 .build();
     }

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/RuntimeService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/RuntimeService.java
@@ -339,10 +339,17 @@ private RuntimeInfoVo toRuntimeInfoVo(RuntimeEntity rt, RuntimeVersionEntity ver
             return RuntimeInfoVo.builder()
                     .id(idConvertor.convert(rt.getId()))
                     .name(rt.getRuntimeName())
+                    .versionId(idConvertor.convert(versionEntity.getId()))
+                    .versionAlias(versionAliasConvertor.convert(versionEntity.getVersionOrder()))
+                    .versionName(versionEntity.getVersionName())
+                    .versionTag(versionEntity.getVersionTag())
+                    .versionMeta(versionEntity.getVersionMeta())
+                    .shared(toInt(versionEntity.getShared()))
+                    .createdTime(versionEntity.getCreatedTime().getTime())
                     .versionInfo(versionConvertor.convert(
-                            versionEntity,
-                            versionEntity,
-                            tags.get(versionEntity.getId())
+                        versionEntity,
+                        versionEntity,
+                        tags.get(versionEntity.getId())
                     ))
                     .files(collect)
                     .build();