Dear User,
-The Dify team has generated a new password for you, details as follows:
-{new_password}
-Please change your password to log in as soon as possible.
-Regards,
-The Dify Team
- """ - } + # message = { + # 'from_email': 'noreply@example.com', + # 'to': [{'email': account['email']}], + # 'subject': 'Reset your Dify password', + # 'html': """ + #Dear User,
+ #The Dify team has generated a new password for you, details as follows:
+ #{new_password}
+ #Please change your password to log in as soon as possible.
+ #Regards,
+ #The Dify Team
+ # """ + # } # response = mailchimp.messages.send({ # 'message': message, diff --git a/api/controllers/console/auth/oauth.py b/api/controllers/console/auth/oauth.py index 2e4a627e06..4a651bfe7b 100644 --- a/api/controllers/console/auth/oauth.py +++ b/api/controllers/console/auth/oauth.py @@ -6,6 +6,7 @@ import requests from flask import current_app, redirect, request from flask_restful import Resource +from configs import dify_config from constants.languages import languages from extensions.ext_database import db from libs.helper import get_remote_ip @@ -18,22 +19,24 @@ from .. import api def get_oauth_providers(): with current_app.app_context(): - github_oauth = GitHubOAuth(client_id=current_app.config.get('GITHUB_CLIENT_ID'), - client_secret=current_app.config.get( - 'GITHUB_CLIENT_SECRET'), - redirect_uri=current_app.config.get( - 'CONSOLE_API_URL') + '/console/api/oauth/authorize/github') + if not dify_config.GITHUB_CLIENT_ID or not dify_config.GITHUB_CLIENT_SECRET: + github_oauth = None + else: + github_oauth = GitHubOAuth( + client_id=dify_config.GITHUB_CLIENT_ID, + client_secret=dify_config.GITHUB_CLIENT_SECRET, + redirect_uri=dify_config.CONSOLE_API_URL + '/console/api/oauth/authorize/github', + ) + if not dify_config.GOOGLE_CLIENT_ID or not dify_config.GOOGLE_CLIENT_SECRET: + google_oauth = None + else: + google_oauth = GoogleOAuth( + client_id=dify_config.GOOGLE_CLIENT_ID, + client_secret=dify_config.GOOGLE_CLIENT_SECRET, + redirect_uri=dify_config.CONSOLE_API_URL + '/console/api/oauth/authorize/google', + ) - google_oauth = GoogleOAuth(client_id=current_app.config.get('GOOGLE_CLIENT_ID'), - client_secret=current_app.config.get( - 'GOOGLE_CLIENT_SECRET'), - redirect_uri=current_app.config.get( - 'CONSOLE_API_URL') + '/console/api/oauth/authorize/google') - - OAUTH_PROVIDERS = { - 'github': github_oauth, - 'google': google_oauth - } + OAUTH_PROVIDERS = {'github': github_oauth, 'google': google_oauth} return OAUTH_PROVIDERS @@ -63,8 +66,7 @@ class OAuthCallback(Resource): token = oauth_provider.get_access_token(code) user_info = oauth_provider.get_user_info(token) except requests.exceptions.HTTPError as e: - logging.exception( - f"An error occurred during the OAuth process with {provider}: {e.response.text}") + logging.exception(f'An error occurred during the OAuth process with {provider}: {e.response.text}') return {'error': 'OAuth process failed'}, 400 account = _generate_account(provider, user_info) @@ -81,7 +83,7 @@ class OAuthCallback(Resource): token = AccountService.login(account, ip_address=get_remote_ip(request)) - return redirect(f'{current_app.config.get("CONSOLE_WEB_URL")}?console_token={token}') + return redirect(f'{dify_config.CONSOLE_WEB_URL}?console_token={token}') def _get_account_by_openid_or_email(provider: str, user_info: OAuthUserInfo) -> Optional[Account]: @@ -101,11 +103,7 @@ def _generate_account(provider: str, user_info: OAuthUserInfo): # Create account account_name = user_info.name if user_info.name else 'Dify' account = RegisterService.register( - email=user_info.email, - name=account_name, - password=None, - open_id=user_info.id, - provider=provider + email=user_info.email, name=account_name, password=None, open_id=user_info.id, provider=provider ) # Set interface language diff --git a/api/core/extension/api_based_extension_requestor.py b/api/core/extension/api_based_extension_requestor.py index 40e60687b2..4db7a99973 100644 --- a/api/core/extension/api_based_extension_requestor.py +++ b/api/core/extension/api_based_extension_requestor.py @@ -1,7 +1,6 @@ -import os - import requests +from configs import dify_config from models.api_based_extension import APIBasedExtensionPoint @@ -31,10 +30,10 @@ class APIBasedExtensionRequestor: try: # proxy support for security proxies = None - if os.environ.get("SSRF_PROXY_HTTP_URL") and os.environ.get("SSRF_PROXY_HTTPS_URL"): + if dify_config.SSRF_PROXY_HTTP_URL and dify_config.SSRF_PROXY_HTTPS_URL: proxies = { - 'http': os.environ.get("SSRF_PROXY_HTTP_URL"), - 'https': os.environ.get("SSRF_PROXY_HTTPS_URL"), + 'http': dify_config.SSRF_PROXY_HTTP_URL, + 'https': dify_config.SSRF_PROXY_HTTPS_URL, } response = requests.request( diff --git a/api/core/helper/code_executor/code_executor.py b/api/core/helper/code_executor/code_executor.py index ec731693b6..f094f7d79b 100644 --- a/api/core/helper/code_executor/code_executor.py +++ b/api/core/helper/code_executor/code_executor.py @@ -1,5 +1,4 @@ import logging -import os import time from enum import Enum from threading import Lock @@ -9,6 +8,7 @@ from httpx import get, post from pydantic import BaseModel from yarl import URL +from configs import dify_config from core.helper.code_executor.entities import CodeDependency from core.helper.code_executor.javascript.javascript_transformer import NodeJsTemplateTransformer from core.helper.code_executor.jinja2.jinja2_transformer import Jinja2TemplateTransformer @@ -18,8 +18,8 @@ from core.helper.code_executor.template_transformer import TemplateTransformer logger = logging.getLogger(__name__) # Code Executor -CODE_EXECUTION_ENDPOINT = os.environ.get('CODE_EXECUTION_ENDPOINT', 'http://sandbox:8194') -CODE_EXECUTION_API_KEY = os.environ.get('CODE_EXECUTION_API_KEY', 'dify-sandbox') +CODE_EXECUTION_ENDPOINT = dify_config.CODE_EXECUTION_ENDPOINT +CODE_EXECUTION_API_KEY = dify_config.CODE_EXECUTION_API_KEY CODE_EXECUTION_TIMEOUT= (10, 60) diff --git a/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py b/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py index 29b1746351..6588d1dd68 100644 --- a/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py +++ b/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py @@ -29,10 +29,8 @@ class ZhipuAI(HttpClient): http_client: httpx.Client | None = None, custom_headers: Mapping[str, str] | None = None ) -> None: - # if api_key is None: - # api_key = os.environ.get("ZHIPUAI_API_KEY") if api_key is None: - raise ZhipuAIError("未提供api_key，请通过参数或环境变量提供") + raise ZhipuAIError("No api_key provided, please provide it through parameters or environment variables") self.api_key = api_key if base_url is None: diff --git a/api/core/workflow/nodes/code/code_node.py b/api/core/workflow/nodes/code/code_node.py index 610a23e704..e15c1c6f87 100644 --- a/api/core/workflow/nodes/code/code_node.py +++ b/api/core/workflow/nodes/code/code_node.py @@ -1,6 +1,6 @@ -import os from typing import Optional, Union, cast +from configs import dify_config from core.helper.code_executor.code_executor import CodeExecutionException, CodeExecutor, CodeLanguage from core.helper.code_executor.code_node_provider import CodeNodeProvider from core.helper.code_executor.javascript.javascript_code_provider import JavascriptCodeProvider @@ -11,14 +11,14 @@ from core.workflow.nodes.base_node import BaseNode from core.workflow.nodes.code.entities import CodeNodeData from models.workflow import WorkflowNodeExecutionStatus -MAX_NUMBER = int(os.environ.get('CODE_MAX_NUMBER', '9223372036854775807')) -MIN_NUMBER = int(os.environ.get('CODE_MIN_NUMBER', '-9223372036854775808')) +MAX_NUMBER = dify_config.CODE_MAX_NUMBER +MIN_NUMBER = dify_config.CODE_MIN_NUMBER MAX_PRECISION = 20 MAX_DEPTH = 5 -MAX_STRING_LENGTH = int(os.environ.get('CODE_MAX_STRING_LENGTH', '80000')) -MAX_STRING_ARRAY_LENGTH = int(os.environ.get('CODE_MAX_STRING_ARRAY_LENGTH', '30')) -MAX_OBJECT_ARRAY_LENGTH = int(os.environ.get('CODE_MAX_OBJECT_ARRAY_LENGTH', '30')) -MAX_NUMBER_ARRAY_LENGTH = int(os.environ.get('CODE_MAX_NUMBER_ARRAY_LENGTH', '1000')) +MAX_STRING_LENGTH = dify_config.CODE_MAX_STRING_LENGTH +MAX_STRING_ARRAY_LENGTH = dify_config.CODE_MAX_STRING_ARRAY_LENGTH +MAX_OBJECT_ARRAY_LENGTH = dify_config.CODE_MAX_OBJECT_ARRAY_LENGTH +MAX_NUMBER_ARRAY_LENGTH = dify_config.CODE_MAX_NUMBER_ARRAY_LENGTH class CodeNode(BaseNode): diff --git a/api/core/workflow/nodes/http_request/entities.py b/api/core/workflow/nodes/http_request/entities.py index f4d6afa6ed..65451452c8 100644 --- a/api/core/workflow/nodes/http_request/entities.py +++ b/api/core/workflow/nodes/http_request/entities.py @@ -1,13 +1,13 @@ -import os from typing import Literal, Optional, Union from pydantic import BaseModel, ValidationInfo, field_validator +from configs import dify_config from core.workflow.entities.base_node_data_entities import BaseNodeData -MAX_CONNECT_TIMEOUT = int(os.environ.get('HTTP_REQUEST_MAX_CONNECT_TIMEOUT', '300')) -MAX_READ_TIMEOUT = int(os.environ.get('HTTP_REQUEST_MAX_READ_TIMEOUT', '600')) -MAX_WRITE_TIMEOUT = int(os.environ.get('HTTP_REQUEST_MAX_WRITE_TIMEOUT', '600')) +MAX_CONNECT_TIMEOUT = dify_config.HTTP_REQUEST_MAX_CONNECT_TIMEOUT +MAX_READ_TIMEOUT = dify_config.HTTP_REQUEST_MAX_READ_TIMEOUT +MAX_WRITE_TIMEOUT = dify_config.HTTP_REQUEST_MAX_WRITE_TIMEOUT class HttpRequestNodeAuthorizationConfig(BaseModel): diff --git a/api/core/workflow/nodes/http_request/http_executor.py b/api/core/workflow/nodes/http_request/http_executor.py index d69b323bbb..902d821e40 100644 --- a/api/core/workflow/nodes/http_request/http_executor.py +++ b/api/core/workflow/nodes/http_request/http_executor.py @@ -1,5 +1,4 @@ import json -import os from copy import deepcopy from random import randint from typing import Any, Optional, Union @@ -8,6 +7,7 @@ from urllib.parse import urlencode import httpx import core.helper.ssrf_proxy as ssrf_proxy +from configs import dify_config from core.workflow.entities.variable_entities import VariableSelector from core.workflow.entities.variable_pool import ValueType, VariablePool from core.workflow.nodes.http_request.entities import ( @@ -18,10 +18,10 @@ from core.workflow.nodes.http_request.entities import ( ) from core.workflow.utils.variable_template_parser import VariableTemplateParser -MAX_BINARY_SIZE = int(os.environ.get('HTTP_REQUEST_NODE_MAX_BINARY_SIZE', 1024 * 1024 * 10)) # 10MB -READABLE_MAX_BINARY_SIZE = f'{MAX_BINARY_SIZE / 1024 / 1024:.2f}MB' -MAX_TEXT_SIZE = int(os.environ.get('HTTP_REQUEST_NODE_MAX_TEXT_SIZE', 1024 * 1024)) # 1MB -READABLE_MAX_TEXT_SIZE = f'{MAX_TEXT_SIZE / 1024 / 1024:.2f}MB' +MAX_BINARY_SIZE = dify_config.HTTP_REQUEST_NODE_MAX_BINARY_SIZE +READABLE_MAX_BINARY_SIZE = dify_config.HTTP_REQUEST_NODE_READABLE_MAX_BINARY_SIZE +MAX_TEXT_SIZE = dify_config.HTTP_REQUEST_NODE_MAX_TEXT_SIZE +READABLE_MAX_TEXT_SIZE = dify_config.HTTP_REQUEST_NODE_READABLE_MAX_TEXT_SIZE class HttpExecutorResponse: