From 1a29c55faddf6edece5c73d5ff6da8136ae1871f Mon Sep 17 00:00:00 2001
From: Kayd-06 <kunaldadlani25@gmail.com>
Date: Sun, 12 Apr 2026 16:32:55 +0530
Subject: [PATCH 1/4] refactor: rename search/title endpoint to search/model
 for broader generic search

---
 mainapp/api.py                      |  4 ++--
 mainapp/templates/mainapp/docs.html | 12 ++++++------
 mainapp/tests/api/test_lookup.py    |  4 ++--
 mainapp/urls.py                     |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mainapp/api.py b/mainapp/api.py
index 70461c2..ad62957 100644
--- a/mainapp/api.py
+++ b/mainapp/api.py
@@ -189,8 +189,8 @@ def search_range(request, latitude, longitude, distance, page_id=1):
     return api_paginate(models, page_id)
 
 @any_origin
-def search_title(request, title, page_id=1):
-    models = Model.objects.filter(latest=True, title__icontains=title)
+def search_model(request, query, page_id=1):
+    models = Model.objects.filter(latest=True, title__icontains=query)
 
     if not admin(request):
         models = models.filter(is_hidden=False)
diff --git a/mainapp/templates/mainapp/docs.html b/mainapp/templates/mainapp/docs.html
index 6f6d403..c8daab4 100644
--- a/mainapp/templates/mainapp/docs.html
+++ b/mainapp/templates/mainapp/docs.html
@@ -130,17 +130,17 @@ <h3 class="panel-title">Author Lookup</h3>
 				</div>
 			</div>
 			<h2>Searches</h2>
-			<div class="panel panel-primary" id="title">
+			<div class="panel panel-primary" id="model-search">
 				<div class="panel-heading">
-					<h3 class="panel-title">Title Search</h3>
+					<h3 class="panel-title">Model Attributes Search</h3>
 				</div>
 				<div class="panel-body">
-					<p>Returns model ids that contain the specified string in their title.</p>
+					<p>Returns model ids that contain the specified string in their title or description.</p>
 					<span class="label label-success">GET</span>
-					<span class="label label-default">/api/search/title/&lt;string:title&gt;</span>
+					<span class="label label-default">/api/search/model/&lt;string:title&gt;</span>
 					<br>
 					<span class="label label-success">GET</span>
-					<span class="label label-default">/api/search/title/&lt;string:title&gt;/&lt;int:pageid&gt;</span>
+					<span class="label label-default">/api/search/model/&lt;string:title&gt;/&lt;int:pageid&gt;</span>
 					<p class="response">Sample Response:</p>
 					<pre><code>[2, 10, 17]</code></pre>
 				</div>
@@ -169,7 +169,7 @@ <h3 class="panel-title">Full Search</h3>
 					<p>Notes:</p>
 					<ul>
 						<li>The "lat", "lon" and "range" attributes do what is described in the <a href="#latlon">Latitude and Longitude Search</a> endpoint.</li>
-						<li>The "title" attribute does what is described in the <a href="#title">Title Search</a> endpoint.</li>
+						<li>The "title" attribute does what is described in the <a href="#model-search">Model Attributes Search</a> endpoint.</li>
 						<li>The "tags" attribute finds models that match all tags.</li>
 						<li>The "categories" attribute finds models that match all categories.</li>
 						<li>The "author" attribute does what is described in the <a href="#author">Author Lookup</a> endpoint.</li>
diff --git a/mainapp/tests/api/test_lookup.py b/mainapp/tests/api/test_lookup.py
index 8572e5f..fd9cbd9 100644
--- a/mainapp/tests/api/test_lookup.py
+++ b/mainapp/tests/api/test_lookup.py
@@ -92,8 +92,8 @@ def test_search_range_invalid_params_404(self):
 
 class LookupTitleAPIViewTests(BaseViewTestMixin, TestCase):
 
