Add source to results

analyse/search.py

@@ -18,7 +18,7 @@ def run():
     with TinyIndex(Document, INDEX_PATH) as tiny_index:
         completer = Completer()
         ranker = HeuristicRanker(tiny_index, completer)
-        items = ranker.search('jasper fforde')
+        items = ranker.search('jasper fforde', [])
         print()
         if items:
             for i, item in enumerate(islice(items, 10)):

front-end/assets/css/global.css

@@ -148,6 +148,13 @@ body {
   font-size: .9rem;
 }
 
+.via {
+  font-size: .9rem;
+  font-weight: var(--default-font-weight);
+  /* italics */
+  font-style: italic;
+}
+
 .result .title, .result .title>* {
   color: var(--primary-color);
   font-size: 1.1rem;

mwmbl/format.py

@@ -3,7 +3,7 @@ import re
 from mwmbl.tokenizer import tokenize, clean_unicode
 
 
-def format_result_with_pattern(pattern, result):
+def format_result_with_pattern(pattern, result, source):
     formatted_result = {}
     for content_type, content_raw in [('title', result.title), ('extract', result.extract)]:
         content = clean_unicode(content_raw)
@@ -17,6 +17,7 @@ def format_result_with_pattern(pattern, result):
             content_result.append({'value': content[start:end], 'is_bold': is_bold})
         formatted_result[content_type] = content_result
     formatted_result['url'] = result.url
+    formatted_result['source'] = source
     return formatted_result
 
 
@@ -34,8 +35,8 @@ def get_query_regex(terms, is_complete, is_url):
     return pattern
 
 
-def format_result(result, query):
+def format_result(result, query, source):
     tokens = tokenize(query)
     pattern = get_query_regex(tokens, True, False)
-    return format_result_with_pattern(pattern, result)
+    return format_result_with_pattern(pattern, result, source)
 

mwmbl/settings.py

@@ -32,7 +32,7 @@ SCORE_FOR_SAME_DOMAIN = 0.01
 EXTRA_LINK_MULTIPLIER = 0.001
 UNKNOWN_DOMAIN_MULTIPLIER = 0.001
 EXCLUDED_DOMAINS = {'web.archive.org', 'forums.giantitp.com', 'www.crutchfield.com', 'plus.google.com'}
-DOMAIN_BLACKLIST_REGEX = re.compile(r"porn|xxx|jksu\.org|lwhyl\.org$|rgcd\.cn$|hzqwyou\.cn$|omgoat\.org$")
+DOMAIN_BLACKLIST_REGEX = re.compile(r"porn|xxx|jksu\.org|lwhyl\.org$|rgcd\.cn$|hzqwyou\.cn$")
 CORE_DOMAINS = {
     'github.com',
     'en.wikipedia.org',

mwmbl/templates/result.html

@@ -3,7 +3,7 @@
   <div class="result-container">
     <div class="result-link">
       <a href="{{result.url}}">
-        <p class='link'>{{result.url}}</p>
+        <p><span class='link'>{{result.url}}</span> <span class="via">— found via {{result.source|title}}</span></p>
         <p class='title'>{{result.title|strengthen}}</p>
       </a>
       <p class='extract'>{{result.extract|strengthen}}</p>

mwmbl/tinysearchengine/rank.py

@@ -3,6 +3,7 @@ import re
 from abc import abstractmethod
 from logging import getLogger
 from operator import itemgetter
+from typing import Optional
 from urllib.parse import urlparse
 
 from mwmbl.format import format_result_with_pattern, get_query_regex
@@ -118,17 +119,22 @@ class Ranker:
     def order_results(self, terms, pages, is_complete):
         pass
 
-    def search(self, s: str):
-        results, terms, _ = self.get_results(s)
+    def search(self, s: str, additional_results: list[Document], source: Optional[str] = None):
+        mwmbl_results, terms, _ = self.get_results(s)
 
         is_complete = s.endswith(' ')
         pattern = get_query_regex(terms, is_complete, False)
         formatted_results = []
+        seen_urls = set()
+        for results, source in [(additional_results, source), (mwmbl_results, 'mwmbl')]:
             for result in results:
-            formatted_result = format_result_with_pattern(pattern, result)
+                if result.url in seen_urls:
+                    continue
+                formatted_result = format_result_with_pattern(pattern, result, source)
                 formatted_results.append(formatted_result)
+                seen_urls.add(result.url)
 
-        logger.info("Return results: %r", formatted_results)
+        logger.info("Return results: %d", len(formatted_results))
         return formatted_results
 
     def complete(self, q: str):

mwmbl/views.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from datetime import datetime
 from itertools import groupby
-from urllib.parse import urlparse, parse_qs, urlencode, urlunparse, ParseResult
+from urllib.parse import urlparse, parse_qs
 
 import justext
 import requests
@@ -66,13 +66,12 @@ def home_fragment(request):
         "query": query,
         "activity": activity,
     })
-
-    # Encode the new query string
-    if query:
-        new_query_string = urlencode({"q": query}, doseq=True)
-        new_url = "/?" + new_query_string
-    else:
-        new_url = "/"
+    current_url = request.htmx.current_url
+    # Replace query string with new query
+    stripped_url = current_url[:current_url.index("?")] if "?" in current_url else current_url
+    query_string = "?q=" + query if len(query) > 0 else ""
+    new_url = stripped_url + query_string
+    # Set the htmx replace header
     response["HX-Replace-Url"] = new_url
     return response
 
@@ -89,7 +88,19 @@ class Activity:
 def _get_results_and_activity(request):
     query = request.GET.get("q")
     if query:
-        results = ranker.search(query)
+        # There may be extra results in the request that we need to add in
+        # format is ?enhanced=google&title=title1&url=url1&extract=extract1&title=title2&url=url2&extract=extract2
+        source = request.GET.get("enhanced", "unknown")
+        titles = request.GET.getlist(f"title")
+        urls = request.GET.getlist(f"url")
+        extracts = request.GET.getlist(f"extract")
+
+        additional_results = [
+            Document(title=title, url=url, extract=extract, score=0.0)
+            for title, url, extract in zip(titles, urls, extracts)
+        ]
+
+        results = ranker.search(query, additional_results=additional_results, source=source)
         activity = None
     else:
         results = None
@@ -126,5 +137,5 @@ def fetch_url(request):
 
     result = Document(title=title, url=url, extract=extract, score=0.0)
     return render(request, "result.html", {
-        "result": format_result(result, query),
+        "result": format_result(result, query, "user"),
     })