Skip to content

Commit b691b27

Browse files
PhineasePhinease
authored
🚚 Merge Release/v1.6.0 into main.
2 parents 680e74a + 3e2d08d commit b691b27

File tree

134 files changed

+8866
-4338
lines changed

Some content is hidden

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

134 files changed

+8866
-4338
lines changed

‎.devcontainer/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
### 2.1 准备工作
1919

2020
1. 安装 Cursor
21-
2. 安装 Dev Containers 插件 (`ms-vscode-remote.remote-containers`)
21+
02. 安装 Dev Containers 插件 (`anysphere.remote-containers` 与 `anysphere.remote-sshRemote`)
2222
3. 确保 Docker 和 Docker Compose 已安装并运行
2323

2424
### 2.2 使用 Dev Container 启动项目

‎.dockerignore‎

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

1414
# Git
1515
.git
16+
**/.git/
1617
.gitignore
1718

1819
# Docker
@@ -29,7 +30,7 @@ yarn-error.log*
2930
frontend/node_modules/
3031
node_modules/
3132
.pnpm-store/
32-
.next/
33+
.pnpm-lock.yaml
3334
dist/
3435
build/
3536
.npm

‎.github/workflows/docker-build-push-beta.yml‎

Lines changed: 15 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,11 @@ jobs:
2626
uses: actions/checkout@v4
2727
- name: Build main image (amd64) and load locally
2828
run: |
29-
docker buildx build --platform linux/amd64 -t nexent/nexent:beta-amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent:beta-amd64 -f make/main/Dockerfile .
29+
docker buildx build --platform linux/amd64 -t nexent/nexent:beta-amd64 --load -f make/main/Dockerfile .
3030
- name: Login to DockerHub
3131
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
3232
- name: Push main image (amd64) to DockerHub
3333
run: docker push nexent/nexent:beta-amd64
34-
- name: Logout Tencent Cloud
35-
run: docker logout ccr.ccs.tencentyun.com
36-
- name: Login to Tencent Cloud
37-
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
38-
- name: Push main image (amd64) to Tencent Cloud
39-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent:beta-amd64
4034

4135
build-and-push-main-arm64:
4236
runs-on: ubuntu-latest
@@ -52,17 +46,11 @@ jobs:
5246
uses: actions/checkout@v4
5347
- name: Build main image (arm64) and load locally
5448
run: |
55-
docker buildx build --platform linux/arm64 -t nexent/nexent:beta-arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent:beta-arm64 -f make/main/Dockerfile .
49+
docker buildx build --platform linux/arm64 -t nexent/nexent:beta-arm64 --load -f make/main/Dockerfile .
5650
- name: Login to DockerHub
5751
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
5852
- name: Push main image (arm64) to DockerHub
5953
run: docker push nexent/nexent:beta-arm64
60-
- name: Logout Tencent Cloud
61-
run: docker logout ccr.ccs.tencentyun.com
62-
- name: Login to Tencent Cloud
63-
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
64-
- name: Push main image (arm64) to Tencent Cloud
65-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent:beta-arm64
6654