-    def test_search_title_success(self):
-        response = self.client.get(reverse("search_title", args=[self.model1.title, 1]))
+    def test_search_model_success(self):
+        response = self.client.get(reverse("search_model", args=[self.model1.title, 1]))
         self.assertEqual(response.status_code, 200)
         data = response.json()
         self.assertIn(self.model1.model_id, data)
diff --git a/mainapp/urls.py b/mainapp/urls.py
index 2701534..eab4435 100644
--- a/mainapp/urls.py
+++ b/mainapp/urls.py
@@ -36,7 +36,7 @@
 
     re_path(r'^api/search/?(?P<latitude>-?[0-9]+(\.[0-9]+)?)/(?P<longitude>-?[0-9]+(\.[0-9]+)?)/(?P<distance>[0-9]+(\.[0-9]+)?)/(?P<page_id>[0-9]+)$', api.search_range, name='lookup_range'),
     re_path(r'^api/search/(?P<latitude>-?[0-9]+(\.[0-9]+)?)/(?P<longitude>-?[0-9]+(\.[0-9]+)?)/(?P<distance>[0-9]+(\.[0-9]+)?)$', api.search_range, name='lookup_range'),
-    re_path(r'^api/search/title/(?P<title>.*)/(?P<page_id>[0-9]+)$', api.search_title, name='search_title'),
-    re_path(r'^api/search/title/(?P<title>.*)$', api.search_title, name='search_title'),
+    re_path(r'^api/search/model/(?P<query>.*)/(?P<page_id>[0-9]+)$', api.search_model, name='search_model'),
+    re_path(r'^api/search/model/(?P<query>.*)$', api.search_model, name='search_model'),
     re_path(r'^api/search/full$', api.search_full, name='search_full'),
 ]
\ No newline at end of file

From 18a38888e518ebbf6b17bd6058253cf2e3027e3e Mon Sep 17 00:00:00 2001
From: Kayd-06 <kunaldadlani25@gmail.com>
Date: Sun, 12 Apr 2026 16:32:55 +0530
Subject: [PATCH 2/4] fix(search): apply search queries additively to prevent
 filter shadowing and UnboundLocalError

---
 mainapp/views.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/mainapp/views.py b/mainapp/views.py
index 8ec6d98..f81e525 100644
--- a/mainapp/views.py
+++ b/mainapp/views.py
@@ -117,29 +117,28 @@ def search(request):
     if category:
         url_params += 'category=' + category
 
-    models = Model.objects.filter(latest=True)
+    if not query and not tag and not category:
+        return redirect(index)
+
+    filtered_models = Model.objects.filter(latest=True)
 
     if tag:
         try:
             key, value = get_kv(tag)
         except ValueError:
             return redirect(index)
-        filtered_models = models.filter(tags__contains={key: value})
-    elif category:
-        filtered_models = models.filter(categories__name=category)
-    elif query:
+        filtered_models = filtered_models.filter(tags__contains={key: value})
+    if category:
+        filtered_models = filtered_models.filter(categories__name=category)
+    if query:
         filtered_models = \
-            models.filter(title__icontains=query) | \
-            models.filter(description__icontains=query)
+            filtered_models.filter(title__icontains=query) | \
+            filtered_models.filter(description__icontains=query)
 
-    try:
-        if not admin(request):
-            filtered_models = filtered_models.filter(is_hidden=False)
+    if not admin(request):
+        filtered_models = filtered_models.filter(is_hidden=False)
 
-        ordered_models = filtered_models.order_by('-pk')
-    except UnboundLocalError:
-        # filtered_models isn't set, redirect to homepage
-        return redirect(index)
+    ordered_models = filtered_models.order_by('-pk')
 
     if not ordered_models:
         results = None

From 9cb70c778c819ef9e2fb07f88f63acd6f34eb0de Mon Sep 17 00:00:00 2001
From: Kayd-06 <kunaldadlani25@gmail.com>
Date: Sun, 12 Apr 2026 16:32:55 +0530
Subject: [PATCH 3/4] feat(search): implement typo-tolerant full-text weighted
 search ranking

