ckanext-search-tweaks 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

ckanext/search_tweaks/__init__.py

@@ -1,19 +1,3 @@
 from __future__ import annotations
 
-from typing import Any
-import ckan.plugins.toolkit as tk
-
-CONFIG_PREFER_BOOST = "ckanext.search_tweaks.common.prefer_boost"
-DEFAULT_PREFER_BOOST = True
-
-
-def boost_preffered() -> bool:
-    return tk.asbool(tk.config.get(CONFIG_PREFER_BOOST, DEFAULT_PREFER_BOOST))
-
-
-def feature_disabled(feature: str, search_params: dict[str, Any]) -> bool:
-    return tk.asbool(
-        search_params.get("extras", {}).get(
-            f"ext_search_tweaks_disable_{feature}", False
-        )
-    )
+from .shared import feature_disabled

ckanext/search_tweaks/advanced_search/plugin.py

@@ -37,14 +37,14 @@ DEFAULT_FORM_DEFINITION = json.dumps(
                 {"value": "private", "label": "Private"},
             ],
         },
-    }
+    },
 )
 DEFAULT_FIELD_ORDER = None
 
 
 def form_config():
     definition = json.loads(
-        tk.config.get(CONFIG_FORM_DEFINITION, DEFAULT_FORM_DEFINITION)
+        tk.config.get(CONFIG_FORM_DEFINITION, DEFAULT_FORM_DEFINITION),
     )
     order = tk.aslist(tk.config.get(CONFIG_FIELD_ORDER, DEFAULT_FIELD_ORDER))
     if not order:
@@ -74,7 +74,7 @@ class AdvancedSearchPlugin(p.SingletonPlugin):
             from ckanext.composite_search.interfaces import ICompositeSearch
         except ImportError:
             raise CkanConfigurationException(
-                "ckanext-composite-search is not installed"
+                "ckanext-composite-search is not installed",
             )
         if not p.plugin_loaded("composite_search"):
             msg = "Advanced search requires `composite_search` plugin"

ckanext/search_tweaks/cli.py

@@ -1,8 +1,8 @@
 import click
 
-
-def get_commands():
-    return [search_tweaks]
+__all__ = [
+    "search_tweaks",
+]
 
 
 @click.group(short_help="Search tweaks")

ckanext/search_tweaks/config.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+import ckan.plugins.toolkit as tk
+from ckan.lib.search.query import QUERY_FIELDS
+
+CONFIG_QF = "ckanext.search_tweaks.common.qf"
+DEFAULT_QF = QUERY_FIELDS
+
+CONFIG_FUZZY = "ckanext.search_tweaks.common.fuzzy_search.enabled"
+CONFIG_FUZZY_DISTANCE = "ckanext.search_tweaks.common.fuzzy_search.distance"
+CONFIG_MM = "ckanext.search_tweaks.common.mm"
+CONFIG_FUZZY_KEEP_ORIGINAL = "ckanext.search_tweaks.common.fuzzy_search.keep_original"
+CONFIG_PREFER_BOOST = "ckanext.search_tweaks.common.prefer_boost"
+
+
+def qf() -> str:
+    return tk.config[CONFIG_QF] or DEFAULT_QF
+
+
+def fuzzy() -> bool:
+    return tk.config[CONFIG_FUZZY]
+
+
+def fuzzy_distance() -> int:
+    return tk.config[CONFIG_FUZZY_DISTANCE]
+
+
+def mm() -> str:
+    return tk.config[CONFIG_MM]
+
+
+def fuzzy_with_original() -> bool:
+    return tk.config[CONFIG_FUZZY_KEEP_ORIGINAL]
+
+
+def prefer_boost() -> bool:
+    return tk.config[CONFIG_PREFER_BOOST]

ckanext/search_tweaks/field_relevance/plugin.py

@@ -5,8 +5,8 @@ from typing import Any
 import ckan.plugins as p
 import ckan.plugins.toolkit as tk
 
-from .. import feature_disabled
-from ..interfaces import ISearchTweaks
+from ckanext.search_tweaks import feature_disabled
+from ckanext.search_tweaks.interfaces import ISearchTweaks
 from . import views
 
 CONFIG_BOOST_FN = "ckanext.search_tweaks.field_relevance.boost_function"
@@ -23,7 +23,7 @@ class FieldRelevancePlugin(p.SingletonPlugin):
     # ISearchTweaks
     def get_search_boost_fn(self, search_params: dict[str, Any]) -> str | None:
         if feature_disabled("field_boost", search_params):
-            return
+            return None
 
         return tk.config.get(CONFIG_BOOST_FN, DEFAULT_BOOST_FN)
 

ckanext/search_tweaks/field_relevance/views.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Optional
+from typing import Any
 
 from flask import Blueprint
 from flask.views import MethodView
@@ -29,7 +29,7 @@ field_relevance = Blueprint("search_tweaks_field_relevance", __name__)
 
 def get_blueprints():
     if tk.asbool(
-        tk.config.get(CONFIG_ENABLE_PROMOTION_ROUTE, DEFAULT_ENABLE_PROMOTION_ROUTE)
+        tk.config.get(CONFIG_ENABLE_PROMOTION_ROUTE, DEFAULT_ENABLE_PROMOTION_ROUTE),
     ):
         path = tk.config.get(CONFIG_PROMOTION_PATH, DEFAULT_PROMOTION_PATH)
         field_relevance.add_url_rule(path, view_func=PromoteView.as_view("promote"))
@@ -52,9 +52,9 @@ class PromoteView(MethodView):
                 tk.get_validator("convert_int"),
                 tk.get_validator("natural_number_validator"),
                 tk.get_validator("limit_to_configured_maximum")(
-                    CONFIG_MAX_PROMOTION, DEFAULT_MAX_PROMOTION
+                    CONFIG_MAX_PROMOTION, DEFAULT_MAX_PROMOTION,
                 ),
-            ]
+            ],
         }
 
         data, errors = tk.navl_validate(
@@ -67,7 +67,7 @@ class PromoteView(MethodView):
             return self.get(id, data, errors)
         try:
             pkg_dict = tk.get_action("package_patch")(
-                {}, {"id": id, field: data[field]}
+                {}, {"id": id, field: data[field]},
             )
         except tk.ValidationError as e:
             for k, v in e.error_summary.items():
@@ -79,8 +79,8 @@ class PromoteView(MethodView):
     def get(
         self,
         id,
-        data: Optional[dict[str, Any]] = None,
-        errors: Optional[dict[str, Any]] = None,
+        data: dict[str, Any] | None = None,
+        errors: dict[str, Any] | None = None,
     ):
         self._check_access(id)
         field = tk.config.get(CONFIG_PROMOTION_FIELD, DEFAULT_PROMOTION_FIELD)
@@ -90,7 +90,7 @@ class PromoteView(MethodView):
             "errors": errors or {},
             "data": data or pkg_dict,
             "max_promotion": tk.asint(
-                tk.config.get(CONFIG_MAX_PROMOTION, DEFAULT_MAX_PROMOTION)
+                tk.config.get(CONFIG_MAX_PROMOTION, DEFAULT_MAX_PROMOTION),
             ),
             "field_name": field,
         }

ckanext/search_tweaks/interfaces.py

