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 实现 - 工作池初始化 - 批量工作流服务实现 - 转发扩展配置 - 用户服务扩展
175 lines
7.1 KiB
Python
175 lines
7.1 KiB
Python
import logging
|
|
|
|
from flask_login import current_user
|
|
from flask_restx import reqparse
|
|
from werkzeug.exceptions import InternalServerError, NotFound
|
|
|
|
import services
|
|
from controllers.console.app.error import (
|
|
AppUnavailableError,
|
|
CompletionRequestError,
|
|
ConversationCompletedError,
|
|
ProviderModelCurrentlyNotSupportError,
|
|
ProviderNotInitializeError,
|
|
ProviderQuotaExceededError,
|
|
)
|
|
from controllers.console.explore.error import NotChatAppError, NotCompletionAppError
|
|
from controllers.console.explore.wraps import InstalledAppResource
|
|
from controllers.console.money_extend import money_limit
|
|
from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
|
|
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.datetime_utils import naive_utc_now
|
|
from libs.helper import uuid_value
|
|
from models.model import AppMode
|
|
from services.app_generate_service import AppGenerateService
|
|
from services.app_generate_service_extend import (
|
|
AppGenerateServiceExtend, # Extend: App Center - Recommended list sorted by usage frequency
|
|
)
|
|
from services.errors.llm import InvokeRateLimitError
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# define completion api for user
|
|
class CompletionApi(InstalledAppResource):
|
|
@money_limit
|
|
def post(self, installed_app):
|
|
app_model = installed_app.app
|
|
if app_model.mode != "completion":
|
|
raise NotCompletionAppError()
|
|
|
|
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="explore_app", location="json")
|
|
args = parser.parse_args()
|
|
|
|
streaming = args["response_mode"] == "streaming"
|
|
args["auto_generate_name"] = False
|
|
|
|
installed_app.last_used_at = naive_utc_now()
|
|
db.session.commit()
|
|
|
|
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=current_user, args=args, invoke_from=InvokeFrom.EXPLORE, 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:
|
|
logger.exception("internal server error.")
|
|
raise InternalServerError()
|
|
|
|
|
|
class CompletionStopApi(InstalledAppResource):
|
|
def post(self, installed_app, task_id):
|
|
app_model = installed_app.app
|
|
if app_model.mode != "completion":
|
|
raise NotCompletionAppError()
|
|
|
|
AppQueueManager.set_stop_flag(task_id, InvokeFrom.EXPLORE, current_user.id)
|
|
|
|
return {"result": "success"}, 200
|
|
|
|
|
|
class ChatApi(InstalledAppResource):
|
|
@money_limit
|
|
def post(self, installed_app):
|
|
app_model = installed_app.app
|
|
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("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="explore_app", location="json")
|
|
args = parser.parse_args()
|
|
|
|
args["auto_generate_name"] = False
|
|
|
|
installed_app.last_used_at = naive_utc_now()
|
|
db.session.commit()
|
|
|
|
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=current_user, args=args, invoke_from=InvokeFrom.EXPLORE, streaming=True
|
|
)
|
|
|
|
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 InvokeRateLimitError as ex:
|
|
raise InvokeRateLimitHttpError(ex.description)
|
|
except ValueError as e:
|
|
raise e
|
|
except Exception:
|
|
logger.exception("internal server error.")
|
|
raise InternalServerError()
|
|
|
|
|
|
class ChatStopApi(InstalledAppResource):
|
|
def post(self, installed_app, task_id):
|
|
app_model = installed_app.app
|
|
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.EXPLORE, current_user.id)
|
|
|
|
return {"result": "success"}, 200
|