Use API V3

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  browser-tools: circleci/browser-tools@1.1.1
+  browser-tools: circleci/browser-tools@1.4.1
 
 commands:
   run-tox:

.readthedocs.yaml

@@ -1,11 +1,9 @@
 version: 2
 
 build:
-  os: "ubuntu-20.04"
+  os: "ubuntu-22.04"
   tools:
-    # sphinx-js isn't compatible with python 3.10.
-    # https://github.com/mozilla/sphinx-js/issues/186
-    python: "3.9"
+    python: "3"
     nodejs: "16"
 
 python:
@@ -16,5 +14,3 @@ python:
 
 sphinx:
   configuration: docs/conf.py
-
-formats: []

docs/conf.py

@@ -11,9 +11,10 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+from pathlib import Path
 import sys
-sys.path.insert(0, os.path.abspath('..'))
-sys.path.append(os.path.abspath("./_ext"))
+sys.path.insert(0, str(Path(__file__).parent.parent))
+sys.path.insert(0, str(Path(__file__).parent / "_ext"))
 
 ON_RTD = os.environ.get('READTHEDOCS', False)
 
@@ -100,6 +101,8 @@
 
 if not ON_RTD:
     html_js_files = ['rtd_dummy_data.js']
+    os.environ['READTHEDOCS_PROJECT'] = 'readthedocs-sphinx-search'
+    os.environ['READTHEDOCS_VERSION'] = 'latest'
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.

docs/configuration.rst

@@ -16,3 +16,47 @@ You can customize these configuration options in your ``conf.py`` file:
    Default: ``'minified'``
 
    Type: ``string``
+
+.. confval:: rtd_sphinx_search_default_filter
+
+   Description: Default filter to be used when the user hasn't selected any other filters.
+   The filter will simply be appended to the current search query.
+
+   Default: ``project:<project>/<version>``
+
+   Type: ``string``
+
+   Example:
+
+   .. code-block:: python
+
+      # https://docs.readthedocs.io/page/reference/environment-variables.html
+      project = os.environ["READTHEDOCS_PROJECT"]
+      version = os.environ["READTHEDOCS_VERSION"]
+
+      # Include results from subprojects by default.
+      rtd_sphinx_search_default_filter = f"subprojects:{project}/{version}"
+
+.. confval:: rtd_sphinx_search_filters
+
+   Description: Map of filters to show in the search bar.
+   The key is the name of the filter to show to the user,
+   and the value is the filter itself.
+   The filter will simply be appended to the current search query.
+
+   Default: ``{}``
+
+   Type: ``dict``
+
+   Example:
+
+   .. code-block:: python
+
+      # https://docs.readthedocs.io/page/reference/environment-variables.html
+      project = os.environ["READTHEDOCS_PROJECT"]
+      version = os.environ["READTHEDOCS_VERSION"]
+
+      rtd_sphinx_search_filters = {
+          "Search this project": f"project:{project}/{version}",
+          "Search subprojects": f"subprojects:{project}/{version}",
+      }

docs/development.rst

@@ -41,7 +41,7 @@ Go to http://127.0.0.1:8000 and start searching!
 
    The extension works when is hosted on Read the Docs,
    but to make it work locally a custom ``READTHEDOCS_DATA`` js variable is injected automatically
-   to send the search requests to https://readthedocs.org/api/v2/search/.
+   to send the search requests to https://readthedocs.org/api/v3/search/.
 
 Releasing
 ---------

sphinx_search/extension.py

@@ -1,17 +1,19 @@
 import os
-
 from sphinx_search import __version__
 from sphinx.errors import ExtensionError
+from pathlib import Path
 from sphinx.util.fileutil import copy_asset
 
 ASSETS_FILES = {
     'minified': [
-        os.path.join('js', 'rtd_sphinx_search.min.js'),
-        os.path.join('css', 'rtd_sphinx_search.min.css'),
+        Path("js/rtd_search_config.js_t"),
+        Path("js/rtd_sphinx_search.min.js"),
+        Path("css/rtd_sphinx_search.min.css"),
     ],
     'un-minified': [
-        os.path.join('js', 'rtd_sphinx_search.js'),
-        os.path.join('css', 'rtd_sphinx_search.css'),
+        Path("js/rtd_search_config.js_t"),
+        Path("js/rtd_sphinx_search.js"),
+        Path("css/rtd_sphinx_search.css"),
     ]
 }
 