@@ -1,25 +1,32 @@
 from __future__ import annotations
 
-from typing import Any, Optional
+from typing import Any
 
 from ckan.plugins.interfaces import Interface
 
-from . import CONFIG_PREFER_BOOST
-
 
 class ISearchTweaks(Interface):
-    def get_search_boost_fn(self, search_params: dict[str, Any]) -> Optional[str]:
-        f"""Return Solr's boost function applicable to the current search.
+    def get_search_boost_fn(self, search_params: dict[str, Any]) -> str | None:
+        """Return Solr's boost function applicable to the current search.
 
-        Note: it will be applied as `boost` when `{CONFIG_PREFER_BOOST}`
-        enabled and as `bf` otherwise.
+        Note: it will be applied as `boost` when
+        `ckanext.search_tweaks.common.prefer_boost` enabled and as `bf`
+        otherwise.
 
         """
         return None
 
-    def get_extra_qf(self, search_params: dict[str, Any]) -> Optional[str]:
+    def get_extra_qf(self, search_params: dict[str, Any]) -> str | None:
         """Return an additional fragment of the Solr's qf.
 
         This fragment will be appended to the current qf
         """
         return None
+
+
+
+class IQueryPopularity(Interface):
+    def skip_query_popularity(self, params: dict[str, Any]) -> bool:
+        """Do not index search query.
+        """
+        return False

ckanext/search_tweaks/plugin.py

@@ -1,54 +1,37 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Dict
+from typing import Any
 
 import ckan.plugins as plugins
 import ckan.plugins.toolkit as tk
-from ckan.lib.search.query import QUERY_FIELDS
-
-from . import boost_preffered, cli, feature_disabled
+from . import feature_disabled, config
 from .interfaces import ISearchTweaks
 
 log = logging.getLogger(__name__)
-
-SearchParams = Dict[str, Any]
-
-CONFIG_QF = "ckanext.search_tweaks.common.qf"
-CONFIG_FUZZY = "ckanext.search_tweaks.common.fuzzy_search.enabled"
-CONFIG_FUZZY_DISTANCE = "ckanext.search_tweaks.common.fuzzy_search.distance"
-CONFIG_MM = "ckanext.search_tweaks.common.mm"
-CONFIG_FUZZY_KEEP_ORIGINAL = "ckanext.search_tweaks.common.fuzzy_search.keep_original"
-
-DEFAULT_QF = QUERY_FIELDS
-DEFAULT_FUZZY = False
-DEFAULT_FUZZY_DISTANCE = 1
-DEFAULT_MM = "1"
-DEFAULT_FUZZY_KEEP_ORIGINAL = True
+CONFIG_PREFER_BOOST = "ckanext.search_tweaks.common.prefer_boost"
+DEFAULT_PREFER_BOOST = True
 
 
+@tk.blanket.cli
+@tk.blanket.config_declarations
 class SearchTweaksPlugin(plugins.SingletonPlugin):
-    plugins.implements(plugins.IClick)
     plugins.implements(plugins.IPackageController, inherit=True)
 
-    # IClick
-
-    def get_commands(self):
-        return cli.get_commands()
-
     # IPackageController
 
-    def before_dataset_search(self, search_params: SearchParams):
+    def before_dataset_search(self, search_params: dict[str, Any]):
         if feature_disabled("everything", search_params):
             return search_params
 
-        search_params.setdefault("mm", tk.config.get(CONFIG_MM, DEFAULT_MM))
+        search_params.setdefault("mm", config.mm())
 
         if "defType" not in search_params:
             search_params["defType"] = "edismax"
 
-        if boost_preffered() and search_params["defType"] == "edismax":
+        if config.prefer_boost() and search_params["defType"] == "edismax":
             _set_boost(search_params)
+
         else:
             _set_bf(search_params)
 
@@ -58,7 +41,7 @@ class SearchTweaksPlugin(plugins.SingletonPlugin):
         return search_params
 
 
-def _set_boost(search_params: SearchParams) -> None:
+def _set_boost(search_params: dict[str, Any]) -> None:
     boost: list[str] = search_params.setdefault("boost", [])
     for plugin in plugins.PluginImplementations(ISearchTweaks):
         extra = plugin.get_search_boost_fn(search_params)
@@ -67,7 +50,7 @@ def _set_boost(search_params: SearchParams) -> None:
         boost.append(extra)
 
 
-def _set_bf(search_params: SearchParams) -> None:
+def _set_bf(search_params: dict[str, Any]) -> None:
     default_bf: str = search_params.get("bf") or "0"
     search_params.setdefault("bf", default_bf)
     for plugin in plugins.PluginImplementations(ISearchTweaks):
@@ -77,11 +60,11 @@ def _set_bf(search_params: SearchParams) -> None:
         search_params["bf"] = f"sum({search_params['bf']},{extra_bf})"
 
 
-def _set_qf(search_params: SearchParams) -> None:
+def _set_qf(search_params: dict[str, Any]) -> None:
     if feature_disabled("qf", search_params):
         return
 
-    default_qf: str = search_params.get("qf") or tk.config.get(CONFIG_QF, DEFAULT_QF)
+    default_qf: str = search_params.get("qf") or config.qf()
     search_params.setdefault("qf", default_qf)
     for plugin in plugins.PluginImplementations(ISearchTweaks):
         extra_qf = plugin.get_extra_qf(search_params)
@@ -90,8 +73,8 @@ def _set_qf(search_params: SearchParams) -> None:
         search_params["qf"] += " " + extra_qf
 
 
-def _set_fuzzy(search_params: SearchParams) -> None:
-    if not tk.asbool(tk.config.get(CONFIG_FUZZY, DEFAULT_FUZZY)):
+def _set_fuzzy(search_params: dict[str, Any]) -> None:
+    if not config.fuzzy():
         return
 
     if feature_disabled("fuzzy", search_params):
@@ -114,18 +97,16 @@ def _set_fuzzy(search_params: SearchParams) -> None:
             if s.isalpha() and s not in ("AND", "OR", "TO")
             else s,
             q.split(),
-        )
+        ),
     )
-    if tk.asbool(
-        tk.config.get(CONFIG_FUZZY_KEEP_ORIGINAL, DEFAULT_FUZZY_KEEP_ORIGINAL)
-    ):
+    if config.fuzzy_with_original():
         search_params["q"] = f"({fuzzy_q}) OR ({q})"
     else:
         search_params["q"] = fuzzy_q
 
 
 def _get_fuzzy_distance() -> int:
-    distance = tk.asint(tk.config.get(CONFIG_FUZZY_DISTANCE, DEFAULT_FUZZY_DISTANCE))
+    distance = config.fuzzy_distance()
     if distance < 0:
         log.warning("Cannot use negative fuzzy distance: %s.", distance)
         distance = 0

ckanext/search_tweaks/query_popularity/config.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+import ckan.plugins.toolkit as tk
+
+
+def skip_irrefutable() -> bool:
+    return tk.config["ckanext.search_tweaks.query_popularity.skip_irrefutable_search"]
+
+
+def ignored_symbols() -> set[str]:
+    return set(tk.config["ckanext.search_tweaks.query_popularity.ignored_symbols"])
+
+
+def ignored_terms() -> list[str]:
+    return tk.config["ckanext.search_tweaks.query_popularity.ignored_terms"]
+
+
+def throttle() -> int:
+    return tk.config["ckanext.search_tweaks.query_popularity.query_throttle"]
+
+
+def max_age() -> int:
+    return tk.config["ckanext.search_tweaks.query_popularity.max_age"]
+
+
+def obsoletion_period() -> int:
+    return tk.config["ckanext.search_tweaks.query_popularity.obsoletion_period"]
+
+
+def tracked_endpoints() -> list[str]:
+    return tk.config["ckanext.search_tweaks.query_popularity.tracked_endpoints"]

ckanext/search_tweaks/query_popularity/logic/action.py

@@ -0,0 +1,43 @@
+from __future__ import annotations
+from typing import Any
+from ckan import types
+import ckan.plugins.toolkit as tk
+
+from ckanext.search_tweaks.query_popularity.score import Score
+
+
+@tk.side_effect_free
+def search_tweaks_query_popularity_list(
+    context: types.Context, data_dict: dict[str, Any]
+) -> list[dict[str, Any]]:
+    score = Score()
+
+    if tk.asbool(data_dict.get("refresh")):
+        score.refresh()
+
+    limit = tk.asint(data_dict.get("limit", 10))
+
+    return list(score.stats(limit))
+
+
+@tk.side_effect_free
+def search_tweaks_query_popularity_export(
+    context: types.Context, data_dict: dict[str, Any]
+) -> dict[str, Any]:
+    score = Score()
+
+    results = score.export()
+    return {"results": results, "count": len(results)}
+
+
+@tk.side_effect_free
+def search_tweaks_query_popularity_ignore(
+    context: types.Context, data_dict: dict[str, Any]
+):
+    q = tk.get_or_bust(data_dict, "q")
+    score = Score()
+    result = score.ignore(q)
+    if tk.asbool(data_dict.get("remove")):
+        score.drop(q)
+
+    return result

ckanext/search_tweaks/query_popularity/logic/auth.py

@@ -0,0 +1,23 @@
+from __future__ import annotations
+from typing import Any
+from ckan import types
+
+from ckan.authz import is_authorized
+
+
+def search_tweaks_query_popularity_list(
+    context: types.Context, data_dict: dict[str, Any]
+) -> types.AuthResult:
+    return is_authorized("sysadmin", context, data_dict)
+
+
+def search_tweaks_query_popularity_export(
+    context: types.Context, data_dict: dict[str, Any]
+) -> types.AuthResult:
+    return is_authorized("sysadmin", context, data_dict)
+
+
+def search_tweaks_query_popularity_ignore(
+    context: types.Context, data_dict: dict[str, Any]
+) -> types.AuthResult:
+    return is_authorized("sysadmin", context, data_dict)

ckanext/search_tweaks/query_popularity/plugin.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+from typing import Any
+import ckan.plugins as p
+import ckan.plugins.toolkit as tk
+from ckanext.search_tweaks.interfaces import IQueryPopularity
+from . import config, score
+
+
+@tk.blanket.actions
+@tk.blanket.auth_functions
+@tk.blanket.config_declarations
+class QueryPopularityPlugin(p.SingletonPlugin):
+    p.implements(p.IConfigurable)
+    p.implements(p.IPackageController, inherit=True)
+    p.implements(IQueryPopularity, inherit=True)
+
+    def after_dataset_search(self, results: dict[str, Any], params: dict[str, Any]):
+        bp, view = tk.get_endpoint()
+        if bp and view and f"{bp}.{view}" in config.tracked_endpoints():
+            if not any(
+                plugin.skip_query_popularity(params)
+                for plugin in p.PluginImplementations(IQueryPopularity)
+            ):
+                self.score.save(params["q"])
+
+        return results
+
+    def configure(self, config: Any):
+        self.score = score.Score()
+
+    def skip_query_popularity(self, params: dict[str, Any]) -> bool:
+        q = params["q"]
+
+        if q == "*:*":
+            return config.skip_irrefutable()
+
+        symbols = config.ignored_symbols()
+        if symbols and set(q) & symbols:
+            return True
+
+        terms = config.ignored_terms()
+
+        for term in terms:
+            if term in q:
+                return True
+
+        return False

ckanext/search_tweaks/query_popularity/score.py

@@ -0,0 +1,165 @@
+from __future__ import annotations
+from collections import defaultdict
+from datetime import datetime, timedelta
+import logging
+from hashlib import md5
+from typing import Any, Iterable, cast
+from operator import itemgetter
+from ckan.lib.redis import connect_to_redis
+import ckan.plugins.toolkit as tk
+from redis import Redis
+from . import config
+
+log = logging.getLogger(__name__)
+connect_to_redis: Any
+
+
+class Score:
+    redis: Redis[bytes]
+    date_format = "%Y-%m-%d %H-%M"
+
+    def __init__(self):
+        self.redis = connect_to_redis()
+
+        site = tk.config["ckan.site_id"]
+        self.prefix = f"{site}:search_tweaks:qp"
+
+    def export(self):
+        data: dict[bytes, dict[str, Any]] = {
+            hash: {"query": query, "records": []}
+            for hash, query in self.redis.hgetall(self.trans_key()).items()
+        }
+        for k, v in self.redis.hscan_iter(self.distribution_key()):
+            date_str, q_hash = k.split(b"/", 1)
+            try:
+                date = datetime.strptime(date_str.decode(), self.date_format)
+            except ValueError:
+                continue
+
+            data[q_hash]["records"].append({"date": date, "count": int(v)})
+
+        return list(data.values())
+
+    def save(self, q: str):
+        q = q.strip()
+        q_hash = self.hash(q)
+
+        if self.is_ignored(q_hash):
+            return
+
+        if self.is_throttling(q_hash):
+            return
+
+        self.redis.hset(self.trans_key(), q_hash, q)
+
+        date_stem = self.format_date_stem(self.now())
+
+        self.redis.hincrby(self.distribution_key(), f"{date_stem}/{q_hash}", 1)
+
+    def drop(self, q: str):
+        q_hash = self.hash(q)
+        dk = self.distribution_key()
+
+        series = self.redis.hscan_iter(dk, f"*/{q_hash}")
+        keys = list(map(itemgetter(0), series))
+        if keys:
+            self.redis.hdel(dk, *keys)
+
+        self.redis.hdel(self.trans_key(), q_hash)
+        self.redis.zrem(self.score_key(), q_hash)
+
+    def is_throttling(self, q_hash: str):
+        user = tk.current_user.name
+
+        throttle_key = f"{self.prefix}:throttle:{user}:{q_hash}"
+        if self.redis.exists(throttle_key):
+            return True
+
+        self.redis.set(throttle_key, 1, ex=config.throttle())
+        return False
+
+    def reset(self):
+        keys = self.redis.keys(f"{self.prefix}:*")
+        if keys:
+            self.redis.delete(*keys)
+
+    def refresh(self):
+        max_age = timedelta(seconds=config.max_age())
+        dk = self.distribution_key()
+        sk = self.score_key()
+
+        expired_dist: set[bytes] = set()
+        distribution = cast(
+            "Iterable[tuple[bytes, bytes]]",
+            self.redis.hscan_iter(dk),
+        )
+
+        scores: dict[bytes, float] = defaultdict(float)
+
+        for k, v in distribution:
+            date_str, q_hash = k.split(b"/", 1)
+            try:
+                date = datetime.strptime(date_str.decode(), self.date_format)
+            except ValueError:
+                log.error("Remove invalid key %s", k)
+                expired_dist.add(k)
+                continue
+
+            age = self.now() - date
+
+            if age > max_age:
+                expired_dist.add(k)
+                continue
+
+            scores[q_hash] += int(v) / (age.seconds // config.obsoletion_period() + 1)
+
+        if expired_dist:
+            self.redis.hdel(dk, *expired_dist)
+
+        expired_scores: set[bytes] = set()
+        for k, v in self.redis.zscan_iter(sk):
+            if k not in scores:
+                expired_scores.add(k)
+                continue
+        if scores:
+            self.redis.zadd(sk, cast(Any, scores))
+
+        if expired_scores:
+            self.redis.zrem(sk, *expired_scores)
+            self.redis.hdel(self.trans_key(), *expired_scores)
+
+    def hash(self, q: str):
+        return md5(q.encode()).hexdigest()
+
+    def is_ignored(self, q_hash: str):
+        return self.redis.sismember(self.ignore_key(), q_hash)
+
+    def ignore(self, q: str):
+        return self.redis.sadd(self.ignore_key(), self.hash(q))
+
+    def now(self):
+        return datetime.utcnow()
+
+    def score_key(self):
+        return f"{self.prefix}:score"
+
+    def trans_key(self):
+        return f"{self.prefix}:trans"
+
+    def ignore_key(self):
+        return f"{self.prefix}:ignore"
+
+    def distribution_key(self):
+        return f"{self.prefix}:distribution"
+
+    def format_date_stem(self, date: datetime):
+        return date.strftime(self.date_format)
+
+    def stats(self, num: int) -> Iterable[dict[str, Any]]:
+        scores: list[tuple[bytes, float]] = self.redis.zrange(
+            self.score_key(), 0, num - 1, desc=True, withscores=True
+        )
+        trans_key = self.trans_key()
+
+        for k, v in scores:
+            yield {"query": self.redis.hget(trans_key, k), "score": v}

ckanext/search_tweaks/query_relevance/__init__.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 import contextlib
-from typing import Optional
 
 from urllib.parse import urlparse, parse_qs
 
@@ -14,7 +13,7 @@ from .score import QueryScore, normalize_query
 __all__ = ["QueryScore", "normalize_query", "update_score_by_url"]
 
 
-def update_score_by_url(pkg: model.Package, ref: Optional[str] = None) -> bool:
+def update_score_by_url(pkg: model.Package, ref: str | None = None) -> bool:
     """Make given package more relevant for the current search query."""
     if tk.request:
         ref = ref or tk.request.referrer

ckanext/search_tweaks/query_relevance/plugin.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
 from string import Template
-from typing import Any, Optional
+from typing import Any
 
 import ckan.plugins as plugins
 import ckan.plugins.toolkit as tk
 
-from .. import feature_disabled
-from ..cli import attach_relevance_command
-from ..interfaces import ISearchTweaks
+from ckanext.search_tweaks import feature_disabled
+from ckanext.search_tweaks.cli import attach_relevance_command
+from ckanext.search_tweaks.interfaces import ISearchTweaks
 from . import QueryScore, cli, normalize_query, update_score_by_url
 
 CONFIG_BOOST_STRING = "ckanext.search_tweaks.query_relevance.boost_function"
@@ -30,7 +30,7 @@ class QueryRelevancePlugin(plugins.SingletonPlugin):
 
     # IPackageController
 
-    def before_index(self, pkg_dict):
+    def before_dataset_index(self, pkg_dict):
         prefix = tk.config.get(CONFIG_RELEVANCE_PREFIX, DEFAULT_RELEVANCE_PREFIX)
 
         for _, query, score in QueryScore.get_for(pkg_dict["id"]):
@@ -47,27 +47,28 @@ class QueryRelevancePlugin(plugins.SingletonPlugin):
 
     # ISearchTweaks
 
-    def get_search_boost_fn(self, search_params: dict[str, Any]) -> Optional[str]:
+    def get_search_boost_fn(self, search_params: dict[str, Any]) -> str | None:
         if feature_disabled("query_boost", search_params):
-            return
+            return None
 
         prefix = tk.config.get(CONFIG_RELEVANCE_PREFIX, DEFAULT_RELEVANCE_PREFIX)
         disabled = tk.asbool(
             search_params.get("extras", {}).get(
-                "ext_search_tweaks_disable_relevance", False
-            )
+                "ext_search_tweaks_disable_relevance",
+                False,
+            ),
         )
 
         if not search_params.get("q") or disabled:
-            return
+            return None
 
         normalized = normalize_query(search_params["q"]).replace(" ", "_")
         if not normalized:
-            return
+            return None
 
         field = prefix + normalized
         boost_string = Template(
-            tk.config.get(CONFIG_BOOST_STRING, DEFAULT_BOOST_STRING)
+            tk.config.get(CONFIG_BOOST_STRING, DEFAULT_BOOST_STRING),
         )
 
         return boost_string.safe_substitute({"field": field})

ckanext/search_tweaks/query_relevance/score.py

@@ -34,7 +34,7 @@ class QueryScore:
         query: str,
         *,
         normalize: bool = True,
-        storage_class: Optional[Type[ScoreStorage]] = None
+        storage_class: Optional[Type[ScoreStorage]] = None,
     ):
         if normalize:
             query = normalize_query(query)

ckanext/search_tweaks/query_relevance/storage.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from abc import ABC, abstractclassmethod, abstractmethod
 from datetime import date, timedelta
-from typing import Any, Iterable, Optional, cast, Tuple
+from typing import Any, Iterable, cast, Tuple
 
 import ckan.plugins.toolkit as tk
 from ckan.lib.redis import connect_to_redis, Redis
@@ -37,7 +37,7 @@ class ScoreStorage(ABC):
 
     @classmethod
     @abstractclassmethod
-    def scan(cls, id_: Optional[str] = None) -> Iterable[ScanItem]:
+    def scan(cls, id_: str | None = None) -> Iterable[ScanItem]:
         """Get all the scores."""
         ...
 
@@ -53,11 +53,10 @@ class ScoreStorage(ABC):
 
     def align(self) -> None:
         """Make some cleanup in order to maintain fast and correct value."""
-        pass
 
 
 class RedisScoreStorage(ScoreStorage):
-    _conn: Optional[Redis] = None
+    _conn: Redis | None = None
 
     @property
     def conn(self):
@@ -109,13 +108,10 @@ class PermanentRedisScoreStorage(RedisScoreStorage):
         return f"{self._common_key_part()}:{self.id}"
 
     @classmethod
-    def scan(cls, id_: Optional[str] = None) -> Iterable[ScanItem]:
+    def scan(cls, id_: str | None = None) -> Iterable[ScanItem]:
         conn = cls.connect()
         common_key = cls._common_key_part()
-        if id_:
-            pattern = f"{common_key}:{id_}"
-        else:
-            pattern = f"{common_key}:*"
+        pattern = f"{common_key}:{id_}" if id_ else f"{common_key}:*"
         for key in conn.keys(pattern):
             _, row_id = key.rsplit(b":", 1)
             for query, score in conn.hgetall(key).items():
@@ -169,13 +165,10 @@ class DailyRedisScoreStorage(RedisScoreStorage):
         return date.today().isoformat()
 
     @classmethod
-    def scan(cls, id_: Optional[str] = None) -> Iterable[ScanItem]:
+    def scan(cls, id_: str | None = None) -> Iterable[ScanItem]:
         conn = cls.connect()
         common_key = cls._common_key_part()
-        if id_:
-            pattern = f"{common_key}:{id_}:*"
-        else:
-            pattern = f"{common_key}:*"
+        pattern = f"{common_key}:{id_}:*" if id_ else f"{common_key}:*"
         for key in conn.keys(pattern):
             _, id_, query = key.decode().rsplit(":", 2)
             yield id_, query, cls(id_, query).get()

ckanext/search_tweaks/shared.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+from typing import Any
+import ckan.plugins.toolkit as tk
+
+
+def feature_disabled(feature: str, search_params: dict[str, Any]) -> bool:
+    return tk.asbool(
+        search_params.get("extras", {}).get(
+            f"ext_search_tweaks_disable_{feature}",
+            False,
+        ),
+    )

ckanext/search_tweaks/spellcheck/helpers.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import total_ordering
-from typing import Any, Optional
+from typing import Any
 
 import ckan.plugins.toolkit as tk
 from ckan.lib.search.common import make_connection
@@ -24,7 +24,7 @@ def get_helpers():
 
 
 def spellcheck_did_you_mean(
-    q: str, min_hits: int = 0, max_suggestions: int = None
+    q: str, min_hits: int = 0, max_suggestions: int = None,
 ) -> list[str]:
     """Return optimal query that can be used instead of the current one.
 
