Merge pull request #115 from xtreme1-io/dev

Release v0.7.0

.ops/.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 
 variables:
   APP_NAME: "xtreme1"
-  APP_VERSION: "0.6.1"
+  APP_VERSION: "0.7.0"
 
   FRONTEND_PACKAGE_DIR: "dist"
   BACKEND_PACKAGE_NAME: "${APP_NAME}-backend-${APP_VERSION}-SNAPSHOT.jar"
@@ -65,6 +65,9 @@ build-frontend-package:
     - cd ../pc-tool
     - npm install
     - npm run build
+    - cd ../text-tool
+    - npm install
+    - npm run build
   artifacts:
     paths:
       - frontend/$FRONTEND_PACKAGE_DIR
@@ -73,6 +76,7 @@ build-frontend-package:
       - frontend/main/node_modules
       - frontend/image-tool/node_modules
       - frontend/pc-tool/node_modules
+      - frontend/text-tool/node_modules
 
 build-release-package:
   stage: build-package

.ops/alidev/frontend-deployment.yml

@@ -119,3 +119,27 @@ spec:
     - hosts:
         - xtreme1.alidev.beisai.com
       secretName: alidev.beisai.com
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /text-tool/$2
+  name: frontend-text-tool
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: xtreme1.alidev.beisai.com
+      http:
+        paths:
+          - backend:
+              service:
+                name: frontend
+                port:
+                  number: 80
+            path: /tool/text(/|$)(.*)
+            pathType: Prefix
+  tls:
+    - hosts:
+        - xtreme1.alidev.beisai.com
+      secretName: alidev.beisai.com

.ops/alitest/frontend-deployment.yml

@@ -119,3 +119,27 @@ spec:
     - hosts:
         - xtreme1.alitest.beisai.com
       secretName: alitest.beisai.com
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /text-tool/$2
+  name: frontend-text-tool
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: xtreme1.alitest.beisai.com
+      http:
+        paths:
+          - backend:
+              service:
+                name: frontend
+                port:
+                  number: 80
+            path: /tool/text(/|$)(.*)
+            pathType: Prefix
+  tls:
+    - hosts:
+        - xtreme1.alitest.beisai.com
+      secretName: alitest.beisai.com

.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@bddaa8d
+RUN pip3 install --upgrade --force-reinstall git+https://github.com/xtreme1-io/xtreme1-sdk.git@d0cf4cc
 WORKDIR /app
 COPY target/$BACKEND_PACKAGE_NAME ./app.jar
 RUN mkdir -p config

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.1-green) 
+![](https://img.shields.io/badge/Release-v0.7.0-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.1/xtreme1-v0.6.1.zip
-unzip -d xtreme1-v0.6.1 xtreme1-v0.6.1.zip
+wget https://github.com/xtreme1-io/xtreme1/releases/download/v0.7.0/xtreme1-v0.7.0.zip
+unzip -d xtreme1-v0.7.0 xtreme1-v0.7.0.zip
 ```
 
 ## Start all services

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@bddaa8d
+RUN pip3 install --upgrade --force-reinstall git+https://github.com/xtreme1-io/xtreme1-sdk.git@d0cf4cc
 WORKDIR /app
-COPY --from=build /build/target/xtreme1-backend-0.6.1-SNAPSHOT.jar ./app.jar
+COPY --from=build /build/target/xtreme1-backend-0.7.0-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

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.1-SNAPSHOT.jar
+java -Dspring.profiles.active=local -jar target/xtreme1-backend-0.7.0-SNAPSHOT.jar
 ```
 
 Now you can access the backend service at `http://localhost:8080/`.

backend/pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>ai.basic</groupId>
     <artifactId>xtreme1-backend</artifactId>
-    <version>0.6.1-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <name>Xtreme1 Backend</name>
     <description></description>
 

backend/src/main/java/ai/basic/x1/adapter/dto/request/DatasetRequestDTO.java

@@ -34,7 +34,7 @@ public class DatasetRequestDTO {
      * Dataset type LIDAR_FUSION, LIDAR_BASIC, IMAGE
      */
     @NotEmpty(message = "dataset type cannot be null", groups = GroupInsert.class)
-    @ValidStringEnum(message = "dataset type must be one of LIDAR_FUSION, LIDAR_BASIC, IMAGE", enumClass = DatasetTypeEnum.class)
+    @ValidStringEnum(message = "dataset type must be one of LIDAR_FUSION, LIDAR_BASIC, IMAGE,TEXT", enumClass = DatasetTypeEnum.class)
     private String type;
 
     /**

backend/src/main/java/ai/basic/x1/entity/TextDataContentBO.java

@@ -0,0 +1,21 @@
+package ai.basic.x1.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TextDataContentBO {
+
+    private String id;
+
+    private String parentId;
+
+    private String text;
+
+    private String role;
+}

backend/src/main/java/ai/basic/x1/entity/TextDataExportBO.java

@@ -0,0 +1,24 @@
+package ai.basic.x1.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TextDataExportBO extends DataExportBaseBO {
+
+    /**
+     * Text url
+     */
+    private String textUrl;
+
+    /**
+     * The path in the compressed package
+     */
+    private String textZipPath;
+
+}

backend/src/main/java/ai/basic/x1/entity/enums/DatasetTypeEnum.java

@@ -17,5 +17,9 @@ public enum DatasetTypeEnum {
     /**
      * IMAGE
      */
-    IMAGE
+    IMAGE,
+    /**
+     * TEXT
+     */
+    TEXT
 }

backend/src/main/java/ai/basic/x1/entity/enums/InputTypeEnum.java

@@ -22,6 +22,8 @@ public enum InputTypeEnum {
     /**
      * TEXT
      */
-    TEXT
+    TEXT,
+
+    LONG_TEXT
 
 }