ckanext-search-tweaks 0.6.0a1__tar.gz → 0.6.1.post1__tar.gz

{ckanext-search-tweaks-0.6.0a1/ckanext_search_tweaks.egg-info → ckanext_search_tweaks-0.6.1.post1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: ckanext-search-tweaks
-Version: 0.6.0a1
-Home-page: https://github.com/DataShades/ckanext-search-tweaks
-Author: Sergey Motornyuk
-Author-email: sergey.motornyuk@linkdigital.com.au
+Version: 0.6.1.post1
+Author-email: DataShades <datashades@linkdigital.com.au>, Sergey Motornyuk <sergey.motornyuk@linkdigital.com.au>
+Maintainer-email: DataShades <datashades@linkdigital.com.au>
 License: AGPL
+Project-URL: Homepage, https://github.com/DataShades/ckanext-search-tweaks
 Keywords: CKAN
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
@@ -15,6 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: freezegun
 Requires-Dist: typing_extensions>=4.0.0
+Requires-Dist: ckanext-toolbelt>=0.4.11
 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.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/advanced_search/plugin.py

@@ -72,10 +72,10 @@ class AdvancedSearchPlugin(p.SingletonPlugin):
     def configure(self, config):
         try:
             from ckanext.composite_search.interfaces import ICompositeSearch
-        except ImportError:
-            raise CkanConfigurationException(
-                "ckanext-composite-search is not installed",
-            )
+        except ImportError as err:
+            msg = "ckanext-composite-search is not installed"
+            raise CkanConfigurationException(msg) from err
+
         if not p.plugin_loaded("composite_search"):
             msg = "Advanced search requires `composite_search` plugin"
             raise CkanConfigurationException(msg)

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/field_relevance/plugin.py

@@ -5,8 +5,9 @@ from typing import Any
 import ckan.plugins as p
 import ckan.plugins.toolkit as tk
 
-from ckanext.search_tweaks import feature_disabled
 from ckanext.search_tweaks.interfaces import ISearchTweaks
+from ckanext.search_tweaks.shared import feature_disabled
+
 from . import views
 
 CONFIG_BOOST_FN = "ckanext.search_tweaks.field_relevance.boost_function"

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/plugin.py

@@ -5,8 +5,10 @@ from typing import Any
 
 import ckan.plugins as plugins
 import ckan.plugins.toolkit as tk
-from . import feature_disabled, config
+
+from . import config
 from .interfaces import ISearchTweaks
+from .shared import feature_disabled
 
 log = logging.getLogger(__name__)
 CONFIG_PREFER_BOOST = "ckanext.search_tweaks.common.prefer_boost"
@@ -74,10 +76,7 @@ def _set_qf(search_params: dict[str, Any]) -> None:
 
 
 def _set_fuzzy(search_params: dict[str, Any]) -> None:
-    if not config.fuzzy():
-        return
-
-    if feature_disabled("fuzzy", search_params):
+    if not config.fuzzy() or feature_disabled("fuzzy", search_params):
         return
 
     distance = _get_fuzzy_distance()
@@ -93,9 +92,9 @@ def _set_fuzzy(search_params: dict[str, Any]) -> None:
 
     fuzzy_q = " ".join(
         map(
-            lambda s: f"{s}~{distance}"
-            if s.isalpha() and s not in ("AND", "OR", "TO")
-            else s,
+            lambda s: (
+                f"{s}~{distance}" if s.isalpha() and s not in ("AND", "OR", "TO") else s
+            ),
             q.split(),
         ),
     )

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/query_popularity/logic/action.py

@@ -1,14 +1,20 @@
 from __future__ import annotations
+
 from typing import Any
-from ckan import types
+
 import ckan.plugins.toolkit as tk
+from ckan import types
+from ckan.logic import validate
 
 from ckanext.search_tweaks.query_popularity.score import Score
 
+from . import schema
+
 
 @tk.side_effect_free
 def search_tweaks_query_popularity_list(
-    context: types.Context, data_dict: dict[str, Any]
+    context: types.Context,
+    data_dict: dict[str, Any],
 ) -> list[dict[str, Any]]:
     score = Score()
 
@@ -22,17 +28,32 @@ def search_tweaks_query_popularity_list(
 
 @tk.side_effect_free
 def search_tweaks_query_popularity_export(
-    context: types.Context, data_dict: dict[str, Any]
+    context: types.Context,
+    data_dict: dict[str, Any],
+) -> list[Any]:
+    score = Score()
+
+    return score.export()
+
+
+@validate(schema.query_popularity_import)
+def search_tweaks_query_popularity_import(
+    context: types.Context,
+    data_dict: dict[str, Any],
 ) -> dict[str, Any]:
+    tk.check_access("sysadmin", context, data_dict)
     score = Score()
 
-    results = score.export()
-    return {"results": results, "count": len(results)}
+    if tk.asbool(data_dict.get("reset")):
+        score.reset()
+    score.restore(data_dict["snapshot"])
+    score.refresh()
+    return {"success": True}
 
 
-@tk.side_effect_free
 def search_tweaks_query_popularity_ignore(
-    context: types.Context, data_dict: dict[str, Any]
+    context: types.Context,
+    data_dict: dict[str, Any],
 ):
     q = tk.get_or_bust(data_dict, "q")
     score = Score()

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/query_popularity/logic/auth.py

@@ -1,23 +1,27 @@
 from __future__ import annotations
+
 from typing import Any
-from ckan import types
 
+from ckan import types
 from ckan.authz import is_authorized
 
 
 def search_tweaks_query_popularity_list(
-    context: types.Context, data_dict: dict[str, Any]
+    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]
+    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]
+    context: types.Context,
+    data_dict: dict[str, Any],
 ) -> types.AuthResult:
     return is_authorized("sysadmin", context, data_dict)