@@ -41,18 +41,18 @@ def spellcheck_did_you_mean(
     spellcheck = _do_spellcheck(q)
 
     show_only_more = tk.asbool(
-        tk.config.get(CONFIG_SHOW_ONLY_MORE, DEFAULT_SHOW_ONLY_MORE)
+        tk.config.get(CONFIG_SHOW_ONLY_MORE, DEFAULT_SHOW_ONLY_MORE),
     )
     if not show_only_more:
         min_hits = -1
 
     if not max_suggestions:
         max_suggestions = tk.asint(
-            tk.config.get(CONFIG_MAX_SUGGESTIONS, DEFAULT_MAX_SUGGESTIONS)
+            tk.config.get(CONFIG_MAX_SUGGESTIONS, DEFAULT_MAX_SUGGESTIONS),
         )
 
     use_suggestion_for_single = tk.asbool(
-        tk.config.get(CONFIG_SUGGESTION_FOR_SINGLE, DEFAULT_SUGGESTION_FOR_SINGLE)
+        tk.config.get(CONFIG_SUGGESTION_FOR_SINGLE, DEFAULT_SUGGESTION_FOR_SINGLE),
     )
     terms = q.split()
     if len(terms) == 1 and use_suggestion_for_single:
@@ -71,7 +71,7 @@ def spellcheck_did_you_mean(
 
         # TODO: check min hits
         new_q = " ".join(
-            [spellcheck.suggestions[w][0] for w in terms if w in spellcheck.suggestions]
+            [spellcheck.suggestions[w][0] for w in terms if w in spellcheck.suggestions],
         )
         if new_q:
             collations.append(new_q)
@@ -139,8 +139,8 @@ class SpellcheckResult:
     def __init__(self, collations: list[Any], suggestions: list[Any]):
         self.collations = [Collation(item) for item in collations[1::2]]
         self.suggestions = dict(
-            zip(suggestions[::2], [s["suggestion"] for s in suggestions[1::2]])
+            zip(suggestions[::2], [s["suggestion"] for s in suggestions[1::2]]),
         )
 
-    def best_collations(self, n: Optional[int] = None) -> list[Collation]:
+    def best_collations(self, n: int | None = None) -> list[Collation]:
         return sorted(self.collations, reverse=True)[:n]

ckanext/search_tweaks/spellcheck/plugin.py

@@ -1,6 +1,6 @@
 import ckan.plugins as p
 import ckan.plugins.toolkit as tk
-from ..cli import attach_main_command
+from ckanext.search_tweaks.cli import attach_main_command
 from . import cli, helpers
 
 

ckanext/search_tweaks/tests/query_relevance/test_storage.py

@@ -27,7 +27,7 @@ class TestStorages:
         assert sorted(list(storage.scan())) == sorted(
             [
                 ("key", "query", 10),
-            ]
+            ],
         )
 
         s2 = storage("second key", "second query")
@@ -37,7 +37,7 @@ class TestStorages:
             [
                 ("key", "query", 100),
                 ("second key", "second query", 5),
-            ]
+            ],
         )
 
         s3 = storage("key", "extra query")