---
 mainapp/api.py                        | 40 +++++++++++++++++++++++++--
 mainapp/migrations/0008_trgm_ext.py   | 14 ++++++++++
 mainapp/tests/api/test_search_full.py | 12 ++++++++
 mainapp/tests/views/test_search.py    | 14 ++++++++--
 mainapp/views.py                      | 26 ++++++++++-------
 5 files changed, 90 insertions(+), 16 deletions(-)
 create mode 100644 mainapp/migrations/0008_trgm_ext.py

diff --git a/mainapp/api.py b/mainapp/api.py
index ad62957..5c128ce 100644
--- a/mainapp/api.py
+++ b/mainapp/api.py
@@ -6,6 +6,8 @@
 from django.shortcuts import get_object_or_404
 from django.http import JsonResponse, HttpResponse, Http404, HttpResponseBadRequest, HttpResponseServerError
 from django.core.paginator import Paginator, EmptyPage
+from django.contrib.postgres.search import SearchVector, SearchQuery, SearchRank, TrigramSimilarity
+from django.db.models import Q
 from .models import Model
 from .utils import get_kv, admin
 from django.views.decorators.csrf import csrf_exempt
@@ -15,6 +17,8 @@
 
 # returns a paginated json response
 def api_paginate(models, page_id):
+    if hasattr(models, 'ordered') and not models.ordered:
+        models = models.order_by('model_id')
     paginator = Paginator(models, RESULTS_PER_API_CALL)
 
     try:
@@ -190,11 +194,18 @@ def search_range(request, latitude, longitude, distance, page_id=1):
 
 @any_origin
 def search_model(request, query, page_id=1):
-    models = Model.objects.filter(latest=True, title__icontains=query)
+    vector = SearchVector('title', weight='A') + SearchVector('description', weight='B')
+    search_query = SearchQuery(query)
+    models = Model.objects.filter(latest=True).annotate(
+        rank=SearchRank(vector, search_query),
+        similarity=TrigramSimilarity('title', query) + TrigramSimilarity('description', query)
+    ).filter(Q(rank__gte=0.01) | Q(similarity__gt=0.1))
 
     if not admin(request):
         models = models.filter(is_hidden=False)
 
+    models = models.order_by('-rank', 'model_id')
+
     return api_paginate(models, page_id)
 
 @csrf_exempt # there's no need for this, since no data is modified
@@ -229,9 +240,23 @@ def search_full(request):
         except (ValueError, TypeError):
             return HttpResponseBadRequest('Invalid range parameters')
 
+    query = data.get('query')
+    if query:
+        vector = SearchVector('title', weight='A') + SearchVector('description', weight='B')
+        search_query = SearchQuery(query)
+        models = models.annotate(
+            rank_query=SearchRank(vector, search_query),
+            similarity_query=TrigramSimilarity('title', query) + TrigramSimilarity('description', query)
+        ).filter(Q(rank_query__gte=0.01) | Q(similarity_query__gt=0.1))
+
     title = data.get('title')
     if title:
-        models = models.filter(title__icontains=title)
+        vector = SearchVector('title', weight='A')
+        search_query = SearchQuery(title)
+        models = models.annotate(
+            rank_title=SearchRank(vector, search_query),
+            similarity_title=TrigramSimilarity('title', title)
+        ).filter(Q(rank_title__gte=0.01) | Q(similarity_title__gt=0.1))
 
     tags = data.get('tags')
     if tags:
@@ -243,7 +268,14 @@ def search_full(request):
         for category in categories:
             models = models.filter(categories__name=category)
 
-    models = models.order_by('model_id')
+    if query and title:
+        models = models.order_by('-rank_query', '-similarity_query', '-rank_title', '-similarity_title', 'model_id')
+    elif query:
+        models = models.order_by('-rank_query', '-similarity_query', 'model_id')
+    elif title:
+        models = models.order_by('-rank_title', '-similarity_title', 'model_id')
+    else:
+        models = models.order_by('model_id')
 
     try:
         page_id = int(data.get('page', 1))
