diff --git a/api/core/plugin/impl/trigger.py b/api/core/plugin/impl/trigger.py index f23d839d5b..9cd7a89e73 100644 --- a/api/core/plugin/impl/trigger.py +++ b/api/core/plugin/impl/trigger.py @@ -18,7 +18,7 @@ from core.trigger.entities.entities import Subscription from models.provider_ids import TriggerProviderID -class PluginTriggerManager(BasePluginClient): +class PluginTriggerClient(BasePluginClient): def fetch_trigger_providers(self, tenant_id: str) -> list[PluginTriggerProviderEntity]: """ Fetch trigger providers for the given tenant. diff --git a/api/core/trigger/provider.py b/api/core/trigger/provider.py index 510cf34d88..10fa31fdfa 100644 --- a/api/core/trigger/provider.py +++ b/api/core/trigger/provider.py @@ -15,7 +15,7 @@ from core.plugin.entities.request import ( TriggerInvokeEventResponse, TriggerSubscriptionResponse, ) -from core.plugin.impl.trigger import PluginTriggerManager +from core.plugin.impl.trigger import PluginTriggerClient from core.trigger.entities.api_entities import EventApiEntity, TriggerProviderApiEntity from core.trigger.entities.entities import ( EventEntity, @@ -171,7 +171,7 @@ class PluginTriggerProviderController: raise TriggerProviderCredentialValidationError(f"Missing required credential field: {config.name}") # Then validate with the plugin daemon - manager = PluginTriggerManager() + manager = PluginTriggerClient() provider_id = self.get_provider_id() response = manager.validate_provider_credentials( tenant_id=self.tenant_id, @@ -282,7 +282,7 @@ class PluginTriggerProviderController: :param credential_type: Credential type :return: Dispatch response with triggers and raw HTTP response """ - manager = PluginTriggerManager() + manager = PluginTriggerClient() provider_id: TriggerProviderID = self.get_provider_id() response: TriggerDispatchResponse = manager.dispatch_event( @@ -318,7 +318,7 @@ class PluginTriggerProviderController: :param payload: Payload :return: Trigger execution result """ - manager = PluginTriggerManager() + manager = PluginTriggerClient() provider_id: TriggerProviderID = self.get_provider_id() return manager.invoke_trigger_event( @@ -352,7 +352,7 @@ class PluginTriggerProviderController: :param credential_type: Credential type :return: Subscription result """ - manager = PluginTriggerManager() + manager = PluginTriggerClient() provider_id: TriggerProviderID = self.get_provider_id() response: TriggerSubscriptionResponse = manager.subscribe( @@ -379,7 +379,7 @@ class PluginTriggerProviderController: :param credential_type: Credential type :return: Unsubscribe result """ - manager = PluginTriggerManager() + manager = PluginTriggerClient() provider_id: TriggerProviderID = self.get_provider_id() response: TriggerSubscriptionResponse = manager.unsubscribe( @@ -403,7 +403,7 @@ class PluginTriggerProviderController: :param credentials: Provider credentials :return: Refreshed subscription result """ - manager = PluginTriggerManager() + manager = PluginTriggerClient() provider_id: TriggerProviderID = self.get_provider_id() response: TriggerSubscriptionResponse = manager.refresh( diff --git a/api/core/trigger/trigger_manager.py b/api/core/trigger/trigger_manager.py index b24c240cb4..8568d7f204 100644 --- a/api/core/trigger/trigger_manager.py +++ b/api/core/trigger/trigger_manager.py @@ -14,7 +14,7 @@ from configs import dify_config from core.plugin.entities.plugin_daemon import CredentialType, PluginTriggerProviderEntity from core.plugin.entities.request import TriggerInvokeEventResponse from core.plugin.impl.exc import PluginDaemonError, PluginInvokeError, PluginNotFoundError -from core.plugin.impl.trigger import PluginTriggerManager +from core.plugin.impl.trigger import PluginTriggerClient from core.trigger.entities.entities import ( EventEntity, Subscription, @@ -37,7 +37,7 @@ class TriggerManager: """ Get the icon of a trigger plugin """ - manager = PluginTriggerManager() + manager = PluginTriggerClient() provider: PluginTriggerProviderEntity = manager.fetch_trigger_provider( tenant_id=tenant_id, provider_id=TriggerProviderID(provider_id) ) @@ -53,7 +53,7 @@ class TriggerManager: :param tenant_id: Tenant ID :return: List of trigger provider controllers """ - manager = PluginTriggerManager() + manager = PluginTriggerClient() provider_entities = manager.fetch_trigger_providers(tenant_id) controllers: list[PluginTriggerProviderController] = [] @@ -101,7 +101,7 @@ class TriggerManager: return plugin_trigger_providers[provider_id_str] try: - manager = PluginTriggerManager() + manager = PluginTriggerClient() provider = manager.fetch_trigger_provider(tenant_id, provider_id) if not provider: