youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-06-08 09:27:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feat/new-biliing-quota

Browse Source
This commit is contained in:
Yansong Zhang
2026-03-27 16:26:09 +08:00
parent 9503803997 5a8a68cab8
commit 37d438fa19
1942 changed files with 115994 additions and 41525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/services/trigger/schedule_service.py
View File

@ -13,7 +13,7 @@ from core.workflow.nodes.trigger_schedule.entities import (
VisualConfig,
)
from core.workflow.nodes.trigger_schedule.exc import ScheduleConfigError, ScheduleNotFoundError
from dify_graph.entities.graph_config import NodeConfigDict
from graphon.entities.graph_config import NodeConfigDict
from libs.schedule_utils import calculate_next_run_at, convert_12h_to_24h
from models.account import Account, TenantAccountJoin
from models.trigger import WorkflowSchedulePlan

2
api/services/trigger/trigger_service.py
View File

@ -18,9 +18,9 @@ from core.trigger.provider import PluginTriggerProviderController
from core.trigger.trigger_manager import TriggerManager
from core.trigger.utils.encryption import create_trigger_provider_encrypter_for_subscription
from core.workflow.nodes.trigger_plugin.entities import TriggerEventNodeData
from dify_graph.entities.graph_config import NodeConfigDict
from extensions.ext_database import db
from extensions.ext_redis import redis_client
from graphon.entities.graph_config import NodeConfigDict
from models.model import App
from models.provider_ids import TriggerProviderID
from models.trigger import TriggerSubscription, WorkflowPluginTrigger

9
api/services/trigger/webhook_service.py
View File

@ -15,6 +15,7 @@ from werkzeug.exceptions import RequestEntityTooLarge
from configs import dify_config
from core.app.entities.app_invoke_entities import InvokeFrom
from core.app.file_access import DatabaseFileAccessController
from core.tools.tool_file_manager import ToolFileManager
from core.trigger.constants import TRIGGER_WEBHOOK_NODE_TYPE
from core.workflow.nodes.trigger_webhook.entities import (
@ -23,13 +24,13 @@ from core.workflow.nodes.trigger_webhook.entities import (
WebhookData,
WebhookParameter,
)
from dify_graph.entities.graph_config import NodeConfigDict
from dify_graph.file.models import FileTransferMethod
from dify_graph.variables.types import ArrayValidation, SegmentType
from enums.quota_type import QuotaType
from extensions.ext_database import db
from extensions.ext_redis import redis_client
from factories import file_factory
from graphon.entities.graph_config import NodeConfigDict
from graphon.file.models import FileTransferMethod
from graphon.variables.types import ArrayValidation, SegmentType
from models.enums import AppTriggerStatus, AppTriggerType
from models.model import App
from models.trigger import AppTrigger, WorkflowWebhookTrigger
@ -46,6 +47,7 @@ except ImportError:
magic = None # type: ignore[assignment]
logger = logging.getLogger(__name__)
_file_access_controller = DatabaseFileAccessController()
class WebhookService:
@ -422,6 +424,7 @@ class WebhookService:
return file_factory.build_from_mapping(
mapping=mapping,
tenant_id=webhook_trigger.tenant_id,
access_controller=_file_access_controller,
)
@classmethod