@@ -255,6 +287,8 @@ def search_full(request):
     if not fmt:
         return api_paginate(models, page_id)
 
+    if hasattr(models, 'ordered') and not models.ordered:
+        models = models.order_by('model_id')
     paginator = Paginator(models, RESULTS_PER_API_CALL)
 
     try:
diff --git a/mainapp/migrations/0008_trgm_ext.py b/mainapp/migrations/0008_trgm_ext.py
new file mode 100644
index 0000000..a6af69d
--- /dev/null
+++ b/mainapp/migrations/0008_trgm_ext.py
@@ -0,0 +1,14 @@
+# Generated by Django 6.0 on 2026-03-27 18:00
+
+from django.db import migrations
+from django.contrib.postgres.operations import TrigramExtension
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mainapp', '0007_update_osm_oauth2_provider'),
+    ]
+
+    operations = [
+        TrigramExtension(),
+    ]
diff --git a/mainapp/tests/api/test_search_full.py b/mainapp/tests/api/test_search_full.py
index 403c763..29de592 100644
--- a/mainapp/tests/api/test_search_full.py
+++ b/mainapp/tests/api/test_search_full.py
@@ -49,6 +49,18 @@ def test_search_full_title_filter(self):
         self.assertEqual(len(results), 3)
         self.assertSetEqual({result[1] for result in results}, {"Model 1", "Model 3", "Model 4 No Loc"})
 
