67 admin autocomplete fields are not working

django_typesense/admin.py

@@ -81,15 +81,10 @@ def get_paginator(
         self, request, results, per_page, orphans=0, allow_empty_first_page=True
     ):
         # fallback incase we receive a queryset.
-        # Happens for autocomplete fields. Simple fix to avoid creating a custom AdminSite and AutoCompleteJSONView
-        search_term = request.GET.get("term", "*")
         if isinstance(results, QuerySet):
-            if not issubclass(results.model, TypesenseModelMixin):
-                return super().get_paginator(
-                    request, results, per_page, orphans, allow_empty_first_page
-                )
-
-            results = self.get_typesense_search_results(request, search_term)
+            return super().get_paginator(
+                request, results, per_page, orphans, allow_empty_first_page
+            )
 
         return TypesenseSearchPaginator(
             results, per_page, orphans, allow_empty_first_page, self.model
@@ -127,3 +122,10 @@ def get_typesense_search_results(
             sort_by=sort_by,
         )
         return results
+
+    def get_search_results(self, request, queryset, search_term):
+        may_have_duplicates = False
+        results = self.get_typesense_search_results(request, search_term)
+        ids = [result["document"]["id"] for result in results["hits"]]
+        queryset = queryset.filter(id__in=ids)
+        return queryset, may_have_duplicates

django_typesense/changelist.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from django import forms
 from django.contrib import messages
 from django.contrib.admin.exceptions import DisallowedModelAdminToField
@@ -391,15 +389,20 @@ def get_typesense_results(self, request):
 
     def get_queryset(self, request):
         # this is needed for admin actions that call cl.get_queryset
-        # To reduce the trips use max per_page
-        self.list_per_page = 250
-        ids = []
-        while True:
-            results = self.get_typesense_results(request)
-            if not results["hits"]:
-                break
 
-            ids.extend([result["document"]["id"] for result in results["hits"]])
-            self.page_num += 1
-
-        return self.model.objects.filter(id__in=ids)
+        # TODO: The uncommented code below introduces a issue. Search filters passed to typesense not available here.
+        #  Maybe look for a way to reverse enmgineer or a better solution to the uncommented cose that is lazy
+        #  like django querysets.
+        # To reduce the trips use max per_page
+        # self.list_per_page = 250  # Updated but not used, check self.model_admin.list_per_page
+        # ids = []
+        # while True:
+        #     results = self.get_typesense_results(request)
+        #     if not results["hits"]:
+        #         break
+        #
+        #     ids.extend([result["document"]["id"] for result in results["hits"]])
+        #     self.page_num += 1
+        #
+        # return self.model.objects.filter(id__in=ids)
+        return super().get_queryset(request)

django_typesense/collections.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import logging
-import pdb
 from typing import Dict, Iterable, List, Union
 
 from django.db.models import QuerySet