@@ -47,14 +47,14 @@ class TestStorages:
                 ("key", "query", 100),
                 ("key", "extra query", 1),
                 ("second key", "second query", 5),
-            ]
+            ],
         )
 
         assert sorted(list(storage.scan("key"))) == sorted(
             [
                 ("key", "query", 100),
                 ("key", "extra query", 1),
-            ]
+            ],
         )
 
     def test_missing_key(self, storage):

ckanext/search_tweaks/tests/spellcheck/test_plugin.py

@@ -48,7 +48,7 @@ class TestHelper:
         assert helper("do nat touc me") == ["do not touch me"]
 
         assert helper("pic", 3) == [
-            "pick"
+            "pick",
         ]  # min_hits fucked up because of single-term match
         assert helper("pic", 1) == ["pick"]
 
@@ -61,7 +61,7 @@ class TestHelper:
 
         assert helper("pock", 1) == ["pick"]
         assert helper("pick", 3) == [
-            "pock"
+            "pock",
         ]  # min_hits fucked up because of single-term match
 
         monkeypatch.setitem(ckan_config, CONFIG_SHOW_ONLY_MORE, "off")

ckanext/search_tweaks/tests/test_plugin.py

@@ -4,7 +4,8 @@ import ckan.lib.search.query as query
 import ckan.plugins as p
 
 import ckanext.search_tweaks.plugin as plugin