+    def test_search_full_query_filter(self):
+        payload = {"query": "Model", "format": ["id", "title"]}
+        response = self.client.post(
+            reverse("search_full"),
+            data=json.dumps(payload),
+            content_type="application/json",
+        )
+        self.assertEqual(response.status_code, 200)
+        results = json.loads(response.content)
+        self.assertEqual(len(results), 3)
+        self.assertSetEqual({result[1] for result in results}, {"Model 1", "Model 3", "Model 4 No Loc"})
+
     def test_search_full_tags_filter(self):
         payload = {"tags": {"color": "red"}, "format": ["id", "title"]}
         response = self.client.post(
diff --git a/mainapp/tests/views/test_search.py b/mainapp/tests/views/test_search.py
index ec6435c..1e0b20c 100644
--- a/mainapp/tests/views/test_search.py
+++ b/mainapp/tests/views/test_search.py
@@ -16,9 +16,17 @@ def test_search_by_title(self):
         response = self.client.get(reverse("search"), {"query": "Model 1"})
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "Model 1")
-        self.assertNotContains(response, "Model 2")
-        self.assertNotContains(response, "Model 3")
-        self.assertEqual(len(response.context["models"]), 1)
+        # Typo tolerance will match "Model 2" and "Model 3" as well, but "Model 1" should be ranked first.
+        self.assertEqual(response.context["models"][0].model_id, self.model1.model_id)
+        self.assertGreaterEqual(len(response.context["models"]), 1)
+
+    def test_search_typo_tolerance(self):
+        # Searching for "Modl 1" (typ0) should still find "Model 1"
+        response = self.client.get(reverse("search"), {"query": "Modl 1"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Model 1")
+        # Should rank the most similar one first
+        self.assertEqual(response.context["models"][0].model_id, self.model1.model_id)
 
     def test_search_by_tag_filter(self):
         response = self.client.get(reverse("search"), {"tag": "color=red"})
diff --git a/mainapp/views.py b/mainapp/views.py
index f81e525..26b9e9d 100644
--- a/mainapp/views.py
+++ b/mainapp/views.py
@@ -9,6 +9,8 @@
 from django.contrib.auth import logout
 from django.contrib import messages
 from django.db import transaction
+from django.contrib.postgres.search import SearchVector, SearchQuery, SearchRank, TrigramSimilarity
+from django.db.models import Q
 from .models import Model, Category, Change, Ban, Location
 from .forms import UploadFileForm, UploadFileMetadataForm, MetadataForm, UserDescriptionForm
 from .utils import get_kv, update_last_page, get_last_page, CHANGES, admin, LICENSES_DISPLAY
@@ -114,12 +116,12 @@ def search(request):
         url_params += 'query=' + query
     if tag:
         url_params += 'tag=' + tag
-    if category:
-        url_params += 'category=' + category
-
     if not query and not tag and not category:
         return redirect(index)
 
+    if category:
+        url_params += 'category=' + category
+
     filtered_models = Model.objects.filter(latest=True)
 
     if tag:
@@ -130,15 +132,19 @@ def search(request):
         filtered_models = filtered_models.filter(tags__contains={key: value})
     if category:
         filtered_models = filtered_models.filter(categories__name=category)
+    
     if query:
-        filtered_models = \
-            filtered_models.filter(title__icontains=query) | \
-            filtered_models.filter(description__icontains=query)
-
-    if not admin(request):
-        filtered_models = filtered_models.filter(is_hidden=False)
+        vector = SearchVector('title', weight='A') + SearchVector('description', weight='B')
+        search_query = SearchQuery(query)
+        filtered_models = filtered_models.annotate(
+            rank=SearchRank(vector, search_query),
+            similarity=TrigramSimilarity('title', query) + TrigramSimilarity('description', query)
+        ).filter(Q(rank__gte=0.01) | Q(similarity__gt=0.4))
 
-    ordered_models = filtered_models.order_by('-pk')
+    if query:
+        ordered_models = filtered_models.order_by('-rank', '-similarity', '-pk')
+    else:
+        ordered_models = filtered_models.order_by('-pk')
 
     if not ordered_models:
         results = None

From 6c4fea8fc34d9700ce3b26810e73071fdfe1bdf3 Mon Sep 17 00:00:00 2001
From: Kayd-06 <kunaldadlani25@gmail.com>
Date: Thu, 23 Apr 2026 13:51:26 +0530
Subject: [PATCH 4/4] fix(api): restore title parameter in search endpoint for
 backwards compatibility

---
 mainapp/api.py                      |  8 ++++----
 mainapp/templates/mainapp/docs.html | 12 ++++++------
 mainapp/tests/api/test_lookup.py    |  4 ++--
 mainapp/urls.py                     |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mainapp/api.py b/mainapp/api.py
index 5c128ce..40401c3 100644
--- a/mainapp/api.py
+++ b/mainapp/api.py
@@ -193,12 +193,12 @@ def search_range(request, latitude, longitude, distance, page_id=1):
     return api_paginate(models, page_id)
 
 @any_origin
-def search_model(request, query, page_id=1):
-    vector = SearchVector('title', weight='A') + SearchVector('description', weight='B')
-    search_query = SearchQuery(query)
+def search_title(request, title, page_id=1):
+    vector = SearchVector('title', weight='A')
+    search_query = SearchQuery(title)
     models = Model.objects.filter(latest=True).annotate(
         rank=SearchRank(vector, search_query),
-        similarity=TrigramSimilarity('title', query) + TrigramSimilarity('description', query)
+        similarity=TrigramSimilarity('title', title)
     ).filter(Q(rank__gte=0.01) | Q(similarity__gt=0.1))
 
     if not admin(request):
diff --git a/mainapp/templates/mainapp/docs.html b/mainapp/templates/mainapp/docs.html
index c8daab4..6f6d403 100644
--- a/mainapp/templates/mainapp/docs.html
+++ b/mainapp/templates/mainapp/docs.html
@@ -130,17 +130,17 @@ <h3 class="panel-title">Author Lookup</h3>
 				</div>
 			</div>
 			<h2>Searches</h2>
-			<div class="panel panel-primary" id="model-search">
+			<div class="panel panel-primary" id="title">
 				<div class="panel-heading">
-					<h3 class="panel-title">Model Attributes Search</h3>
+					<h3 class="panel-title">Title Search</h3>
 				</div>
 				<div class="panel-body">
-					<p>Returns model ids that contain the specified string in their title or description.</p>
+					<p>Returns model ids that contain the specified string in their title.</p>
 					<span class="label label-success">GET</span>
-					<span class="label label-default">/api/search/model/&lt;string:title&gt;</span>
+					<span class="label label-default">/api/search/title/&lt;string:title&gt;</span>
 					<br>
 					<span class="label label-success">GET</span>
-					<span class="label label-default">/api/search/model/&lt;string:title&gt;/&lt;int:pageid&gt;</span>
+					<span class="label label-default">/api/search/title/&lt;string:title&gt;/&lt;int:pageid&gt;</span>
 					<p class="response">Sample Response:</p>
 					<pre><code>[2, 10, 17]</code></pre>
 				</div>
@@ -169,7 +169,7 @@ <h3 class="panel-title">Full Search</h3>
 					<p>Notes:</p>
 					<ul>
 						<li>The "lat", "lon" and "range" attributes do what is described in the <a href="#latlon">Latitude and Longitude Search</a> endpoint.</li>
-						<li>The "title" attribute does what is described in the <a href="#model-search">Model Attributes Search</a> endpoint.</li>
+						<li>The "title" attribute does what is described in the <a href="#title">Title Search</a> endpoint.</li>
 						<li>The "tags" attribute finds models that match all tags.</li>
 						<li>The "categories" attribute finds models that match all categories.</li>
 						<li>The "author" attribute does what is described in the <a href="#author">Author Lookup</a> endpoint.</li>
diff --git a/mainapp/tests/api/test_lookup.py b/mainapp/tests/api/test_lookup.py
index fd9cbd9..8572e5f 100644
--- a/mainapp/tests/api/test_lookup.py
+++ b/mainapp/tests/api/test_lookup.py
@@ -92,8 +92,8 @@ def test_search_range_invalid_params_404(self):
 
 class LookupTitleAPIViewTests(BaseViewTestMixin, TestCase):
 
-    def test_search_model_success(self):
-        response = self.client.get(reverse("search_model", args=[self.model1.title, 1]))
+    def test_search_title_success(self):
+        response = self.client.get(reverse("search_title", args=[self.model1.title, 1]))
         self.assertEqual(response.status_code, 200)
         data = response.json()
         self.assertIn(self.model1.model_id, data)
diff --git a/mainapp/urls.py b/mainapp/urls.py
index eab4435..2701534 100644
--- a/mainapp/urls.py
+++ b/mainapp/urls.py
@@ -36,7 +36,7 @@
 
     re_path(r'^api/search/?(?P<latitude>-?[0-9]+(\.[0-9]+)?)/(?P<longitude>-?[0-9]+(\.[0-9]+)?)/(?P<distance>[0-9]+(\.[0-9]+)?)/(?P<page_id>[0-9]+)$', api.search_range, name='lookup_range'),
     re_path(r'^api/search/(?P<latitude>-?[0-9]+(\.[0-9]+)?)/(?P<longitude>-?[0-9]+(\.[0-9]+)?)/(?P<distance>[0-9]+(\.[0-9]+)?)$', api.search_range, name='lookup_range'),
-    re_path(r'^api/search/model/(?P<query>.*)/(?P<page_id>[0-9]+)$', api.search_model, name='search_model'),
-    re_path(r'^api/search/model/(?P<query>.*)$', api.search_model, name='search_model'),
+    re_path(r'^api/search/title/(?P<title>.*)/(?P<page_id>[0-9]+)$', api.search_title, name='search_title'),
+    re_path(r'^api/search/title/(?P<title>.*)$', api.search_title, name='search_title'),
     re_path(r'^api/search/full$', api.search_full, name='search_full'),
 ]
\ No newline at end of file