Fix circular import

src/content/models.py

@@ -35,7 +35,6 @@
 from extended_search.index import DWIndexedField as IndexedField
 from extended_search.index import Indexed, RelatedFields
 from peoplefinder.widgets import PersonChooser
-from search.utils import split_query
 from user.models import User as UserModel
 
 
@@ -527,8 +526,9 @@ class SearchKeywordOrPhrase(models.Model):
 
 class SearchKeywordOrPhraseQuerySet(models.QuerySet):
     def filter_by_query(self, query):
-        query_parts = split_query(query)
+        from search.utils import split_query
 
+        query_parts = split_query(query)
         return self.filter(search_keyword_or_phrase__keyword_or_phrase__in=query_parts)
 
 

src/search/utils.py

@@ -1,18 +1,21 @@
 import re
 import unicodedata
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 from django.conf import settings
 from django.urls import reverse
 from wagtail.search.query import Fuzzy, Or, Phrase, PlainText
 
-from content.models import BasePage
 from extended_search import settings as search_settings
 from extended_search.index import Indexed
 from extended_search.query import Nested, OnlyFields
 from extended_search.query_builder import CustomQueryBuilder
 from news.models import NewsPage
-from peoplefinder.models import Person, Team
+
+
+if TYPE_CHECKING:
+    from content.models import BasePage
+    from peoplefinder.models import Person, Team
 
 
 def sanitize_search_query(query: Optional[str] = None) -> str:
@@ -280,7 +283,7 @@ def get_content_author(page) -> dict:
     return content_author
 
 
-def get_page_export_row(page_result: BasePage, base_url: str) -> list[str]:
+def get_page_export_row(page_result: "BasePage", base_url: str) -> list[str]:
     content_owner = get_content_owner(page_result)
     content_author = get_content_author(page_result)
     return [
@@ -297,7 +300,7 @@ def get_page_export_row(page_result: BasePage, base_url: str) -> list[str]:
     ]
 
 
-def get_person_export_row(person_result: Person, base_url: str) -> list[str]:
+def get_person_export_row(person_result: "Person", base_url: str) -> list[str]:
     return [
         f"{person_result.first_name} {person_result.last_name}",
         person_result.email,
@@ -307,7 +310,7 @@ def get_person_export_row(person_result: Person, base_url: str) -> list[str]:
     ]
 
 
-def get_team_export_row(team_result: Team, base_url: str) -> list[str]:
+def get_team_export_row(team_result: "Team", base_url: str) -> list[str]:
     return [
         team_result.name,
         f"{base_url}{team_result.get_absolute_url()}",

src/search/views.py

@@ -16,12 +16,6 @@
 from extended_search.settings import settings_singleton
 from peoplefinder.models import Person, Team
 from search.templatetags import search as search_template_tag
-from search.utils import (
-    get_page_export_row,
-    get_person_export_row,
-    get_query_info_for_model,
-    get_team_export_row,
-)
 
 
 logger = logging.getLogger(__name__)
@@ -108,6 +102,8 @@ def explore(request: HttpRequest) -> HttpResponse:
     """
     Administrative view for exploring search options, boosts, etc
     """
+    from search.utils import get_query_info_for_model
+
     if request.method == "POST":
         if not request.user.has_perm("extended_search.change_setting"):
             messages.error(request, "You are not authorised to edit settings")
@@ -150,6 +146,12 @@ def export_search(request: HttpRequest, category: str) -> HttpResponse:
     """
     Administrative view for exporting search results as csv
     """
+    from search.utils import (
+        get_page_export_row,
+        get_person_export_row,
+        get_team_export_row,
+    )
+
     query = request.GET.get("query", "")
     if category == "all":
         category = "all_pages"