linting

Author: reekitconcept

backend/pyproject.toml

@@ -148,6 +148,8 @@ lint.select = [
 lint.ignore = [
     # DoNotAssignLambda
     "E731",
+    # Function complexity
+    "C901",
 ]
 
 [tool.ruff.lint.isort]

backend/src/kitconcept/solr/services/solr_highlighting_utils.py

@@ -5,14 +5,11 @@ class SolrHighlightingUtils:
 
     def __init__(self, solr_config):
         highlightingFields = solr_config.config.get("highlightingFields", [])
-        self.fields = list(map(lambda field: field["field"], highlightingFields))
+        self.fields = [field["field"] for field in highlightingFields]
         self.enabled = len(self.fields) > 0
-        self.propByField = dict(
-            map(
-                lambda field: (field["field"], field["prop"]),
-                highlightingFields,
-            )
-        )
+        self.propByField = {
+            field["field"]: field["prop"] for field in highlightingFields
+        }
 
     def enhance_items(self, items: list, highlighting: dict):
         if self.enabled:

backend/src/kitconcept/solr/services/solr_utils_extra.py

@@ -76,12 +76,14 @@ def query_list(self):
                 keys = set(condition.keys())
                 if not keys.issubset({"in"}):
                     raise RuntimeError(
-                        f"invalid keys in options for condition 'string', supported: 'in' [{keys}]"
+                        "invalid keys in options for condition 'string', "
+                        f"supported: 'in' [{keys}]"
                     )
                 if "in" in condition:
                     if type(condition["in"]) is not list:
                         raise RuntimeError(
-                            f"invalid type for condition 'string' [{type(condition['in'])}]"
+                            "invalid type for condition 'string' "
+                            f"[{type(condition['in'])}]"
                         )
                     if len(condition["in"]) == 0:
                         # Empty list, ignore
@@ -90,12 +92,7 @@ def query_list(self):
                     result += (
                         "("
                         + " OR ".join(
-                            list(
-                                map(
-                                    lambda term: replace_reserved(term),
-                                    condition["in"],
-                                )
-                            )
+                            [replace_reserved(term) for term in condition["in"]]
                         )
                         + ")"
                     )

backend/src/kitconcept/solr/services/suggest.py

@@ -40,12 +40,17 @@ def query_suggest(self, query):
         term = f"({escape(replace_reserved(query))})" if query else "*"
         d = {
             "q": (
-                f"+suggest:{term}^10 OR +suggest_ngram:{term} OR +searchwords:{term}^1000 OR +suggest_searchwords_ngram:{term}"
+                f"+suggest:{term}^10 OR +suggest_ngram:{term} "
+                f"OR +searchwords:{term}^1000 OR +suggest_searchwords_ngram:{term}"
             ),
             "fq": [
                 security_filter(),
                 "-showinsearch:False",
-                "-portal_type:Image -portal_type:Glossary -portal_type:FAQ -portal_type:(FAQ Item) -portal_type:(FAQ Category) -portal_type:Link",
+                (
+                    "-portal_type:Image -portal_type:Glossary -portal_type:FAQ "
+                    "-portal_type:(FAQ Item) -portal_type:(FAQ Category) "
+                    "-portal_type:Link"
+                ),
             ],
             "defType": "lucene",
         }
@@ -55,7 +60,7 @@ def query_suggest(self, query):
 
         d["fq"] = " AND ".join(d["fq"])
         querystring = urllib.parse.urlencode(d)
-        url = "{}/{}".format(connection.solrBase, "suggest?%s" % querystring)
+        url = "{}/{}".format(connection.solrBase, f"suggest?{querystring}")
         try:
             res = connection.doGet(url, {"Accept": "application/json"})
             data = json.loads(res.read())

backend/tests/services/extra_conditions/test_extra_conditions.py

@@ -1,6 +1,7 @@
 import base64
 import json
 import pytest
+from typing import ClassVar
 
 
 def encoded(o):
@@ -124,7 +125,7 @@ def test_paths(self, all_path_string, path: str, expected: bool):
 
 
 class TestExtraConditionsDateGe(TestEndpointCustom):
-    extra_conditions = [
+    extra_conditions: ClassVar[list] = [
         [
             "start",
             "date-range",
@@ -167,7 +168,7 @@ def test_paths(self, all_path_string, path: str, expected: bool):
 
 
 class TestExtraConditionsDateLe(TestEndpointCustom):
-    extra_conditions = [
+    extra_conditions: ClassVar[list] = [
         [
             "start",
             "date-range",
@@ -210,7 +211,7 @@ def test_paths(self, all_path_string, path: str, expected: bool):
 
 
 class TestExtraConditionsDateGeLe(TestEndpointCustom):
-    extra_conditions = [
+    extra_conditions: ClassVar[list] = [
         [
             "start",
             "date-range",
@@ -253,7 +254,7 @@ def test_paths(self, all_path_string, path: str, expected: bool):
 
 
 class TestExtraConditionsDateGrLs(TestEndpointCustom):
-    extra_conditions = [
+    extra_conditions: ClassVar[list] = [
         [
             "start",
             "date-range",
@@ -296,7 +297,7 @@ def test_paths(self, all_path_string, path: str, expected: bool):
 
 
 class TestExtraConditionsStringInSingleTerm(TestEndpointCustom):
-    extra_conditions = [
+    extra_conditions: ClassVar[list] = [
         [
             "searchwords",
             "string",
@@ -327,7 +328,7 @@ def test_paths(self, all_path_string, path: str, expected: bool):
 
 
 class TestExtraConditionsStringInSingleTerm2(TestEndpointCustom):
-    extra_conditions = [
+    extra_conditions: ClassVar[list] = [
         [
             "searchwords",
             "string",
@@ -358,7 +359,7 @@ def test_paths(self, all_path_string, path: str, expected: bool):
 
 
 class TestExtraConditionsStringInMultipleTerms(TestEndpointCustom):
-    extra_conditions = [
+    extra_conditions: ClassVar[list] = [
         [
             "searchwords",
             "string",
@@ -389,7 +390,7 @@ def test_paths(self, all_path_string, path: str, expected: bool):
 
 
 class TestExtraConditionsStringInNoTerms(TestEndpointCustom):
-    extra_conditions = [
+    extra_conditions: ClassVar[list] = [
         [
             "searchwords",
             "string",

backend/tests/services/highlighting/conftest.py

@@ -1,10 +1,9 @@
-from typing import List
 
 import pytest
 
 
 @pytest.fixture
-def contents() -> List:
+def contents() -> list:
     """Content to be created."""
     return [
         {

backend/tests/services/suggest/test_suggest.py

@@ -1,5 +1,6 @@
 import pytest
 import urllib.parse
+from typing import ClassVar
 
 
 class TestSuggestDefault:
@@ -40,7 +41,7 @@ def func(data, index: int) -> dict:
 
 class TestSuggestDefaultBaseSearch(TestSuggestDefault):
     url = "/@solr-suggest?query=chomsky"
-    expected_result = [
+    expected_result: ClassVar[list] = [
         {
             "@id": "http://localhost:59793/plone/mydocument",
             "@type": "Document",