6755
build-and-push-data-process-amd64:
6856
runs-on: ubuntu-latest
@@ -79,35 +67,19 @@ jobs:
7967
fi
8068
- name: Checkout code
8169
uses: actions/checkout@v4
82-
- name: Check if model is cached locally
83-
id: check-model
70+
- name: Clone model
8471
run: |
85-
if [ -f ./model-assets/clip-vit-base-patch32/config.json ]; then
86-
echo "cache-hit=true" >> "$GITHUB_OUTPUT"
87-
else
88-
echo "cache-hit=false" >> "$GITHUB_OUTPUT"
89-
fi
90-
- name: Clone model if not cached
91-
if: steps.check-model.outputs.cache-hit == 'false'
92-
run: |
93-
mkdir -p ./model-assets
94-
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/openai/clip-vit-base-patch32 ./model-assets/clip-vit-base-patch32
95-
cd ./model-assets/clip-vit-base-patch32
72+
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/Nexent-AI/model-assets
73+
cd ./model-assets
9674
GIT_TRACE=1 GIT_CURL_VERBOSE=1 GIT_LFS_LOG=debug git lfs pull
97-
rm -rf .git flax_model.msgpack tf_model.h5
75+
rm -rf .git .gitattributes
9876
- name: Build data process image (amd64) and load locally
9977
run: |
100-
docker buildx build --platform linux/amd64 -t nexent/nexent-data-process:beta-amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:beta-amd64 -f make/data_process/Dockerfile .
78+
docker buildx build --platform linux/amd64 -t nexent/nexent-data-process:beta-amd64 --load -f make/data_process/Dockerfile .
10179
- name: Login to DockerHub
10280
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
10381
- name: Push data process image (amd64) to DockerHub
10482
run: docker push nexent/nexent-data-process:beta-amd64
105-
- name: Logout Tencent Cloud
106-
run: docker logout ccr.ccs.tencentyun.com
107-
- name: Login to Tencent Cloud
108-
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
109-
- name: Push data process image (amd64) to Tencent Cloud
110-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:beta-amd64
11183

11284
build-and-push-data-process-arm64:
11385
runs-on: ubuntu-latest
@@ -124,35 +96,19 @@ jobs:
12496
fi
12597
- name: Checkout code
12698
uses: actions/checkout@v4
127-
- name: Check if model is cached locally
128-
id: check-model
99+
- name: Clone model
129100
run: |
130-
if [ -f ./model-assets/clip-vit-base-patch32/config.json ]; then
131-
echo "cache-hit=true" >> "$GITHUB_OUTPUT"
132-
else
133-
echo "cache-hit=false" >> "$GITHUB_OUTPUT"
134-
fi
135-
- name: Clone model if not cached
136-
if: steps.check-model.outputs.cache-hit == 'false'
137-
run: |
138-
mkdir -p ./model-assets
139-
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/openai/clip-vit-base-patch32 ./model-assets/clip-vit-base-patch32
140-
cd ./model-assets/clip-vit-base-patch32
101+
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/Nexent-AI/model-assets
102+
cd ./model-assets
141103
GIT_TRACE=1 GIT_CURL_VERBOSE=1 GIT_LFS_LOG=debug git lfs pull
142-
rm -rf .git flax_model.msgpack tf_model.h5
104+
rm -rf .git .gitattributes
143105
- name: Build data process image (arm64) and load locally
144106
run: |
145-
docker buildx build --platform linux/arm64 -t nexent/nexent-data-process:beta-arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:beta-arm64 -f make/data_process/Dockerfile .
107+
docker buildx build --platform linux/arm64 -t nexent/nexent-data-process:beta-arm64 --load -f make/data_process/Dockerfile .
146108
- name: Login to DockerHub
147109
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
148110
- name: Push data process image (arm64) to DockerHub
149111
run: docker push nexent/nexent-data-process:beta-arm64
150-
- name: Logout Tencent Cloud
151-
run: docker logout ccr.ccs.tencentyun.com
152-
- name: Login to Tencent Cloud
153-
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
154-
- name: Push data process image (arm64) to Tencent Cloud
155-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:beta-arm64
156112

157113
build-and-push-web-amd64:
158114
runs-on: ubuntu-latest
@@ -168,17 +124,11 @@ jobs:
168124
uses: actions/checkout@v4
169125
- name: Build web image (amd64) and load locally
170126
run: |
171-
docker buildx build --platform linux/amd64 -t nexent/nexent-web:beta-amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web:beta-amd64 -f make/web/Dockerfile .
127+
docker buildx build --platform linux/amd64 -t nexent/nexent-web:beta-amd64 --load -f make/web/Dockerfile .
172128
- name: Login to DockerHub
173129
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
174130
- name: Push web image (amd64) to DockerHub
175131
run: docker push nexent/nexent-web:beta-amd64
176-
- name: Logout Tencent Cloud
177-
run: docker logout ccr.ccs.tencentyun.com
178-
- name: Login to Tencent Cloud
179-
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
180-
- name: Push web image (amd64) to Tencent Cloud
181-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-web:beta-amd64
182132

183133
build-and-push-web-arm64:
184134
runs-on: ubuntu-latest
@@ -194,17 +144,11 @@ jobs:
194144
uses: actions/checkout@v4
195145
- name: Build web image (arm64) and load locally
196146
run: |
197-
docker buildx build --platform linux/arm64 -t nexent/nexent-web:beta-arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web:beta-arm64 -f make/web/Dockerfile .
147+
docker buildx build --platform linux/arm64 -t nexent/nexent-web:beta-arm64 --load -f make/web/Dockerfile .
198148
- name: Login to DockerHub
199149
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
200150
- name: Push web image (arm64) to DockerHub
201151
run: docker push nexent/nexent-web:beta-arm64
202-
- name: Logout Tencent Cloud
203-
run: docker logout ccr.ccs.tencentyun.com
204-
- name: Login to Tencent Cloud
205-
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
206-
- name: Push web image (arm64) to Tencent Cloud
207-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-web:beta-arm64
208152

209153
manifest-push-main:
210154
runs-on: ubuntu-latest
@@ -220,16 +164,6 @@ jobs:
220164
nexent/nexent:beta-amd64 \
221165
nexent/nexent:beta-arm64
222166
docker manifest push nexent/nexent:beta
223-
- name: Logout Tencent Cloud
224-
run: docker logout ccr.ccs.tencentyun.com
225-
- name: Login to Tencent Cloud
226-
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
227-
- name: Create and push manifest for main (Tencent Cloud)
228-
run: |
229-
docker manifest create ccr.ccs.tencentyun.com/nexent-hub/nexent:beta \
230-
ccr.ccs.tencentyun.com/nexent-hub/nexent:beta-amd64 \
231-
ccr.ccs.tencentyun.com/nexent-hub/nexent:beta-arm64
232-
docker manifest push ccr.ccs.tencentyun.com/nexent-hub/nexent:beta
233167
234168
manifest-push-data-process:
235169
runs-on: ubuntu-latest
@@ -245,16 +179,6 @@ jobs:
245179
nexent/nexent-data-process:beta-amd64 \
246180
nexent/nexent-data-process:beta-arm64
247181
docker manifest push nexent/nexent-data-process:beta
248-
- name: Logout Tencent Cloud
249-
run: docker logout ccr.ccs.tencentyun.com
250-
- name: Login to Tencent Cloud
251-
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
252-
- name: Create and push manifest for data-process (Tencent Cloud)
253-
run: |
254-
docker manifest create ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:beta \
255-
ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:beta-amd64 \
256-
ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:beta-arm64
257-
docker manifest push ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:beta
258182
259183
manifest-push-web:
260184
runs-on: ubuntu-latest
@@ -269,14 +193,4 @@ jobs:
269193
docker manifest create nexent/nexent-web:beta \
270194
nexent/nexent-web:beta-amd64 \
271195
nexent/nexent-web:beta-arm64
272-
docker manifest push nexent/nexent-web:beta
273-
- name: Logout Tencent Cloud
274-
run: docker logout ccr.ccs.tencentyun.com
275-
- name: Login to Tencent Cloud
276-
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
277-
- name: Create and push manifest for web (Tencent Cloud)
278-
run: |
279-
docker manifest create ccr.ccs.tencentyun.com/nexent-hub/nexent-web:beta \
280-
ccr.ccs.tencentyun.com/nexent-hub/nexent-web:beta-amd64 \
281-
ccr.ccs.tencentyun.com/nexent-hub/nexent-web:beta-arm64
282-
docker manifest push ccr.ccs.tencentyun.com/nexent-hub/nexent-web:beta
196+
docker manifest push nexent/nexent-web:beta

