youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-03-13 19:17:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: propagate trigger metadata for plugin icons across UI

Browse Source
This commit is contained in:
lyzno1
2025-10-25 12:15:21 +08:00
parent e3484c8dc3
commit 3bd62f3fdf
9 changed files with 258 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
api/controllers/console/app/workflow_trigger.py
View File

@ -5,16 +5,17 @@ from sqlalchemy import select
from sqlalchemy.orm import Session
from werkzeug.exceptions import Forbidden, NotFound
from configs import dify_config
from controllers.console import api
from controllers.console.app.wraps import get_app_model
from controllers.console.wraps import account_initialization_required, setup_required
from core.trigger.trigger_manager import TriggerManager
from extensions.ext_database import db
from fields.workflow_trigger_fields import trigger_fields, triggers_list_fields, webhook_trigger_fields
from libs.login import current_user, login_required
from models.enums import AppTriggerStatus
from models.enums import AppTriggerStatus, AppTriggerType
from models.model import Account, App, AppMode
from models.trigger import AppTrigger, WorkflowWebhookTrigger
from models.provider_ids import TriggerProviderID
from models.trigger import AppTrigger, WorkflowPluginTrigger, WorkflowWebhookTrigger
logger = logging.getLogger(__name__)
@ -80,13 +81,64 @@ class AppTriggersApi(Resource):
.all()
)
# Add computed icon field for each trigger
url_prefix = dify_config.CONSOLE_API_URL + "/console/api/workspaces/current/tool-provider/builtin/"
plugin_node_ids = [
trigger.node_id for trigger in triggers if trigger.trigger_type == AppTriggerType.TRIGGER_PLUGIN.value
]
plugin_trigger_map: dict[str, WorkflowPluginTrigger] = {}
if plugin_node_ids:
plugin_triggers = (
session.execute(
select(WorkflowPluginTrigger).where(
WorkflowPluginTrigger.app_id == app_model.id,
WorkflowPluginTrigger.node_id.in_(plugin_node_ids),
)
)
.scalars()
.all()
)
plugin_trigger_map = {plugin_trigger.node_id: plugin_trigger for plugin_trigger in plugin_triggers}
tenant_id = current_user.current_tenant_id if isinstance(current_user, Account) else None
provider_cache: dict[str, dict[str, str]] = {}
def resolve_provider_metadata(provider_id: str) -> dict[str, str]:
if provider_id in provider_cache:
return provider_cache[provider_id]
metadata: dict[str, str] = {}
if not tenant_id:
provider_cache[provider_id] = metadata
return metadata
try:
controller = TriggerManager.get_trigger_provider(tenant_id, TriggerProviderID(provider_id))
api_entity = controller.to_api_entity()
metadata = {
"plugin_id": controller.plugin_id,
"plugin_unique_identifier": controller.plugin_unique_identifier,
"icon": api_entity.icon or "",
"provider_name": api_entity.name,
}
except Exception:
metadata = {}
provider_cache[provider_id] = metadata
return metadata
for trigger in triggers:
if trigger.trigger_type == "trigger-plugin":
trigger.icon = url_prefix + trigger.provider_name + "/icon" # type: ignore
if trigger.trigger_type == AppTriggerType.TRIGGER_PLUGIN.value:
plugin_trigger = plugin_trigger_map.get(trigger.node_id)
if not plugin_trigger:
trigger.icon = "" # type: ignore[attr-defined]
continue
trigger.provider_id = plugin_trigger.provider_id # type: ignore[attr-defined]
trigger.subscription_id = plugin_trigger.subscription_id # type: ignore[attr-defined]
trigger.event_name = plugin_trigger.event_name # type: ignore[attr-defined]
metadata = resolve_provider_metadata(plugin_trigger.provider_id)
trigger.plugin_id = metadata.get("plugin_id") # type: ignore[attr-defined]
trigger.plugin_unique_identifier = metadata.get("plugin_unique_identifier") # type: ignore[attr-defined]
trigger.icon = metadata.get("icon", "") # type: ignore[attr-defined]
if not trigger.provider_name:
trigger.provider_name = metadata.get("provider_name", "")
else:
trigger.icon = "" # type: ignore
trigger.icon = "" # type: ignore[attr-defined]
return {"data": triggers}
@ -130,12 +182,31 @@ class AppTriggerEnableApi(Resource):
session.commit()
session.refresh(trigger)
# Add computed icon field
url_prefix = dify_config.CONSOLE_API_URL + "/console/api/workspaces/current/tool-provider/builtin/"
if trigger.trigger_type == "trigger-plugin":
trigger.icon = url_prefix + trigger.provider_name + "/icon" # type: ignore
if trigger.trigger_type == AppTriggerType.TRIGGER_PLUGIN.value:
plugin_icon = ""
with Session(db.engine) as session:
plugin_trigger = session.execute(
select(WorkflowPluginTrigger).where(
WorkflowPluginTrigger.app_id == app_model.id,
WorkflowPluginTrigger.node_id == trigger.node_id,
)
).scalar_one_or_none()
if plugin_trigger and current_user.current_tenant_id:
try:
controller = TriggerManager.get_trigger_provider(
current_user.current_tenant_id, TriggerProviderID(plugin_trigger.provider_id)
)
trigger.provider_id = plugin_trigger.provider_id # type: ignore[attr-defined]
trigger.subscription_id = plugin_trigger.subscription_id # type: ignore[attr-defined]
trigger.event_name = plugin_trigger.event_name # type: ignore[attr-defined]
trigger.plugin_id = controller.plugin_id # type: ignore[attr-defined]
trigger.plugin_unique_identifier = controller.plugin_unique_identifier # type: ignore[attr-defined]
plugin_icon = controller.to_api_entity().icon or ""
except Exception:
plugin_icon = ""
trigger.icon = plugin_icon # type: ignore[attr-defined]
else:
trigger.icon = "" # type: ignore
trigger.icon = "" # type: ignore[attr-defined]
return trigger