mirror of
https://github.com/YFGaia/dify-plus.git
synced 2026-06-04 10:14:00 +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 实现 - 工作池初始化 - 批量工作流服务实现 - 转发扩展配置 - 用户服务扩展
117 lines
4.1 KiB
Python
117 lines
4.1 KiB
Python
import logging
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
from pydantic.fields import FieldInfo
|
|
from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, SettingsConfigDict, TomlConfigSettingsSource
|
|
|
|
from libs.file_utils import search_file_upwards
|
|
|
|
from .deploy import DeploymentConfig
|
|
from .enterprise import EnterpriseFeatureConfig
|
|
from .extend import ExtendConfig # 二开部分 新增配置
|
|
from .extra import ExtraServiceConfig
|
|
from .feature import FeatureConfig
|
|
from .middleware import MiddlewareConfig
|
|
from .observability import ObservabilityConfig
|
|
from .packaging import PackagingInfo
|
|
from .remote_settings_sources import RemoteSettingsSource, RemoteSettingsSourceConfig, RemoteSettingsSourceName
|
|
from .remote_settings_sources.apollo import ApolloSettingsSource
|
|
from .remote_settings_sources.nacos import NacosSettingsSource
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class RemoteSettingsSourceFactory(PydanticBaseSettingsSource):
|
|
def __init__(self, settings_cls: type[BaseSettings]):
|
|
super().__init__(settings_cls)
|
|
|
|
def get_field_value(self, field: FieldInfo, field_name: str) -> tuple[Any, str, bool]:
|
|
raise NotImplementedError
|
|
|
|
def __call__(self) -> dict[str, Any]:
|
|
current_state = self.current_state
|
|
remote_source_name = current_state.get("REMOTE_SETTINGS_SOURCE_NAME")
|
|
if not remote_source_name:
|
|
return {}
|
|
|
|
remote_source: RemoteSettingsSource | None = None
|
|
match remote_source_name:
|
|
case RemoteSettingsSourceName.APOLLO:
|
|
remote_source = ApolloSettingsSource(current_state)
|
|
case RemoteSettingsSourceName.NACOS:
|
|
remote_source = NacosSettingsSource(current_state)
|
|
case _:
|
|
logger.warning("Unsupported remote source: %s", remote_source_name)
|
|
return {}
|
|
|
|
d: dict[str, Any] = {}
|
|
|
|
for field_name, field in self.settings_cls.model_fields.items():
|
|
field_value, field_key, value_is_complex = remote_source.get_field_value(field, field_name)
|
|
field_value = remote_source.prepare_field_value(field_name, field, field_value, value_is_complex)
|
|
if field_value is not None:
|
|
d[field_key] = field_value
|
|
|
|
return d
|
|
|
|
|
|
class DifyConfig(
|
|
# Packaging info
|
|
PackagingInfo,
|
|
# Deployment configs
|
|
DeploymentConfig,
|
|
# Feature configs
|
|
FeatureConfig,
|
|
# Middleware configs
|
|
MiddlewareConfig,
|
|
# Extra service configs
|
|
ExtraServiceConfig,
|
|
# Observability configs
|
|
ObservabilityConfig,
|
|
# Remote source configs
|
|
RemoteSettingsSourceConfig,
|
|
# Enterprise feature configs
|
|
# **Before using, please contact business@dify.ai by email to inquire about licensing matters.**
|
|
EnterpriseFeatureConfig,
|
|
# 二开部分 新增配置
|
|
ExtendConfig,
|
|
):
|
|
model_config = SettingsConfigDict(
|
|
# read from dotenv format config file
|
|
env_file=".env",
|
|
env_file_encoding="utf-8",
|
|
# ignore extra attributes
|
|
extra="ignore",
|
|
)
|
|
|
|
# Before adding any config,
|
|
# please consider to arrange it in the proper config group of existed or added
|
|
# for better readability and maintainability.
|
|
# Thanks for your concentration and consideration.
|
|
|
|
@classmethod
|
|
def settings_customise_sources(
|
|
cls,
|
|
settings_cls: type[BaseSettings],
|
|
init_settings: PydanticBaseSettingsSource,
|
|
env_settings: PydanticBaseSettingsSource,
|
|
dotenv_settings: PydanticBaseSettingsSource,
|
|
file_secret_settings: PydanticBaseSettingsSource,
|
|
) -> tuple[PydanticBaseSettingsSource, ...]:
|
|
return (
|
|
init_settings,
|
|
env_settings,
|
|
RemoteSettingsSourceFactory(settings_cls),
|
|
dotenv_settings,
|
|
file_secret_settings,
|
|
TomlConfigSettingsSource(
|
|
settings_cls=settings_cls,
|
|
toml_file=search_file_upwards(
|
|
base_dir_path=Path(__file__).parent,
|
|
target_file_name="pyproject.toml",
|
|
max_search_parent_depth=2,
|
|
),
|
|
),
|
|
)
|