ckanext_search_tweaks-0.6.1.post1/ckanext/search_tweaks/query_popularity/logic/schema.py

@@ -0,0 +1,10 @@
+from __future__ import annotations
+
+from ckan.logic.schema import validator_args
+
+@validator_args
+def query_popularity_import(not_empty, boolean_validator, convert_to_json_if_string):
+    return {
+        "snapshot": [not_empty, convert_to_json_if_string],
+        "reset": [boolean_validator],
+    }

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/query_popularity/plugin.py

@@ -1,8 +1,12 @@
 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
 
 
@@ -16,12 +20,16 @@ class QueryPopularityPlugin(p.SingletonPlugin):
 
     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(
+        if (
+            bp
+            and view
+            and f"{bp}.{view}" in config.tracked_endpoints()
+            and not any(
                 plugin.skip_query_popularity(params)
                 for plugin in p.PluginImplementations(IQueryPopularity)
-            ):
-                self.score.save(params["q"])
+            )
+        ):
+            self.score.hit(params["q"].strip())
 
         return results
 
@@ -40,8 +48,4 @@ class QueryPopularityPlugin(p.SingletonPlugin):
 
         terms = config.ignored_terms()
 
-        for term in terms:
-            if term in q:
-                return True
-
-        return False
+        return any(term in q for term in terms)

ckanext_search_tweaks-0.6.1.post1/ckanext/search_tweaks/query_popularity/score.py

@@ -0,0 +1,46 @@
+from __future__ import annotations
+
+import logging
+from typing import Any, Iterable
+
+from ckanext.toolbelt.utils.tracking import DateTracker
+
+from . import config
+
+log = logging.getLogger(__name__)
+connect_to_redis: Any
+
+
+class Score:
+    def __init__(self):
+        self.track = DateTracker(
+            "search_tweaks:qp",
+            throttling_time=config.throttle(),
+            max_age=config.max_age(),
+            obsoletion_period=config.obsoletion_period(),
+            personalized=True,
+        )
+
+    def export(self):
+        return self.track.snapshot()
+
+    def restore(self, snapshot: Any):
+        return self.track.restore(snapshot)
+
+    def hit(self, q: str):
+        self.track.hit(q)
+
+    def refresh(self):
+        self.track.refresh()
+
+    def stats(self, num: int) -> Iterable[dict[str, str | float]]:
+        return self.track.most_common(num)
+
+    def drop(self, q: str):
+        self.track.drop(q)
+
+    def reset(self):
+        self.track.reset()
+
+    def ignore(self, q: str):
+        self.track.ignore(self.track.hash(q))

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/query_relevance/plugin.py

@@ -6,9 +6,10 @@ from typing import Any
 import ckan.plugins as plugins
 import ckan.plugins.toolkit as tk
 