-from ckanext.search_tweaks import CONFIG_PREFER_BOOST
+import ckanext.search_tweaks.config as config
+from ckanext.search_tweaks.config import CONFIG_PREFER_BOOST
 
 
 @pytest.mark.usefixtures("with_plugins")
@@ -45,7 +46,7 @@ class TestPlugin:
     def test_default_qf(self, search):
         assert search()["qf"] == query.QUERY_FIELDS
 
-    @pytest.mark.ckan_config(plugin.CONFIG_QF, "title^10 name^0.1")
+    @pytest.mark.ckan_config(config.CONFIG_QF, "title^10 name^0.1")
     def test_modified_qf(self, search):
         assert search()["qf"] == "title^10 name^0.1"
 
@@ -59,11 +60,11 @@ class TestFuzzy:
         assert search(q="hello:world")["q"] == "hello:world"
         assert search(q="hello AND world")["q"] == "hello AND world"
 
-    @pytest.mark.ckan_config(plugin.CONFIG_FUZZY_KEEP_ORIGINAL, False)
-    @pytest.mark.ckan_config(plugin.CONFIG_FUZZY, "on")
+    @pytest.mark.ckan_config(config.CONFIG_FUZZY_KEEP_ORIGINAL, False)
+    @pytest.mark.ckan_config(config.CONFIG_FUZZY, True)
     @pytest.mark.parametrize("distance", [1, 2])
     def test_fuzzy_enabled(self, search, distance, ckan_config, monkeypatch):
