Feat/2.3.0 (#1881)

Author: zgqgit

.gitattributes

@@ -1,5 +1,5 @@
 # 默认：自动识别文本，统一用 LF 存库
-* text=auto eol=lf
+#* text=auto eol=lf
 
 # 明确常见文本文件用 LF
 *.py   text eol=lf
@@ -31,4 +31,4 @@
 *.mp4  binary
 *.docx binary
 *.xlsx binary
-*.pptx binary
+*.pptx binary

.github/workflows/build_linux_only.yml

@@ -0,0 +1,97 @@
+name: Build Linux Binaries (x86_64 & ARM)
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "build.*"
+
+jobs:
+  build_pyc:
+    name: Build for pyc files only
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          repository: dataelement/bisheng-telemetry-search
+          token: ${{ secrets.CROSS_REPO_TOKEN }}
+          path: bisheng-telemetry-search
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Build and Clean Artifacts
+        working-directory: ./bisheng-telemetry-search/telemetry_search
+        run: |
+          # 执行构建
+          python -m compileall -b .
+          
+          # 在上传前彻底清理源代码和中间文件
+          # 即使 build_all.py 做了清理，这里再次强制清理，防止 .c 文件泄露
+          find . -name "*.py" -delete
+          find . -name "__pycache__" -exec rm -rf {} +
+          
+          # 准备输出
+          mkdir ../../build_output
+          cp -r ./* ../../build_output/
+          
+          echo "Listing artifacts to be uploaded:"
+          ls -R ../../build_output/
+
+      - name: Upload PYC Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: telemetry_search
+          path: ./build_output/*
+
+  deploy_to_sso_project:
+    name: Deploy Artifacts to SSO Project
+    needs: [ build_pyc ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout SSO Project
+        uses: actions/checkout@v4
+        with:
+          repository: dataelement/bisheng
+          token: ${{ secrets.CROSS_REPO_TOKEN }}
+          # 使用 ref 指定分支，而不是 base
+          ref: feat/2.3.0
+          path: bisheng
+          # 确保拉取完整的历史以便正确提交
+          fetch-depth: 0
+
+      - name: Download PYC Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: telemetry_search
+          path: ./telemetry_search
+
+      - name: Merge and Place Files
+        run: |
+          
+          find ./telemetry_search -name "*.py" -delete
+          
+          # 移动到目标仓库目录
+          cp -r ./telemetry_search ./bisheng/src/backend/bisheng/
+          
+          echo "Final content of target directory:"
+          ls -lh ./bisheng/src/backend/bisheng/telemetry_search
+
+      - name: Commit and Push changes
+        working-directory: ./bisheng
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          
+          git add .
+          
+          # 检查是否有变更，有才提交
+          if git diff --staged --quiet; then
+            echo "No changes to commit"
+          else
+            git commit -m "chore: update telemetry_search build artifacts [skip ci]"
+            git push origin feat/2.3.0
+          fi

.gitignore

@@ -123,14 +123,10 @@ __pycache__/
 *$py.class
 notebooks
 
-# C extensions
-*.so
-
 # Distribution / packaging
 .Python
 build/
 ./third_party
-output/
 develop-eggs/
 config.dev.yaml
 downloads/
@@ -267,3 +263,4 @@ docker/mysql/data/*
 docker/office/bisheng/*.gz
 
 CLAUDE.md
+!src/backend/bisheng/telemetry_search/**/*.pyc

docker/bisheng/config/config.yaml

@@ -4,6 +4,7 @@ database_url:
   "mysql+pymysql://root:gAAAAABlp4b4c59FeVGF_OQRVf6NOUIGdxq8246EBD-b0hdK_jVKRs1x4PoAn0A6C5S6IiFKmWn0Nm5eBUWu-7jxcqw6TiVjQA==@mysql:3306/bisheng?charset=utf8mb4"
 
 # 缓存配置  redis://[[username]:[password]]@localhost:6379/0
+# 如果设置了密码，需要参考MySQL密码的加密逻辑对密码进行加密。eg: redis://root:gAAAAABlp4b4c59FeVGF_OQRVf6NOUIGdxq8246EBD-b0hdK_jVKRs1x4PoAn0A6C5S6IiFKmWn0Nm5eBUWu-7jxcqw6TiVjQA==@redis:6379/0
 # 普通模式:
 redis_url: "redis://redis:6379/1"
 

docker/bisheng/entrypoint.sh

@@ -1,21 +1,66 @@
 #!/bin/bash
+set -xe
 
 export PYTHONPATH="./"
 
 start_mode=${1:-api}
 
-if [ $start_mode = "api" ]; then
+start_knowledge(){
+  # 知识库解析的celery worker
+    celery -A bisheng.worker.main worker -l info -c 20 -P threads -Q knowledge_celery -n knowledge@%h
+}
+
+start_workflow(){
+  # 工作流相关的celery worker
+    celery -A bisheng.worker.main worker -l info -c 100 -P threads -Q workflow_celery -n workflow@%h
+}
+
+start_beat(){
+  # 定时任务调度
+    celery -A bisheng.worker.main beat -l info
+}
+
+start_linsight(){
+  # 灵思后台任务worker
+    python bisheng/linsight/worker.py --worker_num 4 --max_concurrency 5
+}
+start_default(){
+    # 默认其他任务的执行worker，目前是定时统计埋点数据
+    celery -A bisheng.worker.main worker -l info -c 100 -P threads -Q celery -n celery@%h
+}
+
+if [ "$start_mode" = "api" ]; then
     echo "Starting API server..."
     uvicorn bisheng.main:app --host 0.0.0.0 --port 7860 --no-access-log --workers 8
-elif [ $start_mode = "worker" ]; then
-    echo "Starting Celery worker..."
+elif [ "$start_mode" = "knowledge" ]; then
+    echo "Starting Knowledge Celery worker..."
+    start_knowledge
+elif [ "$start_mode" = "workflow" ]; then
+    echo "Starting Workflow Celery worker..."
+    start_workflow
+elif [ "$start_mode" = "beat" ]; then
+    echo "Starting Celery beat..."
+    start_beat
+elif [ "$start_mode" = "default" ]; then
+    echo "Starting default celery worker..."
+    start_default
+elif [ "$start_mode" = "linsight" ]; then
+    echo "Starting LinSight worker..."
+    start_linsight
+elif [ "$start_mode" = "worker" ]; then
+    echo "Starting All worker..."
     # 处理知识库相关任务的worker
-    nohup celery -A bisheng.worker.main worker -l info -c 20 -P threads -Q knowledge_celery -n knowledge@%h &
-    # 工作流执行worker
-    nohup celery -A bisheng.worker.main worker -l info -c 100 -P threads -Q workflow_celery -n workflow@%h &
+    start_knowledge &
+    # 处理工作流相关任务的worker
+    start_workflow &
+    # 处理linsight相关任务的worker
+    start_linsight &
+    # 默认其他任务的执行worker，目前是定时统计埋点数据
+    start_default &
+    start_beat
 
-    python bisheng/linsight/worker.py --worker_num 4 --max_concurrency 5
+    echo "All workers started successfully."
 else
-    echo "Invalid start mode. Use 'api' or 'worker'."
+    echo "Invalid start mode. Use api、worker、knowledge、workflow、beat、default、linsight."
     exit 1
 fi

docker/docker-compose.yml

@@ -40,7 +40,7 @@ services:
 
   backend:
     container_name: bisheng-backend
-    image: dataelement/bisheng-backend:v2.3.0-beta4
+    image: dataelement/bisheng-backend:v2.3.0
     ports:
       - "7860:7860"
     environment:
@@ -78,7 +78,7 @@ services:
 
   backend_worker:
     container_name: bisheng-backend-worker
-    image: dataelement/bisheng-backend:v2.3.0-beta4
+    image: dataelement/bisheng-backend:v2.3.0
     environment:
       TZ: Asia/Shanghai
       BS_MILVUS_CONNECTION_ARGS: '{"host":"milvus","port":"19530","user":"","password":"","secure":false}'
@@ -109,7 +109,7 @@ services:
 
   frontend:
     container_name: bisheng-frontend
-    image: dataelement/bisheng-frontend:v2.3.0-beta4
+    image: dataelement/bisheng-frontend:v2.3.0
     ports:
       - "3001:3001"
     environment:

src/backend/bisheng/__init__.py

@@ -6,8 +6,8 @@
 # from bisheng.processing.process import load_flow_from_json  # noqa: E402
 
 try:
-    # 通过ci去自动修改
-    __version__ = '2.3.0-beta4'
+    # SetujuciGo to automatic modification
+    __version__ = '2.3.0'
 except metadata.PackageNotFoundError:
     # Case where package metadata is not available.
     __version__ = ''

src/backend/bisheng/api/router.py

@@ -6,7 +6,7 @@
                             group_router, mark_router,
                             report_router, skillcenter_router, tag_router,
                             user_router, validate_router, variable_router, workflow_router,
-                            workstation_router, linsight_router, tool_router, invite_code_router)
+                            workstation_router, tool_router, invite_code_router)
 from bisheng.chat_session.api.router import router as session_router
 from bisheng.finetune.api.finetune import router as finetune_router
 from bisheng.finetune.api.server import router as server_router
@@ -17,6 +17,8 @@
                                                knowledge_router_rpc, workflow_router_rpc,
                                                filelib_router_rpc)
 from bisheng.share_link.api.router import router as share_link_router
+from bisheng.linsight.api.router import router as linsight_router
+from bisheng.telemetry_search.api.router import router as telemetry_search_router
 
 router = APIRouter(prefix='/api/v1', )
 router.include_router(chat_router)
@@ -46,6 +48,7 @@
 router.include_router(invite_code_router)
 router.include_router(session_router)
 router.include_router(share_link_router)
+router.include_router(telemetry_search_router)
 
 router_rpc = APIRouter(prefix='/api/v2', )
 router_rpc.include_router(knowledge_router_rpc)