Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v0.7.0 #115

Merged
merged 45 commits into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
c5f4d23
Optimize the export and remove the id suffix after the file
fanyinbo Apr 25, 2023
fe7c657
Update xtreme1-sdk version
fanyinbo Apr 25, 2023
69b092f
Text annotation upload
fanyinbo Apr 26, 2023
5e1fa52
Text annotation upload
fanyinbo Apr 26, 2023
3044303
Text annotation export
fanyinbo Apr 26, 2023
f359722
Text annotation upload data verification
fanyinbo Apr 26, 2023
a048f4c
Text annotation upload data verification
fanyinbo Apr 26, 2023
fc234d9
Optimize upload
fanyinbo Apr 26, 2023
702f167
feat: text dataset
Apr 26, 2023
e0fb90e
feat: text dataset upload
Apr 26, 2023
b1d9f41
classification add type long text
Apr 26, 2023
552e3db
Merge branch 'dev' of https://github.com/xtreme1-io/xtreme1 into dev
Apr 26, 2023
389093e
feat: text dataset gotoTool
Apr 26, 2023
9a58f58
feat: ontology del more action
Apr 26, 2023
8368253
fix: dataset list filter style update
Apr 26, 2023
312df99
Update init sql
fanyinbo Apr 26, 2023
1a785c9
feat: init text-tool
Zhangfc846072 Apr 27, 2023
10ca65a
CI support text tool.
jaggerwang Apr 27, 2023
fb2d377
CI build text tool.
jaggerwang Apr 27, 2023
009919d
feat: add text card
raincolor Apr 27, 2023
a7414a6
Merge branch 'dev' of https://github.com/xtreme1-io/xtreme1 into dev
raincolor Apr 27, 2023
ac47b9d
feat: add text-tool build config
raincolor Apr 27, 2023
a646e8e
feat: add thumbsup img and Main application jumps to text-tool
raincolor Apr 27, 2023
a250ce0
Update init sql
fanyinbo Apr 27, 2023
9bc455f
Merge remote-tracking branch 'origin/dev' into dev
fanyinbo Apr 27, 2023
a67196a
Merge branch 'dev' of https://github.com/xtreme1-io/xtreme1 into dev
raincolor Apr 27, 2023
a0c4986
fix: data && style
Zhangfc846072 Apr 27, 2023
97c904e
feat: text-tool updated
raincolor Apr 27, 2023
b2813fa
feat: text-tool style update
raincolor Apr 27, 2023
645a760
fix: text-tool style update
raincolor Apr 27, 2023
86c051d
feat: upadte text-tool jump url
raincolor Apr 27, 2023
b868eaf
fix: save data; file name;
Zhangfc846072 Apr 27, 2023
881d4bc
Merge branch 'dev' of https://github.com/xtreme1-io/xtreme1 into dev
Zhangfc846072 Apr 27, 2023
3524a6c
fix: saved status
Zhangfc846072 Apr 27, 2023
e5b06c7
fix: update frame index
Zhangfc846072 Apr 27, 2023
e6613ec
fix: text-tool style update
raincolor Apr 28, 2023
1323146
fix: fix some bug
Apr 28, 2023
9b7fcdb
feat: update longText disable
Apr 28, 2023
27d3939
Version upgraded to 0.7.0
fanyinbo Apr 28, 2023
8f7087f
Merge remote-tracking branch 'origin/dev' into dev
fanyinbo Apr 28, 2023
b2035fb
fix: onToggleValid bugfix
raincolor Apr 28, 2023
166e7fb
Merge branch 'dev' of https://github.com/xtreme1-io/xtreme1 into dev
raincolor Apr 28, 2023
c8d41f8
pc-tool onToggleValid bugfix
raincolor Apr 28, 2023
4150e6c
Version upgraded to 0.7.0
fanyinbo Apr 28, 2023
8d5583a
Merge remote-tracking branch 'origin/dev' into dev
fanyinbo Apr 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion .ops/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
24 changes: 24 additions & 0 deletions .ops/alidev/frontend-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 24 additions & 0 deletions .ops/alitest/frontend-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .ops/backend.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -58,8 +58,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
Expand Down
4 changes: 2 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/`.
Expand Down
2 changes: 1 addition & 1 deletion backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
21 changes: 21 additions & 0 deletions backend/src/main/java/ai/basic/x1/entity/TextDataContentBO.java
Original file line number Diff line number Diff line change
@@ -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;
}
24 changes: 24 additions & 0 deletions backend/src/main/java/ai/basic/x1/entity/TextDataExportBO.java
Original file line number Diff line number Diff line change
@@ -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;

}
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,9 @@ public enum DatasetTypeEnum {
/**
* IMAGE
*/
IMAGE
IMAGE,
/**
* TEXT
*/
TEXT
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public enum InputTypeEnum {
/**
* TEXT
*/
TEXT
TEXT,

LONG_TEXT

}
Loading