-from ckanext.search_tweaks import feature_disabled
 from ckanext.search_tweaks.cli import attach_relevance_command
 from ckanext.search_tweaks.interfaces import ISearchTweaks
+from ckanext.search_tweaks.shared import feature_disabled
+
 from . import QueryScore, cli, normalize_query, update_score_by_url
 
 CONFIG_BOOST_STRING = "ckanext.search_tweaks.query_relevance.boost_function"

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/query_relevance/storage.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
-from abc import ABC, abstractclassmethod, abstractmethod
+
+from abc import ABC, abstractmethod
 from datetime import date, timedelta
-from typing import Any, Iterable, cast, Tuple
+from typing import Any, Iterable, Tuple, cast
 
 import ckan.plugins.toolkit as tk
-from ckan.lib.redis import connect_to_redis, Redis
+from ckan.lib.redis import Redis, connect_to_redis
 
 CONFIG_DAILY_AGE = "ckanext.search_tweaks.query_relevance.daily.age"
 DEFAULT_DAILY_AGE = 90
@@ -36,13 +37,13 @@ class ScoreStorage(ABC):
         ...
 
     @classmethod
-    @abstractclassmethod
+    @abstractmethod
     def scan(cls, id_: str | None = None) -> Iterable[ScanItem]:
         """Get all the scores."""
         ...
 
     @classmethod
-    @abstractclassmethod
+    @abstractmethod
     def reset_storage(cls):
         """Remove everything from storage."""
         ...
@@ -53,6 +54,7 @@ class ScoreStorage(ABC):
 
     def align(self) -> None:
         """Make some cleanup in order to maintain fast and correct value."""
+        return
 
 
 class RedisScoreStorage(ScoreStorage):
@@ -80,8 +82,7 @@ class RedisScoreStorage(ScoreStorage):
             conn.delete(key)
 
     @abstractmethod
-    def _key(self) -> str:
-        ...
+    def _key(self) -> str: ...
 
     def reset(self):
         self.conn.delete(self._key())
@@ -135,8 +136,7 @@ class DailyRedisScoreStorage(RedisScoreStorage):
     def get(self) -> int:
         key = self._key()
         values = self.conn.zrange(key, 0, -1, withscores=True)
-        total = self._total(values)
-        return total
+        return self._total(values)
 
     @staticmethod
     def _total(values: list[tuple[Any, Any]]) -> int:

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/spellcheck/helpers.py

@@ -24,7 +24,9 @@ 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.
 
@@ -71,7 +73,11 @@ 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)

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/tests/spellcheck/test_plugin.py

@@ -44,8 +44,8 @@ class TestHelper:
         Dataset(title="Do not touch me")
         helper = tk.h.spellcheck_did_you_mean
         rebuild_dictionary()
-        assert helper("pick thes") == ["pick test"]
-        assert helper("do nat touc me") == ["do not touch me"]
+        assert helper("pick thes") == ["pick this"]
+        assert helper("do nat touc") == ["do not touch"]
 
         assert helper("pic", 3) == [
             "pick",

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext/search_tweaks/tests/test_plugin.py

@@ -3,7 +3,6 @@ import pytest
 import ckan.lib.search.query as query
 import ckan.plugins as p
 
-import ckanext.search_tweaks.plugin as plugin
 import ckanext.search_tweaks.config as config
 from ckanext.search_tweaks.config import CONFIG_PREFER_BOOST
 
@@ -76,7 +75,11 @@ class TestFuzzy:
     @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, config.CONFIG_FUZZY_DISTANCE, distance)
         assert search(q="")["q"] == "*:*"
@@ -89,7 +92,11 @@ class TestFuzzy:
     @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, config.CONFIG_FUZZY_DISTANCE, distance)
         assert search()["q"] == "*:*"
@@ -101,7 +108,11 @@ class TestFuzzy:
     @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, config.CONFIG_FUZZY_DISTANCE, distance)
         assert search()["q"] == "*:*"

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1/ckanext_search_tweaks.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: ckanext-search-tweaks
-Version: 0.6.0a1
-Home-page: https://github.com/DataShades/ckanext-search-tweaks
-Author: Sergey Motornyuk
-Author-email: sergey.motornyuk@linkdigital.com.au
+Version: 0.6.1.post1
+Author-email: DataShades <datashades@linkdigital.com.au>, Sergey Motornyuk <sergey.motornyuk@linkdigital.com.au>
+Maintainer-email: DataShades <datashades@linkdigital.com.au>
 License: AGPL
