mirror of
https://github.com/YFGaia/dify-plus.git
synced 2026-06-14 20:41:21 +08:00
17832f2424
本次提交整合了多个功能改进和问题修复: 主要功能: - 批量工作流处理功能完善,支持 Excel 上传和进度跟踪 - 管理中心反向代理和转发配置优化 - 用户同步添加互斥锁,防止并发问题 - 计费系统和额度显示优化 - AI 绘图功能扩展 前端改进: - 文本生成应用显示修复 - 批量任务进度展示优化 - 按钮样式和 CSS 优化,禁止换行 - 多语言支持完善(新增印尼语等) - 构建镜像逻辑优化 - 批量处理进度管理器实现 后端改进: - Docker Compose 配置升级 - 队列任务和 Worker Pool 优化 - Admin API 初始化和验证逻辑改进 - 数据库迁移和初始化完善 - 静态变量处理优化 - URL 签名助手实现 - Celery 扩展优化 - 代码和导入包问题修复(idea 自动调整代码位置) 技术改进: - 兼容性修复 (flask-restx, jschardet) - 钉钉 Web API 版本更新 - 代码格式化和导入包问题修复 - 日志处理优化 - 工作流循环管理优化 Docker 相关: - Nginx 配置更新 - 容器启动脚本优化 - 镜像构建流程改进 - docker-compose.dify-plus.yaml 大幅更新 管理后台: - 工作流批量处理 API 实现 - 工作池初始化 - 批量工作流服务实现 - 转发扩展配置 - 用户服务扩展
325 lines
13 KiB
Python
325 lines
13 KiB
Python
import logging
|
|
|
|
from flask import request # ----------------- start You must log in to access your account extend ---------------
|
|
from flask_restx import reqparse # type: ignore
|
|
from werkzeug.exceptions import InternalServerError, NotFound
|
|
|
|
import services
|
|
from controllers.web import api
|
|
from controllers.web.error import (
|
|
AppUnavailableError,
|
|
CompletionRequestError,
|
|
ConversationCompletedError,
|
|
NotChatAppError,
|
|
NotCompletionAppError,
|
|
ProviderModelCurrentlyNotSupportError,
|
|
ProviderNotInitializeError,
|
|
ProviderQuotaExceededError,
|
|
)
|
|
from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
|
|
from controllers.web.error_extend import (
|
|
AccountNoMoneyErrorExtend, # You must log in to access your account extend
|
|
WebAuthRequiredErrorExtend,
|
|
)
|
|
from controllers.web.wraps import WebApiResource
|
|
from core.app.apps.base_app_queue_manager import AppQueueManager
|
|
from core.app.entities.app_invoke_entities import InvokeFrom
|
|
from core.errors.error import (
|
|
ModelCurrentlyNotSupportError,
|
|
ProviderTokenNotInitError,
|
|
QuotaExceededError,
|
|
)
|
|
from core.model_runtime.errors.invoke import InvokeError
|
|
from extensions.ext_database import db
|
|
from libs import helper
|
|
from libs.helper import uuid_value
|
|
from libs.passport import (
|
|
PassportService, # ----------------- start You must log in to access your account extend ---------------
|
|
)
|
|
from models.account_money_extend import AccountMoneyExtend
|
|
from models.model import AppMode
|
|
from services.account_service import (
|
|
AccountService, # ----------------- start You must log in to access your account extend ---------------
|
|
)
|
|
from services.app_generate_service import AppGenerateService
|
|
from services.app_generate_service_extend import AppGenerateServiceExtend
|
|
from services.errors.llm import InvokeRateLimitError
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# ----------------- start You must log in to access your account extend ---------------
|
|
def is_end_login(end_user):
|
|
user_info = None
|
|
try:
|
|
auth_token = request.headers.get("Authorization-extend")
|
|
decoded = PassportService().verify(auth_token)
|
|
user_info = AccountService.load_logged_in_account(account_id=decoded.get("user_id"))
|
|
if user_info is not None:
|
|
if end_user.external_user_id is None:
|
|
end_user.external_user_id = decoded.get("user_id")
|
|
except:
|
|
logging.exception("load_logged_in_account error")
|
|
pass
|
|
# no login
|
|
return user_info
|
|
|
|
|
|
# ----------------- stop You must log in to access your account extend ---------------
|
|
|
|
|
|
# ----------------- 二开部分Begin - 额度限制 ---------------
|
|
def is_money_limit(end_user) -> bool:
|
|
try:
|
|
# TODO 需要写入缓存,读缓存
|
|
account_money = (
|
|
db.session.query(AccountMoneyExtend).filter(AccountMoneyExtend.account_id == end_user.id).first()
|
|
)
|
|
if not account_money:
|
|
return False
|
|
|
|
if account_money.used_quota >= account_money.total_quota:
|
|
return True
|
|
return False
|
|
except:
|
|
return True
|
|
|
|
|
|
# ----------------- 二开部分End - 额度限制 ---------------
|
|
|
|
|
|
# define completion api for user
|
|
class CompletionApi(WebApiResource):
|
|
@api.doc("Create Completion Message")
|
|
@api.doc(description="Create a completion message for text generation applications.")
|
|
@api.doc(
|
|
params={
|
|
"inputs": {"description": "Input variables for the completion", "type": "object", "required": True},
|
|
"query": {"description": "Query text for completion", "type": "string", "required": False},
|
|
"files": {"description": "Files to be processed", "type": "array", "required": False},
|
|
"response_mode": {
|
|
"description": "Response mode: blocking or streaming",
|
|
"type": "string",
|
|
"enum": ["blocking", "streaming"],
|
|
"required": False,
|
|
},
|
|
"retriever_from": {"description": "Source of retriever", "type": "string", "required": False},
|
|
}
|
|
)
|
|
@api.doc(
|
|
responses={
|
|
200: "Success",
|
|
400: "Bad Request",
|
|
401: "Unauthorized",
|
|
403: "Forbidden",
|
|
404: "App Not Found",
|
|
500: "Internal Server Error",
|
|
}
|
|
)
|
|
def post(self, app_model, end_user):
|
|
if app_model.mode != "completion":
|
|
raise NotCompletionAppError()
|
|
|
|
# ----------------- start You must log in to access your account extend ---------------
|
|
# no login
|
|
if is_end_login(end_user) is None:
|
|
raise WebAuthRequiredErrorExtend()
|
|
# ----------------- stop You must log in to access your account extend ---------------
|
|
|
|
# ----------------- 二开部分Begin - 余额判断-----------------
|
|
if is_money_limit(end_user):
|
|
raise AccountNoMoneyErrorExtend()
|
|
# ----------------- 二开部分End - 余额判断-----------------
|
|
|
|
parser = reqparse.RequestParser()
|
|
parser.add_argument("inputs", type=dict, required=True, location="json")
|
|
parser.add_argument("query", type=str, location="json", default="")
|
|
parser.add_argument("files", type=list, required=False, location="json")
|
|
parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
|
|
parser.add_argument("retriever_from", type=str, required=False, default="web_app", location="json")
|
|
|
|
args = parser.parse_args()
|
|
|
|
streaming = args["response_mode"] == "streaming"
|
|
args["auto_generate_name"] = False
|
|
|
|
try:
|
|
AppGenerateServiceExtend.calculate_cumulative_usage(
|
|
app_model=app_model,
|
|
args=args,
|
|
) # Extend: App Center -
|
|
# Recommended list sorted by usage frequency
|
|
response = AppGenerateService.generate(
|
|
app_model=app_model, user=end_user, args=args, invoke_from=InvokeFrom.WEB_APP, streaming=streaming
|
|
)
|
|
|
|
return helper.compact_generate_response(response)
|
|
except services.errors.conversation.ConversationNotExistsError:
|
|
raise NotFound("Conversation Not Exists.")
|
|
except services.errors.conversation.ConversationCompletedError:
|
|
raise ConversationCompletedError()
|
|
except services.errors.app_model_config.AppModelConfigBrokenError:
|
|
logger.exception("App model config broken.")
|
|
raise AppUnavailableError()
|
|
except ProviderTokenNotInitError as ex:
|
|
raise ProviderNotInitializeError(ex.description)
|
|
except QuotaExceededError:
|
|
raise ProviderQuotaExceededError()
|
|
except ModelCurrentlyNotSupportError:
|
|
raise ProviderModelCurrentlyNotSupportError()
|
|
except InvokeError as e:
|
|
raise CompletionRequestError(e.description)
|
|
except ValueError as e:
|
|
raise e
|
|
except Exception as e:
|
|
logger.exception("internal server error.")
|
|
raise InternalServerError()
|
|
|
|
|
|
class CompletionStopApi(WebApiResource):
|
|
@api.doc("Stop Completion Message")
|
|
@api.doc(description="Stop a running completion message task.")
|
|
@api.doc(params={"task_id": {"description": "Task ID to stop", "type": "string", "required": True}})
|
|
@api.doc(
|
|
responses={
|
|
200: "Success",
|
|
400: "Bad Request",
|
|
401: "Unauthorized",
|
|
403: "Forbidden",
|
|
404: "Task Not Found",
|
|
500: "Internal Server Error",
|
|
}
|
|
)
|
|
def post(self, app_model, end_user, task_id):
|
|
if app_model.mode != "completion":
|
|
raise NotCompletionAppError()
|
|
|
|
AppQueueManager.set_stop_flag(task_id, InvokeFrom.WEB_APP, end_user.id)
|
|
|
|
return {"result": "success"}, 200
|
|
|
|
|
|
class ChatApi(WebApiResource):
|
|
@api.doc("Create Chat Message")
|
|
@api.doc(description="Create a chat message for conversational applications.")
|
|
@api.doc(
|
|
params={
|
|
"inputs": {"description": "Input variables for the chat", "type": "object", "required": True},
|
|
"query": {"description": "User query/message", "type": "string", "required": True},
|
|
"files": {"description": "Files to be processed", "type": "array", "required": False},
|
|
"response_mode": {
|
|
"description": "Response mode: blocking or streaming",
|
|
"type": "string",
|
|
"enum": ["blocking", "streaming"],
|
|
"required": False,
|
|
},
|
|
"conversation_id": {"description": "Conversation UUID", "type": "string", "required": False},
|
|
"parent_message_id": {"description": "Parent message UUID", "type": "string", "required": False},
|
|
"retriever_from": {"description": "Source of retriever", "type": "string", "required": False},
|
|
}
|
|
)
|
|
@api.doc(
|
|
responses={
|
|
200: "Success",
|
|
400: "Bad Request",
|
|
401: "Unauthorized",
|
|
403: "Forbidden",
|
|
404: "App Not Found",
|
|
500: "Internal Server Error",
|
|
}
|
|
)
|
|
def post(self, app_model, end_user):
|
|
# ----------------- start You must log in to access your account extend ---------------
|
|
# no login
|
|
if is_end_login(end_user) is None:
|
|
raise WebAuthRequiredErrorExtend()
|
|
# ----------------- stop You must log in to access your account extend ---------------
|
|
|
|
# ----------------- 二开部分Begin - 余额判断-----------------
|
|
if is_money_limit(end_user):
|
|
raise AccountNoMoneyErrorExtend()
|
|
# ----------------- 二开部分End - 余额判断-----------------
|
|
|
|
app_mode = AppMode.value_of(app_model.mode)
|
|
if app_mode not in {AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT}:
|
|
raise NotChatAppError()
|
|
|
|
parser = reqparse.RequestParser()
|
|
parser.add_argument("inputs", type=dict, required=True, location="json")
|
|
parser.add_argument("query", type=str, required=True, location="json")
|
|
parser.add_argument("files", type=list, required=False, location="json")
|
|
parser.add_argument("files_extend", type=list, required=False, location="json")
|
|
parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
|
|
parser.add_argument("conversation_id", type=uuid_value, location="json")
|
|
parser.add_argument("parent_message_id", type=uuid_value, required=False, location="json")
|
|
parser.add_argument("retriever_from", type=str, required=False, default="web_app", location="json")
|
|
|
|
args = parser.parse_args()
|
|
|
|
streaming = args["response_mode"] == "streaming"
|
|
args["auto_generate_name"] = False
|
|
|
|
try:
|
|
AppGenerateServiceExtend.calculate_cumulative_usage(
|
|
app_model=app_model,
|
|
args=args,
|
|
) # Extend: App
|
|
# Center - Recommended list sorted by usage frequency
|
|
response = AppGenerateService.generate(
|
|
app_model=app_model, user=end_user, args=args, invoke_from=InvokeFrom.WEB_APP, streaming=streaming
|
|
)
|
|
|
|
return helper.compact_generate_response(response)
|
|
except services.errors.conversation.ConversationNotExistsError:
|
|
raise NotFound("Conversation Not Exists.")
|
|
except services.errors.conversation.ConversationCompletedError:
|
|
raise ConversationCompletedError()
|
|
except services.errors.app_model_config.AppModelConfigBrokenError:
|
|
logger.exception("App model config broken.")
|
|
raise AppUnavailableError()
|
|
except ProviderTokenNotInitError as ex:
|
|
raise ProviderNotInitializeError(ex.description)
|
|
except QuotaExceededError:
|
|
raise ProviderQuotaExceededError()
|
|
except ModelCurrentlyNotSupportError:
|
|
raise ProviderModelCurrentlyNotSupportError()
|
|
except InvokeRateLimitError as ex:
|
|
raise InvokeRateLimitHttpError(ex.description)
|
|
except InvokeError as e:
|
|
raise CompletionRequestError(e.description)
|
|
except ValueError as e:
|
|
raise e
|
|
except Exception as e:
|
|
logger.exception("internal server error.")
|
|
raise InternalServerError()
|
|
|
|
|
|
class ChatStopApi(WebApiResource):
|
|
@api.doc("Stop Chat Message")
|
|
@api.doc(description="Stop a running chat message task.")
|
|
@api.doc(params={"task_id": {"description": "Task ID to stop", "type": "string", "required": True}})
|
|
@api.doc(
|
|
responses={
|
|
200: "Success",
|
|
400: "Bad Request",
|
|
401: "Unauthorized",
|
|
403: "Forbidden",
|
|
404: "Task Not Found",
|
|
500: "Internal Server Error",
|
|
}
|
|
)
|
|
def post(self, app_model, end_user, task_id):
|
|
app_mode = AppMode.value_of(app_model.mode)
|
|
if app_mode not in {AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT}:
|
|
raise NotChatAppError()
|
|
|
|
AppQueueManager.set_stop_flag(task_id, InvokeFrom.WEB_APP, end_user.id)
|
|
|
|
return {"result": "success"}, 200
|
|
|
|
|
|
api.add_resource(CompletionApi, "/completion-messages")
|
|
api.add_resource(CompletionStopApi, "/completion-messages/<string:task_id>/stop")
|
|
api.add_resource(ChatApi, "/chat-messages")
|
|
api.add_resource(ChatStopApi, "/chat-messages/<string:task_id>/stop")
|