Feat/2.2.0 (#1734)

Author: zgqgit

.drone.yml

@@ -41,8 +41,9 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
     - REPO2=$(echo $REPO | sed 's/http:\\/\\///g')
     - sed  '/apt-get/ s|$| '"$PROXY"'|' Dockerfile
     - sed -i '6i\RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
-    - sed -i '7i\RUN poetry source add --priority=supplemental foo http://'$NEXUS_PUBLIC':'$NEXUS_PUBLIC_PASSWORD'@'$REPO2'simple' Dockerfile
-    - sed -i '8i\RUN poetry source add --priority=primary qh https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
+    - sed -i '7i\RUN export UV_PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
+    - sed -i '8i\RUN export UV_DEFAULT_INDEX=https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
+    - sed -i '9i\RUN export PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
     - cat Dockerfile
 
   - name: build_docker
@@ -214,8 +215,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
     - REPO2=$(echo $REPO | sed 's/http:\\/\\///g')
     - sed  '/apt-get/ s|$| '"$PROXY"'|' Dockerfile
     - sed -i '6i\RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
-    - sed -i '7i\RUN poetry source add --priority=supplemental foo http://'$NEXUS_PUBLIC':'$NEXUS_PUBLIC_PASSWORD'@'$REPO2'simple' Dockerfile
-    - sed -i '8i\RUN poetry source add --priority=primary qh https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
+    - sed -i '7i\RUN export UV_PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
     - cat Dockerfile
 
   - name: build_docker

docker/docker-compose.yml

@@ -40,7 +40,7 @@ services:
 
   backend:
     container_name: bisheng-backend
-    image: dataelement/bisheng-backend:v2.2.0-beta3
+    image: dataelement/bisheng-backend:v2.2.0
     ports:
       - "7860:7860"
     environment:
@@ -78,7 +78,7 @@ services:
 
   backend_worker:
     container_name: bisheng-backend-worker
-    image: dataelement/bisheng-backend:v2.2.0-beta3
+    image: dataelement/bisheng-backend:v2.2.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.2.0-beta3
+    image: dataelement/bisheng-frontend:v2.2.0
     ports:
       - "3001:3001"
     environment:

src/backend/Dockerfile

@@ -1,11 +1,15 @@
-FROM dataelement/bisheng-backend:base.v6
+FROM dataelement/bisheng-backend:base.v7
 
 WORKDIR /app
 
 COPY ./ ./
 
-RUN poetry config virtualenvs.create false
-RUN poetry update --without dev
+# 生成并安装依赖
+RUN uv pip compile pyproject.toml --upgrade --output-file requirements.txt && \
+    uv pip install -r requirements.txt --system --no-cache-dir && \
+    uv cache clean && \
+    rm -f requirements.txt
+
 
 # patch langchain-openai lib. remove this when langchain-openai support reasoning_content
 RUN patch -p1 < /app/bisheng/patches/langchain_openai.patch /usr/local/lib/python3.10/site-packages/langchain_openai/chat_models/base.py

src/backend/base.Dockerfile

@@ -14,6 +14,9 @@ RUN apt-get update && \
     libglib2.0-0 libsm6 libxrender1 libxext6 libgl1 \
     && rm -rf /var/lib/apt/lists/*
 
+# 安装 FFmpeg
+RUN apt-get update && apt-get install -y --no-install-recommends ffmpeg && rm -rf /var/lib/apt/lists/*
+
 
 # 安装 pandoc
 RUN mkdir -p /opt/pandoc && \
@@ -27,16 +30,23 @@ RUN mkdir -p /opt/pandoc && \
 RUN curl -LsSf https://astral.sh/uv/install.sh | sh
 
 # 安装 Poetry
-RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.2
+#RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.2
 
 # 拷贝项目依赖文件
 COPY ./pyproject.toml ./
 
 # 安装 Python 依赖
 RUN python -m pip install --upgrade pip && \
-    pip install shapely==2.0.1 && \
-    poetry config virtualenvs.create false && \
-    poetry install --no-interaction --no-ansi --without dev
+    uv pip compile pyproject.toml --output-file requirements.txt && \
+    uv pip install -r requirements.txt --system --no-cache-dir && \
+    uv cache clean
+
+
+
+#RUN python -m pip install --upgrade pip && \
+#    pip install shapely==2.0.1 && \
+#    poetry config virtualenvs.create false && \
+#    poetry install --no-interaction --no-ansi --without dev
 
 # 安装 NLTK 数据
 RUN python -c "import nltk; nltk.download('punkt'); nltk.download('punkt_tab'); nltk.download('averaged_perceptron_tagger'); nltk.download('averaged_perceptron_tagger_eng')"

src/backend/bisheng/__init__.py

@@ -1,16 +1,16 @@
 from importlib import metadata
 
-from bisheng.api.errcode import BaseErrorCode
-from bisheng.cache import cache_manager  # noqa: E402
+from bisheng.core.cache import cache_manager
 from bisheng.interface.custom.custom_component import CustomComponent
-from bisheng.processing.process import load_flow_from_json  # noqa: E402
+
+# from bisheng.processing.process import load_flow_from_json  # noqa: E402
 
 try:
     # 通过ci去自动修改
-    __version__ = '2.2.0-beta3'
+    __version__ = '2.2.0'
 except metadata.PackageNotFoundError:
     # Case where package metadata is not available.
     __version__ = ''
 del metadata  # optional, avoids polluting the results of dir(__package__)
 
-__all__ = ['load_flow_from_json', 'cache_manager', 'CustomComponent', "BaseErrorCode"]
+__all__ = ['cache_manager', 'CustomComponent']

src/backend/bisheng/__main__.py

@@ -9,9 +9,11 @@
 
 import httpx
 import typer
+from loguru import logger
+
+from bisheng.core.logger import set_logger_config
 from bisheng.main import setup_app
-from bisheng.settings import settings
-from bisheng.utils.logger import configure, logger
+from bisheng.common.services.config_service import settings
 from dotenv import load_dotenv
 from multiprocess import Process, cpu_count  # type: ignore
 from rich import box
@@ -175,7 +177,7 @@ def serve(
     if jcloud:
         return serve_on_jcloud()
 
-    configure(log_level=log_level, log_file=log_file)
+    set_logger_config(logger_config=settings.logger_conf)
     update_settings(
         config,
         dev=dev,

src/backend/bisheng/api/JWT.py

@@ -3,7 +3,7 @@
 
 from pydantic import BaseModel
 
-from bisheng.settings import settings
+from bisheng.common.services.config_service import settings
 
 # 配置JWT token的有效期
 ACCESS_TOKEN_EXPIRE_TIME = 86400

src/backend/bisheng/api/router.py

@@ -3,13 +3,17 @@
 
 from bisheng.api.v1 import (assistant_router, audit_router, chat_router, component_router,
                             endpoints_router, evaluation_router, finetune_router, flows_router,
-                            group_router, knowledge_router, llm_router, mark_router, qa_router,
+                            group_router, knowledge_router, mark_router, qa_router,
                             report_router, server_router, skillcenter_router, tag_router,
                             user_router, validate_router, variable_router, workflow_router,
                             workstation_router, linsight_router, tool_router, invite_code_router)
 from bisheng.api.v2 import (assistant_router_rpc, chat_router_rpc, flow_router,
                             knowledge_router_rpc, rpc_router_rpc, workflow_router_rpc,
                             workstation_router_rpc)
+from bisheng.api.v2.llm import router as llm_router_rpc
+from bisheng.chat_session.api.router import router as session_router
+from bisheng.llm.api.router import router as llm_router
+from bisheng.share_link.api.router import router as share_link_router
 
 router = APIRouter(prefix='/api/v1', )
 router.include_router(chat_router)
@@ -37,6 +41,7 @@
 router.include_router(linsight_router)
 router.include_router(tool_router)
 router.include_router(invite_code_router)
+router.include_router(session_router)
 router_rpc = APIRouter(prefix='/api/v2', )
 router_rpc.include_router(knowledge_router_rpc)
 router_rpc.include_router(chat_router_rpc)
@@ -45,3 +50,5 @@
 router_rpc.include_router(assistant_router_rpc)
 router_rpc.include_router(workflow_router_rpc)
 router_rpc.include_router(workstation_router_rpc)
+router_rpc.include_router(llm_router_rpc)
+router.include_router(share_link_router)