mirror of
https://github.com/YFGaia/dify-plus.git
synced 2026-06-04 10:14:00 +08:00
npc0-hue
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 实现 - 工作池初始化 - 批量工作流服务实现 - 转发扩展配置 - 用户服务扩展
361 lines
15 KiB
Python
361 lines
15 KiB
Python
import json # extend: oauth2
|
||
import re # extend: oauth2
|
||
from enum import StrEnum
|
||
|
||
from flask import request # extend: oauth2
|
||
from pydantic import BaseModel, ConfigDict, Field
|
||
|
||
from configs import dify_config
|
||
from extensions.ext_database import db # extend: oauth2
|
||
from extensions.ext_redis import redis_client # extend: oauth2
|
||
from models.system_extend import SystemIntegrationClassify, SystemIntegrationExtend # Extend DingTalk third-party login
|
||
from services.billing_service import BillingService
|
||
from services.enterprise.enterprise_service import EnterpriseService
|
||
|
||
|
||
class SubscriptionModel(BaseModel):
|
||
plan: str = "sandbox"
|
||
interval: str = ""
|
||
|
||
|
||
class BillingModel(BaseModel):
|
||
enabled: bool = False
|
||
subscription: SubscriptionModel = SubscriptionModel()
|
||
|
||
|
||
class EducationModel(BaseModel):
|
||
enabled: bool = False
|
||
activated: bool = False
|
||
|
||
|
||
class LimitationModel(BaseModel):
|
||
size: int = 0
|
||
limit: int = 0
|
||
|
||
|
||
class LicenseLimitationModel(BaseModel):
|
||
"""
|
||
- enabled: whether this limit is enforced
|
||
- size: current usage count
|
||
- limit: maximum allowed count; 0 means unlimited
|
||
"""
|
||
|
||
enabled: bool = Field(False, description="Whether this limit is currently active")
|
||
size: int = Field(0, description="Number of resources already consumed")
|
||
limit: int = Field(0, description="Maximum number of resources allowed; 0 means no limit")
|
||
|
||
def is_available(self, required: int = 1) -> bool:
|
||
"""
|
||
Determine whether the requested amount can be allocated.
|
||
|
||
Returns True if:
|
||
- this limit is not active, or
|
||
- the limit is zero (unlimited), or
|
||
- there is enough remaining quota.
|
||
"""
|
||
if not self.enabled or self.limit == 0:
|
||
return True
|
||
|
||
return (self.limit - self.size) >= required
|
||
|
||
|
||
class LicenseStatus(StrEnum):
|
||
NONE = "none"
|
||
INACTIVE = "inactive"
|
||
ACTIVE = "active"
|
||
EXPIRING = "expiring"
|
||
EXPIRED = "expired"
|
||
LOST = "lost"
|
||
|
||
|
||
class LicenseModel(BaseModel):
|
||
status: LicenseStatus = LicenseStatus.NONE
|
||
expired_at: str = ""
|
||
workspaces: LicenseLimitationModel = LicenseLimitationModel(enabled=False, size=0, limit=0)
|
||
|
||
|
||
class BrandingModel(BaseModel):
|
||
enabled: bool = False
|
||
application_title: str = ""
|
||
login_page_logo: str = ""
|
||
workspace_logo: str = ""
|
||
favicon: str = ""
|
||
|
||
|
||
class WebAppAuthSSOModel(BaseModel):
|
||
protocol: str = ""
|
||
|
||
|
||
class WebAppAuthModel(BaseModel):
|
||
enabled: bool = False
|
||
allow_sso: bool = False
|
||
sso_config: WebAppAuthSSOModel = WebAppAuthSSOModel()
|
||
allow_email_code_login: bool = False
|
||
allow_email_password_login: bool = False
|
||
|
||
|
||
class PluginInstallationScope(StrEnum):
|
||
NONE = "none"
|
||
OFFICIAL_ONLY = "official_only"
|
||
OFFICIAL_AND_SPECIFIC_PARTNERS = "official_and_specific_partners"
|
||
ALL = "all"
|
||
|
||
|
||
class PluginInstallationPermissionModel(BaseModel):
|
||
# Plugin installation scope – possible values:
|
||
# none: prohibit all plugin installations
|
||
# official_only: allow only Dify official plugins
|
||
# official_and_specific_partners: allow official and specific partner plugins
|
||
# all: allow installation of all plugins
|
||
plugin_installation_scope: PluginInstallationScope = PluginInstallationScope.ALL
|
||
|
||
# If True, restrict plugin installation to the marketplace only
|
||
# Equivalent to ForceEnablePluginVerification
|
||
restrict_to_marketplace_only: bool = False
|
||
|
||
|
||
class FeatureModel(BaseModel):
|
||
billing: BillingModel = BillingModel()
|
||
education: EducationModel = EducationModel()
|
||
members: LimitationModel = LimitationModel(size=0, limit=1)
|
||
apps: LimitationModel = LimitationModel(size=0, limit=10)
|
||
vector_space: LimitationModel = LimitationModel(size=0, limit=5)
|
||
knowledge_rate_limit: int = 10
|
||
annotation_quota_limit: LimitationModel = LimitationModel(size=0, limit=10)
|
||
documents_upload_quota: LimitationModel = LimitationModel(size=0, limit=50)
|
||
docs_processing: str = "standard"
|
||
can_replace_logo: bool = False
|
||
model_load_balancing_enabled: bool = False
|
||
dataset_operator_enabled: bool = False
|
||
webapp_copyright_enabled: bool = False
|
||
workspace_members: LicenseLimitationModel = LicenseLimitationModel(enabled=False, size=0, limit=0)
|
||
is_allow_transfer_workspace: bool = True
|
||
# pydantic configs
|
||
model_config = ConfigDict(protected_namespaces=())
|
||
|
||
|
||
class KnowledgeRateLimitModel(BaseModel):
|
||
enabled: bool = False
|
||
limit: int = 10
|
||
subscription_plan: str = ""
|
||
|
||
|
||
class SystemFeatureModel(BaseModel):
|
||
sso_enforced_for_signin: bool = False
|
||
sso_enforced_for_signin_protocol: str = ""
|
||
enable_marketplace: bool = False
|
||
max_plugin_package_size: int = dify_config.PLUGIN_MAX_PACKAGE_SIZE
|
||
enable_email_code_login: bool = False
|
||
enable_email_password_login: bool = True
|
||
enable_social_oauth_login: bool = False
|
||
is_allow_register: bool = False
|
||
is_allow_create_workspace: bool = False
|
||
is_email_setup: bool = False
|
||
license: LicenseModel = LicenseModel()
|
||
branding: BrandingModel = BrandingModel()
|
||
webapp_auth: WebAppAuthModel = WebAppAuthModel()
|
||
plugin_installation_permission: PluginInstallationPermissionModel = PluginInstallationPermissionModel()
|
||
enable_change_email: bool = True
|
||
is_custom_auth2: str = "" # extend: Customizing AUTH2
|
||
is_custom_auth2_logout: str = "" # extend: Customizing AUTH2
|
||
ding_talk_client_id: str = "" # extend: DingTalk third-party login
|
||
ding_talk_corp_id: str = "" # extend: DingTalk sidebar login
|
||
ding_talk: bool = "" # extend: DingTalk sidebar login
|
||
|
||
|
||
class FeatureService:
|
||
@classmethod
|
||
def get_features(cls, tenant_id: str) -> FeatureModel:
|
||
features = FeatureModel()
|
||
|
||
cls._fulfill_params_from_env(features)
|
||
|
||
if dify_config.BILLING_ENABLED and tenant_id:
|
||
cls._fulfill_params_from_billing_api(features, tenant_id)
|
||
|
||
if dify_config.ENTERPRISE_ENABLED:
|
||
features.webapp_copyright_enabled = True
|
||
cls._fulfill_params_from_workspace_info(features, tenant_id)
|
||
|
||
return features
|
||
|
||
@classmethod
|
||
def get_knowledge_rate_limit(cls, tenant_id: str):
|
||
knowledge_rate_limit = KnowledgeRateLimitModel()
|
||
if dify_config.BILLING_ENABLED and tenant_id:
|
||
knowledge_rate_limit.enabled = True
|
||
limit_info = BillingService.get_knowledge_rate_limit(tenant_id)
|
||
knowledge_rate_limit.limit = limit_info.get("limit", 10)
|
||
knowledge_rate_limit.subscription_plan = limit_info.get("subscription_plan", "sandbox")
|
||
return knowledge_rate_limit
|
||
|
||
@classmethod
|
||
def get_system_features(cls) -> SystemFeatureModel:
|
||
system_features = SystemFeatureModel()
|
||
# extend start: oauth2
|
||
api_host = request.host_url
|
||
# 通过nginx代理转发会导致 request.host_url 获取的是内网ip，这个时候使用.env的配置
|
||
if bool(re.search(r'^(?:[0-9]{1,3}\.){3}[0-9]{1,3}', request.host_url)):
|
||
api_host = dify_config.CONSOLE_WEB_URL
|
||
redis_client.set("api_host", api_host)
|
||
# extend stop: oauth2
|
||
|
||
cls._fulfill_system_params_from_env(system_features)
|
||
|
||
if dify_config.ENTERPRISE_ENABLED:
|
||
system_features.branding.enabled = True
|
||
system_features.webapp_auth.enabled = True
|
||
system_features.enable_change_email = False
|
||
cls._fulfill_params_from_enterprise(system_features)
|
||
|
||
if dify_config.MARKETPLACE_ENABLED:
|
||
system_features.enable_marketplace = True
|
||
|
||
return system_features
|
||
|
||
@classmethod
|
||
def _fulfill_system_params_from_env(cls, system_features: SystemFeatureModel):
|
||
system_features.enable_email_code_login = dify_config.ENABLE_EMAIL_CODE_LOGIN
|
||
system_features.enable_email_password_login = dify_config.ENABLE_EMAIL_PASSWORD_LOGIN
|
||
system_features.enable_social_oauth_login = dify_config.ENABLE_SOCIAL_OAUTH_LOGIN
|
||
system_features.is_allow_register = dify_config.ALLOW_REGISTER
|
||
system_features.is_allow_create_workspace = dify_config.ALLOW_CREATE_WORKSPACE
|
||
system_features.is_email_setup = dify_config.MAIL_TYPE is not None and dify_config.MAIL_TYPE != ""
|
||
# extend start: DingTalk third-party login
|
||
for i in db.session.query(SystemIntegrationExtend).filter(SystemIntegrationExtend.status == True).all():
|
||
if i.classify == SystemIntegrationClassify.SYSTEM_INTEGRATION_DINGTALK:
|
||
system_features.ding_talk_client_id = i.app_key
|
||
system_features.ding_talk_corp_id = i.corp_id
|
||
system_features.ding_talk = i.status
|
||
# Extend: OAuth2 Start
|
||
elif i.classify == SystemIntegrationClassify.SYSTEM_INTEGRATION_OAUTH_TWO:
|
||
config = json.loads(i.config)
|
||
system_features.is_custom_auth2 = i.status
|
||
if "logout_url" in config.keys():
|
||
system_features.is_custom_auth2_logout = "{}{}".format(
|
||
config['server_url'], config['logout_url'])
|
||
# Extend: OAuth2 Stop
|
||
# extend stop: DingTalk third-party login
|
||
|
||
@classmethod
|
||
def _fulfill_params_from_env(cls, features: FeatureModel):
|
||
features.can_replace_logo = dify_config.CAN_REPLACE_LOGO
|
||
features.model_load_balancing_enabled = dify_config.MODEL_LB_ENABLED
|
||
features.dataset_operator_enabled = dify_config.DATASET_OPERATOR_ENABLED
|
||
features.education.enabled = dify_config.EDUCATION_ENABLED
|
||
|
||
@classmethod
|
||
def _fulfill_params_from_workspace_info(cls, features: FeatureModel, tenant_id: str):
|
||
workspace_info = EnterpriseService.get_workspace_info(tenant_id)
|
||
if "WorkspaceMembers" in workspace_info:
|
||
features.workspace_members.size = workspace_info["WorkspaceMembers"]["used"]
|
||
features.workspace_members.limit = workspace_info["WorkspaceMembers"]["limit"]
|
||
features.workspace_members.enabled = workspace_info["WorkspaceMembers"]["enabled"]
|
||
|
||
@classmethod
|
||
def _fulfill_params_from_billing_api(cls, features: FeatureModel, tenant_id: str):
|
||
billing_info = BillingService.get_info(tenant_id)
|
||
|
||
features.billing.enabled = billing_info["enabled"]
|
||
features.billing.subscription.plan = billing_info["subscription"]["plan"]
|
||
features.billing.subscription.interval = billing_info["subscription"]["interval"]
|
||
features.education.activated = billing_info["subscription"].get("education", False)
|
||
|
||
if features.billing.subscription.plan != "sandbox":
|
||
features.webapp_copyright_enabled = True
|
||
else:
|
||
features.is_allow_transfer_workspace = False
|
||
|
||
if "members" in billing_info:
|
||
features.members.size = billing_info["members"]["size"]
|
||
features.members.limit = billing_info["members"]["limit"]
|
||
|
||
if "apps" in billing_info:
|
||
features.apps.size = billing_info["apps"]["size"]
|
||
features.apps.limit = billing_info["apps"]["limit"]
|
||
|
||
if "vector_space" in billing_info:
|
||
features.vector_space.size = billing_info["vector_space"]["size"]
|
||
features.vector_space.limit = billing_info["vector_space"]["limit"]
|
||
|
||
if "documents_upload_quota" in billing_info:
|
||
features.documents_upload_quota.size = billing_info["documents_upload_quota"]["size"]
|
||
features.documents_upload_quota.limit = billing_info["documents_upload_quota"]["limit"]
|
||
|
||
if "annotation_quota_limit" in billing_info:
|
||
features.annotation_quota_limit.size = billing_info["annotation_quota_limit"]["size"]
|
||
features.annotation_quota_limit.limit = billing_info["annotation_quota_limit"]["limit"]
|
||
|
||
if "docs_processing" in billing_info:
|
||
features.docs_processing = billing_info["docs_processing"]
|
||
|
||
if "can_replace_logo" in billing_info:
|
||
features.can_replace_logo = billing_info["can_replace_logo"]
|
||
|
||
if "model_load_balancing_enabled" in billing_info:
|
||
features.model_load_balancing_enabled = billing_info["model_load_balancing_enabled"]
|
||
|
||
if "knowledge_rate_limit" in billing_info:
|
||
features.knowledge_rate_limit = billing_info["knowledge_rate_limit"]["limit"]
|
||
|
||
@classmethod
|
||
def _fulfill_params_from_enterprise(cls, features: SystemFeatureModel):
|
||
enterprise_info = EnterpriseService.get_info()
|
||
|
||
if "SSOEnforcedForSignin" in enterprise_info:
|
||
features.sso_enforced_for_signin = enterprise_info["SSOEnforcedForSignin"]
|
||
|
||
if "SSOEnforcedForSigninProtocol" in enterprise_info:
|
||
features.sso_enforced_for_signin_protocol = enterprise_info["SSOEnforcedForSigninProtocol"]
|
||
|
||
if "EnableEmailCodeLogin" in enterprise_info:
|
||
features.enable_email_code_login = enterprise_info["EnableEmailCodeLogin"]
|
||
|
||
if "EnableEmailPasswordLogin" in enterprise_info:
|
||
features.enable_email_password_login = enterprise_info["EnableEmailPasswordLogin"]
|
||
|
||
if "IsAllowRegister" in enterprise_info:
|
||
features.is_allow_register = enterprise_info["IsAllowRegister"]
|
||
|
||
if "IsAllowCreateWorkspace" in enterprise_info:
|
||
features.is_allow_create_workspace = enterprise_info["IsAllowCreateWorkspace"]
|
||
|
||
if "Branding" in enterprise_info:
|
||
features.branding.application_title = enterprise_info["Branding"].get("applicationTitle", "")
|
||
features.branding.login_page_logo = enterprise_info["Branding"].get("loginPageLogo", "")
|
||
features.branding.workspace_logo = enterprise_info["Branding"].get("workspaceLogo", "")
|
||
features.branding.favicon = enterprise_info["Branding"].get("favicon", "")
|
||
|
||
if "WebAppAuth" in enterprise_info:
|
||
features.webapp_auth.allow_sso = enterprise_info["WebAppAuth"].get("allowSso", False)
|
||
features.webapp_auth.allow_email_code_login = enterprise_info["WebAppAuth"].get(
|
||
"allowEmailCodeLogin", False
|
||
)
|
||
features.webapp_auth.allow_email_password_login = enterprise_info["WebAppAuth"].get(
|
||
"allowEmailPasswordLogin", False
|
||
)
|
||
features.webapp_auth.sso_config.protocol = enterprise_info.get("SSOEnforcedForWebProtocol", "")
|
||
|
||
if "License" in enterprise_info:
|
||
license_info = enterprise_info["License"]
|
||
|
||
if "status" in license_info:
|
||
features.license.status = LicenseStatus(license_info.get("status", LicenseStatus.INACTIVE))
|
||
|
||
if "expiredAt" in license_info:
|
||
features.license.expired_at = license_info["expiredAt"]
|
||
|
||
if "workspaces" in license_info:
|
||
features.license.workspaces.enabled = license_info["workspaces"]["enabled"]
|
||
features.license.workspaces.limit = license_info["workspaces"]["limit"]
|
||
features.license.workspaces.size = license_info["workspaces"]["used"]
|
||
|
||
if "PluginInstallationPermission" in enterprise_info:
|
||
plugin_installation_info = enterprise_info["PluginInstallationPermission"]
|
||
features.plugin_installation_permission.plugin_installation_scope = plugin_installation_info[
|
||
"pluginInstallationScope"
|
||
]
|
||
features.plugin_installation_permission.restrict_to_marketplace_only = plugin_installation_info[
|
||
"restrictToMarketplaceOnly"
|
||
]
|