diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py index 3bd73cde84..18db53023e 100644 --- a/api/controllers/console/app/workflow.py +++ b/api/controllers/console/app/workflow.py @@ -35,8 +35,8 @@ from models.workflow import Workflow from services.app_generate_service import AppGenerateService from services.errors.app import WorkflowHashNotEqualError from services.errors.llm import InvokeRateLimitError +from services.trigger.webhook_service import WebhookService from services.trigger_debug_service import TriggerDebugService, WebhookDebugService -from services.webhook_service import WebhookService from services.workflow_service import DraftWorkflowDeletionError, WorkflowInUseError, WorkflowService logger = logging.getLogger(__name__) diff --git a/api/controllers/trigger/webhook.py b/api/controllers/trigger/webhook.py index 85b27bda67..8907bd5805 100644 --- a/api/controllers/trigger/webhook.py +++ b/api/controllers/trigger/webhook.py @@ -5,8 +5,8 @@ from flask import jsonify from werkzeug.exceptions import NotFound, RequestEntityTooLarge from controllers.trigger import bp +from services.trigger.webhook_service import WebhookService from services.trigger_debug_service import WebhookDebugService -from services.webhook_service import WebhookService logger = logging.getLogger(__name__) diff --git a/api/events/event_handlers/sync_webhook_when_app_created.py b/api/events/event_handlers/sync_webhook_when_app_created.py index 6a5ef2c654..481561faa2 100644 --- a/api/events/event_handlers/sync_webhook_when_app_created.py +++ b/api/events/event_handlers/sync_webhook_when_app_created.py @@ -3,7 +3,7 @@ import logging from events.app_event import app_draft_workflow_was_synced from models.model import App, AppMode from models.workflow import Workflow -from services.webhook_service import WebhookService +from services.trigger.webhook_service import WebhookService logger = logging.getLogger(__name__) diff --git a/api/services/webhook_service.py b/api/services/trigger/webhook_service.py similarity index 100% rename from api/services/webhook_service.py rename to api/services/trigger/webhook_service.py diff --git a/api/tests/test_containers_integration_tests/services/test_webhook_service.py b/api/tests/test_containers_integration_tests/services/test_webhook_service.py index 264a12947f..e1056718e6 100644 --- a/api/tests/test_containers_integration_tests/services/test_webhook_service.py +++ b/api/tests/test_containers_integration_tests/services/test_webhook_service.py @@ -10,7 +10,7 @@ from werkzeug.datastructures import FileStorage from models.model import App from models.workflow import Workflow, WorkflowWebhookTrigger from services.account_service import AccountService, TenantService -from services.webhook_service import WebhookService +from services.trigger.webhook_service import WebhookService class TestWebhookService: diff --git a/api/tests/unit_tests/services/test_webhook_service.py b/api/tests/unit_tests/services/test_webhook_service.py index 24375a6e7d..44765aeb9e 100644 --- a/api/tests/unit_tests/services/test_webhook_service.py +++ b/api/tests/unit_tests/services/test_webhook_service.py @@ -5,7 +5,7 @@ import pytest from flask import Flask from werkzeug.datastructures import FileStorage -from services.webhook_service import WebhookService +from services.trigger.webhook_service import WebhookService class TestWebhookServiceUnit: