From 81cb7c83646b89ba613ea6a874aabf4131f10f06 Mon Sep 17 00:00:00 2001
From: Will Sheldon <114631109+wssheldon@users.noreply.github.com>
Date: Tue, 2 May 2023 13:41:24 -0700
Subject: [PATCH 1/2] raise specific exception

---
 src/dispatch/signal/flows.py     | 5 +++--
 tests/signal/test_signal_flow.py | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/dispatch/signal/flows.py b/src/dispatch/signal/flows.py
index 6f83ce012828..a9155cdeb093 100644
--- a/src/dispatch/signal/flows.py
+++ b/src/dispatch/signal/flows.py
@@ -9,6 +9,7 @@
 from dispatch.case import service as case_service
 from dispatch.case.models import CaseCreate
 from dispatch.entity import service as entity_service
+from dispatch.exceptions import DispatchException
 from dispatch.plugin import service as plugin_service
 from dispatch.project.models import Project
 from dispatch.signal import service as signal_service
@@ -128,10 +129,10 @@ def create_signal_instance(
     )
 
     if not signal:
-        raise Exception("No signal definition defined.")
+        raise DispatchException("No signal definition defined.")
 
     if not signal.enabled:
-        raise Exception("Signal definition is not enabled.")
+        raise DispatchException("Signal definition is not enabled.")
 
     signal_instance_in = SignalInstanceCreate(
         raw=signal_instance_data, signal=signal, project=signal.project
diff --git a/tests/signal/test_signal_flow.py b/tests/signal/test_signal_flow.py
index 51da2426594b..f4612bbde555 100644
--- a/tests/signal/test_signal_flow.py
+++ b/tests/signal/test_signal_flow.py
@@ -1,5 +1,7 @@
 import pytest
 
+from dispatch.exceptions import DispatchException
+
 
 def test_create_signal_instance(session, signal, case_severity, case_priority, user):
     from dispatch.signal.flows import create_signal_instance
@@ -30,7 +32,7 @@ def test_create_signal_instance_no_variant(session, signal, case_severity, case_
     case_severity.project_id = signal.project_id
 
     instance_data = {"variant": "unknown"}
-    with pytest.raises(Exception):
+    with pytest.raises(DispatchException):
         create_signal_instance(
             db_session=session,
             project=signal.project,
@@ -50,7 +52,7 @@ def test_create_signal_instance_not_enabled(session, signal, case_severity, case
 
     signal.enabled = False
     instance_data = {"variant": signal.variant}
-    with pytest.raises(Exception):
+    with pytest.raises(DispatchException):
         create_signal_instance(
             db_session=session,
             project=signal.project,

From 7f95872775c59dc0f6f97af7f5779c7e11ce149e Mon Sep 17 00:00:00 2001
From: Will Sheldon <114631109+wssheldon@users.noreply.github.com>
Date: Tue, 2 May 2023 13:47:55 -0700
Subject: [PATCH 2/2] fix project import in workflow service

---
 src/dispatch/workflow/service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dispatch/workflow/service.py b/src/dispatch/workflow/service.py
index 86315adbdf56..00868a29c15b 100644
--- a/src/dispatch/workflow/service.py
+++ b/src/dispatch/workflow/service.py
@@ -13,7 +13,7 @@
 from dispatch.participant import service as participant_service
 from dispatch.plugin import service as plugin_service
 from dispatch.project import service as project_service
-from dispatch.project.models.py import Project
+from dispatch.project.models import Project
 from dispatch.signal import service as signal_service
 from dispatch.workflow.enums import WorkflowInstanceStatus