‎.github/workflows/docker-build-push.yml‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,12 @@ jobs:
6464
fi
6565
- name: Checkout code
6666
uses: actions/checkout@v4
67-
- name: Check if model is cached locally
68-
id: check-model
67+
- name: Clone model
6968
run: |
70-
if [ -f ./model-assets/clip-vit-base-patch32/config.json ]; then
71-
echo "cache-hit=true" >> "$GITHUB_OUTPUT"
72-
else
73-
echo "cache-hit=false" >> "$GITHUB_OUTPUT"
74-
fi
75-
- name: Clone model if not cached
76-
if: steps.check-model.outputs.cache-hit == 'false'
77-
run: |
78-
mkdir -p ./model-assets
79-
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/openai/clip-vit-base-patch32 ./model-assets/clip-vit-base-patch32
80-
cd ./model-assets/clip-vit-base-patch32
69+
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/Nexent-AI/model-assets
70+
cd ./model-assets
8171
GIT_TRACE=1 GIT_CURL_VERBOSE=1 GIT_LFS_LOG=debug git lfs pull
82-
rm -rf .git flax_model.msgpack tf_model.h5
72+
rm -rf .git .gitattributes
8373
- name: Build data process image (amd64) and load locally
8474
run: |
8575
docker buildx build --platform linux/amd64 -t nexent/nexent-data-process:amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:amd64 -f make/data_process/Dockerfile .
@@ -103,22 +93,12 @@ jobs:
10393
fi
10494
- name: Checkout code
10595
uses: actions/checkout@v4
106-
- name: Check if model is cached locally
107-
id: check-model
108-
run: |
109-
if [ -f ./model-assets/clip-vit-base-patch32/config.json ]; then
110-
echo "cache-hit=true" >> "$GITHUB_OUTPUT"
111-
else
112-
echo "cache-hit=false" >> "$GITHUB_OUTPUT"
113-
fi
114-
- name: Clone model if not cached
115-
if: steps.check-model.outputs.cache-hit == 'false'
96+
- name: Clone model
11697
run: |
117-
mkdir -p ./model-assets
118-
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/openai/clip-vit-base-patch32 ./model-assets/clip-vit-base-patch32
119-
cd ./model-assets/clip-vit-base-patch32
98+
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/Nexent-AI/model-assets
99+
cd ./model-assets
120100
GIT_TRACE=1 GIT_CURL_VERBOSE=1 GIT_LFS_LOG=debug git lfs pull
121-
rm -rf .git flax_model.msgpack tf_model.h5
101+
rm -rf .git .gitattributes
122102
- name: Build data process image (arm64) and load locally
123103
run: |
124104
docker buildx build --platform linux/arm64 -t nexent/nexent-data-process:arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:arm64 -f make/data_process/Dockerfile .

‎.github/workflows/docker-build.yml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,12 @@ jobs:
2424
- name: Checkout code
2525
uses: actions/checkout@v4
2626

27-
- name: Check if model is cached locally
28-
id: check-model
27+
- name: Clone model
2928
run: |
30-
if [ -f ./model-assets/clip-vit-base-patch32/config.json ]; then
31-
echo "cache-hit=true" >> "$GITHUB_OUTPUT"
32-
else
33-
echo "cache-hit=false" >> "$GITHUB_OUTPUT"
34-
fi
35-
36-
- name: Clone model if not cached
37-
if: steps.check-model.outputs.cache-hit == 'false'
38-
run: |
39-
mkdir -p ./model-assets
40-
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/openai/clip-vit-base-patch32 ./model-assets/clip-vit-base-patch32
41-
cd ./model-assets/clip-vit-base-patch32
29+
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/Nexent-AI/model-assets
30+
cd ./model-assets
4231
GIT_TRACE=1 GIT_CURL_VERBOSE=1 GIT_LFS_LOG=debug git lfs pull
43-
rm -rf .git flax_model.msgpack tf_model.h5
32+
rm -rf .git .gitattributes
4433
4534
- name: Build data process image
4635
run: docker build --progress=plain -t nexent/nexent-data-process -f make/data_process/Dockerfile .

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ frontend_standalone/
2424
.pnpm-store/
2525
frontend-dist/
2626

27-
backend/assets/clip-vit-base-patch32
28-
model-assets
27+
model-assets/
2928

3029
# Test coverage reports
3130
*coverage_html

0 commit comments

Comments
 (0)