Merge pull request #114 from xtreme1-io/dev

Release v0.6.1
xtreme1-io · Apr 25, 2023 · ff76721 · ff76721
2 parents ea79f93 + 643911e
commit ff76721
Show file tree

Hide file tree

Showing 44 changed files with 394 additions and 231 deletions.
diff --git a/.ops/.gitlab-ci.yml b/.ops/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 
 variables:
   APP_NAME: "xtreme1"
-  APP_VERSION: "0.6.0"
+  APP_VERSION: "0.6.1"
 
   FRONTEND_PACKAGE_DIR: "dist"
   BACKEND_PACKAGE_NAME: "${APP_NAME}-backend-${APP_VERSION}-SNAPSHOT.jar"

diff --git a/.ops/alidev/backend-deployment.yml b/.ops/alidev/backend-deployment.yml
@@ -29,7 +29,7 @@ spec:
           resources:
             requests:
               memory: 200Mi
-              cpu: 100m
+              cpu: 10m
             limits:
               memory: 2Gi
               cpu: 1

diff --git a/.ops/alidev/frontend-deployment.yml b/.ops/alidev/frontend-deployment.yml
@@ -26,7 +26,7 @@ spec:
           resources:
             requests:
               memory: 200Mi
-              cpu: 100m
+              cpu: 10m
             limits:
               memory: 2Gi
               cpu: 1

diff --git a/.ops/alitest/backend-deployment.yml b/.ops/alitest/backend-deployment.yml
@@ -29,7 +29,7 @@ spec:
           resources:
             requests:
               memory: 200Mi
-              cpu: 100m
+              cpu: 10m
             limits:
               memory: 2Gi
               cpu: 1

diff --git a/.ops/alitest/frontend-deployment.yml b/.ops/alitest/frontend-deployment.yml
@@ -26,7 +26,7 @@ spec:
           resources:
             requests:
               memory: 200Mi
-              cpu: 100m
+              cpu: 10m
             limits:
               memory: 2Gi
               cpu: 1

diff --git a/.ops/backend.dockerfile b/.ops/backend.dockerfile
@@ -2,7 +2,7 @@ FROM openjdk:11
 
 RUN apt update && \
     apt install -y iputils-ping curl wget netcat python3 python3-pip
-RUN pip3 install --upgrade --force-reinstall git+https://github.com/xtreme1-io/xtreme1-sdk.git@97f0e90
+RUN pip3 install --upgrade --force-reinstall git+https://github.com/xtreme1-io/xtreme1-sdk.git@bddaa8d
 WORKDIR /app
 COPY target/$BACKEND_PACKAGE_NAME ./app.jar
 RUN mkdir -p config

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <div align="center">
 <img width="386" alt="Xtreme1 logo" src="https://user-images.githubusercontent.com/84139543/190300943-98da7d5c-bd67-4074-a94f-b7405d29fb90.png">
 
