From 84afa8be85e511b7eabb9546a42df9fdbca930e7 Mon Sep 17 00:00:00 2001
From: Marc Vilanova <mvilanova@netflix.com>
Date: Thu, 5 Jun 2025 13:28:10 -0700
Subject: [PATCH 1/2] fix(case): markdown in case resolution

---
 .../plugins/dispatch_slack/case/messages.py   |  71 ++++++--
 src/dispatch/static/dispatch/components.d.ts  |  93 +---------
 .../src/case/CaseAttributesDrawer.vue         |   1 +
 .../static/dispatch/src/case/ClosedDialog.vue |  22 ++-
 .../static/dispatch/src/case/DetailsTab.vue   |  39 ++--
 .../dispatch/src/components/HtmlRenderer.vue  | 166 ++++++++++++++++++
 .../dispatch/src/components/RichEditor.vue    |  23 ++-
 7 files changed, 279 insertions(+), 136 deletions(-)
 create mode 100644 src/dispatch/static/dispatch/src/components/HtmlRenderer.vue

diff --git a/src/dispatch/plugins/dispatch_slack/case/messages.py b/src/dispatch/plugins/dispatch_slack/case/messages.py
index 12d5cbdb0f93..898ed679e056 100644
--- a/src/dispatch/plugins/dispatch_slack/case/messages.py
+++ b/src/dispatch/plugins/dispatch_slack/case/messages.py
@@ -1,5 +1,7 @@
 import logging
 from typing import NamedTuple
+import html
+import re
 
 
 from blockkit import (
@@ -28,6 +30,7 @@
 )
 from dispatch.plugins.dispatch_slack.config import (
     MAX_SECTION_TEXT_LENGTH,
+    SlackConversationConfiguration,
 )
 from dispatch.plugins.dispatch_slack.models import (
     CaseSubjects,
@@ -46,21 +49,61 @@
 
 
 def map_priority_color(color: str) -> str:
-    """Maps a priority color to its corresponding emoji symbol."""
-    if not color:
-        return ""
+    """
+    Returns the first slack-compatible priority color for the given color.
 
-    # TODO we should probably restrict the possible colors to make this work
-    priority_color_mapping = {
-        "#9e9e9e": "⚪",
-        "#8bc34a": "🟢",
-        "#ffeb3b": "🟡",
-        "#ff9800": "🟠",
-        "#f44336": "🔴",
-        "#9c27b0": "🟣",
+    Args:
+        color (str): RGB Hex color string.
+
+    Returns:
+        str: Slack Color string.
+    """
+    color_mappings = {
+        "red": ":red_circle:",
+        "orange": ":orange_circle:",
+        "amber": ":yellow_circle:",
+        "green": ":green_circle:",
+        "blue": ":blue_circle:",
+        "purple": ":purple_circle:",
+        "grey": ":grey_circle:",
+        "gray": ":grey_circle:",
     }
 
-    return priority_color_mapping.get(color.lower(), "")
+    for mapping_color in color_mappings:
+        if mapping_color in color.lower():
+            return color_mappings[mapping_color]
+
+    return ":blue_circle:"
+
+
+def html_to_plain_text(html_content: str) -> str:
+    """
+    Convert HTML content to plain text for Slack messages.
+
+    Args:
+        html_content (str): HTML content to convert
+
+    Returns:
+        str: Plain text content
+    """
+    if not html_content:
+        return ""
+
+    # First decode any HTML entities
+    text = html.unescape(html_content)
+
+    # Remove HTML tags but preserve line breaks
+    text = re.sub(r'<br\s*/?>', '\n', text)
+    text = re.sub(r'</p>', '\n\n', text)
+    text = re.sub(r'<p[^>]*>', '', text)
+    text = re.sub(r'</?[^>]+>', '', text)
+
+    # Clean up extra whitespace
+    text = re.sub(r'\n\s*\n\s*\n', '\n\n', text)  # Multiple newlines to double
+    text = re.sub(r'[ \t]+', ' ', text)  # Multiple spaces/tabs to single space
+    text = text.strip()
+
+    return text
 
 
 def create_case_message(case: Case, channel_id: str) -> list[Block]:
@@ -142,11 +185,13 @@ def create_case_message(case: Case, channel_id: str) -> list[Block]:
             ]
         )
     elif case.status == CaseStatus.closed:
+        # Convert HTML resolution to plain text for Slack display
+        resolution_text = html_to_plain_text(case.resolution) if case.resolution else ""
         blocks.extend(
             [
                 Section(text=f"*Resolution reason* \n {case.resolution_reason}"),
                 Section(
-                    text=f"*Resolution description* \n {case.resolution}"[:MAX_SECTION_TEXT_LENGTH]
+                    text=f"*Resolution description* \n {resolution_text}"[:MAX_SECTION_TEXT_LENGTH]
                 ),
                 Actions(
                     elements=[
diff --git a/src/dispatch/static/dispatch/components.d.ts b/src/dispatch/static/dispatch/components.d.ts
index cd9ce5015d8e..b4e4bf790339 100644
--- a/src/dispatch/static/dispatch/components.d.ts
+++ b/src/dispatch/static/dispatch/components.d.ts
@@ -8,11 +8,9 @@ export {}
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     AdminLayout: typeof import('./src/components/layouts/AdminLayout.vue')['default']
-    AnimatedNumber: typeof import("./src/components/AnimatedNumber.vue")["default"]
     AppDrawer: typeof import('./src/components/AppDrawer.vue')['default']
     AppToolbar: typeof import('./src/components/AppToolbar.vue')['default']
     AutoComplete: typeof import('./src/components/AutoComplete.vue')['default']
-    Avatar: typeof import("./src/components/Avatar.vue")["default"]
     BaseCombobox: typeof import('./src/components/BaseCombobox.vue')['default']
     BasicLayout: typeof import('./src/components/layouts/BasicLayout.vue')['default']
     ColorPickerInput: typeof import('./src/components/ColorPickerInput.vue')['default']
@@ -25,17 +23,15 @@ declare module '@vue/runtime-core' {
     DMenu: typeof import('./src/components/DMenu.vue')['default']
     DTooltip: typeof import('./src/components/DTooltip.vue')['default']
     GenaiAnalysisDisplay: typeof import('./src/components/GenaiAnalysisDisplay.vue')['default']
+    HtmlRenderer: typeof import('./src/components/HtmlRenderer.vue')['default']
     IconPickerInput: typeof import('./src/components/IconPickerInput.vue')['default']
     InfoWidget: typeof import('./src/components/InfoWidget.vue')['default']
     Loading: typeof import('./src/components/Loading.vue')['default']
     LockButton: typeof import('./src/components/LockButton.vue')['default']
     MonacoEditor: typeof import('./src/components/MonacoEditor.vue')['default']
     NotificationSnackbarsWrapper: typeof import('./src/components/NotificationSnackbarsWrapper.vue')['default']
-    PageHeader: typeof import("./src/components/PageHeader.vue")["default"]
-    ParticipantAutoComplete: typeof import("./src/components/ParticipantAutoComplete.vue")["default"]
     ParticipantSelect: typeof import('./src/components/ParticipantSelect.vue')['default']
     PreciseDateTimePicker: typeof import('./src/components/PreciseDateTimePicker.vue')['default']
-    ProjectAutoComplete: typeof import("./src/components/ProjectAutoComplete.vue")["default"]
     Refresh: typeof import('./src/components/Refresh.vue')['default']
     RichEditor: typeof import('./src/components/RichEditor.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
@@ -43,93 +39,6 @@ declare module '@vue/runtime-core' {
     SavingState: typeof import('./src/components/SavingState.vue')['default']
     SearchPopover: typeof import('./src/components/SearchPopover.vue')['default']
     SettingsBreadcrumbs: typeof import('./src/components/SettingsBreadcrumbs.vue')['default']
-    ShepherdStep: typeof import("./src/components/ShepherdStep.vue")["default"]
-    ShpherdStep: typeof import("./src/components/ShpherdStep.vue")["default"]
     StatWidget: typeof import('./src/components/StatWidget.vue')['default']
-    SubjectLastUpdated: typeof import("./src/components/SubjectLastUpdated.vue")["default"]
-    TimePicker: typeof import("./src/components/TimePicker.vue")["default"]
-    VAlert: typeof import("vuetify/lib")["VAlert"]
-    VApp: typeof import("vuetify/lib")["VApp"]
-    VAppBar: typeof import("vuetify/lib")["VAppBar"]
-    VAutocomplete: typeof import("vuetify/lib")["VAutocomplete"]
-    VAvatar: typeof import("vuetify/lib")["VAvatar"]
-    VBadge: typeof import("vuetify/lib")["VBadge"]
-    VBottomSheet: typeof import("vuetify/lib")["VBottomSheet"]
-    VBreadcrumbs: typeof import("vuetify/lib")["VBreadcrumbs"]
-    VBreadcrumbsItem: typeof import("vuetify/lib")["VBreadcrumbsItem"]
-    VBtn: typeof import("vuetify/lib")["VBtn"]
-    VCard: typeof import("vuetify/lib")["VCard"]
-    VCardActions: typeof import("vuetify/lib")["VCardActions"]
-    VCardSubtitle: typeof import("vuetify/lib")["VCardSubtitle"]
-    VCardText: typeof import("vuetify/lib")["VCardText"]
-    VCardTitle: typeof import("vuetify/lib")["VCardTitle"]
-    VCheckbox: typeof import("vuetify/lib")["VCheckbox"]
-    VChip: typeof import("vuetify/lib")["VChip"]
-    VChipGroup: typeof import("vuetify/lib")["VChipGroup"]
-    VCol: typeof import("vuetify/lib")["VCol"]
-    VColorPicker: typeof import("vuetify/lib")["VColorPicker"]
-    VCombobox: typeof import("vuetify/lib")["VCombobox"]
-    VContainer: typeof import("vuetify/lib")["VContainer"]
-    VDataTable: typeof import("vuetify/lib")["VDataTable"]
-    VDatePicker: typeof import("vuetify/lib")["VDatePicker"]
-    VDialog: typeof import("vuetify/lib")["VDialog"]
-    VDivider: typeof import("vuetify/lib")["VDivider"]
-    VExpandTransition: typeof import("vuetify/lib")["VExpandTransition"]
-    VExpansionPanel: typeof import("vuetify/lib")["VExpansionPanel"]
-    VExpansionPanelContent: typeof import("vuetify/lib")["VExpansionPanelContent"]
-    VExpansionPanelHeader: typeof import("vuetify/lib")["VExpansionPanelHeader"]
-    VExpansionPanels: typeof import("vuetify/lib")["VExpansionPanels"]
-    VFlex: typeof import("vuetify/lib")["VFlex"]
-    VForm: typeof import("vuetify/lib")["VForm"]
-    VHover: typeof import("vuetify/lib")["VHover"]
-    VIcon: typeof import("vuetify/lib")["VIcon"]
-    VItem: typeof import("vuetify/lib")["VItem"]
-    VLayout: typeof import("vuetify/lib")["VLayout"]
-    VLazy: typeof import("vuetify/lib")["VLazy"]
-    VList: typeof import("vuetify/lib")["VList"]
-    VListGroup: typeof import("vuetify/lib")["VListGroup"]
-    VListItem: typeof import("vuetify/lib")["VListItem"]
-    VListItemAction: typeof import("vuetify/lib")["VListItemAction"]
-    VListItemAvatar: typeof import("vuetify/lib")["VListItemAvatar"]
-    VListItemContent: typeof import("vuetify/lib")["VListItemContent"]
-    VListItemGroup: typeof import("vuetify/lib")["VListItemGroup"]
-    VListItemIcon: typeof import("vuetify/lib")["VListItemIcon"]
-    VListItemSubtitle: typeof import("vuetify/lib")["VListItemSubtitle"]
-    VListItemTitle: typeof import("vuetify/lib")["VListItemTitle"]
-    VMain: typeof import("vuetify/lib")["VMain"]
-    VMenu: typeof import("vuetify/lib")["VMenu"]
-    VNavigationDrawer: typeof import("vuetify/lib")["VNavigationDrawer"]
-    VProgressLinear: typeof import("vuetify/lib")["VProgressLinear"]
-    VRadio: typeof import("vuetify/lib")["VRadio"]
-    VRadioGroup: typeof import("vuetify/lib")["VRadioGroup"]
-    VRow: typeof import("vuetify/lib")["VRow"]
-    VSelect: typeof import("vuetify/lib")["VSelect"]
-    VSheet: typeof import("vuetify/lib")["VSheet"]
-    VSimpleCheckbox: typeof import("vuetify/lib")["VSimpleCheckbox"]
-    VSnackbar: typeof import("vuetify/lib")["VSnackbar"]
-    VSpacer: typeof import("vuetify/lib")["VSpacer"]
-    VStepper: typeof import("vuetify/lib")["VStepper"]
-    VStepperContent: typeof import("vuetify/lib")["VStepperContent"]
-    VStepperHeader: typeof import("vuetify/lib")["VStepperHeader"]
-    VStepperItems: typeof import("vuetify/lib")["VStepperItems"]
-    VStepperStep: typeof import("vuetify/lib")["VStepperStep"]
-    VSubheader: typeof import("vuetify/lib")["VSubheader"]
-    VSwitch: typeof import("vuetify/lib")["VSwitch"]
-    VSystemBar: typeof import("vuetify/lib")["VSystemBar"]
-    VTab: typeof import("vuetify/lib")["VTab"]
-    VTabItem: typeof import("vuetify/lib")["VTabItem"]
-    VTabs: typeof import("vuetify/lib")["VTabs"]
-    VTabsItems: typeof import("vuetify/lib")["VTabsItems"]
-    VTextarea: typeof import("vuetify/lib")["VTextarea"]
-    VTextArea: typeof import("vuetify/lib")["VTextArea"]
-    VTextField: typeof import("vuetify/lib")["VTextField"]
-    VTimeline: typeof import("vuetify/lib")["VTimeline"]
-    VTimelineItem: typeof import("vuetify/lib")["VTimelineItem"]
-    VTimePicker: typeof import("vuetify/lib")["VTimePicker"]
-    VToolbarItems: typeof import("vuetify/lib")["VToolbarItems"]
-    VToolbarTitle: typeof import("vuetify/lib")["VToolbarTitle"]
-    VTooltip: typeof import("vuetify/lib")["VTooltip"]
-    VWindow: typeof import("vuetify/lib")["VWindow"]
-    VWindowItem: typeof import("vuetify/lib")["VWindowItem"]
   }
 }
diff --git a/src/dispatch/static/dispatch/src/case/CaseAttributesDrawer.vue b/src/dispatch/static/dispatch/src/case/CaseAttributesDrawer.vue
index 3ce037f86e5b..631dc467bb9e 100644
--- a/src/dispatch/static/dispatch/src/case/CaseAttributesDrawer.vue
+++ b/src/dispatch/static/dispatch/src/case/CaseAttributesDrawer.vue
@@ -11,6 +11,7 @@ import DTooltip from "@/components/DTooltip.vue"
 import ParticipantSearchPopover from "@/participant/ParticipantSearchPopover.vue"
 import ProjectSearchPopover from "@/project/ProjectSearchPopover.vue"
 import TagSearchPopover from "@/tag/TagSearchPopover.vue"
+import RichEditor from "@/components/RichEditor.vue"
 import { useSavingState } from "@/composables/useSavingState"
 
 // Define the props
diff --git a/src/dispatch/static/dispatch/src/case/ClosedDialog.vue b/src/dispatch/static/dispatch/src/case/ClosedDialog.vue
index 660765180fd1..4e89e9ddc2ef 100644
--- a/src/dispatch/static/dispatch/src/case/ClosedDialog.vue
+++ b/src/dispatch/static/dispatch/src/case/ClosedDialog.vue
@@ -19,11 +19,18 @@
               />
             </v-col>
             <v-col cols="12">
-              <v-textarea
-                v-model="resolution"
-                label="Resolution"
-                hint="Description of the actions taken to resolve the case."
-                clearable
+              <v-label class="mb-2">Resolution</v-label>
+              <v-card flat color="grey-lighten-5" class="rounded-lg">
+                <RichEditor
+                  :content="resolution"
+                  @update:model-value="(newValue) => (resolution = newValue)"
+                  placeholder="Description of the actions taken to resolve the case..."
+                  style="min-height: 150px; margin: 10px; font-size: 0.9125rem; font-weight: 400"
+                />
+              </v-card>
+              <v-messages
+                :value="['Description of the actions taken to resolve the case.']"
+                class="v-messages--hint"
               />
             </v-col>
             <v-btn color="blue en-1" variant="text" @click="closeClosedDialog()"> Cancel </v-btn>
@@ -51,10 +58,15 @@
 <script>
 import { mapFields } from "vuex-map-fields"
 import { mapActions } from "vuex"
+import RichEditor from "@/components/RichEditor.vue"
 
 export default {
   name: "CaseClosedDialog",
 
+  components: {
+    RichEditor,
+  },
+
   data() {
     return {
       resolutionReason: "False Positive",
diff --git a/src/dispatch/static/dispatch/src/case/DetailsTab.vue b/src/dispatch/static/dispatch/src/case/DetailsTab.vue
index e5d8e2ee9919..be29e59ce17d 100644
--- a/src/dispatch/static/dispatch/src/case/DetailsTab.vue
+++ b/src/dispatch/static/dispatch/src/case/DetailsTab.vue
@@ -32,11 +32,18 @@
         />
       </v-col>
       <v-col cols="12">
-        <v-textarea
-          v-model="resolution"
-          label="Resolution"
-          hint="Description of the actions taken to resolve the case."
-          clearable
+        <v-label class="mb-2">Resolution</v-label>
+        <v-card flat color="grey-lighten-5" class="rounded-lg">
+          <RichEditor
+            :content="resolution"
+            @update:model-value="(newValue) => (resolution = newValue)"
+            placeholder="Description of the actions taken to resolve the case..."
+            style="min-height: 200px; margin: 10px; font-size: 0.9125rem; font-weight: 400"
+          />
+        </v-card>
+        <v-messages
+          :value="['Description of the actions taken to resolve the case.']"
+          class="v-messages--hint"
         />
       </v-col>
       <v-col cols="12">
@@ -138,23 +145,16 @@
         </v-row>
       </v-col>
       <v-col cols="12">
-        <tag-filter-auto-complete
-          label="Tags"
-          v-model="tags"
-          model="case"
-          :model-id="id"
-          :project="project"
-          show-copy
-        />
+        <case-filter-combobox v-model="related" label="Related" />
       </v-col>
       <v-col cols="12">
-        <case-filter-combobox label="Related" v-model="related" :project="project" />
+        <case-filter-combobox v-model="duplicates" label="Duplicates" />
       </v-col>
       <v-col cols="12">
-        <case-filter-combobox label="Duplicates" v-model="duplicates" :project="project" />
+        <incident-filter-combobox v-model="incidents" label="Incidents" />
       </v-col>
       <v-col cols="12">
-        <incident-filter-combobox label="Incidents" v-model="incidents" :project="project" />
+        <tag-filter-auto-complete v-model="tags" label="Tags" model="case" :project="project" />
       </v-col>
     </v-row>
   </v-container>
@@ -163,16 +163,16 @@
 <script>
 import { required } from "@/util/form"
 import { mapFields } from "vuex-map-fields"
-
 import CaseFilterCombobox from "@/case/CaseFilterCombobox.vue"
 import CasePrioritySelect from "@/case/priority/CasePrioritySelect.vue"
 import CaseSeveritySelect from "@/case/severity/CaseSeveritySelect.vue"
 import CaseTypeSelect from "@/case/type/CaseTypeSelect.vue"
 import DateTimePickerMenu from "@/components/DateTimePickerMenu.vue"
 import IncidentFilterCombobox from "@/incident/IncidentFilterCombobox.vue"
-import ProjectSelect from "@/project/ProjectSelect.vue"
 import ParticipantSelect from "@/components/ParticipantSelect.vue"
-import TagFilterAutoComplete from "@/tag/TagPicker.vue"
+import ProjectSelect from "@/project/ProjectSelect.vue"
+import RichEditor from "@/components/RichEditor.vue"
+import TagFilterAutoComplete from "@/tag/TagFilterAutoComplete.vue"
 
 export default {
   setup() {
@@ -191,6 +191,7 @@ export default {
     IncidentFilterCombobox,
     ParticipantSelect,
     ProjectSelect,
+    RichEditor,
     TagFilterAutoComplete,
   },
 
diff --git a/src/dispatch/static/dispatch/src/components/HtmlRenderer.vue b/src/dispatch/static/dispatch/src/components/HtmlRenderer.vue
new file mode 100644
index 000000000000..9a2412bb382f
--- /dev/null
+++ b/src/dispatch/static/dispatch/src/components/HtmlRenderer.vue
@@ -0,0 +1,166 @@
+<template>
+  <div v-if="isHtml" v-html="sanitizedContent" class="html-content" />
+  <div v-else class="plain-text-content">
+    {{ content }}
+  </div>
+</template>
+
+<script setup>
+import { computed } from "vue"
+import DOMPurify from "dompurify"
+
+const props = defineProps({
+  content: {
+    type: String,
+    default: "",
+  },
+})
+
+// Check if content contains HTML tags
+const isHtml = computed(() => {
+  if (!props.content) return false
+  return /<[^>]+>/.test(props.content)
+})
+
+// Sanitize HTML content to prevent XSS attacks
+const sanitizedContent = computed(() => {
+  if (!props.content) return ""
+
+  // Configure DOMPurify to allow common formatting tags
+  const config = {
+    ALLOWED_TAGS: [
+      "p",
+      "br",
+      "strong",
+      "b",
+      "em",
+      "i",
+      "u",
+      "s",
+      "strike",
+      "h1",
+      "h2",
+      "h3",
+      "h4",
+      "h5",
+      "h6",
+      "ul",
+      "ol",
+      "li",
+      "blockquote",
+      "pre",
+      "code",
+      "a",
+    ],
+    ALLOWED_ATTR: ["href", "target", "rel"],
+    ALLOW_DATA_ATTR: false,
+  }
+
+  return DOMPurify.sanitize(props.content, config)
+})
+</script>
+
+<style lang="scss" scoped>
+.html-content {
+  // TipTap-like styling for consistency
+  :deep(> * + *) {
+    margin-top: 0.75em;
+  }
+
+  :deep(h1) {
+    font-size: 1.75em;
+    font-weight: bold;
+    margin-top: 1.5em;
+    margin-bottom: 0.5em;
+  }
+
+  :deep(h2) {
+    font-size: 1.5em;
+    font-weight: bold;
+    margin-top: 1.25em;
+    margin-bottom: 0.5em;
+  }
+
+  :deep(h3) {
+    font-size: 1.25em;
+    font-weight: bold;
+    margin-top: 1em;
+    margin-bottom: 0.5em;
+  }
+
+  :deep(h4, h5, h6) {
+    font-size: 1em;
+    font-weight: bold;
+    margin-top: 0.75em;
+    margin-bottom: 0.5em;
+  }
+
+  :deep(strong, b) {
+    font-weight: bold;
+  }
+
+  :deep(em, i) {
+    font-style: italic;
+  }
+
+  :deep(u) {
+    text-decoration: underline;
+  }
+
+  :deep(s, strike) {
+    text-decoration: line-through;
+  }
+
+  :deep(code) {
+    background-color: rgba(97, 97, 97, 0.1);
+    color: #616161;
+    padding: 0.2em 0.4em;
+    border-radius: 4px;
+    font-family: monospace;
+    font-size: 0.9em;
+  }
+
+  :deep(pre) {
+    background-color: #f5f5f5;
+    border-radius: 5px;
+    padding: 1em;
+    overflow-x: auto;
+
+    code {
+      background: none;
+      padding: 0;
+      color: #333;
+    }
+  }
+
+  :deep(blockquote) {
+    border-left: 4px solid #ddd;
+    padding-left: 1em;
+    margin-left: 0;
+    font-style: italic;
+    color: #666;
+  }
+
+  :deep(ul, ol) {
+    padding-left: 1.5em;
+  }
+
+  :deep(li) {
+    margin-bottom: 0.25em;
+  }
+
+  :deep(a) {
+    color: #1976d2;
+    text-decoration: underline;
+
+    &:hover {
+      color: #1565c0;
+    }
+  }
+}
+
+.plain-text-content {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+</style>
diff --git a/src/dispatch/static/dispatch/src/components/RichEditor.vue b/src/dispatch/static/dispatch/src/components/RichEditor.vue
index 40ec57b99f28..d6e45e60191a 100644
--- a/src/dispatch/static/dispatch/src/components/RichEditor.vue
+++ b/src/dispatch/static/dispatch/src/components/RichEditor.vue
@@ -22,6 +22,7 @@ const props = defineProps({
 })
 
 const editor = ref(null)
+const htmlValue = ref("")
 const plainTextValue = ref("")
 
 const emit = defineEmits(["update:modelValue"])
@@ -36,6 +37,12 @@ const handleBlur = () => {
   userIsTyping.value = false
 }
 
+// Utility function to convert HTML to plain text
+const htmlToPlainText = (html) => {
+  if (!html) return ""
+  return html.replace(/<\/?[^>]+(>|$)/g, "")
+}
+
 watch(
   () => props.content,
   (value) => {
@@ -63,7 +70,7 @@ onMounted(() => {
         // Use different placeholders depending on the node type:
         // placeholder: ({ node }) => {
         //   if (node.type.name === 'heading') {
-        //     return 'What’s the title?'
+        //     return 'What's the title?'
         //   }
 
         //   return 'Can you add some further context?'
@@ -73,10 +80,12 @@ onMounted(() => {
     content: props.content,
     onUpdate: () => {
       let content = editor.value?.getHTML()
-      // remove the HTML tags
-      plainTextValue.value = content.replace(/<\/?[^>]+(>|$)/g, "")
-      // Emitting the updated plain text
-      emit("update:modelValue", plainTextValue.value)
+      // Preserve the HTML content to maintain formatting
+      htmlValue.value = content
+      // Also maintain plain text version for backwards compatibility
+      plainTextValue.value = htmlToPlainText(content)
+      // Emit the HTML content instead of stripped plain text
+      emit("update:modelValue", htmlValue.value)
     },
     keyboardShortcuts: {
       Enter: () => {}, // Override Enter key to do nothing
@@ -92,8 +101,8 @@ onBeforeUnmount(() => {
   editor.value?.destroy()
 })
 
-// Expose plainTextValue for parent component to use
-defineExpose({ plainTextValue })
+// Expose both HTML and plain text values for parent component to use
+defineExpose({ htmlValue, plainTextValue, htmlToPlainText })
 </script>
 
 <style lang="scss">

From 8b0e8970920d59c7fbaa653726298cf41d0994cf Mon Sep 17 00:00:00 2001
From: Marc Vilanova <mvilanova@netflix.com>
Date: Thu, 5 Jun 2025 13:47:14 -0700
Subject: [PATCH 2/2] pre commit pass

---
 .coveragerc                                   |   1 -
 .pre-commit-config.yaml                       |  40 ++++--
 docker/Dockerfile                             |   2 +-
 src/dispatch/auth/service.py                  |   3 +-
 src/dispatch/case/flows.py                    |   2 +-
 src/dispatch/case/messaging.py                |   3 +-
 src/dispatch/case/models.py                   |   3 +
 src/dispatch/case/service.py                  |   3 +-
 src/dispatch/case/type/models.py              |  10 ++
 src/dispatch/case/views.py                    |  11 +-
 src/dispatch/case_cost_type/service.py        |   8 +-
 src/dispatch/conference/service.py            |   1 -
 src/dispatch/conversation/models.py           |   6 +
 src/dispatch/data/alert/service.py            |   1 -
 src/dispatch/data/query/service.py            |  18 +--
 .../data/source/data_format/service.py        |  18 +--
 .../data/source/environment/service.py        |  18 +--
 src/dispatch/data/source/service.py           |  18 +--
 src/dispatch/data/source/status/service.py    |  18 +--
 src/dispatch/data/source/transport/service.py |  18 +--
 src/dispatch/data/source/type/service.py      |  18 +--
 src/dispatch/database/core.py                 |   3 +
 src/dispatch/database/manage.py               |   2 +-
 src/dispatch/database/revisions/core/README   |   2 +-
 src/dispatch/database/revisions/core/env.py   |   1 +
 src/dispatch/database/revisions/tenant/README |   2 +-
 src/dispatch/database/service.py              |   4 +-
 src/dispatch/definition/service.py            |   1 -
 src/dispatch/definition/views.py              |  14 +-
 src/dispatch/document/service.py              |  28 ++--
 src/dispatch/entity_type/views.py             |   1 -
 src/dispatch/event/service.py                 |   4 +-
 src/dispatch/feedback/incident/service.py     |   6 +-
 src/dispatch/feedback/service/service.py      |   1 -
 src/dispatch/group/models.py                  |   6 +
 src/dispatch/group/service.py                 |   1 -
 src/dispatch/incident/messaging.py            |   4 +-
 src/dispatch/incident/service.py              |  14 +-
 src/dispatch/incident/severity/models.py      |   8 ++
 src/dispatch/incident/type/models.py          |   9 ++
 src/dispatch/incident_cost_type/models.py     |   6 +
 src/dispatch/incident_cost_type/service.py    |   4 +-
 src/dispatch/incident_role/service.py         |   2 +-
 src/dispatch/individual/service.py            |  18 +--
 src/dispatch/individual/views.py              |  20 +--
 src/dispatch/messaging/strings.py             | 112 ++++-----------
 src/dispatch/models.py                        |  11 +-
 src/dispatch/monitor/service.py               |   1 -
 src/dispatch/organization/models.py           |   6 +
 src/dispatch/participant/service.py           |   4 +-
 src/dispatch/plugin/service.py                |  18 +--
 src/dispatch/plugins/dispatch_core/plugin.py  |  22 +--
 .../plugins/dispatch_google/drive/task.py     |   5 +-
 .../plugins/dispatch_google/groups/plugin.py  |   4 +-
 .../dispatch_slack/case/interactive.py        |   2 +-
 .../plugins/dispatch_slack/case/messages.py   |  13 +-
 src/dispatch/plugins/dispatch_slack/fields.py |   2 +-
 .../plugins/dispatch_slack/messaging.py       |   6 +-
 src/dispatch/plugins/dispatch_slack/plugin.py |   5 +-
 src/dispatch/report/flows.py                  |  14 +-
 src/dispatch/report/service.py                |   1 -
 src/dispatch/search/fulltext/__init__.py      |   7 +-
 src/dispatch/search/models.py                 |   8 +-
 src/dispatch/search_filter/service.py         |   1 -
 src/dispatch/service/service.py               |  19 +--
 src/dispatch/static/dispatch/.npmrc           |   1 -
 src/dispatch/static/dispatch/jsconfig.json    |   2 +-
 .../static/dispatch/public/static/robots.txt  |   2 +-
 .../src/events/ReportSubmissionCard.vue       |   2 +-
 src/dispatch/storage/models.py                |   2 +
 src/dispatch/storage/service.py               |   1 -
 src/dispatch/tag/service.py                   |  18 +--
 src/dispatch/tag_type/service.py              |   2 +-
 src/dispatch/tag_type/views.py                |   6 +-
 src/dispatch/task/service.py                  |   4 +-
 src/dispatch/team/service.py                  |   1 -
 src/dispatch/term/service.py                  |   1 -
 src/dispatch/ticket/service.py                |   1 -
 src/dispatch/workflow/models.py               |  30 ++--
 src/dispatch/workflow/scheduled.py            |   2 +-
 src/dispatch/workflow/service.py              |  15 +-
 tests/case/test_case_service.py               |  26 ++--
 .../test_case_cost_type_service.py            |   1 +
 .../test_dispatch_google_docs.py              |   1 +
 tests/document/test_document_service.py       |   2 +-
 tests/entity/test_entity_service.py           | 133 +++++++++++-------
 tests/entity_type/test_entity_type_service.py |  58 ++++----
 tests/event/test_event_service.py             |   5 +-
 tests/feedback/test_feedback_cases.py         |  49 +++----
 tests/feedback/test_feedback_oncall.py        | 115 ++++++++-------
 tests/feedback/test_feedback_service.py       |  20 +--
 .../test_incident_cost_service.py             |   6 +-
 .../test_incident_role_service.py             |   4 +-
 .../notification/test_notification_service.py |   4 +-
 ...est_dispatch_slack_incident_interactive.py |   1 -
 tests/signal/test_signal_flow.py              | 118 +++++++++++-----
 tests/signal/test_signal_stats_service.py     |   3 +-
 97 files changed, 727 insertions(+), 551 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index b1c1c93c3598..0181948d2bf9 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -19,4 +19,3 @@ omit =
     src/dispatch/api.py
     src/dispatch/extensions.py
     src/dispatch/scheduler.py
-
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 37d7474cb362..69a57adfa98e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,15 +7,31 @@
 # To Skip Checks:
 #
 # git commit --no-verify
+# git push --no-verify
+# test
+#
+# To update all hooks automatically:
+#
+# pre-commit autoupdate
 fail_fast: false
 
 default_language_version:
   python: python3.11.2
 
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: no-commit-to-branch # prevent direct commits to the `main` branch
+      - id: check-yaml
+        args: ["--unsafe"]
+      - id: check-toml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # ruff version.
-    rev: v0.7.0
+    rev: v0.11.12
     hooks:
       # Run the linter.
       #
@@ -26,19 +42,27 @@ repos:
       # Run the formatter.
       - id: ruff-format
 
-  # Typos
+  # typos
   - repo: https://github.com/crate-ci/typos
-    rev: v1.26.1
+    rev: v1.33.1
     hooks:
       - id: typos
-        exclude: ^(data/dispatch-sample-data.dump|src/dispatch/static/dispatch/src/|src/dispatch/database/revisions/)
+        exclude: |
+          (?x)^(
+            src/dispatch/database/revisions/core/versions/|
+            src/dispatch/database/revisions/tenant/versions/|
+            src/dispatch/static/dispatch/src/assets/icons/|
+            data/dispatch-sample-data.dump|
+            src/dispatch/plugins/dispatch_zoom/client.py
+          )
 
-  # Pytest
+  # pytest
   - repo: local
     hooks:
       - id: tests
         name: run tests
-        entry: pytest -v tests/
+        entry: pytest -v tests
         language: system
-        types: [python]
-        stages: [push]
+        pass_filenames: false
+        always_run: true
+        stages: [pre-push]
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fcab6e531578..580ef3c5d644 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -106,7 +106,7 @@ RUN buildDeps="" \
   && rm -rf /var/lib/apt/lists/* \
   # mjml has to be installed differently here because
   # after node 14, docker will install npm files at the
-  # root directoy and fail, so we have to create a new
+  # root directory and fail, so we have to create a new
   # directory and use it for the install then copy the
   # files to the root directory to maintain backwards
   # compatibility for email generation
diff --git a/src/dispatch/auth/service.py b/src/dispatch/auth/service.py
index a965222b6d83..fe5b0bd597bf 100644
--- a/src/dispatch/auth/service.py
+++ b/src/dispatch/auth/service.py
@@ -152,7 +152,8 @@ def create(*, db_session, organization: str, user_in: (UserRegister | UserCreate
 
     # create the user
     user = DispatchUser(
-        **user_in.model_dump(exclude={"password", "organizations", "projects", "role"}), password=password
+        **user_in.model_dump(exclude={"password", "organizations", "projects", "role"}),
+        password=password,
     )
 
     org = organization_service.get_by_slug_or_raise(
diff --git a/src/dispatch/case/flows.py b/src/dispatch/case/flows.py
index 38381bd26e4c..304912a2fa39 100644
--- a/src/dispatch/case/flows.py
+++ b/src/dispatch/case/flows.py
@@ -42,7 +42,7 @@
     send_case_rating_feedback_message,
     send_case_update_notifications,
     send_event_paging_message,
-    send_event_update_prompt_reminder
+    send_event_update_prompt_reminder,
 )
 from .models import Case
 from .service import get
diff --git a/src/dispatch/case/messaging.py b/src/dispatch/case/messaging.py
index 8242614ad531..12dd1136d5dc 100644
--- a/src/dispatch/case/messaging.py
+++ b/src/dispatch/case/messaging.py
@@ -421,7 +421,7 @@ def send_event_update_prompt_reminder(case: Case, db_session: Session) -> None:
                         "text": {"type": "plain_text", "text": "Update Case"},
                         "action_id": CaseNotificationActions.update,
                         "style": "primary",
-                        "value": button_metadata
+                        "value": button_metadata,
                     }
                 ],
             },
@@ -430,6 +430,7 @@ def send_event_update_prompt_reminder(case: Case, db_session: Session) -> None:
 
     log.debug(f"Security Event update reminder sent to {case.assignee.individual.email}.")
 
+
 def send_event_paging_message(case: Case, db_session: Session, oncall_name: str) -> None:
     """
     Sends a message to the case conversation channel to notify the reporter that they can engage
diff --git a/src/dispatch/case/models.py b/src/dispatch/case/models.py
index 0254f17a0b46..4315ab3088e2 100644
--- a/src/dispatch/case/models.py
+++ b/src/dispatch/case/models.py
@@ -336,6 +336,7 @@ class CaseReadMinimal(CaseBase):
     assignee: ParticipantReadMinimal | None = None
     case_costs: list[CaseCostReadMinimal] = []
 
+
 class CaseReadMinimalWithExtras(CaseBase):
     """Pydantic model for reading minimal case data."""
 
@@ -451,11 +452,13 @@ class CasePagination(Pagination):
 
     items: list[CaseReadMinimal] = []
 
+
 class CasePaginationMinimalWithExtras(Pagination):
     """Pydantic model for paginated minimal case results."""
 
     items: list[CaseReadMinimalWithExtras] = []
 
+
 class CaseExpandedPagination(Pagination):
     """Pydantic model for paginated expanded case results."""
 
diff --git a/src/dispatch/case/service.py b/src/dispatch/case/service.py
index e2ce5ca40ed9..da4a623c2c93 100644
--- a/src/dispatch/case/service.py
+++ b/src/dispatch/case/service.py
@@ -375,8 +375,7 @@ def update(*, db_session, case: Case, case_in: CaseUpdate, current_user: Dispatc
             db_session=db_session,
             source="Dispatch Core App",
             description=(
-                f"Case visibility changed to {case_in.visibility.lower()} "
-                f"by {current_user.email}"
+                f"Case visibility changed to {case_in.visibility.lower()} by {current_user.email}"
             ),
             dispatch_user_id=current_user.id,
             case_id=case.id,
diff --git a/src/dispatch/case/type/models.py b/src/dispatch/case/type/models.py
index 9e6db2b12229..9c0746f4dde4 100644
--- a/src/dispatch/case/type/models.py
+++ b/src/dispatch/case/type/models.py
@@ -1,4 +1,5 @@
 """Models for case types and related entities in the Dispatch application."""
+
 from pydantic import field_validator, AnyHttpUrl
 
 from sqlalchemy import JSON, Boolean, Column, ForeignKey, Integer, String
@@ -19,6 +20,7 @@
 
 class CaseType(ProjectMixin, Base):
     """SQLAlchemy model for case types, representing different types of cases in the system."""
+
     __table_args__ = (UniqueConstraint("name", "project_id"),)
     id = Column(Integer, primary_key=True)
     name = Column(String)
@@ -66,6 +68,7 @@ def get_meta(self, slug):
 # Pydantic models
 class Document(DispatchBase):
     """Pydantic model for a document related to a case type."""
+
     id: PrimaryKey
     description: str | None = None
     name: NameStr
@@ -76,6 +79,7 @@ class Document(DispatchBase):
 
 class IncidentType(DispatchBase):
     """Pydantic model for an incident type related to a case type."""
+
     id: PrimaryKey
     description: str | None = None
     name: NameStr
@@ -84,6 +88,7 @@ class IncidentType(DispatchBase):
 
 class Service(DispatchBase):
     """Pydantic model for a service related to a case type."""
+
     id: PrimaryKey
     description: str | None = None
     external_id: str
@@ -94,6 +99,7 @@ class Service(DispatchBase):
 
 class CaseTypeBase(DispatchBase):
     """Base Pydantic model for case types, used for shared fields."""
+
     case_template_document: Document | None = None
     conversation_target: str | None = None
     default: bool | None = False
@@ -118,19 +124,23 @@ def replace_none_with_empty_list(cls, value):
 
 class CaseTypeCreate(CaseTypeBase):
     """Pydantic model for creating a new case type."""
+
     pass
 
 
 class CaseTypeUpdate(CaseTypeBase):
     """Pydantic model for updating an existing case type."""
+
     id: PrimaryKey | None = None
 
 
 class CaseTypeRead(CaseTypeBase):
     """Pydantic model for reading a case type from the database."""
+
     id: PrimaryKey
 
 
 class CaseTypePagination(Pagination):
     """Pydantic model for paginated case type results."""
+
     items: list[CaseTypeRead] = []
diff --git a/src/dispatch/case/views.py b/src/dispatch/case/views.py
index 7b57456de8cb..e23b89131833 100644
--- a/src/dispatch/case/views.py
+++ b/src/dispatch/case/views.py
@@ -39,7 +39,15 @@
     case_update_flow,
     get_case_participants_flow,
 )
-from .models import Case, CaseCreate, CaseExpandedPagination, CasePagination, CasePaginationMinimalWithExtras, CaseRead, CaseUpdate
+from .models import (
+    Case,
+    CaseCreate,
+    CaseExpandedPagination,
+    CasePagination,
+    CasePaginationMinimalWithExtras,
+    CaseRead,
+    CaseUpdate,
+)
 from .service import create, delete, get, get_participants, update
 
 log = logging.getLogger(__name__)
@@ -144,6 +152,7 @@ def get_cases_minimal(
 
     return json.loads(CasePaginationMinimalWithExtras(**pagination).json())
 
+
 @router.post("", response_model=CaseRead, summary="Creates a new case.")
 def create_case(
     db_session: DbSession,
diff --git a/src/dispatch/case_cost_type/service.py b/src/dispatch/case_cost_type/service.py
index 96fd2f278925..5de43d56f5cb 100644
--- a/src/dispatch/case_cost_type/service.py
+++ b/src/dispatch/case_cost_type/service.py
@@ -16,9 +16,7 @@ def get(*, db_session, case_cost_type_id: int) -> CaseCostType | None:
     return db_session.query(CaseCostType).filter(CaseCostType.id == case_cost_type_id).one_or_none()
 
 
-def get_response_cost_type(
-    *, db_session, project_id: int, model_type: str
-) -> CaseCostType | None:
+def get_response_cost_type(*, db_session, project_id: int, model_type: str) -> CaseCostType | None:
     """Gets the default response cost type."""
     return (
         db_session.query(CaseCostType)
@@ -52,9 +50,7 @@ def get_or_create_response_cost_type(
     return case_cost_type
 
 
-def get_all_response_case_cost_types(
-    *, db_session, project_id: int
-) -> list[CaseCostType | None]:
+def get_all_response_case_cost_types(*, db_session, project_id: int) -> list[CaseCostType | None]:
     """Returns all response case cost types.
 
     This function queries the database for all case cost types that are marked as the response cost type.
diff --git a/src/dispatch/conference/service.py b/src/dispatch/conference/service.py
index a65b8eb2591c..7e2384a33330 100644
--- a/src/dispatch/conference/service.py
+++ b/src/dispatch/conference/service.py
@@ -1,4 +1,3 @@
-
 from .models import Conference, ConferenceCreate
 
 
diff --git a/src/dispatch/conversation/models.py b/src/dispatch/conversation/models.py
index e1e93e2b73e1..94754c35c73d 100644
--- a/src/dispatch/conversation/models.py
+++ b/src/dispatch/conversation/models.py
@@ -11,6 +11,7 @@
 
 class Conversation(Base, ResourceMixin):
     """SQLAlchemy model for conversation resources."""
+
     id = Column(Integer, primary_key=True)
     channel_id = Column(String)
     thread_id = Column(String)
@@ -22,22 +23,26 @@ class Conversation(Base, ResourceMixin):
 # Pydantic models...
 class ConversationBase(ResourceBase):
     """Base Pydantic model for conversation resources."""
+
     channel_id: str | None = None
     thread_id: str | None = None
 
 
 class ConversationCreate(ConversationBase):
     """Pydantic model for creating a conversation resource."""
+
     pass
 
 
 class ConversationUpdate(ConversationBase):
     """Pydantic model for updating a conversation resource."""
+
     pass
 
 
 class ConversationRead(ConversationBase):
     """Pydantic model for reading a conversation resource."""
+
     id: PrimaryKey
     description: str | None = None
 
@@ -50,4 +55,5 @@ def set_description(cls, _):
 
 class ConversationNested(ConversationBase):
     """Pydantic model for a nested conversation resource."""
+
     pass
diff --git a/src/dispatch/data/alert/service.py b/src/dispatch/data/alert/service.py
index f144f187223a..c232d43224a7 100644
--- a/src/dispatch/data/alert/service.py
+++ b/src/dispatch/data/alert/service.py
@@ -1,4 +1,3 @@
-
 from pydantic import ValidationError
 
 
diff --git a/src/dispatch/data/query/service.py b/src/dispatch/data/query/service.py
index 8fe6c9f554a6..d5655ddba126 100644
--- a/src/dispatch/data/query/service.py
+++ b/src/dispatch/data/query/service.py
@@ -27,14 +27,16 @@ def get_by_name_or_raise(*, db_session, query_in: QueryRead, project_id: int) ->
     query = get_by_name(db_session=db_session, name=query_in.name, project_id=project_id)
 
     if not query:
-        raise ValidationError([
-            {
-                "loc": ("query",),
-                "msg": f"Query not found: {query_in.name}",
-                "type": "value_error",
-                "input": query_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("query",),
+                    "msg": f"Query not found: {query_in.name}",
+                    "type": "value_error",
+                    "input": query_in.name,
+                }
+            ]
+        )
 
     return query
 
diff --git a/src/dispatch/data/source/data_format/service.py b/src/dispatch/data/source/data_format/service.py
index 77a278c4fc3c..406030097c1c 100644
--- a/src/dispatch/data/source/data_format/service.py
+++ b/src/dispatch/data/source/data_format/service.py
@@ -38,14 +38,16 @@ def get_by_name_or_raise(
     )
 
     if not data_format:
-        raise ValidationError([
-            {
-                "loc": ("dataFormat",),
-                "msg": f"SourceDataFormat not found: {source_data_format_in.name}",
-                "type": "value_error",
-                "input": source_data_format_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("dataFormat",),
+                    "msg": f"SourceDataFormat not found: {source_data_format_in.name}",
+                    "type": "value_error",
+                    "input": source_data_format_in.name,
+                }
+            ]
+        )
 
     return data_format
 
diff --git a/src/dispatch/data/source/environment/service.py b/src/dispatch/data/source/environment/service.py
index 8c131c5e58bb..b507098310cd 100644
--- a/src/dispatch/data/source/environment/service.py
+++ b/src/dispatch/data/source/environment/service.py
@@ -40,14 +40,16 @@ def get_by_name_or_raise(
     )
 
     if not source:
-        raise ValidationError([
-            {
-                "loc": ("source",),
-                "msg": f"Source environment not found: {source_environment_in.name}",
-                "type": "value_error",
-                "input": source_environment_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("source",),
+                    "msg": f"Source environment not found: {source_environment_in.name}",
+                    "type": "value_error",
+                    "input": source_environment_in.name,
+                }
+            ]
+        )
 
     return source
 
diff --git a/src/dispatch/data/source/service.py b/src/dispatch/data/source/service.py
index eaf76f7c2ffe..bfad43af4b11 100644
--- a/src/dispatch/data/source/service.py
+++ b/src/dispatch/data/source/service.py
@@ -35,14 +35,16 @@ def get_by_name_or_raise(*, db_session, project_id, source_in: SourceRead) -> So
     source = get_by_name(db_session=db_session, project_id=project_id, name=source_in.name)
 
     if not source:
-        raise ValidationError([
-            {
-                "loc": ("source",),
-                "msg": f"Source not found: {source_in.name}",
-                "type": "value_error",
-                "input": source_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("source",),
+                    "msg": f"Source not found: {source_in.name}",
+                    "type": "value_error",
+                    "input": source_in.name,
+                }
+            ]
+        )
 
     return source
 
diff --git a/src/dispatch/data/source/status/service.py b/src/dispatch/data/source/status/service.py
index 114271ea352f..e3f3ea2bc143 100644
--- a/src/dispatch/data/source/status/service.py
+++ b/src/dispatch/data/source/status/service.py
@@ -32,14 +32,16 @@ def get_by_name_or_raise(
     status = get_by_name(db_session=db_session, project_id=project_id, name=source_status_in.name)
 
     if not status:
-        raise ValidationError([
-            {
-                "loc": ("status",),
-                "msg": f"SourceStatus not found: {source_status_in.name}",
-                "type": "value_error",
-                "input": source_status_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("status",),
+                    "msg": f"SourceStatus not found: {source_status_in.name}",
+                    "type": "value_error",
+                    "input": source_status_in.name,
+                }
+            ]
+        )
 
     return status
 
diff --git a/src/dispatch/data/source/transport/service.py b/src/dispatch/data/source/transport/service.py
index ba5106ccb9fb..2b6fe62c8e0a 100644
--- a/src/dispatch/data/source/transport/service.py
+++ b/src/dispatch/data/source/transport/service.py
@@ -38,14 +38,16 @@ def get_by_name_or_raise(
     )
 
     if not source:
-        raise ValidationError([
-            {
-                "loc": ("source",),
-                "msg": f"SourceTransport not found: {source_transport_in.name}",
-                "type": "value_error",
-                "input": source_transport_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("source",),
+                    "msg": f"SourceTransport not found: {source_transport_in.name}",
+                    "type": "value_error",
+                    "input": source_transport_in.name,
+                }
+            ]
+        )
 
     return source
 
diff --git a/src/dispatch/data/source/type/service.py b/src/dispatch/data/source/type/service.py
index 34e9bfda7054..91843b3d9b10 100644
--- a/src/dispatch/data/source/type/service.py
+++ b/src/dispatch/data/source/type/service.py
@@ -32,14 +32,16 @@ def get_by_name_or_raise(
     source = get_by_name(db_session=db_session, project_id=project_id, name=source_type_in.name)
 
     if not source:
-        raise ValidationError([
-            {
-                "loc": ("source",),
-                "msg": f"SourceType not found: {source_type_in.name}",
-                "type": "value_error",
-                "input": source_type_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("source",),
+                    "msg": f"SourceType not found: {source_type_in.name}",
+                    "type": "value_error",
+                    "input": source_type_in.name,
+                }
+            ]
+        )
 
     return source
 
diff --git a/src/dispatch/database/core.py b/src/dispatch/database/core.py
index a68726db472b..aeeb0b224d1d 100644
--- a/src/dispatch/database/core.py
+++ b/src/dispatch/database/core.py
@@ -94,6 +94,7 @@ def resolve_attr(obj, attr, default=None):
 
 class Base(DeclarativeBase):
     """Base class for all SQLAlchemy models."""
+
     __repr_attrs__ = []
     __repr_max_length__ = 15
 
@@ -146,6 +147,8 @@ def __repr__(self):
             id_str,
             " " + self._repr_attrs_str if self._repr_attrs_str else "",
         )
+
+
 make_searchable(Base.metadata)
 
 
diff --git a/src/dispatch/database/manage.py b/src/dispatch/database/manage.py
index f56d4b5db279..903ca252e2fd 100644
--- a/src/dispatch/database/manage.py
+++ b/src/dispatch/database/manage.py
@@ -34,7 +34,7 @@ def version_schema(script_location: str):
     alembic_command.stamp(alembic_cfg, "head")
 
 
-def get_core_tables()  -> list[Table]:
+def get_core_tables() -> list[Table]:
     """Fetches tables that belong to the 'dispatch_core' schema."""
     core_tables: list[Table] = []
     for _, table in Base.metadata.tables.items():
diff --git a/src/dispatch/database/revisions/core/README b/src/dispatch/database/revisions/core/README
index 98e4f9c44eff..2500aa1bcf72 100644
--- a/src/dispatch/database/revisions/core/README
+++ b/src/dispatch/database/revisions/core/README
@@ -1 +1 @@
-Generic single-database configuration.
\ No newline at end of file
+Generic single-database configuration.
diff --git a/src/dispatch/database/revisions/core/env.py b/src/dispatch/database/revisions/core/env.py
index 0ae70a6c01f2..a7b867588e21 100644
--- a/src/dispatch/database/revisions/core/env.py
+++ b/src/dispatch/database/revisions/core/env.py
@@ -34,6 +34,7 @@ def run_migrations_online():
     and associate a connection with the context.
 
     """
+
     def process_revision_directives(context, revision, directives):
         script = directives[0]
         if script.upgrade_ops.is_empty():
diff --git a/src/dispatch/database/revisions/tenant/README b/src/dispatch/database/revisions/tenant/README
index 98e4f9c44eff..2500aa1bcf72 100644
--- a/src/dispatch/database/revisions/tenant/README
+++ b/src/dispatch/database/revisions/tenant/README
@@ -1 +1 @@
-Generic single-database configuration.
\ No newline at end of file
+Generic single-database configuration.
diff --git a/src/dispatch/database/service.py b/src/dispatch/database/service.py
index 96de7519a00d..0be92b6c80c0 100644
--- a/src/dispatch/database/service.py
+++ b/src/dispatch/database/service.py
@@ -273,8 +273,8 @@ def get_query_models(query):
         # Try to get the statement from the query
         stmt = query.statement
 
-        # Extract entities from the statement's froms
-        for from_obj in stmt.froms:
+        # Extract entities from the statement's forms
+        for from_obj in stmt.forms:
             if hasattr(from_obj, "entity"):
                 # For select statements with an entity
                 if from_obj.entity not in models:
diff --git a/src/dispatch/definition/service.py b/src/dispatch/definition/service.py
index 958d10ac3dbb..f603d85e1bdf 100644
--- a/src/dispatch/definition/service.py
+++ b/src/dispatch/definition/service.py
@@ -1,4 +1,3 @@
-
 from dispatch.project import service as project_service
 from dispatch.term import service as term_service
 
diff --git a/src/dispatch/definition/views.py b/src/dispatch/definition/views.py
index 9831d5fffe41..ceb50cb7ae1c 100644
--- a/src/dispatch/definition/views.py
+++ b/src/dispatch/definition/views.py
@@ -39,12 +39,14 @@ def create_definition(db_session: DbSession, definition_in: DefinitionCreate):
     """Create a new definition."""
     definition = get_by_text(db_session=db_session, text=definition_in.text)
     if definition:
-        raise ValidationError([
-            {
-                "msg": "A description with this text already exists.",
-                "loc": "text",
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "msg": "A description with this text already exists.",
+                    "loc": "text",
+                }
+            ]
+        )
 
     return create(db_session=db_session, definition_in=definition_in)
 
diff --git a/src/dispatch/document/service.py b/src/dispatch/document/service.py
index 21deb5866fe5..90f4cc8b865b 100644
--- a/src/dispatch/document/service.py
+++ b/src/dispatch/document/service.py
@@ -89,12 +89,14 @@ def create(*, db_session, document_in: DocumentCreate) -> Document:
             .one_or_none()
         )
         if faq_doc:
-            raise ValidationError([
-                {
-                    "msg": "FAQ document already defined for this project.",
-                    "loc": "document",
-                }
-            ])
+            raise ValidationError(
+                [
+                    {
+                        "msg": "FAQ document already defined for this project.",
+                        "loc": "document",
+                    }
+                ]
+            )
 
     if document_in.resource_type == DocumentResourceTemplateTypes.forms:
         forms_doc = (
@@ -104,12 +106,14 @@ def create(*, db_session, document_in: DocumentCreate) -> Document:
             .one_or_none()
         )
         if forms_doc:
-            raise ValidationError([
-                {
-                    "msg": "Forms export template document already defined for this project.",
-                    "loc": "document",
-                }
-            ])
+            raise ValidationError(
+                [
+                    {
+                        "msg": "Forms export template document already defined for this project.",
+                        "loc": "document",
+                    }
+                ]
+            )
 
     filters = [
         search_filter_service.get(db_session=db_session, search_filter_id=f.id)
diff --git a/src/dispatch/entity_type/views.py b/src/dispatch/entity_type/views.py
index 162600fbf88c..ce951096a050 100644
--- a/src/dispatch/entity_type/views.py
+++ b/src/dispatch/entity_type/views.py
@@ -1,4 +1,3 @@
-
 from fastapi import APIRouter, HTTPException, status
 from pydantic import ValidationError
 from sqlalchemy.exc import IntegrityError
diff --git a/src/dispatch/event/service.py b/src/dispatch/event/service.py
index aa1d7852843a..52032e5ce73a 100644
--- a/src/dispatch/event/service.py
+++ b/src/dispatch/event/service.py
@@ -492,7 +492,7 @@ def export_timeline(
                         }
                     )
 
-                # Formating for date rows
+                # Formatting for date rows
                 if text == "\t":
                     insert_data_request.append(
                         {
@@ -518,7 +518,7 @@ def export_timeline(
                         }
                     )
 
-                # Formating for time column
+                # Formatting for time column
                 if row_idx % num_columns == 0:
                     insert_data_request.append(
                         {
diff --git a/src/dispatch/feedback/incident/service.py b/src/dispatch/feedback/incident/service.py
index 8d8d45d8c8c9..6e077b46ef11 100644
--- a/src/dispatch/feedback/incident/service.py
+++ b/src/dispatch/feedback/incident/service.py
@@ -68,9 +68,9 @@ def create(*, db_session, feedback_in: FeedbackCreate) -> Feedback:
         participant = None
         if feedback_in.participant:
             from dispatch.participant.service import get as get_participant
+
             participant = get_participant(
-                db_session=db_session,
-                participant_id=feedback_in.participant.id
+                db_session=db_session, participant_id=feedback_in.participant.id
             )
 
     # Create feedback with the actual ORM objects, not the Pydantic models
@@ -80,7 +80,7 @@ def create(*, db_session, feedback_in: FeedbackCreate) -> Feedback:
         incident=incident,
         case=case,
         project=project,
-        participant=participant
+        participant=participant,
     )
     db_session.add(feedback)
     db_session.commit()
diff --git a/src/dispatch/feedback/service/service.py b/src/dispatch/feedback/service/service.py
index 75b0c7f2794d..18ef42fd2b57 100644
--- a/src/dispatch/feedback/service/service.py
+++ b/src/dispatch/feedback/service/service.py
@@ -1,4 +1,3 @@
-
 from sqlalchemy.orm import Session
 
 from .models import ServiceFeedback, ServiceFeedbackCreate, ServiceFeedbackUpdate
diff --git a/src/dispatch/group/models.py b/src/dispatch/group/models.py
index 58e962ec45cf..2327df1b4e0a 100644
--- a/src/dispatch/group/models.py
+++ b/src/dispatch/group/models.py
@@ -1,4 +1,5 @@
 """Models for group resources in the Dispatch application."""
+
 from pydantic import field_validator, EmailStr
 
 from sqlalchemy import Column, Integer, String, ForeignKey
@@ -11,6 +12,7 @@
 
 class Group(Base, ResourceMixin):
     """SQLAlchemy model for group resources."""
+
     id = Column(Integer, primary_key=True)
     name = Column(String)
     email = Column(String)
@@ -21,22 +23,26 @@ class Group(Base, ResourceMixin):
 # Pydantic models...
 class GroupBase(ResourceBase):
     """Base Pydantic model for group resources."""
+
     name: NameStr
     email: EmailStr
 
 
 class GroupCreate(GroupBase):
     """Pydantic model for creating a group resource."""
+
     pass
 
 
 class GroupUpdate(GroupBase):
     """Pydantic model for updating a group resource."""
+
     id: PrimaryKey | None = None
 
 
 class GroupRead(GroupBase):
     """Pydantic model for reading a group resource."""
+
     id: PrimaryKey
     description: str | None = None
 
diff --git a/src/dispatch/group/service.py b/src/dispatch/group/service.py
index be889044bc3f..e55fc5d36fdc 100644
--- a/src/dispatch/group/service.py
+++ b/src/dispatch/group/service.py
@@ -1,4 +1,3 @@
-
 from .models import Group, GroupCreate, GroupUpdate
 
 
diff --git a/src/dispatch/incident/messaging.py b/src/dispatch/incident/messaging.py
index 7fa74e3873ee..5c8d4b1edc79 100644
--- a/src/dispatch/incident/messaging.py
+++ b/src/dispatch/incident/messaging.py
@@ -822,7 +822,7 @@ def send_incident_participant_has_role_ephemeral_message(
     )
     if not plugin:
         log.warning(
-            "Unabled to send incident participant has role message, no conversation plugin enabled."
+            "Unable to send incident participant has role message, no conversation plugin enabled."
         )
         return
 
@@ -862,7 +862,7 @@ def send_incident_participant_role_not_assigned_ephemeral_message(
     )
     if not plugin:
         log.warning(
-            "Unabled to send incident participant role not assigned message, no conversation plugin enabled."  # noqa
+            "Unable to send incident participant role not assigned message, no conversation plugin enabled."  # noqa
         )
         return
 
diff --git a/src/dispatch/incident/service.py b/src/dispatch/incident/service.py
index 34c3c20189c3..29da216a9185 100644
--- a/src/dispatch/incident/service.py
+++ b/src/dispatch/incident/service.py
@@ -95,12 +95,14 @@ def get_by_name_or_raise(
     incident = get_by_name(db_session=db_session, project_id=project_id, name=incident_in.name)
 
     if not incident:
-        raise ValidationError([
-            {
-                "msg": "Incident not found.",
-                "loc": "name",
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "msg": "Incident not found.",
+                    "loc": "name",
+                }
+            ]
+        )
     return incident
 
 
diff --git a/src/dispatch/incident/severity/models.py b/src/dispatch/incident/severity/models.py
index dc3ba1efe9d1..d5215317a575 100644
--- a/src/dispatch/incident/severity/models.py
+++ b/src/dispatch/incident/severity/models.py
@@ -9,8 +9,10 @@
 from dispatch.models import DispatchBase, NameStr, ProjectMixin, PrimaryKey, Pagination
 from dispatch.project.models import ProjectRead
 
+
 class IncidentSeverity(Base, ProjectMixin):
     """SQLAlchemy model for incident severity resources."""
+
     __table_args__ = (UniqueConstraint("name", "project_id"),)
     id = Column(Integer, primary_key=True)
     name = Column(String)
@@ -39,6 +41,7 @@ class IncidentSeverity(Base, ProjectMixin):
 # Pydantic models
 class IncidentSeverityBase(DispatchBase):
     """Base Pydantic model for incident severity resources."""
+
     color: str | None = None
     default: bool | None = None
     description: str | None = None
@@ -51,21 +54,25 @@ class IncidentSeverityBase(DispatchBase):
 
 class IncidentSeverityCreate(IncidentSeverityBase):
     """Pydantic model for creating an incident severity resource."""
+
     pass
 
 
 class IncidentSeverityUpdate(IncidentSeverityBase):
     """Pydantic model for updating an incident severity resource."""
+
     pass
 
 
 class IncidentSeverityRead(IncidentSeverityBase):
     """Pydantic model for reading an incident severity resource."""
+
     id: PrimaryKey
 
 
 class IncidentSeverityReadMinimal(DispatchBase):
     """Pydantic model for reading a minimal incident severity resource."""
+
     id: PrimaryKey
     color: str | None = None
     default: bool | None = None
@@ -77,4 +84,5 @@ class IncidentSeverityReadMinimal(DispatchBase):
 
 class IncidentSeverityPagination(Pagination):
     """Pydantic model for paginated incident severity results."""
+
     items: list[IncidentSeverityRead] = []
diff --git a/src/dispatch/incident/type/models.py b/src/dispatch/incident/type/models.py
index d147838203c5..26f3f0b1c9e7 100644
--- a/src/dispatch/incident/type/models.py
+++ b/src/dispatch/incident/type/models.py
@@ -19,8 +19,10 @@
 from dispatch.project.models import ProjectRead
 from dispatch.service.models import ServiceRead
 
+
 class IncidentType(ProjectMixin, Base):
     """SQLAlchemy model for incident type resources."""
+
     __table_args__ = (UniqueConstraint("name", "project_id"),)
     id = Column(Integer, primary_key=True)
     name = Column(String)
@@ -99,6 +101,7 @@ def get_task_meta(self, slug):
 
 class Document(DispatchBase):
     """Pydantic model for a document related to an incident type."""
+
     id: PrimaryKey
     name: NameStr
     resource_type: str | None = None
@@ -110,6 +113,7 @@ class Document(DispatchBase):
 # Pydantic models...
 class IncidentTypeBase(DispatchBase):
     """Base Pydantic model for incident type resources."""
+
     name: NameStr
     visibility: str | None = None
     description: str | None = None
@@ -138,21 +142,25 @@ def replace_none_with_empty_list(cls, value):
 
 class IncidentTypeCreate(IncidentTypeBase):
     """Pydantic model for creating an incident type resource."""
+
     pass
 
 
 class IncidentTypeUpdate(IncidentTypeBase):
     """Pydantic model for updating an incident type resource."""
+
     id: PrimaryKey | None = None
 
 
 class IncidentTypeRead(IncidentTypeBase):
     """Pydantic model for reading an incident type resource."""
+
     id: PrimaryKey
 
 
 class IncidentTypeReadMinimal(DispatchBase):
     """Pydantic model for reading a minimal incident type resource."""
+
     id: PrimaryKey
     name: NameStr
     visibility: str | None = None
@@ -164,4 +172,5 @@ class IncidentTypeReadMinimal(DispatchBase):
 
 class IncidentTypePagination(Pagination):
     """Pydantic model for paginated incident type results."""
+
     items: list[IncidentTypeRead] = []
diff --git a/src/dispatch/incident_cost_type/models.py b/src/dispatch/incident_cost_type/models.py
index 29228e47ecd2..66408dd4fd5b 100644
--- a/src/dispatch/incident_cost_type/models.py
+++ b/src/dispatch/incident_cost_type/models.py
@@ -20,6 +20,7 @@
 # SQLAlchemy Model
 class IncidentCostType(Base, TimeStampMixin, ProjectMixin):
     """SQLAlchemy model for incident cost type resources."""
+
     # columns
     id = Column(Integer, primary_key=True)
     name = Column(String)
@@ -41,6 +42,7 @@ class IncidentCostType(Base, TimeStampMixin, ProjectMixin):
 # Pydantic Models
 class IncidentCostTypeBase(DispatchBase):
     """Base Pydantic model for incident cost type resources."""
+
     name: NameStr
     description: str | None = None
     category: str | None = None
@@ -51,20 +53,24 @@ class IncidentCostTypeBase(DispatchBase):
 
 class IncidentCostTypeCreate(IncidentCostTypeBase):
     """Pydantic model for creating an incident cost type."""
+
     project: ProjectRead
 
 
 class IncidentCostTypeUpdate(IncidentCostTypeBase):
     """Pydantic model for updating an incident cost type."""
+
     id: PrimaryKey | None = None
 
 
 class IncidentCostTypeRead(IncidentCostTypeBase):
     """Pydantic model for reading an incident cost type."""
+
     id: PrimaryKey
     created_at: datetime
 
 
 class IncidentCostTypePagination(Pagination):
     """Pydantic model for paginated incident cost type results."""
+
     items: list[IncidentCostTypeRead] = []
diff --git a/src/dispatch/incident_cost_type/service.py b/src/dispatch/incident_cost_type/service.py
index bc6bdeb0bb12..6d6eb7483da4 100644
--- a/src/dispatch/incident_cost_type/service.py
+++ b/src/dispatch/incident_cost_type/service.py
@@ -50,9 +50,7 @@ def create(*, db_session, incident_cost_type_in: IncidentCostTypeCreate) -> Inci
     project = project_service.get_by_name_or_raise(
         db_session=db_session, project_in=incident_cost_type_in.project
     )
-    incident_cost_type = IncidentCostType(
-        **incident_cost_type_in.dict(exclude={"project"})
-    )
+    incident_cost_type = IncidentCostType(**incident_cost_type_in.dict(exclude={"project"}))
     incident_cost_type.project = project  # type: ignore[attr-defined]
     db_session.add(incident_cost_type)
     db_session.commit()
diff --git a/src/dispatch/incident_role/service.py b/src/dispatch/incident_role/service.py
index 53e21619cf5f..4b5ba4de3677 100644
--- a/src/dispatch/incident_role/service.py
+++ b/src/dispatch/incident_role/service.py
@@ -84,7 +84,7 @@ def create_or_update(
                             "msg": "Incident role not found.",
                             "input": role_policy_in.name,
                         }
-                    ]
+                    ],
                 )
 
         else:
diff --git a/src/dispatch/individual/service.py b/src/dispatch/individual/service.py
index 0a664db10a8a..5edc691c151b 100644
--- a/src/dispatch/individual/service.py
+++ b/src/dispatch/individual/service.py
@@ -53,14 +53,16 @@ def get_by_email_and_project_id_or_raise(
     )
 
     if not individual_contact:
-        raise ValidationError([
-            {
-                "loc": ("individual",),
-                "msg": "Individual not found.",
-                "type": "value_error",
-                "input": individual_contact_in.email,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("individual",),
+                    "msg": "Individual not found.",
+                    "type": "value_error",
+                    "input": individual_contact_in.email,
+                }
+            ]
+        )
 
     return individual_contact
 
diff --git a/src/dispatch/individual/views.py b/src/dispatch/individual/views.py
index 5d362955a7e0..3214fd2bf692 100644
--- a/src/dispatch/individual/views.py
+++ b/src/dispatch/individual/views.py
@@ -36,7 +36,7 @@ def get_individual(db_session: DbSession, individual_contact_id: PrimaryKey):
                     "msg": "Individual not found.",
                     "input": individual_contact_id,
                 }
-            ]
+            ],
         )
     return individual
 
@@ -56,12 +56,14 @@ def create_individual(db_session: DbSession, individual_contact_in: IndividualCo
         project_id=individual_contact_in.project.id,
     )
     if individual:
-        raise ValidationError([
-            {
-                "msg": "An individual with this email already exists.",
-                "loc": "email",
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "msg": "An individual with this email already exists.",
+                    "loc": "email",
+                }
+            ]
+        )
     return create(db_session=db_session, individual_contact_in=individual_contact_in)
 
 
@@ -88,7 +90,7 @@ def update_individual(
                     "msg": "Individual not found.",
                     "input": individual_contact_id,
                 }
-            ]
+            ],
         )
     return update(
         db_session=db_session,
@@ -116,6 +118,6 @@ def delete_individual(db_session: DbSession, individual_contact_id: PrimaryKey):
                     "msg": "Individual not found.",
                     "input": individual_contact_id,
                 }
-            ]
+            ],
         )
     delete(db_session=db_session, individual_contact_id=individual_contact_id)
diff --git a/src/dispatch/messaging/strings.py b/src/dispatch/messaging/strings.py
index a791e7e2c3c4..5dcb194393f7 100644
--- a/src/dispatch/messaging/strings.py
+++ b/src/dispatch/messaging/strings.py
@@ -78,36 +78,24 @@ class MessageType(DispatchEnum):
 ).strip()
 
 INCIDENT_FEEDBACK_DAILY_REPORT_DESCRIPTION = """
-This is a daily report of feedback about incidents handled by you.""".replace(
-    "\n", " "
-).strip()
+This is a daily report of feedback about incidents handled by you.""".replace("\n", " ").strip()
 
 CASE_FEEDBACK_DAILY_REPORT_DESCRIPTION = """
-This is a daily report of feedback about cases handled by you.""".replace(
-    "\n", " "
-).strip()
+This is a daily report of feedback about cases handled by you.""".replace("\n", " ").strip()
 
 INCIDENT_WEEKLY_REPORT_TITLE = """
-Incidents Weekly Report""".replace(
-    "\n", " "
-).strip()
+Incidents Weekly Report""".replace("\n", " ").strip()
 
 INCIDENT_WEEKLY_REPORT_DESCRIPTION = """
 This is an AI-generated weekly summary of incidents that have been marked as closed in the last week.
 NOTE: These summaries may contain errors or inaccuracies.
-Please verify the information before relying on it.""".replace(
-    "\n", " "
-).strip()
+Please verify the information before relying on it.""".replace("\n", " ").strip()
 
 INCIDENT_WEEKLY_REPORT_NO_INCIDENTS_DESCRIPTION = """
-No open visibility incidents have been closed in the last week.""".replace(
-    "\n", " "
-).strip()
+No open visibility incidents have been closed in the last week.""".replace("\n", " ").strip()
 
 INCIDENT_DAILY_REPORT_TITLE = """
-Incidents Daily Report""".replace(
-    "\n", " "
-).strip()
+Incidents Daily Report""".replace("\n", " ").strip()
 
 INCIDENT_DAILY_REPORT_DESCRIPTION = """
 This is a daily report of incidents that are currently active and incidents that have been marked as stable or closed in the last 24 hours.""".replace(
@@ -128,9 +116,7 @@ class MessageType(DispatchEnum):
 INCIDENT_COMMANDER_DESCRIPTION = """
 The Incident Commander (IC) is responsible for
 knowing the full context of the incident.
-Contact them about any questions or concerns.""".replace(
-    "\n", " "
-).strip()
+Contact them about any questions or concerns.""".replace("\n", " ").strip()
 
 INCIDENT_COMMANDER_READDED_DESCRIPTION = """
 {{ commander_fullname }} (Incident Commander) has been re-added to the conversation.
@@ -155,75 +141,53 @@ class MessageType(DispatchEnum):
 
 INCIDENT_CONVERSATION_DESCRIPTION = """
 Private conversation for real-time discussion. All incident participants get added to it.
-""".replace(
-    "\n", " "
-).strip()
+""".replace("\n", " ").strip()
 
 CASE_CONVERSATION_REFERENCE_DOCUMENT_DESCRIPTION = """
 Document containing the list of slash commands available to the Assignee
-and participants in the case conversation.""".replace(
-    "\n", " "
-).strip()
+and participants in the case conversation.""".replace("\n", " ").strip()
 
 INCIDENT_CONVERSATION_REFERENCE_DOCUMENT_DESCRIPTION = """
 Document containing the list of slash commands available to the Incident Commander (IC)
-and participants in the incident conversation.""".replace(
-    "\n", " "
-).strip()
+and participants in the incident conversation.""".replace("\n", " ").strip()
 
 CASE_CONFERENCE_DESCRIPTION = """
 Video conference and phone bridge to be used throughout the case.  Password: {{conference_challenge if conference_challenge else 'N/A'}}
-""".replace(
-    "\n", ""
-).strip()
+""".replace("\n", "").strip()
 
 INCIDENT_CONFERENCE_DESCRIPTION = """
 Video conference and phone bridge to be used throughout the incident.  Password: {{conference_challenge if conference_challenge else 'N/A'}}
-""".replace(
-    "\n", ""
-).strip()
+""".replace("\n", "").strip()
 
 STORAGE_DESCRIPTION = """
 Common storage for all artifacts and
 documents. Add logs, screen captures, or any other data collected during the
-investigation to this folder. It is shared with all participants.""".replace(
-    "\n", " "
-).strip()
+investigation to this folder. It is shared with all participants.""".replace("\n", " ").strip()
 
 INCIDENT_INVESTIGATION_DOCUMENT_DESCRIPTION = """
 This is a document for all incident facts and context. All
 incident participants are expected to contribute to this document.
-It is shared with all incident participants.""".replace(
-    "\n", " "
-).strip()
+It is shared with all incident participants.""".replace("\n", " ").strip()
 
 CASE_INVESTIGATION_DOCUMENT_DESCRIPTION = """
 This is a document for all investigation facts and context. All
 case participants are expected to contribute to this document.
-It is shared with all participants.""".replace(
-    "\n", " "
-).strip()
+It is shared with all participants.""".replace("\n", " ").strip()
 
 INCIDENT_INVESTIGATION_SHEET_DESCRIPTION = """
 This is a sheet for tracking impacted assets. All
 incident participants are expected to contribute to this sheet.
-It is shared with all incident participants.""".replace(
-    "\n", " "
-).strip()
+It is shared with all incident participants.""".replace("\n", " ").strip()
 
 CASE_FAQ_DOCUMENT_DESCRIPTION = """
 First time responding to a case? This
 document answers common questions encountered when
-helping us respond to a case.""".replace(
-    "\n", " "
-).strip()
+helping us respond to a case.""".replace("\n", " ").strip()
 
 INCIDENT_FAQ_DOCUMENT_DESCRIPTION = """
 First time responding to an incident? This
 document answers common questions encountered when
-helping us respond to an incident.""".replace(
-    "\n", " "
-).strip()
+helping us respond to an incident.""".replace("\n", " ").strip()
 
 INCIDENT_REVIEW_DOCUMENT_DESCRIPTION = """
 This document will capture all lessons learned, questions, and action items raised during the incident.""".replace(
@@ -247,15 +211,11 @@ class MessageType(DispatchEnum):
 
 INCIDENT_RESOLUTION_DEFAULT = """
 Description of the actions taken to resolve the incident.
-""".replace(
-    "\n", " "
-).strip()
+""".replace("\n", " ").strip()
 
 CASE_RESOLUTION_DEFAULT = """
 Description of the actions taken to resolve the case.
-""".replace(
-    "\n", " "
-).strip()
+""".replace("\n", " ").strip()
 
 INCIDENT_COMPLETED_FORM_DESCRIPTION = """
 A new {{form_type}} form related to incident {{name}} has been
@@ -263,34 +223,24 @@ class MessageType(DispatchEnum):
 aspects related to potential legal implications. You can review the
 detailed report by clicking on the link below. Please note, the information
 contained in this report is confidential.
-""".replace(
-    "\n", " "
-).strip()
+""".replace("\n", " ").strip()
 
 CASE_PARTICIPANT_WELCOME_DESCRIPTION = """
 You\'ve been added to this case, because we think you may
 be able to help resolve it. Please review the case details below and
-reach out to the assignee if you have any questions.""".replace(
-    "\n", " "
-).strip()
+reach out to the assignee if you have any questions.""".replace("\n", " ").strip()
 
 INCIDENT_PARTICIPANT_WELCOME_DESCRIPTION = """
 You\'ve been added to this incident, because we think you may
 be able to help resolve it. Please review the incident details below and
-reach out to the incident commander if you have any questions.""".replace(
-    "\n", " "
-).strip()
+reach out to the incident commander if you have any questions.""".replace("\n", " ").strip()
 
 INCIDENT_PARTICIPANT_SUGGESTED_READING_DESCRIPTION = """
 Dispatch thinks the following documents might be
-relevant to this incident.""".replace(
-    "\n", " "
-).strip()
+relevant to this incident.""".replace("\n", " ").strip()
 
 NOTIFICATION_PURPOSES_FYI = """
-This message is for notification purposes only.""".replace(
-    "\n", " "
-).strip()
+This message is for notification purposes only.""".replace("\n", " ").strip()
 
 INCIDENT_TACTICAL_REPORT_DESCRIPTION = """
 The following conditions, actions, and needs summarize the current status of the incident.""".replace(
@@ -319,9 +269,7 @@ class MessageType(DispatchEnum):
 ).strip()
 
 CASE_TRIAGE_REMINDER_DESCRIPTION = """The status of this case hasn't been updated recently.
-Please ensure you triage the case based on its priority.""".replace(
-    "\n", " "
-).strip()
+Please ensure you triage the case based on its priority.""".replace("\n", " ").strip()
 
 CASE_CLOSE_REMINDER_DESCRIPTION = """The status of this case hasn't been updated recently.
 You can use the case 'Resolve' button if it has been resolved and can be closed.""".replace(
@@ -346,9 +294,7 @@ class MessageType(DispatchEnum):
 INCIDENT_OPEN_TASKS_DESCRIPTION = """
 Please resolve or transfer ownership of all the open incident tasks assigned to you in the incident documents or using the <{{dispatch_ui_url}}|Dispatch Web UI>,
 then wait about 30 seconds for Dispatch to update the tasks before leaving the incident conversation.
-""".replace(
-    "\n", " "
-).strip()
+""".replace("\n", " ").strip()
 
 INCIDENT_TASK_ADD_TO_INCIDENT_DESCRIPTION = """
 You have been added to this incident because you were assigned a task related to it. View all tasks for this incident using the <{{dispatch_ui_url}}|Dispatch Web UI>
@@ -874,9 +820,7 @@ class MessageType(DispatchEnum):
 CASE_ASSIGNEE_DESCRIPTION = """
 The Case Assignee is responsible for
 knowing the full context of the case.
-Contact them about any questions or concerns.""".replace(
-    "\n", " "
-).strip()
+Contact them about any questions or concerns.""".replace("\n", " ").strip()
 
 CASE_REPORTER_DESCRIPTION = """
 The person who reported the case. Contact them if the report details need clarification.""".replace(
diff --git a/src/dispatch/models.py b/src/dispatch/models.py
index 19822c9e7cc9..9d1cc684b739 100644
--- a/src/dispatch/models.py
+++ b/src/dispatch/models.py
@@ -85,7 +85,10 @@ class EvergreenMixin(object):
     def overdue(self):
         """Returns True if the evergreen reminder is overdue."""
         now = datetime.now(timezone.utc)
-        if self.evergreen_last_reminder_at is not None and self.evergreen_reminder_interval is not None:
+        if (
+            self.evergreen_last_reminder_at is not None
+            and self.evergreen_reminder_interval is not None
+        ):
             next_reminder = self.evergreen_last_reminder_at + timedelta(
                 days=self.evergreen_reminder_interval
             )
@@ -112,6 +115,7 @@ class FeedbackMixin(object):
 # Pydantic models...
 class DispatchBase(BaseModel):
     """Base Pydantic model with shared config for Dispatch models."""
+
     model_config: ClassVar[ConfigDict] = ConfigDict(
         from_attributes=True,
         validate_assignment=True,
@@ -127,6 +131,7 @@ class DispatchBase(BaseModel):
 
 class Pagination(DispatchBase):
     """Pydantic model for paginated results."""
+
     itemsPerPage: int
     page: int
     total: int
@@ -134,11 +139,13 @@ class Pagination(DispatchBase):
 
 class PrimaryKeyModel(BaseModel):
     """Pydantic model for a primary key field."""
+
     id: PrimaryKey
 
 
 class EvergreenBase(DispatchBase):
     """Base Pydantic model for evergreen resources."""
+
     evergreen: bool | None = False
     evergreen_owner: EmailStr | None = None
     evergreen_reminder_interval: int | None = 90
@@ -147,6 +154,7 @@ class EvergreenBase(DispatchBase):
 
 class ResourceBase(DispatchBase):
     """Base Pydantic model for resource-related fields."""
+
     resource_type: str | None = None
     resource_id: str | None = None
     weblink: str | None = None
@@ -154,6 +162,7 @@ class ResourceBase(DispatchBase):
 
 class ContactBase(DispatchBase):
     """Base Pydantic model for contact-related fields."""
+
     email: EmailStr
     name: str | None = None
     is_active: bool | None = True
diff --git a/src/dispatch/monitor/service.py b/src/dispatch/monitor/service.py
index 2c19c453b9d9..3e941aa0e502 100644
--- a/src/dispatch/monitor/service.py
+++ b/src/dispatch/monitor/service.py
@@ -1,4 +1,3 @@
-
 from sqlalchemy.sql.expression import true
 from dispatch.incident import service as incident_service
 from dispatch.plugin import service as plugin_service
diff --git a/src/dispatch/organization/models.py b/src/dispatch/organization/models.py
index 8455f9daf117..41b543f1ef0c 100644
--- a/src/dispatch/organization/models.py
+++ b/src/dispatch/organization/models.py
@@ -12,6 +12,7 @@
 
 class Organization(Base):
     """SQLAlchemy model for organization resources."""
+
     __table_args__ = {"schema": "dispatch_core"}
 
     id = Column(Integer, primary_key=True)
@@ -39,6 +40,7 @@ def generate_slug(target, value, oldvalue, initiator):
 
 class OrganizationBase(DispatchBase):
     """Base Pydantic model for organization resources."""
+
     id: PrimaryKey | None = None
     name: NameStr
     description: str | None = None
@@ -50,11 +52,13 @@ class OrganizationBase(DispatchBase):
 
 class OrganizationCreate(OrganizationBase):
     """Pydantic model for creating an organization resource."""
+
     pass
 
 
 class OrganizationUpdate(DispatchBase):
     """Pydantic model for updating an organization resource."""
+
     id: PrimaryKey | None = None
     description: str | None = None
     default: bool | None = False
@@ -65,10 +69,12 @@ class OrganizationUpdate(DispatchBase):
 
 class OrganizationRead(OrganizationBase):
     """Pydantic model for reading an organization resource."""
+
     id: PrimaryKey | None = None
     slug: OrganizationSlug | None = None
 
 
 class OrganizationPagination(Pagination):
     """Pydantic model for paginated organization results."""
+
     items: list[OrganizationRead] = []
diff --git a/src/dispatch/participant/service.py b/src/dispatch/participant/service.py
index ea873a4bd253..355523342fea 100644
--- a/src/dispatch/participant/service.py
+++ b/src/dispatch/participant/service.py
@@ -60,9 +60,7 @@ def get_by_incident_id_and_role(
     )
 
 
-def get_by_case_id_and_role(
-    *, db_session: Session, case_id: int, role: str
-) -> Participant | None:
+def get_by_case_id_and_role(*, db_session: Session, case_id: int, role: str) -> Participant | None:
     """Get a participant by case id and role name."""
     return (
         db_session.query(Participant)
diff --git a/src/dispatch/plugin/service.py b/src/dispatch/plugin/service.py
index c87e2600801d..fc5c1064bd5a 100644
--- a/src/dispatch/plugin/service.py
+++ b/src/dispatch/plugin/service.py
@@ -152,12 +152,14 @@ def update_instance(
                 db_session=db_session, service_type=plugin_instance.plugin.slug, is_active=True
             )
             if oncall_services:
-                raise ValidationError([
-                    {
-                        "msg": "Cannot disable plugin instance: {plugin_instance.plugin.title}. One or more oncall services depend on it. ",
-                        "loc": "plugin_instance",
-                    }
-                ])
+                raise ValidationError(
+                    [
+                        {
+                            "msg": "Cannot disable plugin instance: {plugin_instance.plugin.title}. One or more oncall services depend on it. ",
+                            "loc": "plugin_instance",
+                        }
+                    ]
+                )
 
     for field in plugin_instance_data:
         if field in update_data:
@@ -185,9 +187,7 @@ def get_plugin_event_by_slug(*, db_session: Session, slug: str) -> PluginEvent |
     return db_session.query(PluginEvent).filter(PluginEvent.slug == slug).one_or_none()
 
 
-def get_all_events_for_plugin(
-    *, db_session: Session, plugin_id: int
-) -> list[PluginEvent | None]:
+def get_all_events_for_plugin(*, db_session: Session, plugin_id: int) -> list[PluginEvent | None]:
     """Returns all plugin events for a given plugin."""
     return db_session.query(PluginEvent).filter(PluginEvent.plugin_id == plugin_id).all()
 
diff --git a/src/dispatch/plugins/dispatch_core/plugin.py b/src/dispatch/plugins/dispatch_core/plugin.py
index 43acb74e1e7d..b9f0df525ad2 100644
--- a/src/dispatch/plugins/dispatch_core/plugin.py
+++ b/src/dispatch/plugins/dispatch_core/plugin.py
@@ -181,7 +181,11 @@ class AwsAlbAuthProviderPlugin(AuthenticationProviderPlugin):
     author_url = "https://manypets.com/"
     configuration_schema = None
 
-    @cached(cache=TTLCache(maxsize=1024, ttl=DISPATCH_AUTHENTICATION_PROVIDER_AWS_ALB_PUBLIC_KEY_CACHE_SECONDS))
+    @cached(
+        cache=TTLCache(
+            maxsize=1024, ttl=DISPATCH_AUTHENTICATION_PROVIDER_AWS_ALB_PUBLIC_KEY_CACHE_SECONDS
+        )
+    )
     def get_public_key(self, kid: str, region: str):
         log.debug("Cache miss. Requesting key from AWS endpoint.")
         url = f"https://public-keys.auth.elb.{region}.amazonaws.com/{kid}"
@@ -193,20 +197,18 @@ def get_current_user(self, request: Request, **kwargs):
             status_code=HTTP_401_UNAUTHORIZED, detail=[{"msg": "Could not validate credentials"}]
         )
 
-        encoded_jwt: str = request.headers.get('x-amzn-oidc-data')
+        encoded_jwt: str = request.headers.get("x-amzn-oidc-data")
         if not encoded_jwt:
-            log.error(
-                "Unable to authenticate. Header x-amzn-oidc-data not found."
-            )
+            log.error("Unable to authenticate. Header x-amzn-oidc-data not found.")
             raise credentials_exception
 
         log.debug(f"Header x-amzn-oidc-data header received: {encoded_jwt}")
 
         # Validate the signer
-        jwt_headers = encoded_jwt.split('.')[0]
+        jwt_headers = encoded_jwt.split(".")[0]
         decoded_jwt_headers = base64.b64decode(jwt_headers)
         decoded_json = json.loads(decoded_jwt_headers)
-        received_alb_arn = decoded_json['signer']
+        received_alb_arn = decoded_json["signer"]
 
         if received_alb_arn != DISPATCH_AUTHENTICATION_PROVIDER_AWS_ALB_ARN:
             log.error(
@@ -215,10 +217,10 @@ def get_current_user(self, request: Request, **kwargs):
             raise credentials_exception
 
         # Get the key id from JWT headers (the kid field)
-        kid = decoded_json['kid']
+        kid = decoded_json["kid"]
 
         # Get the region from the ARN
-        region = DISPATCH_AUTHENTICATION_PROVIDER_AWS_ALB_ARN.split(':')[3]
+        region = DISPATCH_AUTHENTICATION_PROVIDER_AWS_ALB_ARN.split(":")[3]
 
         # Get the public key from regional endpoint
         log.debug(f"Getting public key for kid {kid} in region {region}.")
@@ -226,7 +228,7 @@ def get_current_user(self, request: Request, **kwargs):
 
         # Get the payload
         log.debug(f"Decoding {encoded_jwt} with public key {pub_key}.")
-        payload = jwt.decode(encoded_jwt, pub_key, algorithms=['ES256'])
+        payload = jwt.decode(encoded_jwt, pub_key, algorithms=["ES256"])
 
         return payload[DISPATCH_AUTHENTICATION_PROVIDER_AWS_ALB_EMAIL_CLAIM]
 
diff --git a/src/dispatch/plugins/dispatch_google/drive/task.py b/src/dispatch/plugins/dispatch_google/drive/task.py
index cbb4401da71c..36cd93f11ef7 100644
--- a/src/dispatch/plugins/dispatch_google/drive/task.py
+++ b/src/dispatch/plugins/dispatch_google/drive/task.py
@@ -49,7 +49,10 @@ def find_urls(text: str) -> list[str]:
     """Finds a url in a text blob."""
     # findall() has been used
     # with valid conditions for urls in string
-    regex = r"(?i)\b((?:https?://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'\".,<>?«»""'']))"
+    regex = (
+        r"(?i)\b((?:https?://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'\".,<>?«»"
+        "'']))"
+    )
     url = re.findall(regex, text)
     return [x[0] for x in url]
 
diff --git a/src/dispatch/plugins/dispatch_google/groups/plugin.py b/src/dispatch/plugins/dispatch_google/groups/plugin.py
index aac6dedac399..ea6d41fc98fc 100644
--- a/src/dispatch/plugins/dispatch_google/groups/plugin.py
+++ b/src/dispatch/plugins/dispatch_google/groups/plugin.py
@@ -26,7 +26,9 @@
     retry=retry_if_exception_type(TryAgain),
     wait=wait_exponential(multiplier=1, min=2, max=5),
 )
-def make_call(client: Any, func: Any, delay: int | None = None, propagate_errors: bool = False, **kwargs):
+def make_call(
+    client: Any, func: Any, delay: int | None = None, propagate_errors: bool = False, **kwargs
+):
     """Make an google client api call."""
     try:
         data = getattr(client, func)(**kwargs).execute()
diff --git a/src/dispatch/plugins/dispatch_slack/case/interactive.py b/src/dispatch/plugins/dispatch_slack/case/interactive.py
index 0c79c900ba6e..04052f28c0ac 100644
--- a/src/dispatch/plugins/dispatch_slack/case/interactive.py
+++ b/src/dispatch/plugins/dispatch_slack/case/interactive.py
@@ -287,7 +287,7 @@ def handle_update_case_command(
         ),
         case_visibility_select(
             initial_option={"text": case.visibility, "value": case.visibility},
-        )
+        ),
     ]
 
     modal = Modal(
diff --git a/src/dispatch/plugins/dispatch_slack/case/messages.py b/src/dispatch/plugins/dispatch_slack/case/messages.py
index 898ed679e056..481841806969 100644
--- a/src/dispatch/plugins/dispatch_slack/case/messages.py
+++ b/src/dispatch/plugins/dispatch_slack/case/messages.py
@@ -30,7 +30,6 @@
 )
 from dispatch.plugins.dispatch_slack.config import (
     MAX_SECTION_TEXT_LENGTH,
-    SlackConversationConfiguration,
 )
 from dispatch.plugins.dispatch_slack.models import (
     CaseSubjects,
@@ -93,14 +92,14 @@ def html_to_plain_text(html_content: str) -> str:
     text = html.unescape(html_content)
 
     # Remove HTML tags but preserve line breaks
-    text = re.sub(r'<br\s*/?>', '\n', text)
-    text = re.sub(r'</p>', '\n\n', text)
-    text = re.sub(r'<p[^>]*>', '', text)
-    text = re.sub(r'</?[^>]+>', '', text)
+    text = re.sub(r"<br\s*/?>", "\n", text)
+    text = re.sub(r"</p>", "\n\n", text)
+    text = re.sub(r"<p[^>]*>", "", text)
+    text = re.sub(r"</?[^>]+>", "", text)
 
     # Clean up extra whitespace
-    text = re.sub(r'\n\s*\n\s*\n', '\n\n', text)  # Multiple newlines to double
-    text = re.sub(r'[ \t]+', ' ', text)  # Multiple spaces/tabs to single space
+    text = re.sub(r"\n\s*\n\s*\n", "\n\n", text)  # Multiple newlines to double
+    text = re.sub(r"[ \t]+", " ", text)  # Multiple spaces/tabs to single space
     text = text.strip()
 
     return text
diff --git a/src/dispatch/plugins/dispatch_slack/fields.py b/src/dispatch/plugins/dispatch_slack/fields.py
index 888e6cd505cd..95e4b8f0c104 100644
--- a/src/dispatch/plugins/dispatch_slack/fields.py
+++ b/src/dispatch/plugins/dispatch_slack/fields.py
@@ -696,7 +696,7 @@ def case_visibility_select(
     """Creates a case visibility select."""
     visibility = [
         {"text": Visibility.restricted, "value": Visibility.restricted},
-        {"text": Visibility.open, "value": Visibility.open}
+        {"text": Visibility.open, "value": Visibility.open},
     ]
 
     return static_select_block(
diff --git a/src/dispatch/plugins/dispatch_slack/messaging.py b/src/dispatch/plugins/dispatch_slack/messaging.py
index e11662b8ca50..c12906aeb78b 100644
--- a/src/dispatch/plugins/dispatch_slack/messaging.py
+++ b/src/dispatch/plugins/dispatch_slack/messaging.py
@@ -143,18 +143,18 @@ def get_incident_conversation_command_message(
 
 
 def build_command_error_message(payload: dict, error: Any) -> str:
-    message = f"""Unfortunately we couldn't run `{payload['command']}` due to the following reason: {str(error)}  """
+    message = f"""Unfortunately we couldn't run `{payload["command"]}` due to the following reason: {str(error)}  """
     return message
 
 
 def build_role_error_message(payload: dict) -> str:
-    message = f"""I see you tried to run `{payload['command']}`. This is a sensitive command and cannot be run with the incident role you are currently assigned."""
+    message = f"""I see you tried to run `{payload["command"]}`. This is a sensitive command and cannot be run with the incident role you are currently assigned."""
     return message
 
 
 def build_context_error_message(payload: dict, error: Any) -> str:
     message = (
-        f"""I see you tried to run `{payload['command']}` in an non-incident conversation. Incident-specific commands can only be run in incident conversations."""  # command_context_middleware()
+        f"""I see you tried to run `{payload["command"]}` in an non-incident conversation. Incident-specific commands can only be run in incident conversations."""  # command_context_middleware()
         if payload.get("command")
         else str(error)  # everything else
     )
diff --git a/src/dispatch/plugins/dispatch_slack/plugin.py b/src/dispatch/plugins/dispatch_slack/plugin.py
index 5e10e0fafc2d..1871dda26e6a 100644
--- a/src/dispatch/plugins/dispatch_slack/plugin.py
+++ b/src/dispatch/plugins/dispatch_slack/plugin.py
@@ -442,7 +442,10 @@ def fetch_events(
             activity = event_instance.fetch_activity(client, subject, oldest)
             return activity
         except Exception as e:
-            logger.exception("An error occurred while fetching incident or case events from the Slack plugin.", exc_info=e)
+            logger.exception(
+                "An error occurred while fetching incident or case events from the Slack plugin.",
+                exc_info=e,
+            )
             raise
 
     def get_conversation_replies(self, conversation_id: str, thread_ts: str) -> list[str]:
diff --git a/src/dispatch/report/flows.py b/src/dispatch/report/flows.py
index 6b473658d041..e1faf6a8d86d 100644
--- a/src/dispatch/report/flows.py
+++ b/src/dispatch/report/flows.py
@@ -98,12 +98,14 @@ def create_executive_report(
     incident = incident_service.get(db_session=db_session, incident_id=incident_id)
 
     if not incident.incident_type.executive_template_document:
-        raise ValidationError([
-            {
-                "msg": "No executive report template defined.",
-                "loc": "executive_template_document",
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "msg": "No executive report template defined.",
+                    "loc": "executive_template_document",
+                }
+            ]
+        )
 
     # we fetch all previous executive reports
     executive_reports = get_all_by_incident_id_and_type(
diff --git a/src/dispatch/report/service.py b/src/dispatch/report/service.py
index 8299ddf0e226..5db8209560c1 100644
--- a/src/dispatch/report/service.py
+++ b/src/dispatch/report/service.py
@@ -1,4 +1,3 @@
-
 from .enums import ReportTypes
 from .models import Report, ReportCreate, ReportUpdate
 
diff --git a/src/dispatch/search/fulltext/__init__.py b/src/dispatch/search/fulltext/__init__.py
index 4619b5d89a37..18b510c9bff6 100644
--- a/src/dispatch/search/fulltext/__init__.py
+++ b/src/dispatch/search/fulltext/__init__.py
@@ -2,6 +2,7 @@
 Originally authored by:
 https://github.com/kvesteri/sqlalchemy-searchable/blob/master/sqlalchemy_searchable
 """
+
 import os
 from functools import reduce
 
@@ -55,9 +56,11 @@ def search(query, search_query, vector=None, regconfig=None, sort=False):
         # Get the entity class from the query in a SQLAlchemy 2.x compatible way
         try:
             # For SQLAlchemy 2.x
-            entity = query.column_descriptions[0]['entity']
+            entity = query.column_descriptions[0]["entity"]
         except (AttributeError, IndexError, KeyError):
-            raise ValueError("Could not determine entity class from query. Please provide vector explicitly.") from None
+            raise ValueError(
+                "Could not determine entity class from query. Please provide vector explicitly."
+            ) from None
 
         search_vectors = inspect_search_vectors(entity)
         vector = search_vectors[0]
diff --git a/src/dispatch/search/models.py b/src/dispatch/search/models.py
index 7cb40670f16a..f758284766f5 100644
--- a/src/dispatch/search/models.py
+++ b/src/dispatch/search/models.py
@@ -16,9 +16,11 @@
 from dispatch.team.models import TeamContactRead
 from dispatch.term.models import TermRead
 
+
 # Pydantic models...
 class SearchBase(DispatchBase):
     """Base model for search queries."""
+
     query: str | None = None
 
 
@@ -28,6 +30,7 @@ class SearchRequest(SearchBase):
 
 class ContentResponse(DispatchBase):
     """Model for search content response."""
+
     documents: list[DocumentRead] | None = Field(default_factory=list, alias="Document")
     incidents: list[IncidentRead] | None = Field(default_factory=list, alias="Incident")
     tasks: list[TaskRead] | None = Field(default_factory=list, alias="Task")
@@ -37,7 +40,9 @@ class ContentResponse(DispatchBase):
     sources: list[SourceRead] | None = Field(default_factory=list, alias="Source")
     queries: list[QueryRead] | None = Field(default_factory=list, alias="Query")
     teams: list[TeamContactRead] | None = Field(default_factory=list, alias="TeamContact")
-    individuals: list[IndividualContactRead] | None = Field(default_factory=list, alias="IndividualContact")
+    individuals: list[IndividualContactRead] | None = Field(
+        default_factory=list, alias="IndividualContact"
+    )
     services: list[ServiceRead] | None = Field(default_factory=list, alias="Service")
     cases: list[CaseRead] | None = Field(default_factory=list, alias="Case")
     model_config: ClassVar[ConfigDict] = ConfigDict(populate_by_name=True)
@@ -45,5 +50,6 @@ class ContentResponse(DispatchBase):
 
 class SearchResponse(DispatchBase):
     """Model for a search response."""
+
     query: str | None = None
     results: ContentResponse
diff --git a/src/dispatch/search_filter/service.py b/src/dispatch/search_filter/service.py
index 67ef809671cd..e57ffabcf142 100644
--- a/src/dispatch/search_filter/service.py
+++ b/src/dispatch/search_filter/service.py
@@ -1,4 +1,3 @@
-
 from sqlalchemy_filters import apply_filters
 
 from dispatch.database.core import Base, get_class_by_tablename, get_table_name_by_class_instance
diff --git a/src/dispatch/service/service.py b/src/dispatch/service/service.py
index 6352d1f1dd4b..5b3ecd43887c 100644
--- a/src/dispatch/service/service.py
+++ b/src/dispatch/service/service.py
@@ -1,4 +1,3 @@
-
 from pydantic import ValidationError
 
 from dispatch.plugin import service as plugin_service
@@ -39,14 +38,16 @@ def get_by_name_or_raise(*, db_session, project_id, service_in: ServiceRead) ->
     source = get_by_name(db_session=db_session, project_id=project_id, name=service_in.name)
 
     if not source:
-        raise ValidationError([
-            {
-                "loc": ("service",),
-                "msg": f"Service not found: {service_in.name}",
-                "type": "value_error",
-                "input": service_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("service",),
+                    "msg": f"Service not found: {service_in.name}",
+                    "type": "value_error",
+                    "input": service_in.name,
+                }
+            ]
+        )
 
     return source
 
diff --git a/src/dispatch/static/dispatch/.npmrc b/src/dispatch/static/dispatch/.npmrc
index ff753f54526a..74d1d2708e10 100644
--- a/src/dispatch/static/dispatch/.npmrc
+++ b/src/dispatch/static/dispatch/.npmrc
@@ -1,2 +1 @@
 //registry.npmjs.org/:_authToken=${FORMKIT_ENTERPRISE_TOKEN}
-
diff --git a/src/dispatch/static/dispatch/jsconfig.json b/src/dispatch/static/dispatch/jsconfig.json
index e8b3494e07b5..b8d6842d7fad 100644
--- a/src/dispatch/static/dispatch/jsconfig.json
+++ b/src/dispatch/static/dispatch/jsconfig.json
@@ -4,4 +4,4 @@
       "@/*": ["./src/*"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/dispatch/static/dispatch/public/static/robots.txt b/src/dispatch/static/dispatch/public/static/robots.txt
index 6f27bb66a346..eb0536286f30 100644
--- a/src/dispatch/static/dispatch/public/static/robots.txt
+++ b/src/dispatch/static/dispatch/public/static/robots.txt
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow:
\ No newline at end of file
+Disallow:
diff --git a/src/dispatch/static/dispatch/src/events/ReportSubmissionCard.vue b/src/dispatch/static/dispatch/src/events/ReportSubmissionCard.vue
index c2482103d962..06d297052edf 100644
--- a/src/dispatch/static/dispatch/src/events/ReportSubmissionCard.vue
+++ b/src/dispatch/static/dispatch/src/events/ReportSubmissionCard.vue
@@ -10,7 +10,7 @@
       <v-card-text>
         <p>
           Security Events are an input requiring triage and if deemed significant, can be escalated
-          to incidents for futher investigation and response. If you suspect a security issue and
+          to incidents for further investigation and response. If you suspect a security issue and
           need help, please fill out this form to the best of your abilities.
         </p>
         <v-container>
diff --git a/src/dispatch/storage/models.py b/src/dispatch/storage/models.py
index 7b05d131c45e..f419f926ccbf 100644
--- a/src/dispatch/storage/models.py
+++ b/src/dispatch/storage/models.py
@@ -11,6 +11,7 @@
 
 class Storage(Base, ResourceMixin):
     """SQLAlchemy model for storage resources."""
+
     id = Column(Integer, primary_key=True)
     incident_id = Column(Integer, ForeignKey("incident.id", ondelete="CASCADE"))
     case_id = Column(Integer, ForeignKey("case.id", ondelete="CASCADE"))
@@ -31,6 +32,7 @@ class StorageUpdate(StorageBase):
 
 class StorageRead(StorageBase):
     """Pydantic model for reading a storage resource."""
+
     description: str | None = None
 
     @field_validator("description", mode="before")
diff --git a/src/dispatch/storage/service.py b/src/dispatch/storage/service.py
index d2f6a6b4678a..8b7c72b82a5c 100644
--- a/src/dispatch/storage/service.py
+++ b/src/dispatch/storage/service.py
@@ -1,4 +1,3 @@
-
 from sqlalchemy.orm import Session
 
 from .models import Storage, StorageCreate
diff --git a/src/dispatch/tag/service.py b/src/dispatch/tag/service.py
index 238b7eac633f..479893cc3ea3 100644
--- a/src/dispatch/tag/service.py
+++ b/src/dispatch/tag/service.py
@@ -26,14 +26,16 @@ def get_by_name_or_raise(*, db_session, project_id: int, tag_in: TagRead):
     tag = get_by_name(db_session=db_session, project_id=project_id, name=tag_in.name)
 
     if not tag:
-        raise ValidationError([
-            {
-                "loc": ("tag",),
-                "msg": f"Tag not found: {tag_in.name}",
-                "type": "value_error",
-                "input": tag_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("tag",),
+                    "msg": f"Tag not found: {tag_in.name}",
+                    "type": "value_error",
+                    "input": tag_in.name,
+                }
+            ]
+        )
 
     return tag
 
diff --git a/src/dispatch/tag_type/service.py b/src/dispatch/tag_type/service.py
index cddd312fea33..b58a18433f1e 100644
--- a/src/dispatch/tag_type/service.py
+++ b/src/dispatch/tag_type/service.py
@@ -44,7 +44,7 @@ def get_by_name_or_raise(*, db_session, project_id: int, tag_type_in: TagTypeRea
                     "msg": "Tag type not found.",
                     "input": tag_type_in.name,
                 }
-            ]
+            ],
         )
 
     return tag_type
diff --git a/src/dispatch/tag_type/views.py b/src/dispatch/tag_type/views.py
index 79b61242d846..7dcd496666ed 100644
--- a/src/dispatch/tag_type/views.py
+++ b/src/dispatch/tag_type/views.py
@@ -37,7 +37,7 @@ def get_tag_type(db_session: DbSession, tag_type_id: PrimaryKey):
                     "msg": "Tag type not found.",
                     "input": tag_type_id,
                 }
-            ]
+            ],
         )
     return tag_type
 
@@ -73,7 +73,7 @@ def update_tag_type(db_session: DbSession, tag_type_id: PrimaryKey, tag_type_in:
                     "msg": "Tag type not found.",
                     "input": tag_type_id,
                 }
-            ]
+            ],
         )
 
     try:
@@ -104,6 +104,6 @@ def delete_tag_type(db_session: DbSession, tag_type_id: PrimaryKey):
                     "msg": "Tag type not found.",
                     "input": tag_type_id,
                 }
-            ]
+            ],
         )
     delete(db_session=db_session, tag_type_id=tag_type_id)
diff --git a/src/dispatch/task/service.py b/src/dispatch/task/service.py
index acb291f0ec9b..2571494ce7f4 100644
--- a/src/dispatch/task/service.py
+++ b/src/dispatch/task/service.py
@@ -183,7 +183,9 @@ def update(*, db_session, task: Task, task_in: TaskUpdate, sync_external: bool =
                 user_email=task_in.owner.individual.email,
             )
 
-    update_data = task_in.dict(exclude_unset=True, exclude={"assignees", "owner", "creator", "incident"})
+    update_data = task_in.dict(
+        exclude_unset=True, exclude={"assignees", "owner", "creator", "incident"}
+    )
 
     for field in update_data.keys():
         setattr(task, field, update_data[field])
diff --git a/src/dispatch/team/service.py b/src/dispatch/team/service.py
index 72c3c788d236..a2797e4fa57a 100644
--- a/src/dispatch/team/service.py
+++ b/src/dispatch/team/service.py
@@ -1,4 +1,3 @@
-
 from dispatch.project import service as project_service
 from dispatch.project.models import Project
 from dispatch.search_filter import service as search_filter_service
diff --git a/src/dispatch/term/service.py b/src/dispatch/term/service.py
index a7a891e1e028..d88936f595b2 100644
--- a/src/dispatch/term/service.py
+++ b/src/dispatch/term/service.py
@@ -1,4 +1,3 @@
-
 from dispatch.definition import service as definition_service
 from dispatch.project import service as project_service
 
diff --git a/src/dispatch/ticket/service.py b/src/dispatch/ticket/service.py
index 92ceb5e6fdeb..2bf4f7d258bb 100644
--- a/src/dispatch/ticket/service.py
+++ b/src/dispatch/ticket/service.py
@@ -1,4 +1,3 @@
-
 from sqlalchemy.orm import Session
 
 from .models import Ticket, TicketCreate
diff --git a/src/dispatch/workflow/models.py b/src/dispatch/workflow/models.py
index 2a5d9bf27311..8dc2e747fdcd 100644
--- a/src/dispatch/workflow/models.py
+++ b/src/dispatch/workflow/models.py
@@ -64,6 +64,7 @@
 
 class Workflow(Base, ProjectMixin, TimeStampMixin):
     """SQLAlchemy model for workflow resources."""
+
     id = Column(Integer, primary_key=True)
     name = Column(String)
     description = Column(String)
@@ -73,20 +74,15 @@ class Workflow(Base, ProjectMixin, TimeStampMixin):
     plugin_instance_id = Column(Integer, ForeignKey(PluginInstance.id))
     plugin_instance = relationship(PluginInstance)
     instances = relationship("WorkflowInstance")
-    incident_priorities = relationship(
-        "IncidentPriority", assoc_workflow_incident_priorities
-    )
-    incident_types = relationship(
-        "IncidentType", assoc_workflow_incident_types
-    )
-    terms = relationship(
-        "Term", assoc_workflow_terms
-    )
+    incident_priorities = relationship("IncidentPriority", assoc_workflow_incident_priorities)
+    incident_types = relationship("IncidentType", assoc_workflow_incident_types)
+    terms = relationship("Term", assoc_workflow_terms)
     search_vector = Column(TSVectorType("name", "description"))
 
 
 class WorkflowInstance(Base, ResourceMixin):
     """SQLAlchemy model for workflow instance resources."""
+
     id = Column(Integer, primary_key=True)
     workflow_id = Column(Integer, ForeignKey("workflow.id"))
     parameters = Column(JSON, default=[])
@@ -97,25 +93,26 @@ class WorkflowInstance(Base, ResourceMixin):
     signal_id = Column(Integer, ForeignKey("signal.id", ondelete="CASCADE"))
     creator = relationship("Participant")
     status = Column(String, default=WorkflowInstanceStatus.submitted)
-    artifacts = relationship(
-        "Document", assoc_workflow_instances_artifacts
-    )
+    artifacts = relationship("Document", assoc_workflow_instances_artifacts)
 
 
 class WorkflowIncident(DispatchBase):
     """Pydantic model for workflow incident reference."""
+
     id: PrimaryKey
     name: NameStr | None
 
 
 class WorkflowCase(DispatchBase):
     """Pydantic model for workflow case reference."""
+
     id: PrimaryKey
     name: NameStr | None
 
 
 class WorkflowSignal(DispatchBase):
     """Pydantic model for workflow signal reference."""
+
     id: PrimaryKey
     name: NameStr | None
 
@@ -123,6 +120,7 @@ class WorkflowSignal(DispatchBase):
 # Pydantic models...
 class WorkflowBase(DispatchBase):
     """Base Pydantic model for workflow resources."""
+
     name: NameStr
     resource_id: str
     plugin_instance: PluginInstanceReadMinimal
@@ -135,16 +133,19 @@ class WorkflowBase(DispatchBase):
 
 class WorkflowCreate(WorkflowBase):
     """Pydantic model for creating a workflow resource."""
+
     project: ProjectRead
 
 
 class WorkflowUpdate(WorkflowBase):
     """Pydantic model for updating a workflow resource."""
+
     id: PrimaryKey
 
 
 class WorkflowRead(WorkflowBase):
     """Pydantic model for reading a workflow resource."""
+
     id: PrimaryKey
 
     @field_validator("description", mode="before")
@@ -158,11 +159,13 @@ def set_description(cls, v: str | None):
 
 class WorkflowPagination(Pagination):
     """Pydantic model for paginated workflow results."""
+
     items: list[WorkflowRead] = []
 
 
 class WorkflowInstanceBase(ResourceBase):
     """Base Pydantic model for workflow instance resources."""
+
     artifacts: list[DocumentCreate] | None = None
     created_at: datetime | None = None
     parameters: list[dict[str, object]] | None = None
@@ -176,6 +179,7 @@ class WorkflowInstanceBase(ResourceBase):
 
 class WorkflowInstanceCreate(WorkflowInstanceBase):
     """Pydantic model for creating a workflow instance resource."""
+
     creator: ParticipantRead | None = None
     incident: WorkflowIncident | None = None
     case: WorkflowCase | None = None
@@ -188,6 +192,7 @@ class WorkflowInstanceUpdate(WorkflowInstanceBase):
 
 class WorkflowInstanceRead(WorkflowInstanceBase):
     """Pydantic model for reading a workflow instance resource."""
+
     id: PrimaryKey
     workflow: WorkflowRead | None = None
     creator: ParticipantRead | None = None
@@ -195,4 +200,5 @@ class WorkflowInstanceRead(WorkflowInstanceBase):
 
 class WorkflowInstancePagination(Pagination):
     """Pydantic model for paginated workflow instance results."""
+
     items: list[WorkflowInstanceRead] = []
diff --git a/src/dispatch/workflow/scheduled.py b/src/dispatch/workflow/scheduled.py
index 1e6791338be1..faa9c21c4416 100644
--- a/src/dispatch/workflow/scheduled.py
+++ b/src/dispatch/workflow/scheduled.py
@@ -44,7 +44,7 @@ def sync_workflow(
     # might add to try more retry logic instead of just failing.
     if not instance_data:
         log.warning(
-            f"Unabled to sync instance data. WorkflowId: {instance.workflow.resource_id} WorkflowInstanceId: {instance.id}"
+            f"Unable to sync instance data. WorkflowId: {instance.workflow.resource_id} WorkflowInstanceId: {instance.id}"
         )
         return
 
diff --git a/src/dispatch/workflow/service.py b/src/dispatch/workflow/service.py
index a55c50ebcacb..6ca123fc1061 100644
--- a/src/dispatch/workflow/service.py
+++ b/src/dispatch/workflow/service.py
@@ -1,4 +1,3 @@
-
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import true
 
@@ -39,12 +38,14 @@ def get_by_name_or_raise(*, db_session: Session, workflow_in: WorkflowRead) -> W
     workflow = get_by_name(db_session=db_session, name=workflow_in.name)
 
     if not workflow:
-        raise ValidationError([
-            {
-                "msg": "Workflow not found.",
-                "loc": "workflow",
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "msg": "Workflow not found.",
+                    "loc": "workflow",
+                }
+            ]
+        )
     return workflow
 
 
diff --git a/tests/case/test_case_service.py b/tests/case/test_case_service.py
index c06ada6a175a..5011f3eee7c5 100644
--- a/tests/case/test_case_service.py
+++ b/tests/case/test_case_service.py
@@ -10,13 +10,13 @@
 def test_get(session, case: Case):
     from dispatch.case.service import get
 
-    case_id = getattr(case, 'id', None)
+    case_id = getattr(case, "id", None)
     if case_id is None:
         raise AssertionError("case.id is None; cannot run test_get.")
-    if hasattr(case_id, '__int__'):
+    if hasattr(case_id, "__int__"):
         case_id = int(case_id)
     t_case = get(db_session=session, case_id=case_id)
-    if t_case is not None and getattr(t_case, 'id', None) is not None:
+    if t_case is not None and getattr(t_case, "id", None) is not None:
         assert isinstance(t_case.id, int)
         assert t_case.id == case_id
     else:
@@ -26,13 +26,13 @@ def test_get(session, case: Case):
 def test_get_by_name(session, case: Case):
     from dispatch.case.service import get_by_name
 
-    case_name = getattr(case, 'name', None)
+    case_name = getattr(case, "name", None)
     if case_name is None:
         raise AssertionError("case.name is None; cannot run test_get_by_name.")
-    if hasattr(case_name, '__str__'):
+    if hasattr(case_name, "__str__"):
         case_name = str(case_name)
     t_case = get_by_name(db_session=session, project_id=case.project.id, name=case_name)
-    if t_case is not None and getattr(t_case, 'name', None) is not None:
+    if t_case is not None and getattr(t_case, "name", None) is not None:
         assert isinstance(t_case.name, str)
         assert t_case.name == case_name
     else:
@@ -210,21 +210,21 @@ def test_update(session, case: Case, project):
         db_session=session, case=case, case_in=case_in, current_user=current_user
     )
     if case_out is not None:
-        assert getattr(case_out, 'title', None) == "XXX"
-        assert getattr(case_out, 'description', None) == "YYY"
-        assert getattr(case_out, 'resolution', None) == "True Positive"
-        assert getattr(case_out, 'status', None) == CaseStatus.closed
-        assert getattr(case_out, 'visibility', None) == Visibility.restricted
+        assert getattr(case_out, "title", None) == "XXX"
+        assert getattr(case_out, "description", None) == "YYY"
+        assert getattr(case_out, "resolution", None) == "True Positive"
+        assert getattr(case_out, "status", None) == CaseStatus.closed
+        assert getattr(case_out, "visibility", None) == Visibility.restricted
 
 
 def test_delete(session, case: Case):
     from dispatch.case.service import delete as case_delete
     from dispatch.case.service import get as case_get
 
-    case_id = getattr(case, 'id', None)
+    case_id = getattr(case, "id", None)
     if case_id is None:
         raise AssertionError("case.id is None; cannot run test_delete.")
-    if hasattr(case_id, '__int__'):
+    if hasattr(case_id, "__int__"):
         case_id = int(case_id)
     case_delete(
         db_session=session,
diff --git a/tests/case_cost_type/test_case_cost_type_service.py b/tests/case_cost_type/test_case_cost_type_service.py
index b77559473900..7c7c749caeb8 100644
--- a/tests/case_cost_type/test_case_cost_type_service.py
+++ b/tests/case_cost_type/test_case_cost_type_service.py
@@ -1,5 +1,6 @@
 from datetime import datetime, timezone
 
+
 def test_get(session, case_cost_type):
     from dispatch.case_cost_type.service import get
 
diff --git a/tests/dispatch_google_docs/test_dispatch_google_docs.py b/tests/dispatch_google_docs/test_dispatch_google_docs.py
index e5f8f8bd4cf1..85917e0b7170 100644
--- a/tests/dispatch_google_docs/test_dispatch_google_docs.py
+++ b/tests/dispatch_google_docs/test_dispatch_google_docs.py
@@ -1,6 +1,7 @@
 # Representation of document in the Google Docs API.
 # See https://developers.google.com/docs/api/samples/output-json.
 
+
 def test_find_links():
     """Tests the find_links function returns the expected urls."""
     from dispatch.plugins.dispatch_google.docs.plugin import find_links
diff --git a/tests/document/test_document_service.py b/tests/document/test_document_service.py
index cae311382c93..143277fd9e21 100644
--- a/tests/document/test_document_service.py
+++ b/tests/document/test_document_service.py
@@ -43,7 +43,7 @@ def test_update(session, document):
         resource_id=document.resource_id,
         resource_type=document.resource_type,
         weblink=document.weblink,
-        filters=[]
+        filters=[],
     )
     document = update(
         db_session=session,
diff --git a/tests/entity/test_entity_service.py b/tests/entity/test_entity_service.py
index 54251a28e451..ead885e7d8b7 100644
--- a/tests/entity/test_entity_service.py
+++ b/tests/entity/test_entity_service.py
@@ -1,4 +1,9 @@
-from dispatch.entity_type.models import EntityType, EntityTypeCreate, EntityTypeUpdate, EntityScopeEnum
+from dispatch.entity_type.models import (
+    EntityType,
+    EntityTypeCreate,
+    EntityTypeUpdate,
+    EntityScopeEnum,
+)
 from dispatch.entity import service as entity_service
 from tests.factories import SignalInstanceFactory
 from dispatch.project.models import ProjectRead
@@ -7,14 +12,16 @@
 def test_get(session, entity):
     from dispatch.entity.service import get
 
-    if not hasattr(entity, 'id') or entity.id is None:
+    if not hasattr(entity, "id") or entity.id is None:
         import pytest
+
         pytest.skip("Entity fixture does not have a valid id.")
-    if not hasattr(entity, 'id') or entity.id is None:
+    if not hasattr(entity, "id") or entity.id is None:
         import pytest
+
         pytest.skip("Entity fixture does not have a valid id.")
     t_entity = get(db_session=session, entity_id=entity.id)
-    assert t_entity is not None and hasattr(t_entity, 'id') and t_entity.id == entity.id
+    assert t_entity is not None and hasattr(t_entity, "id") and t_entity.id == entity.id
 
 
 def test_get_all_by_signal(session, entity, signal_instance):
@@ -84,7 +91,9 @@ def test_get_all_desc_by_signal_with_case(session, entity, signal_instance):
     assert entities[0].id == entity.id
 
     # If we pass a non-matching case_id, should return empty
-    entities_none = get_all_desc_by_signal(db_session=session, signal_id=signal_id, case_id=case_id + 999)
+    entities_none = get_all_desc_by_signal(
+        db_session=session, signal_id=signal_id, case_id=case_id + 999
+    )
     assert len(entities_none) == 0
 
 
@@ -113,55 +122,69 @@ def test_create(session, entity_type, project):
             project=ProjectRead(
                 id=project.id,
                 name=project.name,
-                display_name=getattr(project, 'display_name', ''),
-                owner_email=getattr(project, 'owner_email', None),
-                owner_conversation=getattr(project, 'owner_conversation', None),
-                annual_employee_cost=getattr(project, 'annual_employee_cost', 50000),
-                business_year_hours=getattr(project, 'business_year_hours', 2080),
-                description=getattr(project, 'description', None),
-                default=getattr(project, 'default', False),
-                color=getattr(project, 'color', None),
-                send_daily_reports=getattr(project, 'send_daily_reports', True),
-                send_weekly_reports=getattr(project, 'send_weekly_reports', False),
-                weekly_report_notification_id=getattr(project, 'weekly_report_notification_id', None),
-                enabled=getattr(project, 'enabled', True),
-                storage_folder_one=getattr(project, 'storage_folder_one', None),
-                storage_folder_two=getattr(project, 'storage_folder_two', None),
-                storage_use_folder_one_as_primary=getattr(project, 'storage_use_folder_one_as_primary', True),
-                storage_use_title=getattr(project, 'storage_use_title', False),
-                allow_self_join=getattr(project, 'allow_self_join', True),
-                select_commander_visibility=getattr(project, 'select_commander_visibility', True),
-                report_incident_instructions=getattr(project, 'report_incident_instructions', None),
-                report_incident_title_hint=getattr(project, 'report_incident_title_hint', None),
-                report_incident_description_hint=getattr(project, 'report_incident_description_hint', None),
-                snooze_extension_oncall_service=getattr(project, 'snooze_extension_oncall_service', None),
+                display_name=getattr(project, "display_name", ""),
+                owner_email=getattr(project, "owner_email", None),
+                owner_conversation=getattr(project, "owner_conversation", None),
+                annual_employee_cost=getattr(project, "annual_employee_cost", 50000),
+                business_year_hours=getattr(project, "business_year_hours", 2080),
+                description=getattr(project, "description", None),
+                default=getattr(project, "default", False),
+                color=getattr(project, "color", None),
+                send_daily_reports=getattr(project, "send_daily_reports", True),
+                send_weekly_reports=getattr(project, "send_weekly_reports", False),
+                weekly_report_notification_id=getattr(
+                    project, "weekly_report_notification_id", None
+                ),
+                enabled=getattr(project, "enabled", True),
+                storage_folder_one=getattr(project, "storage_folder_one", None),
+                storage_folder_two=getattr(project, "storage_folder_two", None),
+                storage_use_folder_one_as_primary=getattr(
+                    project, "storage_use_folder_one_as_primary", True
+                ),
+                storage_use_title=getattr(project, "storage_use_title", False),
+                allow_self_join=getattr(project, "allow_self_join", True),
+                select_commander_visibility=getattr(project, "select_commander_visibility", True),
+                report_incident_instructions=getattr(project, "report_incident_instructions", None),
+                report_incident_title_hint=getattr(project, "report_incident_title_hint", None),
+                report_incident_description_hint=getattr(
+                    project, "report_incident_description_hint", None
+                ),
+                snooze_extension_oncall_service=getattr(
+                    project, "snooze_extension_oncall_service", None
+                ),
             ),
         ),
         project=ProjectRead(
             id=project.id,
             name=project.name,
-            display_name=getattr(project, 'display_name', ''),
-            owner_email=getattr(project, 'owner_email', None),
-            owner_conversation=getattr(project, 'owner_conversation', None),
-            annual_employee_cost=getattr(project, 'annual_employee_cost', 50000),
-            business_year_hours=getattr(project, 'business_year_hours', 2080),
-            description=getattr(project, 'description', None),
-            default=getattr(project, 'default', False),
-            color=getattr(project, 'color', None),
-            send_daily_reports=getattr(project, 'send_daily_reports', True),
-            send_weekly_reports=getattr(project, 'send_weekly_reports', False),
-            weekly_report_notification_id=getattr(project, 'weekly_report_notification_id', None),
-            enabled=getattr(project, 'enabled', True),
-            storage_folder_one=getattr(project, 'storage_folder_one', None),
-            storage_folder_two=getattr(project, 'storage_folder_two', None),
-            storage_use_folder_one_as_primary=getattr(project, 'storage_use_folder_one_as_primary', True),
-            storage_use_title=getattr(project, 'storage_use_title', False),
-            allow_self_join=getattr(project, 'allow_self_join', True),
-            select_commander_visibility=getattr(project, 'select_commander_visibility', True),
-            report_incident_instructions=getattr(project, 'report_incident_instructions', None),
-            report_incident_title_hint=getattr(project, 'report_incident_title_hint', None),
-            report_incident_description_hint=getattr(project, 'report_incident_description_hint', None),
-            snooze_extension_oncall_service=getattr(project, 'snooze_extension_oncall_service', None),
+            display_name=getattr(project, "display_name", ""),
+            owner_email=getattr(project, "owner_email", None),
+            owner_conversation=getattr(project, "owner_conversation", None),
+            annual_employee_cost=getattr(project, "annual_employee_cost", 50000),
+            business_year_hours=getattr(project, "business_year_hours", 2080),
+            description=getattr(project, "description", None),
+            default=getattr(project, "default", False),
+            color=getattr(project, "color", None),
+            send_daily_reports=getattr(project, "send_daily_reports", True),
+            send_weekly_reports=getattr(project, "send_weekly_reports", False),
+            weekly_report_notification_id=getattr(project, "weekly_report_notification_id", None),
+            enabled=getattr(project, "enabled", True),
+            storage_folder_one=getattr(project, "storage_folder_one", None),
+            storage_folder_two=getattr(project, "storage_folder_two", None),
+            storage_use_folder_one_as_primary=getattr(
+                project, "storage_use_folder_one_as_primary", True
+            ),
+            storage_use_title=getattr(project, "storage_use_title", False),
+            allow_self_join=getattr(project, "allow_self_join", True),
+            select_commander_visibility=getattr(project, "select_commander_visibility", True),
+            report_incident_instructions=getattr(project, "report_incident_instructions", None),
+            report_incident_title_hint=getattr(project, "report_incident_title_hint", None),
+            report_incident_description_hint=getattr(
+                project, "report_incident_description_hint", None
+            ),
+            snooze_extension_oncall_service=getattr(
+                project, "snooze_extension_oncall_service", None
+            ),
         ),
     )
     entity = create(db_session=session, entity_in=entity_in)
@@ -250,7 +273,11 @@ def test_find_entities_with_field_only(session, signal_instance, project):
     ]
     entities = find_entities(session, signal_instance, entity_types)
     assert len(entities) == 2
-    values = {getattr(e, "value", None) for e in entities if hasattr(e, "value") and isinstance(e.value, str)}
+    values = {
+        getattr(e, "value", None)
+        for e in entities
+        if hasattr(e, "value") and isinstance(e.value, str)
+    }
     assert "arn:aws:iam::123456789012:role/Test" in values
     assert "arn:aws:s3:::ap-northeast-3-123456789012-s3-server-access-logs" in values
 
@@ -319,6 +346,10 @@ def test_find_entities_multiple_entity_types(session, signal_instance, project):
 
     entities = find_entities(session, signal_instance, entity_types)
     assert len(entities) == 2
-    values = {getattr(e, "value", None) for e in entities if hasattr(e, "value") and isinstance(e.value, str)}
+    values = {
+        getattr(e, "value", None)
+        for e in entities
+        if hasattr(e, "value") and isinstance(e.value, str)
+    }
     assert "arn:aws:iam::123456789012:role/Test" in values
     assert "arn:aws:s3:::ap-northeast-3-123456789012-s3-server-access-logs" in values
diff --git a/tests/entity_type/test_entity_type_service.py b/tests/entity_type/test_entity_type_service.py
index bb50136aa1f5..12d1bf0369ec 100644
--- a/tests/entity_type/test_entity_type_service.py
+++ b/tests/entity_type/test_entity_type_service.py
@@ -2,7 +2,11 @@ def test_get(session, entity_type):
     from dispatch.entity_type.service import get
 
     t_entity_type = get(db_session=session, entity_type_id=entity_type.id)
-    assert t_entity_type is not None and hasattr(t_entity_type, 'id') and t_entity_type.id == entity_type.id
+    assert (
+        t_entity_type is not None
+        and hasattr(t_entity_type, "id")
+        and t_entity_type.id == entity_type.id
+    )
 
 
 def test_create(session, project):
@@ -26,28 +30,34 @@ def test_create(session, project):
         project=ProjectRead(
             id=project.id,
             name=project.name,
-            display_name=getattr(project, 'display_name', ''),
-            owner_email=getattr(project, 'owner_email', None),
-            owner_conversation=getattr(project, 'owner_conversation', None),
-            annual_employee_cost=getattr(project, 'annual_employee_cost', 50000),
-            business_year_hours=getattr(project, 'business_year_hours', 2080),
-            description=getattr(project, 'description', None),
-            default=getattr(project, 'default', False),
-            color=getattr(project, 'color', None),
-            send_daily_reports=getattr(project, 'send_daily_reports', True),
-            send_weekly_reports=getattr(project, 'send_weekly_reports', False),
-            weekly_report_notification_id=getattr(project, 'weekly_report_notification_id', None),
-            enabled=getattr(project, 'enabled', True),
-            storage_folder_one=getattr(project, 'storage_folder_one', None),
-            storage_folder_two=getattr(project, 'storage_folder_two', None),
-            storage_use_folder_one_as_primary=getattr(project, 'storage_use_folder_one_as_primary', True),
-            storage_use_title=getattr(project, 'storage_use_title', False),
-            allow_self_join=getattr(project, 'allow_self_join', True),
-            select_commander_visibility=getattr(project, 'select_commander_visibility', True),
-            report_incident_instructions=getattr(project, 'report_incident_instructions', None),
-            report_incident_title_hint=getattr(project, 'report_incident_title_hint', None),
-            report_incident_description_hint=getattr(project, 'report_incident_description_hint', None),
-            snooze_extension_oncall_service=getattr(project, 'snooze_extension_oncall_service', None),
+            display_name=getattr(project, "display_name", ""),
+            owner_email=getattr(project, "owner_email", None),
+            owner_conversation=getattr(project, "owner_conversation", None),
+            annual_employee_cost=getattr(project, "annual_employee_cost", 50000),
+            business_year_hours=getattr(project, "business_year_hours", 2080),
+            description=getattr(project, "description", None),
+            default=getattr(project, "default", False),
+            color=getattr(project, "color", None),
+            send_daily_reports=getattr(project, "send_daily_reports", True),
+            send_weekly_reports=getattr(project, "send_weekly_reports", False),
+            weekly_report_notification_id=getattr(project, "weekly_report_notification_id", None),
+            enabled=getattr(project, "enabled", True),
+            storage_folder_one=getattr(project, "storage_folder_one", None),
+            storage_folder_two=getattr(project, "storage_folder_two", None),
+            storage_use_folder_one_as_primary=getattr(
+                project, "storage_use_folder_one_as_primary", True
+            ),
+            storage_use_title=getattr(project, "storage_use_title", False),
+            allow_self_join=getattr(project, "allow_self_join", True),
+            select_commander_visibility=getattr(project, "select_commander_visibility", True),
+            report_incident_instructions=getattr(project, "report_incident_instructions", None),
+            report_incident_title_hint=getattr(project, "report_incident_title_hint", None),
+            report_incident_description_hint=getattr(
+                project, "report_incident_description_hint", None
+            ),
+            snooze_extension_oncall_service=getattr(
+                project, "snooze_extension_oncall_service", None
+            ),
         ),
     )
     entity_type = create(db_session=session, entity_type_in=entity_type_in)
@@ -76,7 +86,7 @@ def test_update(session, project, entity_type):
         entity_type=entity_type,
         entity_type_in=entity_type_in,
     )
-    assert entity_type is not None and getattr(entity_type, 'name', None) == name
+    assert entity_type is not None and getattr(entity_type, "name", None) == name
 
 
 def test_delete(session, entity_type):
diff --git a/tests/event/test_event_service.py b/tests/event/test_event_service.py
index 856b30619426..73d364d91be2 100644
--- a/tests/event/test_event_service.py
+++ b/tests/event/test_event_service.py
@@ -97,7 +97,10 @@ def test_log_case_event(session, case):
     source = "Dispatch event source"
     description = "Dispatch event description"
     event = log_case_event(
-        db_session=session, source=source, description=description, case_id=case.id,
+        db_session=session,
+        source=source,
+        description=description,
+        case_id=case.id,
         started_at=datetime.datetime.now(),
         ended_at=datetime.datetime.now(),
         details={},
diff --git a/tests/feedback/test_feedback_cases.py b/tests/feedback/test_feedback_cases.py
index d4d42c30ba7e..d1f9af927dd1 100644
--- a/tests/feedback/test_feedback_cases.py
+++ b/tests/feedback/test_feedback_cases.py
@@ -6,10 +6,11 @@
 from dispatch.case.severity.models import CaseSeverityRead
 from dispatch.case.priority.models import CasePriorityRead
 
+
 def test_create(session, case, individual_contact, participant_role):
     from dispatch.feedback.incident.service import create
     from dispatch.feedback.incident.models import FeedbackCreate
-    from dispatch.participant.models import Participant # ORM model
+    from dispatch.participant.models import Participant  # ORM model
 
     # Ensure the case has a reporter with an individual contact
     # This would typically be set up by the CaseFactory
@@ -17,18 +18,17 @@ def test_create(session, case, individual_contact, participant_role):
         # Create a minimal reporter participant if one doesn't exist
         reporter_participant = Participant(
             individual=individual_contact,
-            case_id=case.id, # Link to the current case
-            participant_roles=[participant_role] # Add a default role
+            case_id=case.id,  # Link to the current case
+            participant_roles=[participant_role],  # Add a default role
         )
         session.add(reporter_participant)
         case.reporter = reporter_participant
-        session.commit() # Commit to get IDs if necessary and establish relationship
+        session.commit()  # Commit to get IDs if necessary and establish relationship
 
-    if not case.assignee: # Also ensure assignee for CaseReadMinimal
-        case.assignee = case.reporter # Or another valid participant
+    if not case.assignee:  # Also ensure assignee for CaseReadMinimal
+        case.assignee = case.reporter  # Or another valid participant
         session.commit()
 
-
     rating = FeedbackRating.neither_satisfied_nor_dissatisfied
     feedback = "The incident commander did an excellent job"
 
@@ -41,7 +41,8 @@ def test_create(session, case, individual_contact, participant_role):
             title=case.title,
             description=case.description,
             resolution=case.resolution,
-            resolution_reason=case.resolution_reason or "Resolved successfully",  # Add default value if None
+            resolution_reason=case.resolution_reason
+            or "Resolved successfully",  # Add default value if None
             status=case.status,
             visibility=case.visibility,
             closed_at=case.closed_at,
@@ -113,7 +114,9 @@ def test_update(session, feedback, individual_contact, case):  # Added case fixt
         feedback.participant.individual = individual_contact
         session.commit()
 
-    if feedback.case is not None and feedback.case.assignee is None:  # Added 'is not None' and 'is None'
+    if (
+        feedback.case is not None and feedback.case.assignee is None
+    ):  # Added 'is not None' and 'is None'
         # Use feedback's participant as assignee if none, or another valid participant
         feedback.case.assignee = feedback.participant
         session.commit()
@@ -128,29 +131,19 @@ def test_update(session, feedback, individual_contact, case):  # Added case fixt
             id=feedback.case.id if feedback.case is not None else None,
             name=feedback.case.name if feedback.case is not None else None,
             title=feedback.case.title if feedback.case is not None else None,
-            description=(
-                feedback.case.description if feedback.case is not None else None
-            ),
-            resolution=(
-                feedback.case.resolution if feedback.case is not None else None
-            ),
+            description=(feedback.case.description if feedback.case is not None else None),
+            resolution=(feedback.case.resolution if feedback.case is not None else None),
             resolution_reason=(
-                feedback.case.resolution_reason if feedback.case is not None else "Resolved successfully"
+                feedback.case.resolution_reason
+                if feedback.case is not None
+                else "Resolved successfully"
             ),  # Add resolution_reason with default value if None
             status=feedback.case.status if feedback.case is not None else None,
-            visibility=(
-                feedback.case.visibility if feedback.case is not None else None
-            ),
-            closed_at=(
-                feedback.case.closed_at if feedback.case is not None else None
-            ),
-            reported_at=(
-                feedback.case.reported_at if feedback.case is not None else None
-            ),
+            visibility=(feedback.case.visibility if feedback.case is not None else None),
+            closed_at=(feedback.case.closed_at if feedback.case is not None else None),
+            reported_at=(feedback.case.reported_at if feedback.case is not None else None),
             dedicated_channel=(
-                feedback.case.dedicated_channel
-                if feedback.case is not None
-                else None
+                feedback.case.dedicated_channel if feedback.case is not None else None
             ),
             case_type=(
                 CaseTypeRead.model_validate(feedback.case.case_type)
diff --git a/tests/feedback/test_feedback_oncall.py b/tests/feedback/test_feedback_oncall.py
index 540fccf4a111..ada9cdfc92a4 100644
--- a/tests/feedback/test_feedback_oncall.py
+++ b/tests/feedback/test_feedback_oncall.py
@@ -1,4 +1,4 @@
-""" Tests oncall service feedback """
+"""Tests oncall service feedback"""
 
 from datetime import datetime, timezone
 from dispatch.feedback.service.enums import ServiceFeedbackRating
@@ -6,7 +6,6 @@
 from dispatch.project.models import ProjectRead
 
 
-
 def test_create(session, participant, project):
     from dispatch.feedback.service.service import create
     from dispatch.feedback.service.models import ServiceFeedbackCreate
@@ -28,30 +27,36 @@ def test_create(session, participant, project):
         project=ProjectRead(
             id=project.id,
             name=project.name,
-            display_name=getattr(project, 'display_name', ''),
-            owner_email=getattr(project, 'owner_email', None),
-            owner_conversation=getattr(project, 'owner_conversation', None),
-            annual_employee_cost=getattr(project, 'annual_employee_cost', 50000),
-            business_year_hours=getattr(project, 'business_year_hours', 2080),
-            description=getattr(project, 'description', None),
-            default=getattr(project, 'default', False),
-            color=getattr(project, 'color', None),
-            send_daily_reports=getattr(project, 'send_daily_reports', True),
-            send_weekly_reports=getattr(project, 'send_weekly_reports', False),
-            weekly_report_notification_id=getattr(project, 'weekly_report_notification_id', None),
-            enabled=getattr(project, 'enabled', True),
-            storage_folder_one=getattr(project, 'storage_folder_one', None),
-            storage_folder_two=getattr(project, 'storage_folder_two', None),
-            storage_use_folder_one_as_primary=getattr(project, 'storage_use_folder_one_as_primary', True),
-            storage_use_title=getattr(project, 'storage_use_title', False),
-            allow_self_join=getattr(project, 'allow_self_join', True),
-            select_commander_visibility=getattr(project, 'select_commander_visibility', True),
-            report_incident_instructions=getattr(project, 'report_incident_instructions', None),
-            report_incident_title_hint=getattr(project, 'report_incident_title_hint', None),
-            report_incident_description_hint=getattr(project, 'report_incident_description_hint', None),
-            snooze_extension_oncall_service=getattr(project, 'snooze_extension_oncall_service', None),
+            display_name=getattr(project, "display_name", ""),
+            owner_email=getattr(project, "owner_email", None),
+            owner_conversation=getattr(project, "owner_conversation", None),
+            annual_employee_cost=getattr(project, "annual_employee_cost", 50000),
+            business_year_hours=getattr(project, "business_year_hours", 2080),
+            description=getattr(project, "description", None),
+            default=getattr(project, "default", False),
+            color=getattr(project, "color", None),
+            send_daily_reports=getattr(project, "send_daily_reports", True),
+            send_weekly_reports=getattr(project, "send_weekly_reports", False),
+            weekly_report_notification_id=getattr(project, "weekly_report_notification_id", None),
+            enabled=getattr(project, "enabled", True),
+            storage_folder_one=getattr(project, "storage_folder_one", None),
+            storage_folder_two=getattr(project, "storage_folder_two", None),
+            storage_use_folder_one_as_primary=getattr(
+                project, "storage_use_folder_one_as_primary", True
+            ),
+            storage_use_title=getattr(project, "storage_use_title", False),
+            allow_self_join=getattr(project, "allow_self_join", True),
+            select_commander_visibility=getattr(project, "select_commander_visibility", True),
+            report_incident_instructions=getattr(project, "report_incident_instructions", None),
+            report_incident_title_hint=getattr(project, "report_incident_title_hint", None),
+            report_incident_description_hint=getattr(
+                project, "report_incident_description_hint", None
+            ),
+            snooze_extension_oncall_service=getattr(
+                project, "snooze_extension_oncall_service", None
+            ),
         ),
-        created_at=datetime.now(timezone.utc)
+        created_at=datetime.now(timezone.utc),
     )
     feedback = create(db_session=session, service_feedback_in=feedback_in)
     assert feedback
@@ -93,30 +98,44 @@ def test_update(session, service_feedback, individual_contact):
         project=ProjectRead(
             id=service_feedback.project.id,
             name=service_feedback.project.name,
-            display_name=getattr(service_feedback.project, 'display_name', ''),
-            owner_email=getattr(service_feedback.project, 'owner_email', None),
-            owner_conversation=getattr(service_feedback.project, 'owner_conversation', None),
-            annual_employee_cost=getattr(service_feedback.project, 'annual_employee_cost', 50000),
-            business_year_hours=getattr(service_feedback.project, 'business_year_hours', 2080),
-            description=getattr(service_feedback.project, 'description', None),
-            default=getattr(service_feedback.project, 'default', False),
-            color=getattr(service_feedback.project, 'color', None),
-            send_daily_reports=getattr(service_feedback.project, 'send_daily_reports', True),
-            send_weekly_reports=getattr(service_feedback.project, 'send_weekly_reports', False),
-            weekly_report_notification_id=getattr(service_feedback.project, 'weekly_report_notification_id', None),
-            enabled=getattr(service_feedback.project, 'enabled', True),
-            storage_folder_one=getattr(service_feedback.project, 'storage_folder_one', None),
-            storage_folder_two=getattr(service_feedback.project, 'storage_folder_two', None),
-            storage_use_folder_one_as_primary=getattr(service_feedback.project, 'storage_use_folder_one_as_primary', True),
-            storage_use_title=getattr(service_feedback.project, 'storage_use_title', False),
-            allow_self_join=getattr(service_feedback.project, 'allow_self_join', True),
-            select_commander_visibility=getattr(service_feedback.project, 'select_commander_visibility', True),
-            report_incident_instructions=getattr(service_feedback.project, 'report_incident_instructions', None),
-            report_incident_title_hint=getattr(service_feedback.project, 'report_incident_title_hint', None),
-            report_incident_description_hint=getattr(service_feedback.project, 'report_incident_description_hint', None),
-            snooze_extension_oncall_service=getattr(service_feedback.project, 'snooze_extension_oncall_service', None),
+            display_name=getattr(service_feedback.project, "display_name", ""),
+            owner_email=getattr(service_feedback.project, "owner_email", None),
+            owner_conversation=getattr(service_feedback.project, "owner_conversation", None),
+            annual_employee_cost=getattr(service_feedback.project, "annual_employee_cost", 50000),
+            business_year_hours=getattr(service_feedback.project, "business_year_hours", 2080),
+            description=getattr(service_feedback.project, "description", None),
+            default=getattr(service_feedback.project, "default", False),
+            color=getattr(service_feedback.project, "color", None),
+            send_daily_reports=getattr(service_feedback.project, "send_daily_reports", True),
+            send_weekly_reports=getattr(service_feedback.project, "send_weekly_reports", False),
+            weekly_report_notification_id=getattr(
+                service_feedback.project, "weekly_report_notification_id", None
+            ),
+            enabled=getattr(service_feedback.project, "enabled", True),
+            storage_folder_one=getattr(service_feedback.project, "storage_folder_one", None),
+            storage_folder_two=getattr(service_feedback.project, "storage_folder_two", None),
+            storage_use_folder_one_as_primary=getattr(
+                service_feedback.project, "storage_use_folder_one_as_primary", True
+            ),
+            storage_use_title=getattr(service_feedback.project, "storage_use_title", False),
+            allow_self_join=getattr(service_feedback.project, "allow_self_join", True),
+            select_commander_visibility=getattr(
+                service_feedback.project, "select_commander_visibility", True
+            ),
+            report_incident_instructions=getattr(
+                service_feedback.project, "report_incident_instructions", None
+            ),
+            report_incident_title_hint=getattr(
+                service_feedback.project, "report_incident_title_hint", None
+            ),
+            report_incident_description_hint=getattr(
+                service_feedback.project, "report_incident_description_hint", None
+            ),
+            snooze_extension_oncall_service=getattr(
+                service_feedback.project, "snooze_extension_oncall_service", None
+            ),
         ),
-        created_at=service_feedback.created_at
+        created_at=service_feedback.created_at,
     )
     feedback = update(
         db_session=session, service_feedback=service_feedback, service_feedback_in=feedback_in
diff --git a/tests/feedback/test_feedback_service.py b/tests/feedback/test_feedback_service.py
index a97c1a82d269..1653e8ce9229 100644
--- a/tests/feedback/test_feedback_service.py
+++ b/tests/feedback/test_feedback_service.py
@@ -40,7 +40,7 @@ def test_create(session, incident, incident_type, incident_priority):
     feedback_in = FeedbackCreate(
         rating=rating,
         feedback=feedback,
-        incident=incident, # This would need to be IncidentRead.model_validate(incident)
+        incident=incident,  # This would need to be IncidentRead.model_validate(incident)
         # case=... # Similar full population as in other tests
         # participant=... # Similar full population
     )
@@ -48,10 +48,10 @@ def test_create(session, incident, incident_type, incident_priority):
     assert feedback_obj
 
 
-def test_update(session, feedback, individual_contact, case): # Added case fixture
+def test_update(session, feedback, individual_contact, case):  # Added case fixture
     from dispatch.feedback.incident.service import update
     from dispatch.feedback.incident.models import FeedbackUpdate
-    from dispatch.participant.models import Participant # ORM model
+    from dispatch.participant.models import Participant  # ORM model
 
     # Ensure feedback.case is populated for the test
     if not feedback.case:
@@ -61,10 +61,7 @@ def test_update(session, feedback, individual_contact, case): # Added case fixtu
     # Ensure feedback.participant is populated
     if not feedback.participant:
         # Create a participant for the case if needed
-        participant = Participant(
-            individual=individual_contact,
-            case_id=feedback.case.id
-        )
+        participant = Participant(individual=individual_contact, case_id=feedback.case.id)
         session.add(participant)
         session.commit()
         feedback.participant = participant
@@ -98,7 +95,8 @@ def test_update(session, feedback, individual_contact, case): # Added case fixtu
             title=feedback.case.title,
             description=feedback.case.description,
             resolution=feedback.case.resolution,
-            resolution_reason=feedback.case.resolution_reason or "Resolved successfully",  # Add resolution_reason with default value
+            resolution_reason=feedback.case.resolution_reason
+            or "Resolved successfully",  # Add resolution_reason with default value
             status=feedback.case.status,
             visibility=feedback.case.visibility,
             closed_at=feedback.case.closed_at,
@@ -108,8 +106,10 @@ def test_update(session, feedback, individual_contact, case): # Added case fixtu
             case_severity=CaseSeverityRead.model_validate(feedback.case.case_severity),
             case_priority=CasePriorityRead.model_validate(feedback.case.case_priority),
             project=ProjectRead.model_validate(feedback.case.project),
-            assignee=ParticipantReadMinimal.model_validate(feedback.case.assignee) if feedback.case.assignee else None,
-            case_costs=[]
+            assignee=ParticipantReadMinimal.model_validate(feedback.case.assignee)
+            if feedback.case.assignee
+            else None,
+            case_costs=[],
         ),
         participant=ParticipantRead.model_validate(feedback.participant),
     )
diff --git a/tests/incident_cost/test_incident_cost_service.py b/tests/incident_cost/test_incident_cost_service.py
index e98c63f164c7..a4a0f7159b11 100644
--- a/tests/incident_cost/test_incident_cost_service.py
+++ b/tests/incident_cost/test_incident_cost_service.py
@@ -211,7 +211,7 @@ def test_calculate_incident_response_cost_without_cost_model(
     from datetime import timedelta, datetime, UTC
     from dispatch.incident_cost.service import (
         calculate_incident_response_cost_with_classic_model,
-        get_or_create_default_incident_response_cost
+        get_or_create_default_incident_response_cost,
     )
     from dispatch.incident_cost_type import service as incident_cost_type_service
 
@@ -255,9 +255,7 @@ def test_calculate_incident_response_cost_without_cost_model__update_cost(
     from datetime import timedelta, datetime, UTC
 
     from dispatch.incident import service as incident_service
-    from dispatch.incident_cost.service import (
-        calculate_incident_response_cost_with_classic_model
-    )
+    from dispatch.incident_cost.service import calculate_incident_response_cost_with_classic_model
     from dispatch.incident_cost_type import service as incident_cost_type_service
 
     incident = incident_service.get(db_session=session, incident_id=incident.id)
diff --git a/tests/incident_role/test_incident_role_service.py b/tests/incident_role/test_incident_role_service.py
index 6746465d0e54..476cecad9903 100644
--- a/tests/incident_role/test_incident_role_service.py
+++ b/tests/incident_role/test_incident_role_service.py
@@ -44,7 +44,7 @@ def test_create_update(session, incident_type, project):
         service=None,
         individual=None,
         engage_next_oncall=False,
-        project=project_read_in
+        project=project_read_in,
     )
     created_roles = create_or_update(
         db_session=session,
@@ -75,7 +75,7 @@ def test_create_update(session, incident_type, project):
         service=None,
         individual=None,
         engage_next_oncall=True,
-        project=project_read_in
+        project=project_read_in,
     )
     updated_roles = create_or_update(
         db_session=session,
diff --git a/tests/notification/test_notification_service.py b/tests/notification/test_notification_service.py
index 4c68a0564488..50f7b5b38d04 100644
--- a/tests/notification/test_notification_service.py
+++ b/tests/notification/test_notification_service.py
@@ -31,7 +31,7 @@ def test_create(session, project):
         target=target,
         enabled=enabled,
         project=ProjectRead.model_validate(project),
-        filters=[]
+        filters=[],
     )
     created_notification = create(db_session=session, notification_in=notification_in)
     assert created_notification is not None
@@ -54,7 +54,7 @@ def test_update(session, notification, project):
         type=updated_type,
         description=notification.description,
         enabled=notification.enabled,
-        filters=[]
+        filters=[],
     )
     updated_notification_obj = update(
         db_session=session,
diff --git a/tests/plugins/test_dispatch_slack_incident_interactive.py b/tests/plugins/test_dispatch_slack_incident_interactive.py
index 4cac09479204..1d2cfd4a887a 100644
--- a/tests/plugins/test_dispatch_slack_incident_interactive.py
+++ b/tests/plugins/test_dispatch_slack_incident_interactive.py
@@ -1,4 +1,3 @@
-
 def test_configure():
     """Test that we can configure the plugin."""
     from dispatch.plugins.dispatch_slack.incident.interactive import (
diff --git a/tests/signal/test_signal_flow.py b/tests/signal/test_signal_flow.py
index 2e6b16bc3787..ad8d8e1f8a1c 100644
--- a/tests/signal/test_signal_flow.py
+++ b/tests/signal/test_signal_flow.py
@@ -161,7 +161,9 @@ def test_create_signal_instance(session, signal, case_severity, case_priority, u
     )
 
 
-def test_create_signal_instance_no_variant(session, signal, case_severity, case_priority, user, services):
+def test_create_signal_instance_no_variant(
+    session, signal, case_severity, case_priority, user, services
+):
     from dispatch.signal.flows import create_signal_instance
 
     case_priority.default = True
@@ -180,7 +182,9 @@ def test_create_signal_instance_no_variant(session, signal, case_severity, case_
         )
 
 
-def test_create_signal_instance_not_enabled(session, signal, case_severity, case_priority, user, services):
+def test_create_signal_instance_not_enabled(
+    session, signal, case_severity, case_priority, user, services
+):
     from dispatch.signal.flows import create_signal_instance
 
     case_priority.default = True
@@ -199,7 +203,10 @@ def test_create_signal_instance_not_enabled(session, signal, case_severity, case
             current_user=user,
         )
 
-def test_create_signal_instance_custom_conversation_target(session, signal, case_severity, case_priority, user, case_type, services):
+
+def test_create_signal_instance_custom_conversation_target(
+    session, signal, case_severity, case_priority, user, case_type, services
+):
     from dispatch.signal.flows import create_signal_instance
     from dispatch.service.models import ServiceRead
     from dispatch.case.severity.models import CaseSeverityRead
@@ -315,10 +322,12 @@ def test_create_signal_instance_custom_conversation_target(session, signal, case
         signal_instance_data=instance_data,
         current_user=user,
     )
-    assert signal_instance.conversation_target == 'test-conversation-target'
+    assert signal_instance.conversation_target == "test-conversation-target"
 
 
-def test_create_signal_instance_custom_oncall_service(session, signal, case_severity, case_priority, user, services):
+def test_create_signal_instance_custom_oncall_service(
+    session, signal, case_severity, case_priority, user, services
+):
     from dispatch.signal.flows import create_signal_instance
     from dispatch.project.models import ProjectRead as ProjectReadProject
 
@@ -454,7 +463,19 @@ def test_create_signal_instance_custom_oncall_service(session, signal, case_seve
     assert signal_instance.oncall_service is not None, "signal_instance.oncall_service is None"
     assert signal_instance.oncall_service.id == service_1.id
 
-def test_signal_instance_create_flow_custom_attributes(session, signal, case_severity, case_priority, user, services, signal_instance, oncall_plugin, case_type, case):
+
+def test_signal_instance_create_flow_custom_attributes(
+    session,
+    signal,
+    case_severity,
+    case_priority,
+    user,
+    services,
+    signal_instance,
+    oncall_plugin,
+    case_type,
+    case,
+):
     from dispatch.signal.flows import signal_instance_create_flow
     from dispatch.service import flows as service_flows
     from dispatch.case import service as case_service
@@ -474,31 +495,39 @@ def test_signal_instance_create_flow_custom_attributes(session, signal, case_sev
     signal_instance.conversation_target = "instance-conversation-target"
     signal_instance.signal.conversation_target = "signal-conversation-target"
 
-    with mock.patch.object(service_flows, "resolve_oncall") as mock_resolve_oncall, \
-        mock.patch.object(case_service, "create") as mock_case_create, \
-        mock.patch("dispatch.case.flows.case_new_create_flow") as mock_case_new_create_flow:
-        mock_resolve_oncall.side_effect = lambda service, db_session: "example@test.com" if service.id == service_0.id else None
+    with (
+        mock.patch.object(service_flows, "resolve_oncall") as mock_resolve_oncall,
+        mock.patch.object(case_service, "create") as mock_case_create,
+        mock.patch("dispatch.case.flows.case_new_create_flow") as mock_case_new_create_flow,
+    ):
+        mock_resolve_oncall.side_effect = (
+            lambda service, db_session: "example@test.com" if service.id == service_0.id else None
+        )
         mock_case_create.return_value = case
 
         post_flow_instance = signal_instance_create_flow(
-            signal_instance_id=signal_instance.id,
-            db_session=session,
-            current_user=user
+            signal_instance_id=signal_instance.id, db_session=session, current_user=user
         )
-        case_in_arg = mock_case_create.call_args[1]['case_in']
+        case_in_arg = mock_case_create.call_args[1]["case_in"]
         assert case_in_arg.assignee.individual.email == "example@test.com"
-        if post_flow_instance is not None and hasattr(post_flow_instance, "case") and post_flow_instance.case is not None:
+        if (
+            post_flow_instance is not None
+            and hasattr(post_flow_instance, "case")
+            and post_flow_instance.case is not None
+        ):
             mock_case_new_create_flow.assert_called_once_with(
                 db_session=session,
                 organization_slug=None,
                 service_id=None,
                 conversation_target="instance-conversation-target",
                 case_id=post_flow_instance.case.id,
-                create_all_resources=False
+                create_all_resources=False,
             )
 
-def test_signal_instance_create_flow_use_signal_attributes(session, signal, case_severity, case_priority, user, services, signal_instance,
-                                                                              case_type, case):
+
+def test_signal_instance_create_flow_use_signal_attributes(
+    session, signal, case_severity, case_priority, user, services, signal_instance, case_type, case
+):
     """
     If the signal instance does not specify a conversation target or on-call service, use the signal's configurations
     before the case type's configurations.
@@ -523,32 +552,39 @@ def test_signal_instance_create_flow_use_signal_attributes(session, signal, case
     case_type.conversation_target = "case-type-conversation-target"
     signal_instance.signal.case_type = case_type
 
-    with mock.patch.object(service_flows, "resolve_oncall") as mock_resolve_oncall, \
-         mock.patch.object(case_service, "create") as mock_case_create, \
-         mock.patch("dispatch.case.flows.case_new_create_flow") as mock_case_new_create_flow:
-
-        mock_resolve_oncall.side_effect = lambda service, db_session: "example@test.com" if service.id == service_0.id else None
+    with (
+        mock.patch.object(service_flows, "resolve_oncall") as mock_resolve_oncall,
+        mock.patch.object(case_service, "create") as mock_case_create,
+        mock.patch("dispatch.case.flows.case_new_create_flow") as mock_case_new_create_flow,
+    ):
+        mock_resolve_oncall.side_effect = (
+            lambda service, db_session: "example@test.com" if service.id == service_0.id else None
+        )
         mock_case_create.return_value = case
 
         post_flow_instance = signal_instance_create_flow(
-            signal_instance_id=signal_instance.id,
-            db_session=session,
-            current_user=user
+            signal_instance_id=signal_instance.id, db_session=session, current_user=user
         )
-        case_in_arg = mock_case_create.call_args[1]['case_in']
+        case_in_arg = mock_case_create.call_args[1]["case_in"]
         assert case_in_arg.assignee.individual.email == "example@test.com"
-        if post_flow_instance is not None and hasattr(post_flow_instance, "case") and post_flow_instance.case is not None:
+        if (
+            post_flow_instance is not None
+            and hasattr(post_flow_instance, "case")
+            and post_flow_instance.case is not None
+        ):
             mock_case_new_create_flow.assert_called_once_with(
                 db_session=session,
                 organization_slug=None,
                 service_id=None,
                 conversation_target="signal-conversation-target",
                 case_id=post_flow_instance.case.id,
-                create_all_resources=False
+                create_all_resources=False,
             )
 
 
-def test_signal_instance_create_flow_use_case_type_attributes(session, signal, case_severity, case_priority, user, service, case, signal_instance, case_type):
+def test_signal_instance_create_flow_use_case_type_attributes(
+    session, signal, case_severity, case_priority, user, service, case, signal_instance, case_type
+):
     """
     If the signal instance and the signal both do not specify conversation targets or on-call services, use the case type's configurations.
     """
@@ -566,25 +602,29 @@ def test_signal_instance_create_flow_use_case_type_attributes(session, signal, c
     case_type.conversation_target = "case-type-conversation-target"
     signal_instance.signal.case_type = case_type
 
-    with mock.patch.object(service_flows, "resolve_oncall") as mock_resolve_oncall, \
-        mock.patch.object(case_service, "create") as mock_case_create, \
-        mock.patch("dispatch.case.flows.case_new_create_flow") as mock_case_new_create_flow:
+    with (
+        mock.patch.object(service_flows, "resolve_oncall") as mock_resolve_oncall,
+        mock.patch.object(case_service, "create") as mock_case_create,
+        mock.patch("dispatch.case.flows.case_new_create_flow") as mock_case_new_create_flow,
+    ):
         mock_resolve_oncall.side_effect = lambda service, db_session: "example@test.com"
         mock_case_create.return_value = case
 
         post_flow_instance = signal_instance_create_flow(
-            signal_instance_id=signal_instance.id,
-            db_session=session,
-            current_user=user
+            signal_instance_id=signal_instance.id, db_session=session, current_user=user
         )
-        case_in_arg = mock_case_create.call_args[1]['case_in']
+        case_in_arg = mock_case_create.call_args[1]["case_in"]
         assert case_in_arg.assignee.individual.email == "example@test.com"
-        if post_flow_instance is not None and hasattr(post_flow_instance, "case") and post_flow_instance.case is not None:
+        if (
+            post_flow_instance is not None
+            and hasattr(post_flow_instance, "case")
+            and post_flow_instance.case is not None
+        ):
             mock_case_new_create_flow.assert_called_once_with(
                 db_session=session,
                 organization_slug=None,
                 service_id=None,
                 conversation_target="case-type-conversation-target",
                 case_id=post_flow_instance.case.id,
-                create_all_resources=False
+                create_all_resources=False,
             )
diff --git a/tests/signal/test_signal_stats_service.py b/tests/signal/test_signal_stats_service.py
index 34b4261da779..4b2ac9e3a367 100644
--- a/tests/signal/test_signal_stats_service.py
+++ b/tests/signal/test_signal_stats_service.py
@@ -218,8 +218,7 @@ def test_get_signal_stats_with_signal_id_filter(session, entity, entity_type):
 
     # Assert: Without signal_id filter, we should count both instances
     assert (
-        signal_data_all.num_signal_instances_alerted
-        + signal_data_all.num_signal_instances_snoozed
+        signal_data_all.num_signal_instances_alerted + signal_data_all.num_signal_instances_snoozed
         == 3
     )