-        monkeypatch.setitem(ckan_config, plugin.CONFIG_FUZZY_DISTANCE, distance)
+        monkeypatch.setitem(ckan_config, config.CONFIG_FUZZY_DISTANCE, distance)
         assert search()["q"] == "*:*"
         assert search(q="hello")["q"] == f"hello~{distance}"
         assert search(q="hello world")["q"] == f"hello~{distance} world~{distance}"
@@ -72,37 +73,37 @@ class TestFuzzy:
             search(q="hello AND world")["q"] == f"hello~{distance} AND world~{distance}"
         )
 
-    @pytest.mark.ckan_config(plugin.CONFIG_FUZZY, "on")
+    @pytest.mark.ckan_config(config.CONFIG_FUZZY, True)
     @pytest.mark.parametrize("distance", [-10, -1, 0])
     def test_fuzzy_enabled_with_too_low_distance(
-        self, search, distance, ckan_config, monkeypatch
+        self, search, distance, ckan_config, monkeypatch,
     ):
-        monkeypatch.setitem(ckan_config, plugin.CONFIG_FUZZY_DISTANCE, distance)
+        monkeypatch.setitem(ckan_config, config.CONFIG_FUZZY_DISTANCE, distance)
         assert search(q="")["q"] == "*:*"
         assert search(q="hello")["q"] == "hello"
         assert search(q="hello world")["q"] == "hello world"
         assert search(q="hello:world")["q"] == "hello:world"
         assert search(q="hello AND world")["q"] == "hello AND world"
 
-    @pytest.mark.ckan_config(plugin.CONFIG_FUZZY_KEEP_ORIGINAL, False)
-    @pytest.mark.ckan_config(plugin.CONFIG_FUZZY, "on")
+    @pytest.mark.ckan_config(config.CONFIG_FUZZY_KEEP_ORIGINAL, False)
+    @pytest.mark.ckan_config(config.CONFIG_FUZZY, True)
     @pytest.mark.parametrize("distance", [3, 20, 111])
     def test_fuzzy_enabled_with_too_high_distance(
-        self, search, distance, ckan_config, monkeypatch
+        self, search, distance, ckan_config, monkeypatch,
     ):
-        monkeypatch.setitem(ckan_config, plugin.CONFIG_FUZZY_DISTANCE, distance)
+        monkeypatch.setitem(ckan_config, config.CONFIG_FUZZY_DISTANCE, distance)
         assert search()["q"] == "*:*"
         assert search(q="hello")["q"] == "hello~2"
         assert search(q="hello world")["q"] == "hello~2 world~2"
         assert search(q="hello:world")["q"] == "hello:world"
         assert search(q="hello AND world")["q"] == "hello~2 AND world~2"
 
-    @pytest.mark.ckan_config(plugin.CONFIG_FUZZY, "on")
+    @pytest.mark.ckan_config(config.CONFIG_FUZZY, True)
     @pytest.mark.parametrize("distance", [1, 2])
     def test_fuzzy_keep_original_query(
-        self, search, distance, ckan_config, monkeypatch
+        self, search, distance, ckan_config, monkeypatch,
     ):
