Merge branch 'dev' of github.com:xtreme1-io/xtreme1 into dev

Author: guhao

.ops/.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 
 variables:
   APP_NAME: "xtreme1"
-  APP_VERSION: "0.6.0"
+  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.0-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)
@@ -12,10 +12,9 @@
 # Intro #
 Xtreme1 is the world's first open-source platform for Multimodal training data.
 
-Xtreme1 provides deep insight into data annotation, data curation, and ontology management to solve 2D image and 3D point cloud dataset ML challenges.
-The built-in AI-assisted tools take your annotation efforts to the next level of efficiency for your 2D/3D Object Detection, 3D Instance Segmentation, and LiDAR-Camera Fusion projects.
+Xtreme1 unlocks deep insights into data annotation, curation and ontology management for tackling machine learning challenges in computer vision and LLM. The platform's AI-fueled tools elevate your annotation game to the next level of efficiency, powering your projects in 2D/3D Object Detection, 3D Instance Segmentation and LiDAR-Camera Fusion like never before.
 
-It is now hosted in [LF AI & Data Foundation](https://medium.com/multisensory-data-training/xtreme1-the-first-open-source-labeling-annotation-and-visualization-project-is-debuting-at-the-da1d157d1512) as a sandbox project.
+It is now hosted in [LF AI & Data Foundation](https://medium.com/multisensory-data-training/xtreme1-the-first-open-source-labeling-annotation-and-visualization-project-is-debuting-at-the-da1d157d1512) as the 1st open source data labeling annotation and visualization project.
 
 # Join community #
 [Website](https://xtreme1.io) | [Slack](https://join.slack.com/t/xtreme1group/shared_invite/zt-1jhk36uzr-NpdpYXeQAEHN6rYJy5_6pg) | [Twitter](https://twitter.com/Xtreme1io) |  [Medium](https://medium.com/multisensory-data-training) | [Issues](https://github.com/xtreme1-io/xtreme1/issues) 
@@ -26,7 +25,7 @@ Join the Xtreme1 community on Slack to share your suggestions, advice, and quest
 
 # Key features #
 
-Image Annotation (B-box, Segmentation) - [YOLOR](https://github.com/WongKinYiu/yolor) & [RITM](https://github.com/saic-vul/ritm_interactive_segmentation) |  Lidar-camera Fusion (Frame series) Annotation - [OpenPCDet](https://github.com/open-mmlab/OpenPCDet) & [AB3DMOT](https://github.com/xinshuoweng/AB3DMOT)
+Image Annotation (B-box, Segmentation) - [YOLOR](https://github.com/WongKinYiu/yolor) & [RITM](https://github.com/saic-vul/ritm_interactive_segmentation) |  Lidar-camera Fusion Annotation - [OpenPCDet](https://github.com/open-mmlab/OpenPCDet) & [AB3DMOT](https://github.com/xinshuoweng/AB3DMOT)
 :-------------------------:|:-------------------------:
 ![](/docs/images/image_ai.gif)  |  ![](/docs/images/3d_ai.gif)
 
@@ -41,14 +40,16 @@ Image Annotation (B-box, Segmentation) - [YOLOR](https://github.com/WongKinYiu/y
  :five: Find labeling errors and fix them
 
  :six: Model results visualization to help you evaluate your model
+ 
+ :seven: RLHF for Large Language Models :new: (beta version)
 
-Image Data Curation (Visualizing & Debug)  - [MobileNetV3](https://github.com/xiaolai-sqlai/mobilenetv3) & [openTSNE](https://github.com/pavlin-policar/openTSNE)  |  Lidar-camera Fusion Data Curation (Filter by Class name X Cross Dataset)
+Image Data Curation (Visualizing & Debug)  - [MobileNetV3](https://github.com/xiaolai-sqlai/mobilenetv3) & [openTSNE](https://github.com/pavlin-policar/openTSNE)  | RLHF Annotation tool for LLM (beta version)
 :-------------------------:|:-------------------------:
-![](/docs/images/2d_v.gif) |  <img src="/docs/images/dv.png" width="640"> 
+![](/docs/images/2d_v.gif) |  <img src="/docs/images/0.7rlhf.webp" width="640"> 
 
 # Quick start
 
-* Get early access to [Xtreme1 online version](https://app.basic.ai/#/login/) without any installation :rocket:
+* Get access to [Xtreme1 online version](https://app.basic.ai/#/login/) without any installation :rocket:
 
 * [Install and Quick start](https://docs.xtreme1.io/xtreme1-docs/get-started/quick-start) :cd:
 * [Install with Docker](https://docs.xtreme1.io/xtreme1-docs/get-started/install-with-docker) 🐋
@@ -58,8 +59,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.7.0/xtreme1-v0.7.0.zip
+unzip -d xtreme1-v0.7.0 xtreme1-v0.7.0.zip
 ```
 
 ## Start all services
@@ -99,17 +100,17 @@ For more installation, development and deployment, check out [Xtreme1 Docs](docs
 ![](/docs/images/3d_annotation2.png) 
 
 # License #
-This software is licensed under the Apache 2.0 LICENSE. Xtreme1 is a trademark of LF AI Projects.
+This software is licensed under the Apache 2.0 LICENSE. Xtreme1 is a trademark of LF AI & Data Foundation.
 
 <img src="/docs/images/LFAI_DATA_horizontal-color.png" width="250">
 
 If Xtreme1 is part of your development process / project / publication, please cite us ❤️ :
 ```bash
 @misc{Xtreme1,
 title = {Xtreme1 - The Next GEN Platform For Multisensory Training Data},
-year = {2022},
+year = {2023},
 note = {Software available from https://github.com/xtreme1-io/xtreme1/},
 url={https://xtreme1.io/},
-author = {LF AI Projects},
+author = {LF AI & Data Foundation},
 }
 ```

SECURITY.md

@@ -0,0 +1,25 @@
+# Security Policy
+
+## Supported Versions
+
+At the moment only the latest release is supported. When you report a security issue, 
+be sure it can be reproduced in the supported version. 
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.6.x   | :white_check_mark: |
+| < 0.6.0   | :x:                |
+
+## Reporting a Vulnerability
+
+ If you have information about a security issue or vulnerability in the product, 
+ please send an e-mail to [support@basic.ai](mailto:support@basic.ai). 
+
+Please provide as much information as possible, including:
+- The products and versions affected 
+- Detailed description of the vulnerability
+- Information on known exploits
+A member of the xtreme1.io Product Security Team will review your e-mail and contact you to collaborate on resolving the issue. 
+
+
+

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.0-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.0-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.0-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/DataResultObjectExportBO.java

@@ -19,6 +19,11 @@ public class DataResultObjectExportBO {
      */
     private String type;
 
+    /**
+     * Class id
+     */
+    private Long classId;
+
     /**
      * Class name
      */

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
 
 }