Merge pull request #71 from haha-zwx-ooo/main

0.7.0b0
secretflow · May 21, 2024 · 1467a1b · 1467a1b
2 parents 3e665d0 + 92060a6
commit 1467a1b
Show file tree

Hide file tree

Showing 335 changed files with 7,171 additions and 4,279 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,8 +36,8 @@ jobs:
       - checkout
       - setup_remote_docker
       - run:
-          name: Build Docker image
-          command: make image
+          name: Build Jar
+          command: make build
       - run:
           name: Push to Docker Hub
           command: |
@@ -47,14 +47,46 @@ jobs:
             docker login -u ${ALIYUN_DOCKER_USERNAME} -p ${ALIYUN_DOCKER_PASSWORD}  secretflow-registry.cn-hangzhou.cr.aliyuncs.com
             CIRCLETAG=$(echo ${CIRCLE_TAG} | sed 's/v//')
 
-            docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:latest
-            docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow/secretpad:latest
-            docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:${CIRCLETAG}
-            docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow/secretpad:${CIRCLETAG}
-            docker push secretflow/secretpad:${CIRCLETAG}
-            docker push secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:${CIRCLETAG}
-            docker push secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:latest
-            docker push secretflow/secretpad:latest
+            BUILDER_EXISTS=$(
+              docker buildx inspect secretpad_image_buildx >/dev/null 2>&1
+              echo $?
+            )
+
+            if [ "$BUILDER_EXISTS" -eq 0 ]; then
+              echo "existing buildx builder: secretpad_image_buildx"
+              docker buildx use secretpad_image_buildx
+            else
+              echo "creating new buildx builder: secretpad_image_buildx"
+              docker buildx create --name secretpad_image_buildx --use
+            fi
+
+            remote_image="secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:latest"
+            docker buildx build \
+            --platform linux/arm64,linux/amd64 \
+            --tag "${remote_image}" \
+            -f ./build/Dockerfiles/anolis.Dockerfile . \
+            --push
+
+            remote_image="secretflow/secretpad:latest"
+            docker buildx build \
+            --platform linux/arm64,linux/amd64 \
+            --tag "${remote_image}" \
+            -f ./build/Dockerfiles/anolis.Dockerfile . \
+            --push
+
+            remote_image="secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:${CIRCLETAG}"
+            docker buildx build \
+            --platform linux/arm64,linux/amd64 \
+            --tag "${remote_image}" \
+            -f ./build/Dockerfiles/anolis.Dockerfile . \
+            --push
+
+            remote_image="secretflow/secretpad:${CIRCLETAG}"
+            docker buildx build \
+            --platform linux/arm64,linux/amd64 \
+            --tag "${remote_image}" \
+            -f ./build/Dockerfiles/anolis.Dockerfile . \
+            --push
 
 workflows:
   build-deploy:

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/issue_template.yaml b/.github/ISSUE_TEMPLATE/issue_template.yaml
@@ -0,0 +1,66 @@
+name: secretpad Issue Template
+description: Thank you for reporting the issue!
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please make sure that you report a code/doc bug, feature request or build/installation bug on GitHub.
+  - type: dropdown
+    id: issue-type
+    attributes:
+      label: Issue Type
+      description: What type of issue would you like to report?
+      multiple: false
+      options:
+        - Bug
+        - Build/Install
+        - Feature Request
+        - Documentation Feature Request
+        - Documentation Bug
+        - Others
+    validations:
+      required: true
+  - type: dropdown
+    id: source
+    attributes:
+      label: Source
+      description: Secretflow installed from
+      options:
+        - local
+        - docker
+    validations:
+      required: true
+  - type: input
+    id: secretpadversion
+    attributes:
+      label: secretpad Version
+      description:
+      placeholder: e.g., secretpad 0.6.0b0
+    validations:
+      required: true
+  - type: input
+    id: kusciaversion
+    attributes:
+      label: kuscia Version
+      description:
+      placeholder: e.g., kuscia 0.7.0b0
+    validations:
+      required: true
+  - type: input
+    id: OS
+    attributes:
+      label: OS Platform and Distribution
+      description:
+      placeholder: e.g., Linux Ubuntu 18.04
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happend and What you expected to happen.
+      description: Describe the bug, exepcted behavior and relevant log output.
+      placeholder: A bug happened!
+      value:
+      render: shell
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/old-issue-template.md b/.github/ISSUE_TEMPLATE/old-issue-template.md
diff --git a/.gitignore b/.gitignore
@@ -38,9 +38,7 @@ secretpad-web/config
 
 ### VS Code ###
 .vscode/
-
 tmp/
-db/
 log/
 config/certs
 config/server.jks
@@ -52,3 +50,11 @@ docs/_build
 /test/TEST-secretpad.xml
 /.jpb/
 /secretpad-common/src/test/resources/config/
+/secretflow-allinone-package/
+/secretflow-allinone-package-v0.6.0b0-36-g08b4e1cc.tar.gz
+/scripts/oss/secretflow-allinone-package/
+/scripts/oss/secretflow-allinone-package-v0.6.0b0-41-g9af69f63.tar.gz
+/secretpad-web/db/
+/db/secretpad.sqlite
+/db/secretpad.sqlite-shm
+/db/secretpad.sqlite-wal
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 `Fixed` for any bug fixes.
 `Security` in case of vulnerabilities.
 