@@ -24,25 +26,65 @@ def _get_static_files(config):
     return ASSETS_FILES[file_type]
 
 
+def get_context(config):
+    """
+    Get context for templates.
+
+    This mainly returns the settings from the extension
+    that are needed in our JS code.
+    """
+    default_filter = config.rtd_sphinx_search_default_filter
+    filters = config.rtd_sphinx_search_filters
+    # When converting to JSON, the order of the keys is not guaranteed.
+    # So we pass a list of tuples to preserve the order.
+    filters = [(name, filter) for name, filter in filters.items()]
+    return {
+        "rtd_search_config": {
+            "filters": filters,
+            "default_filter": default_filter,
+        }
+    }
+
+
 def copy_asset_files(app, exception):
+    """
+    Copy assets files to the output directory.
+
+    If the name of the file ends with ``_t``, it will be interpreted as a template.
+    """
     if exception is None:  # build succeeded
+        root = Path(__file__).parent
         for file in _get_static_files(app.config):
-            path = os.path.join(os.path.dirname(__file__), 'static', file)
-            copy_asset(path, os.path.join(app.outdir, '_static', file.split('.')[-1]))
+            source = root / 'static' / file
+            destination = Path(app.outdir) / '_static' / file.parent
+            context = None
+            # If the file ends with _t, it is a template file,
+            # so we provide a context to treat it as a template.
+            if file.name.endswith('_t'):
+                context = get_context(app.config)
+            copy_asset(str(source), str(destination), context=context)
 
 
 def inject_static_files(app):
     """Inject correct CSS and JS files based on the value of ``rtd_sphinx_search_file_type``."""
     for file in _get_static_files(app.config):
+        file = str(file)
+        # Templates end with `_t`, Sphinx removes the _t when copying the file.
+        if file.endswith('_t'):
+            file = file[:-2]
         if file.endswith('.js'):
             app.add_js_file(file)
         elif file.endswith('.css'):
             app.add_css_file(file)
 
 
 def setup(app):
+    project = os.environ.get('READTHEDOCS_PROJECT', '')
+    version = os.environ.get('READTHEDOCS_VERSION', '')
 
     app.add_config_value('rtd_sphinx_search_file_type', 'minified', 'html')
+    app.add_config_value('rtd_sphinx_search_default_filter', f'project:{project}/{version}', 'html')
+    app.add_config_value('rtd_sphinx_search_filters', {}, 'html')
 
     app.connect('builder-inited', inject_static_files)
     app.connect('build-finished', copy_asset_files)

sphinx_search/static/css/rtd_sphinx_search.css

@@ -149,9 +149,12 @@
 
 /* Search result */
 
+.search__result__box {
+    padding: 0px 10px;
+}
+
 .search__result__single {
     margin-top: 10px;
-    padding: 0px 10px;
     border-bottom: 1px solid #e6e6e6;
 }
 
@@ -282,6 +285,34 @@
     letter-spacing: 1px;
 }
 
+.search__filters {
+    padding: 0px 10px;
+}
+
+.search__filters ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    display: flex;
+}
+
+.search__filters li {
+    display: flex;
+    align-items: center;
+    margin-right: 15px;
+}
+
+.search__filters label {
+    color: black;
+    font-size: 15px;
+    margin: auto;
+}
+
+.search__filters .search__filters__title {
+    color: black;
+    font-size: 15px;
+}
+
 @media (max-width: 670px) {
     .rtd__search__credits {
         height: 50px;

sphinx_search/static/js/rtd_search_config.js_t

@@ -0,0 +1,2 @@
+{# Set the extension options as a JSON object, so it can be used from our JS code. #}
+var RTD_SEARCH_CONFIG = {{ rtd_search_config | tojson }};