-        monkeypatch.setitem(ckan_config, plugin.CONFIG_FUZZY_DISTANCE, distance)
+        monkeypatch.setitem(ckan_config, config.CONFIG_FUZZY_DISTANCE, distance)
         assert search()["q"] == "*:*"
         assert search(q="hello")["q"] == f"(hello~{distance}) OR (hello)"
         assert (

{ckanext_search_tweaks-0.5.0.dist-info → ckanext_search_tweaks-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ckanext-search-tweaks
-Version: 0.5.0
+Version: 0.6.0
 Home-page: https://github.com/DataShades/ckanext-search-tweaks
 Author: Sergey Motornyuk
 Author-email: sergey.motornyuk@linkdigital.com.au
@@ -8,12 +8,13 @@ License: AGPL
 Keywords: CKAN
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
-Classifier: Programming Language :: Python :: 2.7
-Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: freezegun
-Requires-Dist: typing-extensions
+Requires-Dist: typing-extensions >=4.0.0
 Provides-Extra: advanced-search
 
 [![Tests](https://github.com/DataShades/ckanext-search-tweaks/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/DataShades/ckanext-search-tweaks/actions)

ckanext_search_tweaks-0.6.0.dist-info/RECORD

@@ -0,0 +1,52 @@
+ckanext_search_tweaks-0.6.0-py3.8-nspkg.pth,sha256=VaH--vNo0_vzXvZAeqyq-Bg6m47pBBRlxwvBj0KQxe0,544
+ckanext/search_tweaks/__init__.py,sha256=qcODHzdZk2RZsrNAKKcYKL2Y2yJ6Fwwyp7AfwZiJ8SI,73
+ckanext/search_tweaks/cli.py,sha256=Pex34fMESkVycy6kOfODtNmHh8nPMvzFKTeZD0txLvc,308
+ckanext/search_tweaks/config.py,sha256=NX7rsslGJyxQ8xTZidy9fI-SDkJ4lX4oLTX54lVLGI0,941
+ckanext/search_tweaks/interfaces.py,sha256=pOu2PyMVxu7XDyGCvP42upm5N4Ws1KR0qzyW8wE2CGY,869
+ckanext/search_tweaks/plugin.py,sha256=Pfx3QtdrUrh1dpqd0K7tUsEHDYvmo30BgORIx1NG1PA,3323
+ckanext/search_tweaks/shared.py,sha256=9aWN_OXB5-h99lecnZVoZpLY6F8hbIRNX6WUQaoOoYI,325
+ckanext/search_tweaks/advanced_search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ckanext/search_tweaks/advanced_search/plugin.py,sha256=mrJEx12AtfdyF4m1yF3q_RpH5ytpxx7IK1jpo_n3mkQ,3234
+ckanext/search_tweaks/advanced_search/assets/advanced-search.css,sha256=KlBYOihUJepiu2iiGcRjIWZltogEqI8iGbO-28Wgnqw,584
+ckanext/search_tweaks/advanced_search/assets/advanced-search.js,sha256=rkgprbv9fUnWoxgISXmoxHkSC4Z9OLXgZoOIICpn9X8,2328
+ckanext/search_tweaks/advanced_search/assets/webassets.yml,sha256=g0NMsLyHzslxtkIXRFj_Vf-SU6b8MYlBiuHc50SQiAo,439
+ckanext/search_tweaks/advanced_search/templates/advanced_search/search_form.html,sha256=QlKCxEUDGP1g4oZEOKAGSuopjrJsbcgK2cs28k3X4Vc,4266
+ckanext/search_tweaks/field_relevance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ckanext/search_tweaks/field_relevance/plugin.py,sha256=r4wILcdKIpYI6GT43Tbr3eVSltzJkmshZwto1rLiCtI,1424
+ckanext/search_tweaks/field_relevance/views.py,sha256=vtSOFXRgmzcypLkl_ZBs-enDk0raE2GPd_ruIKJv8IA,3214
+ckanext/search_tweaks/field_relevance/assets/search-tweaks-reflect-range-in-label.js,sha256=WFAzPBvzf6SWaEAQJTxiEGhZm-65o676MN6KttCpvbo,490
+ckanext/search_tweaks/field_relevance/assets/webassets.yml,sha256=PGr_EC4jOTABCRc3JCIAqYCzCMNgGG1KYE6Ua0S0vfk,184
+ckanext/search_tweaks/field_relevance/templates/search_tweaks/field_relevance/promote.html,sha256=uqB9Wf7OJzF3-Ep6VZwe3bYICdzy0JhJPJzNPuMLBr0,1118
+ckanext/search_tweaks/query_popularity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ckanext/search_tweaks/query_popularity/config.py,sha256=O-YptWOeDQ6tyVLZ10D3dVs5tGhjOoOtFY3Xw_InmjA,858
+ckanext/search_tweaks/query_popularity/plugin.py,sha256=Gd5u2h6U2wv-qmNY2pXt7AMld0EA43ISSCozVVMvRxE,1391
+ckanext/search_tweaks/query_popularity/score.py,sha256=CUGT9AuUYxiMFV06HIGbB00C1VuRrJlo-5vg01WtfqY,4794
+ckanext/search_tweaks/query_popularity/logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ckanext/search_tweaks/query_popularity/logic/action.py,sha256=9yJ9n8HreSiQmLS_1Ld08BGryVwGqMF17f9PBgg6RH4,1041
+ckanext/search_tweaks/query_popularity/logic/auth.py,sha256=ozcJK0sLljM95f8CXrpZRWckMcCJIK_zUfx8HhUF1bE,654
+ckanext/search_tweaks/query_relevance/__init__.py,sha256=mGpZuwY8UwPMuxjNLhGVYoaXPfLx5UPMixpldIjZuSY,1467
+ckanext/search_tweaks/query_relevance/cli.py,sha256=7wU3nWdCQNaUi2O_zARy7usvUysE-wnp5h_yRlw7nAo,2576
+ckanext/search_tweaks/query_relevance/plugin.py,sha256=ZgtFyBm_RuUCSOldqYdq_gajEbDW1ecmIsKaQJaqJ7c,2440
+ckanext/search_tweaks/query_relevance/score.py,sha256=hfrfgNP5OUf7YBBDuFFBZb66ixpiAlnM-KAXzUVexXc,1811
+ckanext/search_tweaks/query_relevance/storage.py,sha256=TmeHbeL41Dp5bxN1eNXdb5KG7fNHoExHVnRs73kgz6A,4897
+ckanext/search_tweaks/spellcheck/__init__.py,sha256=Af3LHk9L82QtAh4q7C3srzCwJiF6WCtxe4CFTPKhFMQ,1401
+ckanext/search_tweaks/spellcheck/cli.py,sha256=X1HAXhElqJ6Hrc30USxXG50F-1RS0uvxP2tr3S6jnK0,250
+ckanext/search_tweaks/spellcheck/helpers.py,sha256=RXVVFRaJmyAJ7-A3Tp6tsnxPI646mkowWUoZTVnVFRw,4327
+ckanext/search_tweaks/spellcheck/plugin.py,sha256=lKRNAl5V9REnjTNOhC9e4AfGLAw3wm3oQTwjS8hGofY,592
+ckanext/search_tweaks/spellcheck/templates/search_tweaks/did_you_mean.html,sha256=5IAoogXrnYb8KecOLaPKQUerYCwkbEP5SQVjekeduHM,654
+ckanext/search_tweaks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ckanext/search_tweaks/tests/conftest.py,sha256=Moxwo1WE8Yl6su50C7bqG6IEH3t38UW4PtfHe1SiiAk,662
+ckanext/search_tweaks/tests/test_plugin.py,sha256=ScRWCNf0n_mpiP0rJlwygXhjb1ACNImH0qFItFsq_ac,4713
+ckanext/search_tweaks/tests/query_relevance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ckanext/search_tweaks/tests/query_relevance/test_plugin.py,sha256=RBraEO6_LMvHx9ekDz_h8LgtpEJV8BkR3q-9QotRGWA,2196
+ckanext/search_tweaks/tests/query_relevance/test_score.py,sha256=RwG_o8QyW3BZBx3J5Cs1UUkMHi0DGR-mWvlSlk3ibaU,1140
+ckanext/search_tweaks/tests/query_relevance/test_storage.py,sha256=xBHB69zHE301mHlUB2hz0RXJaqFrhRMesAz2LNYNFE0,2825
+ckanext/search_tweaks/tests/spellcheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ckanext/search_tweaks/tests/spellcheck/test_plugin.py,sha256=9xH8dVFJzJarduKJ5yqJguoJ1EVE2-CpwoVCwvCkxBI,2523
+ckanext_search_tweaks-0.6.0.dist-info/LICENSE,sha256=2lWcRAHjsQhqavGNnR30Ymxq3GJ9BaYL_dnfGO_-WFA,34500
+ckanext_search_tweaks-0.6.0.dist-info/METADATA,sha256=_u5GGldZYOUPYIf1U499o37A6ELhDzx7epss-wKTTJk,12097
+ckanext_search_tweaks-0.6.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+ckanext_search_tweaks-0.6.0.dist-info/entry_points.txt,sha256=0hvD0BILJCAPZBOTH28bAMN8XCbPrltTZ6Q8-mUZGyE,615
+ckanext_search_tweaks-0.6.0.dist-info/namespace_packages.txt,sha256=5yjNwq-s42weaiMMUuA5lZ45g99ANsfcRBCvac1JMS4,8
+ckanext_search_tweaks-0.6.0.dist-info/top_level.txt,sha256=5yjNwq-s42weaiMMUuA5lZ45g99ANsfcRBCvac1JMS4,8
+ckanext_search_tweaks-0.6.0.dist-info/RECORD,,

{ckanext_search_tweaks-0.5.0.dist-info → ckanext_search_tweaks-0.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.41.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{ckanext_search_tweaks-0.5.0.dist-info → ckanext_search_tweaks-0.6.0.dist-info}/entry_points.txt

@@ -5,5 +5,6 @@ ckan = ckan.lib.extract:extract_ckan
 search_tweaks = ckanext.search_tweaks.plugin:SearchTweaksPlugin
 search_tweaks_advanced_search = ckanext.search_tweaks.advanced_search.plugin:AdvancedSearchPlugin
 search_tweaks_field_relevance = ckanext.search_tweaks.field_relevance.plugin:FieldRelevancePlugin
+search_tweaks_query_popularity = ckanext.search_tweaks.query_popularity.plugin:QueryPopularityPlugin
 search_tweaks_query_relevance = ckanext.search_tweaks.query_relevance.plugin:QueryRelevancePlugin
 search_tweaks_spellcheck = ckanext.search_tweaks.spellcheck.plugin:SpellcheckPlugin

ckanext_search_tweaks-0.5.0.dist-info/RECORD

@@ -1,43 +0,0 @@
-ckanext_search_tweaks-0.5.0-py3.8-nspkg.pth,sha256=VaH--vNo0_vzXvZAeqyq-Bg6m47pBBRlxwvBj0KQxe0,544
-ckanext/search_tweaks/__init__.py,sha256=QV056AUS7hxxePRrjiz96aHaq49AzuQO_egEJlO9jac,518
-ckanext/search_tweaks/cli.py,sha256=bCpM8hSfVqFwSEKS-o-1AnOOLKtL7_GY3LrFsKG3GWo,321
-ckanext/search_tweaks/interfaces.py,sha256=4WMScIihbFJ0DYAW0SAk02q6f7V4NmSyfMqm9xvb4is,715
-ckanext/search_tweaks/plugin.py,sha256=dy_1v5ozdpxXZrzb6szZ9sfajEvdTgtqibvCBz3xQAM,4035
-ckanext/search_tweaks/advanced_search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ckanext/search_tweaks/advanced_search/plugin.py,sha256=KZ9ApIxnzpzaewxxqJN-omOe41aNCJ0q3iu-oti7EWg,3231
-ckanext/search_tweaks/advanced_search/assets/advanced-search.css,sha256=KlBYOihUJepiu2iiGcRjIWZltogEqI8iGbO-28Wgnqw,584
-ckanext/search_tweaks/advanced_search/assets/advanced-search.js,sha256=rkgprbv9fUnWoxgISXmoxHkSC4Z9OLXgZoOIICpn9X8,2328
-ckanext/search_tweaks/advanced_search/assets/webassets.yml,sha256=g0NMsLyHzslxtkIXRFj_Vf-SU6b8MYlBiuHc50SQiAo,439
-ckanext/search_tweaks/advanced_search/templates/advanced_search/search_form.html,sha256=QlKCxEUDGP1g4oZEOKAGSuopjrJsbcgK2cs28k3X4Vc,4266
-ckanext/search_tweaks/field_relevance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ckanext/search_tweaks/field_relevance/plugin.py,sha256=tbpZMSBL4Q1L05o-3OIyzmLDipmYcsHLF16vYz_KC9A,1380
-ckanext/search_tweaks/field_relevance/views.py,sha256=ztKoYranaOsnD2mTxNd_76XOmjh0eGmD58_tiZvLAzs,3225
-ckanext/search_tweaks/field_relevance/assets/search-tweaks-reflect-range-in-label.js,sha256=WFAzPBvzf6SWaEAQJTxiEGhZm-65o676MN6KttCpvbo,490
-ckanext/search_tweaks/field_relevance/assets/webassets.yml,sha256=PGr_EC4jOTABCRc3JCIAqYCzCMNgGG1KYE6Ua0S0vfk,184
-ckanext/search_tweaks/field_relevance/templates/search_tweaks/field_relevance/promote.html,sha256=uqB9Wf7OJzF3-Ep6VZwe3bYICdzy0JhJPJzNPuMLBr0,1118
-ckanext/search_tweaks/query_relevance/__init__.py,sha256=IGFf-mSZmnrODNKeF38rpi8g3Twkn9M60JLu1DtJn4s,1498
-ckanext/search_tweaks/query_relevance/cli.py,sha256=7wU3nWdCQNaUi2O_zARy7usvUysE-wnp5h_yRlw7nAo,2576
-ckanext/search_tweaks/query_relevance/plugin.py,sha256=YX6ZL8qOXj5lZEOswEnH4h6hG2wP6hRgrWhwTwYMpJg,2352
-ckanext/search_tweaks/query_relevance/score.py,sha256=aMBRFwmgEXfabqECC0UdcOEsT0KDAURekEmxLPBBAG8,1810
-ckanext/search_tweaks/query_relevance/storage.py,sha256=fogpPGkvzZPmLaoWivqel58cDrm2lrc8rDVhHD4e564,5020
-ckanext/search_tweaks/spellcheck/__init__.py,sha256=Af3LHk9L82QtAh4q7C3srzCwJiF6WCtxe4CFTPKhFMQ,1401
-ckanext/search_tweaks/spellcheck/cli.py,sha256=X1HAXhElqJ6Hrc30USxXG50F-1RS0uvxP2tr3S6jnK0,250
-ckanext/search_tweaks/spellcheck/helpers.py,sha256=IHXCcMA2-L-pYrIsKlk3-6C1EiMnVlvCGWjwe-s5U30,4334
-ckanext/search_tweaks/spellcheck/plugin.py,sha256=96lgsi3kIcisGO3-S_dOpO09kP5GdSSNW7ihw7k0hUQ,572
-ckanext/search_tweaks/spellcheck/templates/search_tweaks/did_you_mean.html,sha256=5IAoogXrnYb8KecOLaPKQUerYCwkbEP5SQVjekeduHM,654
-ckanext/search_tweaks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ckanext/search_tweaks/tests/conftest.py,sha256=Moxwo1WE8Yl6su50C7bqG6IEH3t38UW4PtfHe1SiiAk,662
-ckanext/search_tweaks/tests/test_plugin.py,sha256=YThTfG7LAL9ArWNJr9WnohwJPjxVMxfBhctkDO-ELe0,4657
-ckanext/search_tweaks/tests/query_relevance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ckanext/search_tweaks/tests/query_relevance/test_plugin.py,sha256=RBraEO6_LMvHx9ekDz_h8LgtpEJV8BkR3q-9QotRGWA,2196
-ckanext/search_tweaks/tests/query_relevance/test_score.py,sha256=RwG_o8QyW3BZBx3J5Cs1UUkMHi0DGR-mWvlSlk3ibaU,1140
-ckanext/search_tweaks/tests/query_relevance/test_storage.py,sha256=wejUroQ4JBgVKl3qhyV-flZgbn2MTEpuG_JMPAQJ070,2821
-ckanext/search_tweaks/tests/spellcheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ckanext/search_tweaks/tests/spellcheck/test_plugin.py,sha256=l7qjneS9OUFkxmQ3lQ6tK3GUBOsWs1EUPi_0eHDtCW0,2521
-ckanext_search_tweaks-0.5.0.dist-info/LICENSE,sha256=2lWcRAHjsQhqavGNnR30Ymxq3GJ9BaYL_dnfGO_-WFA,34500
-ckanext_search_tweaks-0.5.0.dist-info/METADATA,sha256=acPRcnjKX4wimsGoga-arsLwbvJWInLRCUeNqVBPgL0,12011
-ckanext_search_tweaks-0.5.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-ckanext_search_tweaks-0.5.0.dist-info/entry_points.txt,sha256=DSz84tCLzsoC4WxH6ObJNDpgJMgBHDdev5YRBgbj6bo,514
-ckanext_search_tweaks-0.5.0.dist-info/namespace_packages.txt,sha256=5yjNwq-s42weaiMMUuA5lZ45g99ANsfcRBCvac1JMS4,8
-ckanext_search_tweaks-0.5.0.dist-info/top_level.txt,sha256=5yjNwq-s42weaiMMUuA5lZ45g99ANsfcRBCvac1JMS4,8
-ckanext_search_tweaks-0.5.0.dist-info/RECORD,,