+## [0.7.0b0] - 2024-05-15
+
+### Added
+
+- [Feature] Secretpad arm & amd image builds, MVP package supports arm & amd.
+- [Feature] Canvas supports changes in SecretFlow 1.6.0: support for GLM model in pvalue evaluation, onehot encoding
+  supports dropping the mode column, LR training components add an option to output weights, addition of vertical union
+  operator for datasets, psi version upgrade, etc.
+- [Feature] Support for changes in kuscia.sh, watch job interface changes, arm changes, and other kuscia 0.8.0
+  modifications.
+- [Feature] Canvas task parallel value configuration.
+- [Feature] Front-end display of Secretpad component versions.
+- [Feature] Integration with Alibaba Cloud SLS to display detailed logs of SLS components on the web interface.
+- [Feature] Secretpad version upgrade data retention.
+- [Feature] Serving online prediction release can specify system resources CPU, memory.
+- [Feature] Addition of platform component linear model parameter modification (currently supports modification of glm
+  model).
+- [Documentation] Supplemental documentation for Secretpad and Secretpad frontend development.
+- [Documentation] Secretpad GitHub technical documentation covering deployment, usage, common issues, development.
+
+### Changed
+
+- [Optimization] Kuscia grpc-related code refactoring and optimization.
+- [Optimization] Adjustment and standardization of data initialization operations.
+- [Optimization] Optimization of unit test structure, log output content, and format.
+
+### Security
+
+- [Vulnerability] Fixes for CVE-2022-40897, CVE-2024-20952, CVE-2024-20932, CVE-2024-20918, CVE-2024-22262,
+  CVE-2024-29025.
+
 ## [0.6.0b0] - 2024-04-15
 
 ### Added

diff --git a/Makefile b/Makefile
@@ -42,5 +42,6 @@ docs: ## Build docs.
 	cd docs && pip install -r requirements.txt && make html
 
 .PHONY: pack
+platform="linux/amd64"
 pack: ## Build pack all in one with tar.gz.
-	./scripts/pack/pack_allinone.sh
+	./scripts/pack/pack_allinone.sh ${platform}
diff --git a/README.md b/README.md
@@ -102,20 +102,12 @@ For more details, see [Development](./docs/deployment_experience/v0.6.0b0/deploy
 
 | secretpad Version | Kuscia Version | secretflow Version | trustedflow Version | serving Version |
 |-------------------|----------------|--------------------|---------------------|-----------------|
+| 0.7.0b0           | 0.8.0b0        | 1.6.0b0            | 0.1.1b0             | 0.3.0b0         |
 | 0.6.0b0           | 0.7.0b0        | 1.5.0b0            | 0.1.1b0             | 0.2.1b0         |
 | 0.5.0b0           | 0.6.0b0        | 1.4.0b0            | 0.1.1b0             | 0.2.0b0         |
 | 0.4.1b0           | 0.5.0b0        | 1.4.0.dev24011601  | 0.1.1b0             |                 |
 | 0.3.0b0           | 0.4.0b0        | 1.3.0.dev20231109  | 0.1.1b0             |                 |
 
-## Development
-
-Kuscia notls mode can realize remote access to the Kuscia GRPC service, but due to file service limitations, it will
-be unavailable in file upload and download, and other file data sources will be provided soon to achieve true extension
-deployment
-
-- [IDEA develop locally](./docs/development/ru_in_idea_cn.md)
-- [Use mysql as the running database](./docs/development/SUPPORT_MYSQL.md)
-
 ## Contact
 
 * [bilibili](https://space.bilibili.com/2073575923): secretflow bilibili account

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -92,19 +92,12 @@ sh install.sh p2p -n domainId  -s 8099 -g 8092 -k 8091 -p 8090 -q 33801
 
 | secretpad Version | Kuscia Version | secretflow Version | trustedflow Version | serving Version |
 |-------------------|----------------|--------------------|---------------------|-----------------|
+| 0.7.0b0           | 0.8.0b0        | 1.6.0b0            | 0.1.1b0             | 0.3.0b0         |
 | 0.6.0b0           | 0.7.0b0        | 1.5.0b0            | 0.1.1b0             | 0.2.1b0         |
 | 0.5.0b0           | 0.6.0b0        | 1.4.0b0            | 0.1.1b0             | 0.2.0b0         |
 | 0.4.1b0           | 0.5.0b0        | 1.4.0.dev24011601  | 0.1.1b0             |                 |
 | 0.3.0b0           | 0.4.0b0        | 1.3.0.dev20231109  | 0.1.1b0             |                 |
 
-## 开发
-
-Kuscia notls 模式可以实现对 Kuscia GRPC 服务的远程访问，但由于文件服务的限制，它会
-在文件上传和下载中不可用，其他文件数据源将很快提供以实现真正的扩展
-
-- [IDEA本地开发调式文档](./docs/development/ru_in_idea_cn.md)
-- [使用mysql作为运行数据库](./docs/development/SUPPORT_MYSQL.md)
-
 ## Contact
 
 * [B站](https://space.bilibili.com/2073575923): secretflow B站账号