-![](https://img.shields.io/badge/Release-v0.6.0-green) 
+![](https://img.shields.io/badge/Release-v0.6.1-green) 
 ![](https://img.shields.io/badge/License-Apache%202.0-blueviolet)
 [![Slack](https://img.shields.io/badge/Join-Slack-orange.svg?logo=slack)](https://join.slack.com/t/xtreme1group/shared_invite/zt-1jhk36uzr-NpdpYXeQAEHN6rYJy5_6pg)
 [![Twitter](https://img.shields.io/badge/Follow-Twitter-blue)](https://twitter.com/Xtreme1io)
@@ -57,8 +57,8 @@ Image Data Curation (Visualizing & Debug)  - [MobileNetV3](https://github.com/xi
 Download the latest release package and unzip it.
 
 ```bash
-wget https://github.com/xtreme1-io/xtreme1/releases/download/v0.6.0/xtreme1-v0.6.0.zip
-unzip -d xtreme1-v0.6.0 xtreme1-v0.6.0.zip
+wget https://github.com/xtreme1-io/xtreme1/releases/download/v0.6.1/xtreme1-v0.6.1.zip
+unzip -d xtreme1-v0.6.1 xtreme1-v0.6.1.zip
 ```
 
 ## Start all services

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -7,9 +7,9 @@ RUN --mount=type=cache,target=/root/.m2 mvn package
 FROM openjdk:11-jre
 RUN apt update && \
     apt install -y iputils-ping curl wget netcat python3 python3-pip git
-RUN pip3 install --upgrade --force-reinstall git+https://github.com/xtreme1-io/xtreme1-sdk.git@97f0e90
+RUN pip3 install --upgrade --force-reinstall git+https://github.com/xtreme1-io/xtreme1-sdk.git@bddaa8d
 WORKDIR /app
-COPY --from=build /build/target/xtreme1-backend-0.6.0-SNAPSHOT.jar ./app.jar
+COPY --from=build /build/target/xtreme1-backend-0.6.1-SNAPSHOT.jar ./app.jar
 RUN mkdir -p config
 RUN wget 'https://basicai-asset.s3.us-west-2.amazonaws.com/xtreme1/xtreme1-lidar-fusion-trial.zip' -O xtreme1-lidar-fusion-trial.zip
 RUN wget 'https://basicai-asset.s3.us-west-2.amazonaws.com/xtreme1/xtreme1-image-trial.zip' -O xtreme1-image-trial.zip

diff --git a/backend/README.md b/backend/README.md
@@ -92,7 +92,7 @@ cd backend
 mvn package
 
 # Using local configuration to start application.
-java -Dspring.profiles.active=local -jar target/xtreme1-backend-0.6.0-SNAPSHOT.jar
+java -Dspring.profiles.active=local -jar target/xtreme1-backend-0.6.1-SNAPSHOT.jar
 ```
 
 Now you can access the backend service at `http://localhost:8080/`.

diff --git a/backend/pom.xml b/backend/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>ai.basic</groupId>
     <artifactId>xtreme1-backend</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.6.1-SNAPSHOT</version>
     <name>Xtreme1 Backend</name>
     <description></description>
 

diff --git a/backend/src/main/java/ai/basic/x1/adapter/api/job/DatasetSimilarityResultScheduledJob.java b/backend/src/main/java/ai/basic/x1/adapter/api/job/DatasetSimilarityResultScheduledJob.java
@@ -52,7 +52,7 @@ public class DatasetSimilarityResultScheduledJob {
     private static final String UPDATE_RESULT_LOCK = "update_dataset_similarity_result_lock";
     private static final String GENERATE_LOCK = "generate_similarity_result_lock";
 
-    @Scheduled(cron = "0/5 * * * * ?")
+    //@Scheduled(cron = "0/5 * * * * ?")
     public void updateDatasetSimilarityResult() {
         boolean getLock = similarityDistributedLock.tryLock(UPDATE_RESULT_LOCK);
         if (getLock) {
@@ -91,7 +91,7 @@ public void updateDatasetSimilarityResult() {
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ?")
+    //@Scheduled(cron = "0/5 * * * * ?")
     public void generateSimilarity() {
         boolean getLock = similarityDistributedLock.tryLock(GENERATE_LOCK);
         if (getLock) {

diff --git a/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/mapper/DataInfoMapper.java b/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/mapper/DataInfoMapper.java
@@ -13,6 +13,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -51,30 +52,44 @@ public interface DataInfoMapper extends ExtendBaseMapper<DataInfo> {
      * Get Model run data id
      *
      * @param queryWrapper Model run Filter data parameter
-     * @param modelId Model id
-     * @param limit data id count
+     * @param modelId      Model id
+     * @param limit        data id count
      * @return data id
      */
-    List<Long> findModelRunDataIds(@Param(Constants.WRAPPER) Wrapper<DataInfo> queryWrapper,@Param("modelId") Long modelId,
-                                   @Param("isExcludeModelData") Boolean isExcludeModelData,@Param("limit") Long limit);
+    List<Long> findModelRunDataIds(@Param(Constants.WRAPPER) Wrapper<DataInfo> queryWrapper, @Param("modelId") Long modelId,
+                                   @Param("isExcludeModelData") Boolean isExcludeModelData, @Param("limit") Long limit);
 
     /**
      * Get Model run data count
      *
      * @param queryWrapper Model run Filter data parameter
-     * @param modelId Model id
+     * @param modelId      Model id
      * @return data count
      */
-    Long findModelRunDataCount(@Param(Constants.WRAPPER) Wrapper<DataInfo> queryWrapper,@Param("modelId") Long modelId,
-                                   @Param("isExcludeModelData") Boolean isExcludeModelData);
-
+    Long findModelRunDataCount(@Param(Constants.WRAPPER) Wrapper<DataInfo> queryWrapper, @Param("modelId") Long modelId,
+                               @Param("isExcludeModelData") Boolean isExcludeModelData);
 
     /**
      * Select data
-     * @param page page
+     *
+     * @param page         page
      * @param queryWrapper parameter
      * @return data page
      */
-    Page<DataInfo> selectDataPage(Page<DataInfo> page, @Param(Constants.WRAPPER) Wrapper<DataInfo> queryWrapper,@Param("dataInfoQuery") DataInfoQuery dataInfoQuery);
+    Page<DataInfo> selectDataPage(Page<DataInfo> page, @Param(Constants.WRAPPER) Wrapper<DataInfo> queryWrapper, @Param("dataInfoQuery") DataInfoQuery dataInfoQuery);
 
+    /**
+     * This method overrides the deleteById method of baseMapper
+     *
+     * @param id
+     */
+    @Override
+    int deleteById(Serializable id);
+
+    /**
+     * Delete data based on dataset Id
+     *
+     * @param datasetId Dataset id
+     */
+    int deleteByDatasetId(@Param("datasetId") Long datasetId);
 }
diff --git a/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/mapper/DatasetMapper.java b/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/mapper/DatasetMapper.java
@@ -8,8 +8,9 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.io.Serializable;
+
 /**
- *
  * @author fyb
  * @date 2022-02-16 10:17:54
  */
@@ -18,11 +19,20 @@ public interface DatasetMapper extends BaseMapper<Dataset> {
 
     /**
      * Paging query dataset according to query conditions
-     * @param page Pagination information
+     *
+     * @param page         Pagination information
      * @param queryWrapper Query conditions
      * @return Dataset paging information
      */
     Page<Dataset> selectDatasetPage(Page<Dataset> page, @Param(Constants.WRAPPER) Wrapper<Dataset> queryWrapper);
 
     Long countObject(@Param("datasetId") Long datasetId);
+
+    /**
+     * This method overrides the deleteById method of baseMapper
+     *
+     * @param id
+     */
+    @Override
+    int deleteById(Serializable id);
 }
diff --git a/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/model/DataInfo.java b/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/model/DataInfo.java
@@ -66,6 +66,11 @@ public class DataInfo implements Serializable {
      */
     private Boolean isDeleted;
 
+    /**
+     * Delete unique flag, 0 when writing, set as primary key id after tombstone
+     */
+    private Long delUniqueKey;
+
     /**
      * Create time
      */

diff --git a/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/model/Dataset.java b/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/model/Dataset.java
@@ -47,6 +47,11 @@ public class Dataset implements Serializable {
      */
     private Boolean isDeleted;
 
+    /**
+     * Delete unique flag, 0 when writing, set as primary key id after tombstone
+     */
+    private Long delUniqueKey;
+
     /**
      * Create time
      */

diff --git a/backend/src/main/java/ai/basic/x1/entity/ClassAndClassificationExportBO.java b/backend/src/main/java/ai/basic/x1/entity/ClassAndClassificationExportBO.java
@@ -30,6 +30,9 @@ public class ClassAndClassificationExportBO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class Class{
+
+        private Long id;
+
         private String name;
 
         private String color;
@@ -50,6 +53,8 @@ public static class Class{
     @AllArgsConstructor
     public static class Classification{
 
+        private Long id;
+
         private String name;
 
         private Boolean isRequired;

diff --git a/backend/src/main/java/ai/basic/x1/entity/ImageDataExportBO.java b/backend/src/main/java/ai/basic/x1/entity/ImageDataExportBO.java
@@ -4,6 +4,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Transient;
 
 @Data
 @Builder
@@ -31,4 +32,9 @@ public class ImageDataExportBO extends DataExportBaseBO {
      */
     private Long height;
 
+    /**
+     * File relative path
+     */
+    private transient String filePath;
+
 }
diff --git a/backend/src/main/java/ai/basic/x1/entity/LidarFusionDataExportBO.java b/backend/src/main/java/ai/basic/x1/entity/LidarFusionDataExportBO.java
@@ -5,6 +5,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Transient;
 
 import java.util.List;
 
@@ -61,6 +62,11 @@ public static class LidarFusionImageBO {
          * Camera image height
          */
         private Long height;
+
+        /**
+         * File relative path
+         */
+        private transient String filePath;
     }
 
 }