+Project-URL: Homepage, https://github.com/DataShades/ckanext-search-tweaks
 Keywords: CKAN
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
@@ -15,6 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: freezegun
 Requires-Dist: typing_extensions>=4.0.0
+Requires-Dist: ckanext-toolbelt>=0.4.11
 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.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext_search_tweaks.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ ckanext/search_tweaks/query_popularity/score.py
 ckanext/search_tweaks/query_popularity/logic/__init__.py
 ckanext/search_tweaks/query_popularity/logic/action.py
 ckanext/search_tweaks/query_popularity/logic/auth.py
+ckanext/search_tweaks/query_popularity/logic/schema.py
 ckanext/search_tweaks/query_relevance/__init__.py
 ckanext/search_tweaks/query_relevance/cli.py
 ckanext/search_tweaks/query_relevance/plugin.py
@@ -54,6 +55,5 @@ ckanext_search_tweaks.egg-info/PKG-INFO
 ckanext_search_tweaks.egg-info/SOURCES.txt
 ckanext_search_tweaks.egg-info/dependency_links.txt
 ckanext_search_tweaks.egg-info/entry_points.txt
-ckanext_search_tweaks.egg-info/namespace_packages.txt
 ckanext_search_tweaks.egg-info/requires.txt
 ckanext_search_tweaks.egg-info/top_level.txt

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext_search_tweaks.egg-info/requires.txt

@@ -1,4 +1,5 @@
 freezegun
 typing_extensions>=4.0.0
+ckanext-toolbelt>=0.4.11
 
 [advanced-search]

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/ckanext_search_tweaks.egg-info/top_level.txt

@@ -1 +1,2 @@
 ckanext
+dist

{ckanext-search-tweaks-0.6.0a1 → ckanext_search_tweaks-0.6.1.post1}/pyproject.toml

@@ -1,9 +1,57 @@
+[build-system]
+requires = [ "setuptools",]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "ckanext-search-tweaks"
+version = "0.6.1.post1"
+description = ""
+classifiers = [ "Development Status :: 4 - Beta", "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10",]
+keywords = [ "CKAN",]
+dependencies = [ "freezegun", "typing_extensions>=4.0.0", "ckanext-toolbelt>=0.4.11",]
+authors = [
+    {name = "DataShades", email = "datashades@linkdigital.com.au"},
+    {name = "Sergey Motornyuk", email = "sergey.motornyuk@linkdigital.com.au"},
+]
+maintainers = [
+    {name = "DataShades", email = "datashades@linkdigital.com.au"},
+]
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.license]
+text = "AGPL"
+
+[project.urls]
+Homepage = "https://github.com/DataShades/ckanext-search-tweaks"
+
+[project.optional-dependencies]
+advanced-search = []
+
+[project.entry-points."ckan.plugins"]
+search_tweaks = "ckanext.search_tweaks.plugin:SearchTweaksPlugin"
+search_tweaks_query_relevance = "ckanext.search_tweaks.query_relevance.plugin:QueryRelevancePlugin"
+search_tweaks_field_relevance = "ckanext.search_tweaks.field_relevance.plugin:FieldRelevancePlugin"
+search_tweaks_spellcheck = "ckanext.search_tweaks.spellcheck.plugin:SpellcheckPlugin"
+search_tweaks_advanced_search = "ckanext.search_tweaks.advanced_search.plugin:AdvancedSearchPlugin"
+search_tweaks_query_popularity = "ckanext.search_tweaks.query_popularity.plugin:QueryPopularityPlugin"
+
+[project.entry-points."babel.extractors"]
+ckan = "ckan.lib.extract:extract_ckan"
+
+[tool.setuptools.packages]
+find = {}
+
 [tool.black]
 # line-length = 88
 # preview = true
 
 [tool.ruff]
 target-version = "py38"
