Skip to content

Commit f46935e

Browse files
authored
Merge pull request #204 from xtreme1-io/dev
Bump version to v0.9
2 parents e7ea484 + 2310180 commit f46935e

File tree

199 files changed

+571
-17444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+571
-17444
lines changed

.ops/.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ include:
44

55
variables:
66
APP_NAME: "xtreme1"
7-
APP_VERSION: "0.8.1"
7+
APP_VERSION: "0.9"

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div align="center">
22
<img width="386" alt="Xtreme1 logo" src="https://user-images.githubusercontent.com/84139543/190300943-98da7d5c-bd67-4074-a94f-b7405d29fb90.png">
33

4-
![](https://img.shields.io/badge/Release-v0.8.1-green)
4+
![](https://img.shields.io/badge/Release-v0.9-green)
55
![](https://img.shields.io/badge/License-Apache%202.0-blueviolet)
66
[![Twitter](https://img.shields.io/badge/Follow-Twitter-blue)](https://twitter.com/Xtreme1io)
77
[![Online](https://img.shields.io/badge/Xtreme1_Online-App-yellow)](https://app.basic.ai/#/login)
@@ -62,8 +62,8 @@ Image Data Curation (Visualizing & Debug) - [MobileNetV3](https://github.com/xi
6262
Download the latest release package and unzip it.
6363

6464
```bash
65-
wget https://github.com/xtreme1-io/xtreme1/releases/download/v0.8.1/xtreme1-v0.8.1.zip
66-
unzip -d xtreme1-v0.8.1 xtreme1-v0.8.1.zip
65+
wget https://github.com/xtreme1-io/xtreme1/releases/download/v0.9/xtreme1-v0.9.zip
66+
unzip -d xtreme1-v0.9 xtreme1-v0.9.zip
6767
```
6868

6969
## Start all services

backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt update && \
99
apt install -y iputils-ping curl wget netcat python3 python3-pip git
1010
RUN pip3 install --upgrade --force-reinstall git+https://github.com/xtreme1-io/xtreme1-sdk.git@d0cf4cc
1111
WORKDIR /app
12-
COPY --from=build /build/target/xtreme1-backend-0.8.1-SNAPSHOT.jar ./app.jar
12+
COPY --from=build /build/target/xtreme1-backend-0.9-SNAPSHOT.jar ./app.jar
1313
RUN mkdir -p config
1414
RUN wget 'https://github.com/xtreme1-io/asset/raw/main/datasets/xtreme1-lidar-fusion-trial.zip' -O xtreme1-lidar-fusion-trial.zip
1515
RUN wget 'https://github.com/xtreme1-io/asset/raw/main/datasets/xtreme1-image-trial.zip' -O xtreme1-image-trial.zip

backend/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ cd backend
9292
mvn package
9393

9494
# Using local configuration to start application.
95-
java -Dspring.profiles.active=local -jar target/xtreme1-backend-0.8.1-SNAPSHOT.jar
95+
java -Dspring.profiles.active=local -jar target/xtreme1-backend-0.9-SNAPSHOT.jar
9696
```
9797

9898
Now you can access the backend service at `http://localhost:8080/`.
9999

100100
## Coding Standards
101101

102-
The code you contribute should follow the guidelines of [Alibaba Java Coding Guidelines](https://github.com/alibaba/Alibaba-Java-Coding-Guidelines). There also have checking plugins for most popular IDEs, such as Intellij IDEA, VS Code etc., you can search "Alibaba Java Coding Guidelines" in each's IDE's plugin repository. There should be no `BLOCKER` and `CRITICAL` error in the code you contribute, excepting for naming error like `DTO`, `BO` etc.
102+
The code you contribute should follow the guidelines of [Alibaba Java Coding Guidelines](https://github.com/alibaba/Alibaba-Java-Coding-Guidelines). There also have checking plugins for most popular IDEs, such as Intellij IDEA, VS Code etc., you can search "Alibaba Java Coding Guidelines" in each's IDE's plugin repository. There should be no `BLOCKER` and `CRITICAL` error in the code you contribute, excepting for naming error like `DTO`, `BO` etc.

backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>ai.basic</groupId>
1515
<artifactId>xtreme1-backend</artifactId>
16-
<version>0.8.1-SNAPSHOT</version>
16+
<version>0.9-SNAPSHOT</version>
1717

1818
<properties>
1919
<java.version>11</java.version>

backend/src/main/java/ai/basic/x1/adapter/dto/DataInfoDTO.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ public class DataInfoDTO {
8383
*/
8484
private String lockedBy;
8585

86+
private Long firstDataId;
87+
8688

8789
@Data
8890
@JsonInclude(value = JsonInclude.Include.NON_NULL)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ public class DataInfoBO {
117117
*/
118118
private String sceneName;
119119

120+
private Long firstDataId;
121+
120122

121123
@Data
122124
@Builder

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public enum ObjectTypeEnum {
55
TWO_D_BOX("2D_BOX"),
66

77
TWO_RECT("2D_RECT"),
8-
RECTANGLE("RECTANGLE"),
8+
BOUNDING_BOX("BOUNDING_BOX"),
99

1010
POLYLINE("POLYLINE"),
1111

backend/src/main/java/ai/basic/x1/usecase/DataInfoUseCase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ private void setSceneFirstData(Long datasetId, List<DataInfoBO> dataInfoBOList)
346346
var dataInfo = sceneDataInfoMap.get(dataInfoBO.getId());
347347
if (ObjectUtil.isNotNull(dataInfo)) {
348348
dataInfoBO.setContent(DefaultConverter.convert(dataInfo.getContent(), DataInfoBO.FileNodeBO.class));
349+
dataInfoBO.setFirstDataId(dataInfo.getId());
349350
}
350351
}
351352
});

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ services:
6565
retries: 10
6666
backend:
6767
# By default, Compose will pull image from Docker Hub when no local image found.
68-
image: basicai/xtreme1-backend:v0.8.1
68+
image: basicai/xtreme1-backend:v0.9
6969
pull_policy: always
7070
# Uncomment this line and comment previous line to build image locally, not pull from Docker Hub.
7171
# build: ./backend
@@ -96,7 +96,7 @@ services:
9696
condition: service_healthy
9797
frontend:
9898
# By default, Compose will pull image from Docker Hub when no local image found.
99-
image: basicai/xtreme1-frontend:v0.8.1
99+
image: basicai/xtreme1-frontend:v0.9
100100
pull_policy: always
101101
# Uncomment this line and comment previous line to build image locally, not pull from Docker Hub.
102102
# build: ./frontend

frontend/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ For more information, refer to `.ops/**/frontend-deployment.yml`
2323
- [vue](https://vuejs.org/)
2424
- [vite](https://vitejs.dev/)
2525
- [typescript](https://www.typescriptlang.org/)
26-
- [vben admin](https://github.com/vbenjs/vue-vben-admin/)
26+
- [vben admin](https://github.com/vbenjs/vue-vben-admin/)

0 commit comments

Comments
 (0)