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 实现 - 工作池初始化 - 批量工作流服务实现 - 转发扩展配置 - 用户服务扩展
182 lines
7.4 KiB
Python
182 lines
7.4 KiB
Python
import ssl
|
|
from datetime import timedelta
|
|
from typing import Any, Optional
|
|
|
|
import pytz
|
|
from celery import Celery, Task
|
|
from celery.schedules import crontab
|
|
|
|
from configs import dify_config
|
|
from dify_app import DifyApp
|
|
|
|
|
|
def _get_celery_ssl_options() -> Optional[dict[str, Any]]:
|
|
"""Get SSL configuration for Celery broker/backend connections."""
|
|
# Use REDIS_USE_SSL for consistency with the main Redis client
|
|
# Only apply SSL if we're using Redis as broker/backend
|
|
if not dify_config.REDIS_USE_SSL:
|
|
return None
|
|
|
|
# Check if Celery is actually using Redis
|
|
broker_is_redis = dify_config.CELERY_BROKER_URL and (
|
|
dify_config.CELERY_BROKER_URL.startswith("redis://") or dify_config.CELERY_BROKER_URL.startswith("rediss://")
|
|
)
|
|
|
|
if not broker_is_redis:
|
|
return None
|
|
|
|
# Map certificate requirement strings to SSL constants
|
|
cert_reqs_map = {
|
|
"CERT_NONE": ssl.CERT_NONE,
|
|
"CERT_OPTIONAL": ssl.CERT_OPTIONAL,
|
|
"CERT_REQUIRED": ssl.CERT_REQUIRED,
|
|
}
|
|
|
|
ssl_cert_reqs = cert_reqs_map.get(dify_config.REDIS_SSL_CERT_REQS, ssl.CERT_NONE)
|
|
|
|
ssl_options = {
|
|
"ssl_cert_reqs": ssl_cert_reqs,
|
|
"ssl_ca_certs": dify_config.REDIS_SSL_CA_CERTS,
|
|
"ssl_certfile": dify_config.REDIS_SSL_CERTFILE,
|
|
"ssl_keyfile": dify_config.REDIS_SSL_KEYFILE,
|
|
}
|
|
|
|
return ssl_options
|
|
|
|
|
|
def init_app(app: DifyApp) -> Celery:
|
|
class FlaskTask(Task):
|
|
def __call__(self, *args: object, **kwargs: object) -> object:
|
|
with app.app_context():
|
|
return self.run(*args, **kwargs)
|
|
|
|
broker_transport_options = {}
|
|
|
|
if dify_config.CELERY_USE_SENTINEL:
|
|
broker_transport_options = {
|
|
"master_name": dify_config.CELERY_SENTINEL_MASTER_NAME,
|
|
"sentinel_kwargs": {
|
|
"socket_timeout": dify_config.CELERY_SENTINEL_SOCKET_TIMEOUT,
|
|
"password": dify_config.CELERY_SENTINEL_PASSWORD,
|
|
},
|
|
}
|
|
|
|
celery_app = Celery(
|
|
app.name,
|
|
task_cls=FlaskTask,
|
|
broker=dify_config.CELERY_BROKER_URL,
|
|
backend=dify_config.CELERY_BACKEND,
|
|
)
|
|
|
|
celery_app.conf.update(
|
|
result_backend=dify_config.CELERY_RESULT_BACKEND,
|
|
broker_transport_options=broker_transport_options,
|
|
broker_connection_retry_on_startup=True,
|
|
worker_log_format=dify_config.LOG_FORMAT,
|
|
worker_task_log_format=dify_config.LOG_FORMAT,
|
|
worker_hijack_root_logger=False,
|
|
timezone=pytz.timezone(dify_config.LOG_TZ or "UTC"),
|
|
task_ignore_result=True,
|
|
)
|
|
|
|
# Apply SSL configuration if enabled
|
|
ssl_options = _get_celery_ssl_options()
|
|
if ssl_options:
|
|
celery_app.conf.update(
|
|
broker_use_ssl=ssl_options,
|
|
# Also apply SSL to the backend if it's Redis
|
|
redis_backend_use_ssl=ssl_options if dify_config.CELERY_BACKEND == "redis" else None,
|
|
)
|
|
|
|
if dify_config.LOG_FILE:
|
|
celery_app.conf.update(
|
|
worker_logfile=dify_config.LOG_FILE,
|
|
)
|
|
|
|
celery_app.set_default()
|
|
app.extensions["celery"] = celery_app
|
|
|
|
imports = []
|
|
day = dify_config.CELERY_BEAT_SCHEDULER_TIME
|
|
|
|
# if you add a new task, please add the switch to CeleryScheduleTasksConfig
|
|
beat_schedule = {}
|
|
if dify_config.ENABLE_CLEAN_EMBEDDING_CACHE_TASK:
|
|
imports.append("schedule.clean_embedding_cache_task")
|
|
beat_schedule["clean_embedding_cache_task"] = {
|
|
"task": "schedule.clean_embedding_cache_task.clean_embedding_cache_task",
|
|
"schedule": crontab(minute="0", hour="2", day_of_month=f"*/{day}"),
|
|
}
|
|
if dify_config.ENABLE_CLEAN_UNUSED_DATASETS_TASK:
|
|
imports.append("schedule.clean_unused_datasets_task")
|
|
beat_schedule["clean_unused_datasets_task"] = {
|
|
"task": "schedule.clean_unused_datasets_task.clean_unused_datasets_task",
|
|
"schedule": crontab(minute="0", hour="3", day_of_month=f"*/{day}"),
|
|
}
|
|
if dify_config.ENABLE_CREATE_TIDB_SERVERLESS_TASK:
|
|
imports.append("schedule.create_tidb_serverless_task")
|
|
beat_schedule["create_tidb_serverless_task"] = {
|
|
"task": "schedule.create_tidb_serverless_task.create_tidb_serverless_task",
|
|
"schedule": crontab(minute="0", hour="*"),
|
|
}
|
|
if dify_config.ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK:
|
|
imports.append("schedule.update_tidb_serverless_status_task")
|
|
beat_schedule["update_tidb_serverless_status_task"] = {
|
|
"task": "schedule.update_tidb_serverless_status_task.update_tidb_serverless_status_task",
|
|
"schedule": timedelta(minutes=10),
|
|
}
|
|
if dify_config.ENABLE_CLEAN_MESSAGES:
|
|
imports.append("schedule.clean_messages")
|
|
beat_schedule["clean_messages"] = {
|
|
"task": "schedule.clean_messages.clean_messages",
|
|
"schedule": crontab(minute="0", hour="4", day_of_month=f"*/{day}"),
|
|
}
|
|
if dify_config.ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK:
|
|
imports.append("schedule.mail_clean_document_notify_task")
|
|
beat_schedule["mail_clean_document_notify_task"] = {
|
|
"task": "schedule.mail_clean_document_notify_task.mail_clean_document_notify_task",
|
|
"schedule": crontab(minute="0", hour="10", day_of_week="1"),
|
|
}
|
|
if dify_config.ENABLE_DATASETS_QUEUE_MONITOR:
|
|
imports.append("schedule.queue_monitor_task")
|
|
beat_schedule["datasets-queue-monitor"] = {
|
|
"task": "schedule.queue_monitor_task.queue_monitor_task",
|
|
"schedule": timedelta(
|
|
minutes=dify_config.QUEUE_MONITOR_INTERVAL if dify_config.QUEUE_MONITOR_INTERVAL else 30
|
|
),
|
|
}
|
|
if dify_config.ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK and dify_config.MARKETPLACE_ENABLED:
|
|
imports.append("schedule.check_upgradable_plugin_task")
|
|
beat_schedule["check_upgradable_plugin_task"] = {
|
|
"task": "schedule.check_upgradable_plugin_task.check_upgradable_plugin_task",
|
|
"schedule": crontab(minute="*/15"),
|
|
}
|
|
|
|
# ---------------------------- 二开部分 Begin ----------------------------
|
|
# 导入扩展的 Celery 任务
|
|
imports.append("tasks.extend.update_account_money_when_workflow_node_execution_created_extend")
|
|
|
|
# 每月1号00:00,重置账号额度
|
|
imports.append("schedule.update_account_used_quota_extend")
|
|
beat_schedule["update_account_used_quota_extend"] = {
|
|
"task": "schedule.update_account_used_quota_extend.update_account_used_quota_extend",
|
|
"schedule": crontab(minute="0", hour="0", day_of_month="1"),
|
|
}
|
|
# 每天,重置密钥日额度
|
|
imports.append("schedule.update_api_token_daily_used_quota_task_extend")
|
|
beat_schedule["update_api_token_daily_used_quota_task_extend"] = {
|
|
"task": "schedule.update_api_token_daily_used_quota_task_extend.update_api_token_daily_used_quota_task_extend",
|
|
"schedule": crontab(hour=0, minute=0),
|
|
}
|
|
# 每月1号00:00,重置密钥月额度
|
|
imports.append("schedule.update_api_token_monthly_used_quota_task_extend")
|
|
beat_schedule["update_api_token_monthly_used_quota_task_extend"] = {
|
|
"task": "schedule.update_api_token_monthly_used_quota_task_extend.update_api_token_monthly_used_quota_task_extend",
|
|
"schedule": crontab(minute="0", hour="0", day_of_month="1"),
|
|
}
|
|
# ---------------------------- 二开部分 End ----------------------------
|
|
|
|
celery_app.conf.update(beat_schedule=beat_schedule, imports=imports)
|
|
|
|
return celery_app
|