django-searchkit 1.0__tar.gz → 1.2__tar.gz

{django_searchkit-1.0/django_searchkit.egg-info → django_searchkit-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-searchkit
-Version: 1.0
+Version: 1.2
 Summary: Finally a real searchkit for django!
 Home-page: https://github.com/thomst/django-searchkit
 Author: Thomas Leichtfuß
@@ -9,8 +9,6 @@ License: BSD License
 Platform: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.1
-Classifier: Framework :: Django :: 3.2
 Classifier: Framework :: Django :: 4.0
 Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
@@ -22,8 +20,6 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -32,8 +28,9 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Description-Content-Type: text/markdown
 License-File: LICENCE
-Requires-Dist: Django>=3.1
+Requires-Dist: Django>=4.0
 Requires-Dist: django-picklefield>=2.0
+Requires-Dist: django-modeltree
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -50,8 +47,8 @@ Dynamic: summary
 
 [<img src="https://github.com/thomst/django-searchkit/actions/workflows/ci.yml/badge.svg">](https://github.com/thomst/django-searchkit/)
 [<img src="https://coveralls.io/repos/github/thomst/django-searchkit/badge.svg?branch=main">](https://coveralls.io/github/thomst/django-searchkit?branch=main)
-[<img src="https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue">](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)
-[<img src="https://img.shields.io/badge/django-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange">](https://img.shields.io/badge/django-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange)
+[<img src="https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11-blue">](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11-blue)
+[<img src="https://img.shields.io/badge/django-4.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange">](https://img.shields.io/badge/django-4.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange)
 
 
 ## Description
@@ -99,20 +96,8 @@ class MyModelAdmin(admin.ModelAdmin):
 ## Usage
 
 1. Open the admin changelist of your Model.
-2. Click "Add filter" on the Searchkit filter.
-3. Choose the Model you want to filter.
+2. Click the "Add filter" button of the Searchkit filter.
+3. Give your Filter a name.
 4. Configure as many filter rules as you want.
-5. Click "Save and apply"
-
-
-## TODO
-
-- Limit the choices of the model field by models that should be searchable.
-- Add an apply button to the search edit page to be able to use a search without
-  saving it.
-- Coming from the search edit page the filtering should be done by an id__in url
-  parameter, not by an search parameter as it is used by the searchkit filter.
-- Preselect the right model in the model field when coming from a models
-  changelist by the "Add filter" button.
-- Add a public field for searches and only offer public searches in the
-  searchkit filter.
+5. Click "Save and apply".
+6. Reuse your filter whenever you want using the Searchkit filter section.

{django_searchkit-1.0 → django_searchkit-1.2}/README.md

@@ -2,8 +2,8 @@
 
 [<img src="https://github.com/thomst/django-searchkit/actions/workflows/ci.yml/badge.svg">](https://github.com/thomst/django-searchkit/)
 [<img src="https://coveralls.io/repos/github/thomst/django-searchkit/badge.svg?branch=main">](https://coveralls.io/github/thomst/django-searchkit?branch=main)
-[<img src="https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue">](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)
-[<img src="https://img.shields.io/badge/django-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange">](https://img.shields.io/badge/django-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange)
+[<img src="https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11-blue">](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11-blue)
+[<img src="https://img.shields.io/badge/django-4.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange">](https://img.shields.io/badge/django-4.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange)
 
 
 ## Description
@@ -51,20 +51,8 @@ class MyModelAdmin(admin.ModelAdmin):
 ## Usage
 
 1. Open the admin changelist of your Model.
-2. Click "Add filter" on the Searchkit filter.
-3. Choose the Model you want to filter.
+2. Click the "Add filter" button of the Searchkit filter.
+3. Give your Filter a name.
 4. Configure as many filter rules as you want.
-5. Click "Save and apply"
-
-
-## TODO
-
-- Limit the choices of the model field by models that should be searchable.
-- Add an apply button to the search edit page to be able to use a search without
-  saving it.
-- Coming from the search edit page the filtering should be done by an id__in url
-  parameter, not by an search parameter as it is used by the searchkit filter.
-- Preselect the right model in the model field when coming from a models
-  changelist by the "Add filter" button.
-- Add a public field for searches and only offer public searches in the
-  searchkit filter.
+5. Click "Save and apply".
+6. Reuse your filter whenever you want using the Searchkit filter section.

{django_searchkit-1.0 → django_searchkit-1.2/django_searchkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-searchkit
-Version: 1.0
+Version: 1.2
 Summary: Finally a real searchkit for django!
 Home-page: https://github.com/thomst/django-searchkit
 Author: Thomas Leichtfuß
@@ -9,8 +9,6 @@ License: BSD License
 Platform: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.1
-Classifier: Framework :: Django :: 3.2
 Classifier: Framework :: Django :: 4.0
 Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
@@ -22,8 +20,6 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -32,8 +28,9 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Description-Content-Type: text/markdown
 License-File: LICENCE
-Requires-Dist: Django>=3.1
+Requires-Dist: Django>=4.0
 Requires-Dist: django-picklefield>=2.0
+Requires-Dist: django-modeltree
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -50,8 +47,8 @@ Dynamic: summary
 
 [<img src="https://github.com/thomst/django-searchkit/actions/workflows/ci.yml/badge.svg">](https://github.com/thomst/django-searchkit/)
 [<img src="https://coveralls.io/repos/github/thomst/django-searchkit/badge.svg?branch=main">](https://coveralls.io/github/thomst/django-searchkit?branch=main)
-[<img src="https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue">](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)
-[<img src="https://img.shields.io/badge/django-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange">](https://img.shields.io/badge/django-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange)
+[<img src="https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11-blue">](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11-blue)
+[<img src="https://img.shields.io/badge/django-4.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange">](https://img.shields.io/badge/django-4.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange)
 
 
 ## Description
@@ -99,20 +96,8 @@ class MyModelAdmin(admin.ModelAdmin):
 ## Usage
 
 1. Open the admin changelist of your Model.
-2. Click "Add filter" on the Searchkit filter.
-3. Choose the Model you want to filter.
+2. Click the "Add filter" button of the Searchkit filter.
+3. Give your Filter a name.
 4. Configure as many filter rules as you want.
-5. Click "Save and apply"
-
-
-## TODO
-
-- Limit the choices of the model field by models that should be searchable.
-- Add an apply button to the search edit page to be able to use a search without
-  saving it.
-- Coming from the search edit page the filtering should be done by an id__in url
-  parameter, not by an search parameter as it is used by the searchkit filter.
-- Preselect the right model in the model field when coming from a models
-  changelist by the "Add filter" button.
-- Add a public field for searches and only offer public searches in the
-  searchkit filter.
+5. Click "Save and apply".
+6. Reuse your filter whenever you want using the Searchkit filter section.

{django_searchkit-1.0 → django_searchkit-1.2}/django_searchkit.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ searchkit/forms/search.py
 searchkit/forms/searchkit.py
 searchkit/forms/utils.py
 searchkit/migrations/0001_initial.py
+searchkit/migrations/0002_rename_searchkitsearch_search.py
 searchkit/migrations/__init__.py
 searchkit/templatetags/__init__.py
 searchkit/templatetags/searchkit.py

django_searchkit-1.2/django_searchkit.egg-info/requires.txt

@@ -0,0 +1,3 @@
+Django>=4.0
+django-picklefield>=2.0
+django-modeltree

{django_searchkit-1.0 → django_searchkit-1.2}/example/example/admin.py

@@ -7,7 +7,7 @@ from .models import ModelB
 @admin.register(ModelA)
 class ModelAAdmin(admin.ModelAdmin):
     list_display = [f.name for f in ModelA._meta.fields]
-    list_filter = [SearchkitFilter, 'chars_choices']
+    list_filter = [SearchkitFilter]
 
 
 @admin.register(ModelB)

{django_searchkit-1.0 → django_searchkit-1.2}/searchkit/__version__.py

@@ -13,4 +13,4 @@ Version 0.x should be considered a development version with an unstable API,
 and backwards compatibility is not guaranteed for minor versions.
 """
 
-__version__ = "1.0"
+__version__ = "1.2"

{django_searchkit-1.0 → django_searchkit-1.2}/searchkit/admin.py

@@ -1,14 +1,14 @@
 from django.contrib import admin
 from django.http import HttpResponseRedirect
 from django.urls import reverse
-from .models import SearchkitSearch
-from .forms import SearchkitSearchForm
+from .models import Search
+from .forms import SearchForm
 from .filters import SearchkitFilter
 
 
-@admin.register(SearchkitSearch)
+@admin.register(Search)
 class SearchkitSearchAdmin(admin.ModelAdmin):
-    form = SearchkitSearchForm
+    form = SearchForm
     list_display = ('name', 'contenttype', 'created_date')
 
     def get_url_for_applied_search(self, obj):

django_searchkit-1.2/searchkit/filters.py

@@ -0,0 +1,28 @@
+from django.contrib.admin import SimpleListFilter
+from django.contrib.contenttypes.models import ContentType
+from .models import Search
+
+
+class SearchkitFilter(SimpleListFilter):
+    title = 'Searchkit Filter'
+    parameter_name = 'search'
+    template = 'searchkit/searchkit_filter.html'
+
+    def __init__(self, request, params, model, model_admin):
+        # We need the app_label and model as get parameter for the new search
+        # link.
+        self.searchkit_model = ContentType.objects.get_for_model(model)
+        super().__init__(request, params, model, model_admin)
+
+    def has_output(self):
+        return True
+
+    def lookups(self, request, model_admin):
+        searches = Search.objects.filter(contenttype=self.searchkit_model).order_by('-created_date')
+        return [(str(obj.id), obj.name) for obj in searches]
+
+    def queryset(self, request, queryset):
+        # Filter the queryset based on the selected SearchkitSearch object
+        if self.value():
+            search = Search.objects.get(id=int(self.value()))
+            return queryset.filter(**search.as_lookups())

django_searchkit-1.2/searchkit/forms/__init__.py

@@ -0,0 +1,5 @@
+from .search import SearchForm
+from .searchkit import SearchkitModelForm
+from .searchkit import BaseSearchkitFormSet
+from .searchkit import BaseSearchkitForm
+from .searchkit import searchkit_formset_factory

django_searchkit-1.2/searchkit/forms/search.py

@@ -0,0 +1,62 @@
+from django import forms
+from django.utils.functional import cached_property
+from django.contrib.contenttypes.models import ContentType
+from ..models import Search
+from .searchkit import SearchkitModelForm
+from .searchkit import searchkit_formset_factory
+from .utils import MediaMixin
+
+
+class SearchForm(MediaMixin, forms.ModelForm):
+    """
+    Represents a SearchkitSearch model. Using a SearchkitFormSet for the data
+    json field.
+    """
+    class Meta:
+        model = Search
+        fields = ['name']
+
+    @cached_property
+    def searchkit_model(self):
+        if self.instance.pk:
+            return self.instance.contenttype.model_class()
+        elif self.searchkit_model_form.is_valid():
+            return self.searchkit_model_form.cleaned_data['searchkit_model'].model_class()
+        elif 'searchkit_model' in self.searchkit_model_form.initial:
+            value = self.searchkit_model_form.initial['searchkit_model']
+            try:
+                return self.searchkit_model_form.fields['searchkit_model'].clean(value).model_class()
+            except forms.ValidationError:
+                return None
+
+    @cached_property
+    def searchkit_model_form(self):
+        kwargs = dict(data=self.data or None, initial=self.initial or None)
+        if self.instance.pk:
+            kwargs['initial'] = dict(searchkit_model=self.instance.contenttype)
+        return SearchkitModelForm(**kwargs)
+
+    @cached_property
+    def formset(self):
+        """
+        A searchkit formset for the model.
+        """
+        kwargs = dict()
+        if self.searchkit_model and self.data:
+            kwargs = dict(data=self.data)
+        elif self.searchkit_model and self.instance.pk:
+            kwargs = dict(initial=self.instance.data)
+
+        extra = 0 if self.instance.pk else 1
+        formset = searchkit_formset_factory(model=self.searchkit_model, extra=extra)
+        return formset(**kwargs)
+
+    def is_valid(self):
+        return self.formset.is_valid() and self.searchkit_model_form.is_valid and super().is_valid()
+
+    def clean(self):
+        if self.searchkit_model_form.is_valid():
+            self.instance.contenttype = self.searchkit_model_form.cleaned_data['searchkit_model']
+        if self.formset.is_valid():
+            self.instance.data = self.formset.cleaned_data
+        return super().clean()

django_searchkit-1.2/searchkit/forms/searchkit.py

@@ -0,0 +1,154 @@
+from django import forms
+from django.utils.translation import gettext_lazy as _
+from django.utils.functional import cached_property
+from .utils import CssClassMixin, FIELD_PLAN, OPERATOR_DESCRIPTION
+from .utils import SUPPORTED_FIELDS
+from .utils import ModelTree
+from .utils import MediaMixin
+from .utils import get_searchable_models
+
+
+class SearchkitModelForm(forms.Form):
+    """
+    Form to select a content type.
+    """
+    searchkit_model = forms.ModelChoiceField(
+        queryset=get_searchable_models(),
+        label=_('Model'),
+        empty_label=_('Select a Model'),
+        widget=forms.Select(attrs={
+            "class": CssClassMixin.reload_on_change_css_class,
+            "data-total-forms": 1,
+        }),
+    )
+
+
+class BaseSearchkitForm(MediaMixin, CssClassMixin, forms.Form):
+    """
+    Searchkit form representing a model field lookup based on the field name,
+    the operator and one or two values.
+
+    The unbound form is composed of an index field (the count of the searchkit
+    form) and a choice field offering the names of the model fields.
+
+    The bound form is dynamically extended by the operator field or the operator and
+    the value field depending on the provided data
+
+    See the FIELD_PLAN variable for the logic of building the form.
+    """
+    model = None  # Set by the formset factory.
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.model_tree = ModelTree(self.model)
+        self.model_field = None
+        self.field_plan = None
+        self.operator = None
+        self._add_field_name_field()
+        lookup = self._preload_clean_data('field')
+        self.model_field = self._get_model_field(lookup)
+        self.field_plan = next(iter([p for t, p in FIELD_PLAN.items() if t(self.model_field)]))
+        self._add_operator_field()
+        self.operator = self._preload_clean_data('operator')
+        self._add_value_field()
+
+    @cached_property
+    def unprefixed_data(self):
+        data = dict()
+        for key, value in self.data.items():
+            if key.startswith(self.prefix):
+                data[key[len(self.prefix) + 1:]] = value
+        return data
+
+    def _preload_clean_data(self, field_name):
+        # Try the initial value first since it is already cleaned.
+        if self.initial and field_name in self.initial:
+            return self.initial[field_name]
+        # Otherwise look up the data dict.
+        elif field_name in self.unprefixed_data:
+            try:
+                # Do we have a valid value?
+                return self.fields[field_name].clean(self.unprefixed_data[field_name])
+            except forms.ValidationError:
+                return self.fields[field_name].choices[0][0]
+        else:
+            # At last simply return the first option which will be the selected
+            # one.
+            return self.fields[field_name].choices[0][0]
+
+    def _get_model_field(self, lookup):
+        path = lookup.split('__')
+        field_name = path[-1]
+        if path[:-1]:
+            model = self.model_tree.get('__'.join(path[:-1])).model
+        else:
+            model = self.model
+        return model._meta.get_field(field_name)
+
+    def _get_model_field_choices(self):
+        choices = list()
+        label_path = list()
+        for node in self.model_tree.iterate():
+            label_path.append
+            for model_field in node.model._meta.fields:
+                if not any(isinstance(model_field, f) for f in SUPPORTED_FIELDS):
+                    continue
+                if node.is_root:
+                    lookup = model_field.name
+                    label = f'`{model_field.verbose_name}`'
+                else:
+                    lookup = f'{node.field_path}__{model_field.name}'
+                    get_field_name = lambda f: getattr(f, 'verbose_name', f.name)
+                    label_path = [f'`{get_field_name(n.field)}` => <{n.model._meta.verbose_name}>' for n in node.path[1:]]
+                    label = ".".join(label_path + [f'`{model_field.verbose_name}`'])
+                choices.append((lookup, label))
+        return choices
+
+    def _add_field_name_field(self):
+        initial = self.initial.get('field')
+        choices = self._get_model_field_choices()
+        field = forms.ChoiceField(label=_('Model field'), choices=choices, initial=initial)
+        field.widget.attrs.update({"class": self.reload_on_change_css_class})
+        self.fields['field'] = field
+
+    def _add_operator_field(self):
+        initial = self.initial.get('operator')
+        choices = [(o, OPERATOR_DESCRIPTION[o]) for o in self.field_plan.keys()]
+        field = forms.ChoiceField(label=_('Operator'), choices=choices, initial=initial)
+        field.widget.attrs.update({"class": self.reload_on_change_css_class})
+        self.fields['operator'] = field
+
+    def _add_value_field(self):
+        initial = self.initial.get('value')
+        field_class = self.field_plan[self.operator][0]
+        if getattr(field_class, 'choices', None) and getattr(self.model_field, 'choices', None):
+            field = field_class(choices=self.model_field.choices, initial=initial)
+        else:
+            field = field_class()
+        self.fields['value'] = field
+
+
+class BaseSearchkitFormSet(CssClassMixin, forms.BaseFormSet):
+    """
+    Formset holding all searchkit forms.
+    """
+    template_name = "searchkit/searchkit.html"
+    template_name_div = "searchkit/searchkit.html"
+    model = None  # Set by the formset factory.
+
+    def add_prefix(self, index):
+        return "%s-%s-%s-%s" % (self.prefix, self.model._meta.app_label, self.model._meta.model_name, index)
+
+    @classmethod
+    def get_default_prefix(self):
+        return "searchkit"
+
+
+def searchkit_formset_factory(model, **kwargs):
+    form = type('SearchkitForm', (BaseSearchkitForm,), dict(model=model))
+    formset = type('SearchkitFormSet', (BaseSearchkitFormSet,), dict(model=model))
+    return forms.formset_factory(
+        form=form,
+        formset=formset,
+        **kwargs
+    )

{django_searchkit-1.0 → django_searchkit-1.2}/searchkit/forms/utils.py

@@ -1,8 +1,23 @@
+from modeltree import ModelTree as BaseModelTree
+from collections import OrderedDict
+from django.apps import apps
+from django.contrib import admin
+from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django.db.utils import OperationalError
 from django import forms
 from django.utils.translation import gettext_lazy as _
-from collections import OrderedDict
-from searchkit.forms import fields as searchkit_fields
+from ..filters import SearchkitFilter
+from . import fields as  searchkit_fields
+
+
+class ModelTree(BaseModelTree):
+    MAX_DEPTH = 3
+    FOLLOW_ACROSS_APPS = True
+    RELATION_TYPES = [
+        'one_to_one',
+        'many_to_one',
+    ]
 
 
 OPERATOR_DESCRIPTION = {
@@ -29,10 +44,6 @@ SUPPORTED_FIELDS = [
     models.DateField,
     models.DateTimeField,
 ]
-SUPPORTED_RELATIONS = [
-    models.ForeignKey,
-    models.OneToOneField,
-]
 
 
 FIELD_PLAN = OrderedDict((
@@ -132,18 +143,36 @@ FIELD_PLAN = OrderedDict((
 ))
 
 
-class CSS_CLASSES:
+class CssClassMixin:
     reload_on_change_css_class = "searchkit-reload-on-change"
     reload_on_click_css_class = "searchkit-reload-on-click"
 
 
-def get_filter_rules(formset):
+class MediaMixin:
+    class Media:
+        js = [
+            'admin/js/vendor/jquery/jquery.min.js',
+            'admin/js/jquery.init.js',
+            "searchkit/searchkit.js"
+        ]
+
+
+def is_searchable_model(model):
+    """
+    Check if the model is searchable by Searchkit.
+    """
+    return admin.site.is_registered(model) and SearchkitFilter in admin.site._registry[model].list_filter
+
+
+def get_searchable_models():
     """
-    Build filter rules out of the cleaned data of the formset.
-    :param formset: Formset to extract filter rules from.
-    :return: OrderedDict with filter rule pairs: field__operator: value
+    Return a queryset of searchable models.
     """
-    lookups = OrderedDict()
-    for data in formset.cleaned_data:
-        lookups[f'{data["field"]}__{data["operator"]}'] = data['value']
-    return lookups
+    # Before mirating the database we get an OperationalError when trying to
+    # access ContentType database table.
+    try:
+        models = [m for m in apps.get_models() if is_searchable_model(m)]
+        ids = [ContentType.objects.get_for_model(m).id for m in models]
+        return ContentType.objects.filter(pk__in=ids).order_by('app_label', 'model')
+    except OperationalError:
+        return ContentType.objects.all()

django_searchkit-1.2/searchkit/migrations/0002_rename_searchkitsearch_search.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.3 on 2025-06-07 05:46
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('searchkit', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='SearchkitSearch',
+            new_name='Search',
+        ),
+    ]

{django_searchkit-1.0 → django_searchkit-1.2}/searchkit/models.py

@@ -5,9 +5,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import gettext_lazy as _
 
 
-# Create your models here.
-# TODO: Use pickled cleaned data with a char field.
-class SearchkitSearch(models.Model):
+class Search(models.Model):
     name = models.CharField(_('Search name'), max_length=255)
     contenttype = models.ForeignKey(ContentType, on_delete=models.CASCADE, verbose_name=_('Model'))
     data = PickledObjectField(_('Serialized filter rule data'))
@@ -16,7 +14,7 @@ class SearchkitSearch(models.Model):
     class Meta:
         unique_together = ('name', 'contenttype')
 
-    def get_filter_rules(self):
+    def as_lookups(self):
         lookups = OrderedDict()
         for data in self.data:
             lookups[f'{data["field"]}__{data["operator"]}'] = data['value']

django_searchkit-1.2/searchkit/templatetags/searchkit.py

@@ -0,0 +1,20 @@
+from django.template import Library
+from django.contrib.admin.helpers import Fieldset
+
+
+register = Library()
+
+@register.inclusion_tag("admin/includes/fieldset.html")
+def as_fieldset(form, heading_level=2, prefix='', id_prefix=0, id_suffix='', **fieldset_kwargs):
+    """
+    Create and render a fieldset for form.
+    """
+    fieldset = Fieldset(form, fields=form.fields, **fieldset_kwargs)
+    context = dict(
+        fieldset=fieldset,
+        heading_level=heading_level,
+        prefix=prefix,
+        id_prefix=id_prefix,
+        id_suffix=id_suffix,
+    )
+    return context