+
+[tool.ruff.lint]
 select = [
        "B",  # likely bugs and design problems
        "BLE",  # do not catch blind exception
@@ -34,11 +82,8 @@ ignore = [
        # "PLC1901", # simplify comparison to empty string: violated by SQLAlchemy filters
 ]
 
-[tool.ruff.per-file-ignores]
-"ckanext/search-tweaks/tests*" = [
-                         "S",  # security testing
-                         "PLR2004" # magic value used in comparison
-]
+[tool.ruff.lint.per-file-ignores]
+"ckanext/search_tweaks/tests*" = ["S", "PL"]
 
 [tool.isort]
 known_ckan = "ckan"

ckanext_search_tweaks-0.6.1.post1/setup.cfg

@@ -0,0 +1,26 @@
+[extract_messages]
+keywords = translate isPlural
+add_comments = TRANSLATORS:
+output_file = ckanext/search_tweaks/i18n/ckanext-search_tweaks.pot
+width = 80
+
+[init_catalog]
+domain = ckanext-search_tweaks
+input_file = ckanext/search_tweaks/i18n/ckanext-search_tweaks.pot
+output_dir = ckanext/search_tweaks/i18n
+
+[update_catalog]
+domain = ckanext-search_tweaks
+input_file = ckanext/search_tweaks/i18n/ckanext-search_tweaks.pot
+output_dir = ckanext/search_tweaks/i18n
+previous = true
+
+[compile_catalog]
+domain = ckanext-search_tweaks
+directory = ckanext/search_tweaks/i18n
+statistics = true
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

ckanext-search-tweaks-0.6.0a1/ckanext/search_tweaks/__init__.py

@@ -1,3 +0,0 @@
-from __future__ import annotations
-
-from .shared import feature_disabled

ckanext-search-tweaks-0.6.0a1/ckanext/search_tweaks/query_popularity/score.py

@@ -1,165 +0,0 @@
-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-0.6.0a1/ckanext_search_tweaks.egg-info/namespace_packages.txt

@@ -1 +0,0 @@
-ckanext

ckanext-search-tweaks-0.6.0a1/setup.cfg

@@ -1,66 +0,0 @@
-[metadata]
-name = ckanext-search-tweaks
-version = 0.6.0a1
-description = 
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/DataShades/ckanext-search-tweaks
-author = Sergey Motornyuk
-author_email = sergey.motornyuk@linkdigital.com.au
-license = AGPL
-classifiers = 
-	Development Status :: 4 - Beta
-	License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
-	Programming Language :: Python :: 3.8
-	Programming Language :: Python :: 3.9
-	Programming Language :: Python :: 3.10
-keywords = CKAN
-
-[options]
-packages = find:
-namespace_packages = ckanext
-install_requires = 
-	freezegun
-	typing_extensions>=4.0.0
-include_package_data = True
-
-[options.entry_points]
-ckan.plugins = 
-	search_tweaks = ckanext.search_tweaks.plugin:SearchTweaksPlugin
-	search_tweaks_query_relevance = ckanext.search_tweaks.query_relevance.plugin:QueryRelevancePlugin
-	search_tweaks_field_relevance = ckanext.search_tweaks.field_relevance.plugin:FieldRelevancePlugin
-	search_tweaks_spellcheck = ckanext.search_tweaks.spellcheck.plugin:SpellcheckPlugin
-	search_tweaks_advanced_search = ckanext.search_tweaks.advanced_search.plugin:AdvancedSearchPlugin
-	search_tweaks_query_popularity = ckanext.search_tweaks.query_popularity.plugin:QueryPopularityPlugin
-babel.extractors = 
-	ckan = ckan.lib.extract:extract_ckan
-
-[options.extras_require]
-advanced-search = 
-
-[extract_messages]
-keywords = translate isPlural
-add_comments = TRANSLATORS:
-output_file = ckanext/search_tweaks/i18n/ckanext-search_tweaks.pot
-width = 80
-
-[init_catalog]
-domain = ckanext-search_tweaks
-input_file = ckanext/search_tweaks/i18n/ckanext-search_tweaks.pot
-output_dir = ckanext/search_tweaks/i18n
-
-[update_catalog]
-domain = ckanext-search_tweaks
-input_file = ckanext/search_tweaks/i18n/ckanext-search_tweaks.pot
-output_dir = ckanext/search_tweaks/i18n
-previous = true
-
-[compile_catalog]
-domain = ckanext-search_tweaks
-directory = ckanext/search_tweaks/i18n
-statistics = true
-
-[egg_info]
-tag_build = 
-tag_date = 0
-