pylint

Валенчиц Александр Александрович · Валенчиц Александр Александрович · commit 85fff6468aed · 2026-05-18T16:01:59.000+03:00
diff --git a/.cursor/scratchpad.md b/.cursor/scratchpad.md
@@ -1,5 +1,5 @@
 # Scratchpad
 
-PART 2: weight_fields/__all__, min_score+score+text, ASYNC_INDEXING+tasks, pgvector, OpenAI/Cohere embeddings, docs, tests.
+Pylint CI: `_parse_float_param` один return + `math.isnan`; `_stringify_numeric_param`; переносы строк в views; фикстуры через `fixture(name=...)` (W0621); pgvector/settings/tasks длина строк; `tasks.delete_instance_task` сигнатура.
 
-DONE
+DONE — `pylint $(git ls-files '*.py')` 10/10; pytest по затронутым модулям 16 passed. Полный pytest: 2 fail в `test_langgraph_search` (Searcher + LANGGRAPH), вне этого PR.
diff --git a/src/django_graph_search/backends/pgvector.py b/src/django_graph_search/backends/pgvector.py
@@ -160,7 +160,10 @@ def search(
         results: List[SearchResult] = []
         for row in rows:
             doc_id, metadata_raw, score = row
-            meta = metadata_raw if isinstance(metadata_raw, dict) else json.loads(metadata_raw or "{}")
+            if isinstance(metadata_raw, dict):
+                meta = metadata_raw
+            else:
+                meta = json.loads(metadata_raw or "{}")
             s = max(0.0, min(1.0, float(score)))
             results.append(SearchResult(id=str(doc_id), score=s, metadata=meta))
         return results
diff --git a/src/django_graph_search/permissions.py b/src/django_graph_search/permissions.py
@@ -185,8 +185,7 @@ def _parse_rate(rate: str) -> Tuple[int, float]:
             "minute": 60.0,
             "hour": 3600.0,
         }.get(unit, 60.0)
-        if num < 1:
-            num = 1
+        num = max(num, 1)
         return num, period
     except (ValueError, AttributeError):
         log.warning("Invalid THROTTLE_RATES entry %r — ignoring.", rate)
diff --git a/src/django_graph_search/settings.py b/src/django_graph_search/settings.py
@@ -361,7 +361,9 @@ def _build_async_indexing_config(payload: Dict[str, Any]) -> AsyncIndexingConfig
     merged = _merge_dicts(defaults, payload)
     backend = str(merged.get("BACKEND") or "celery").lower()
     if backend not in {"celery", "django_q", "thread"}:
-        raise ConfigurationError("ASYNC_INDEXING.BACKEND must be 'celery', 'django_q', or 'thread'.")
+        raise ConfigurationError(
+            "ASYNC_INDEXING.BACKEND must be 'celery', 'django_q', or 'thread'."
+        )
     task_path = merged.get("CELERY_TASK_PATH") or defaults["CELERY_TASK_PATH"]
     if not isinstance(task_path, str):
         raise ConfigurationError("ASYNC_INDEXING.CELERY_TASK_PATH must be a string.")
diff --git a/src/django_graph_search/tasks.py b/src/django_graph_search/tasks.py
@@ -121,9 +121,14 @@ def index_instance_task(app_label: str, model_name: str, pk: Any) -> None:  # ty
         )
         index_instance_task_fn(app_label, model_name, pk)
 
-    def delete_instance_task(app_label: str, model_name: str, pk: Any) -> None:  # type: ignore[misc]
+    def delete_instance_task(  # type: ignore[misc]
+        app_label: str, model_name: str, pk: Any
+    ) -> None:
         log.warning(
-            "Celery not installed. Falling back to sync delete index for %s.%s pk=%s",
+            (
+                "Celery not installed. Falling back to sync delete index "
+                "for %s.%s pk=%s"
+            ),
             app_label,
             model_name,
             pk,
diff --git a/src/django_graph_search/views.py b/src/django_graph_search/views.py
@@ -2,6 +2,7 @@
 
 import json
 import logging
+import math
 import queue
 import threading
 import uuid
@@ -87,47 +88,43 @@ def _parse_float_param(
     Returns:
         Кортеж ``(parsed, None)`` при успехе или ``(None, JsonResponse)`` при ошибке.
     """
+    bad = JsonResponse(
+        {"error": f"'{param_name}' must be a float between 0.0 and 1.0."},
+        status=400,
+    )
+    out: Optional[float] = None
+    err: Optional[JsonResponse] = None
+
     if value is None or value == "":
-        return default, None
-    if isinstance(value, bool):
-        return None, JsonResponse(
-            {"error": f"'{param_name}' must be a float between 0.0 and 1.0."},
-            status=400,
-        )
-    if isinstance(value, (int, float)):
-        parsed = float(value)
+        out = default
+    elif isinstance(value, bool):
+        err = bad
+    elif isinstance(value, (int, float)):
+        out = float(value)
     elif isinstance(value, str):
         stripped = value.strip()
         if not stripped:
-            return default, None
-        try:
-            parsed = float(stripped)
-        except ValueError:
-            return None, JsonResponse(
-                {"error": f"'{param_name}' must be a float between 0.0 and 1.0."},
-                status=400,
-            )
+            out = default
+        else:
+            try:
+                out = float(stripped)
+            except ValueError:
+                err = bad
     else:
-        return None, JsonResponse(
-            {"error": f"'{param_name}' must be a float between 0.0 and 1.0."},
-            status=400,
-        )
-    if parsed != parsed:  # NaN
-        return None, JsonResponse(
-            {"error": f"'{param_name}' must be a float between 0.0 and 1.0."},
-            status=400,
-        )
-    if min_value is not None and parsed < min_value:
-        return None, JsonResponse(
-            {"error": f"'{param_name}' must be a float between 0.0 and 1.0."},
-            status=400,
-        )
-    if max_value is not None and parsed > max_value:
-        return None, JsonResponse(
-            {"error": f"'{param_name}' must be a float between 0.0 and 1.0."},
-            status=400,
-        )
-    return parsed, None
+        err = bad
+
+    if err is None and out is not None:
+        if math.isnan(out):
+            err = bad
+            out = None
+        elif min_value is not None and out < min_value:
+            err = bad
+            out = None
+        elif max_value is not None and out > max_value:
+            err = bad
+            out = None
+
+    return out, err
 
 
 def _stringify_numeric_param(
@@ -144,31 +141,32 @@ def _stringify_numeric_param(
     Returns:
         ``(строка_цифр_или_None, None)`` либо ``(None, JsonResponse)``.
     """
-    if value is None or value == "":
-        return None, None
-    if isinstance(value, bool):
-        return None, JsonResponse(
-            {"error": f"'{param_name}' must be a positive integer."},
-            status=400,
-        )
-    if isinstance(value, int):
-        return str(value), None
-    if isinstance(value, float):
-        if not value.is_integer():
-            return None, JsonResponse(
-                {"error": f"'{param_name}' must be a positive integer."},
-                status=400,
-            )
-        return str(int(value)), None
-    if isinstance(value, str):
-        stripped = value.strip()
-        if not stripped:
-            return None, None
-        return stripped, None
-    return None, JsonResponse(
+    invalid = JsonResponse(
         {"error": f"'{param_name}' must be a positive integer."},
         status=400,
     )
+    out: Optional[str] = None
+    err: Optional[JsonResponse] = None
+
+    if value is None or value == "":
+        pass
+    elif isinstance(value, bool):
+        err = invalid
+    elif isinstance(value, int):
+        out = str(value)
+    elif isinstance(value, float):
+        if not value.is_integer():
+            err = invalid
+        else:
+            out = str(int(value))
+    elif isinstance(value, str):
+        stripped = value.strip()
+        if stripped:
+            out = stripped
+    else:
+        err = invalid
+
+    return out, err
 
 
 class SearchPermissionMixin:
@@ -442,10 +440,20 @@ class StreamingSearchAPIView(SearchPermissionMixin, View):
     marker.
     """
 
-    def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> StreamingHttpResponse | JsonResponse:
+    def get(
+        self,
+        request: HttpRequest,
+        *args: Any,
+        **kwargs: Any,
+    ) -> StreamingHttpResponse | JsonResponse:
         return self._handle(request)
 
-    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> StreamingHttpResponse | JsonResponse:
+    def post(
+        self,
+        request: HttpRequest,
+        *args: Any,
+        **kwargs: Any,
+    ) -> StreamingHttpResponse | JsonResponse:
         return self._handle(request)
 
     def _handle(self, request: HttpRequest) -> StreamingHttpResponse | JsonResponse:
@@ -557,12 +565,24 @@ def _extract_payload(request: HttpRequest) -> Dict[str, Any]:
 def _format_event(event: Dict[str, Any], fmt: str) -> bytes:
     payload = json.dumps(event, ensure_ascii=False, default=str)
     if fmt == "sse":
-        return f"event: {event.get('type', 'message')}\ndata: {payload}\n\n".encode("utf-8")
+        event_type = event.get("type", "message")
+        lines = (
+            f"event: {event_type}\n"
+            f"data: {payload}\n\n"
+        )
+        return lines.encode("utf-8")
     return (payload + "\n").encode("utf-8")
 
 
 class SimilarAPIView(View):
-    def get(self, request: HttpRequest, model: str, pk: str, *args: Any, **kwargs: Any) -> JsonResponse:
+    def get(
+        self,
+        request: HttpRequest,
+        model: str,
+        pk: str,
+        *args: Any,
+        **kwargs: Any,
+    ) -> JsonResponse:
         if "." not in model:
             return JsonResponse({"error": "Model must be in 'app.Model' format."}, status=400)
         app_label, model_name = model.split(".", 1)
diff --git a/tests/test_conversational.py b/tests/test_conversational.py
@@ -34,8 +34,8 @@ def _minimal_graph_search(extra: Dict[str, Any] | None = None) -> Dict[str, Any]
     return base
 
 
-@pytest.fixture
-def conv_settings():
+@pytest.fixture(name="apply_conv_settings")
+def _apply_conv_settings_fixture():
     original = getattr(django_settings, "GRAPH_SEARCH", None)
     original_debug = django_settings.DEBUG
     get_settings.cache_clear()
@@ -58,8 +58,8 @@ def _apply(payload: Dict[str, Any], *, debug: bool):
 
 
 @pytest.mark.django_db
-def test_inmemory_emits_runtime_warning_when_not_debug(conv_settings):
-    conv_settings(_minimal_graph_search(), debug=False)
+def test_inmemory_emits_runtime_warning_when_not_debug(apply_conv_settings):
+    apply_conv_settings(_minimal_graph_search(), debug=False)
     factory = RequestFactory()
     request = factory.post(
         "/api/search/conversation/",
@@ -78,8 +78,8 @@ def test_inmemory_emits_runtime_warning_when_not_debug(conv_settings):
 
 
 @pytest.mark.django_db
-def test_inmemory_no_warning_in_debug(conv_settings):
-    conv_settings(_minimal_graph_search(), debug=True)
+def test_inmemory_no_warning_in_debug(apply_conv_settings):
+    apply_conv_settings(_minimal_graph_search(), debug=True)
     factory = RequestFactory()
     request = factory.post(
         "/api/search/conversation/",
@@ -91,5 +91,10 @@ def test_inmemory_no_warning_in_debug(conv_settings):
         with mock.patch("django_graph_search.views.Searcher") as sc:
             sc.return_value.search.return_value = []
             ConversationalSearchAPIView.as_view()(request)
-    runtime = [w for w in wrec if issubclass(w.category, RuntimeWarning) and "inmemory" in str(w.message)]
+    runtime = [
+        w
+        for w in wrec
+        if issubclass(w.category, RuntimeWarning)
+        and "inmemory" in str(w.message)
+    ]
     assert not runtime
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
@@ -34,8 +34,8 @@ def _minimal_graph_search(extra: Dict[str, Any] | None = None) -> Dict[str, Any]
     return base
 
 
-@pytest.fixture
-def api_settings():
+@pytest.fixture(name="apply_api_settings")
+def _apply_api_settings_fixture():
     original = getattr(django_settings, "GRAPH_SEARCH", None)
     get_settings.cache_clear()
     SimpleScopedRateThrottle._windows.clear()
@@ -65,15 +65,15 @@ def allow_permission(request):
     return True
 
 
-def test_check_permissions_empty_allows(api_settings):
-    cfg = api_settings(_minimal_graph_search())
+def test_check_permissions_empty_allows(apply_api_settings):
+    cfg = apply_api_settings(_minimal_graph_search())
     factory = RequestFactory()
     request = factory.get("/api/search/", {"q": "x"})
     check_permissions(request, cfg)
 
 
-def test_check_permissions_callable_deny(api_settings):
-    cfg = api_settings(
+def test_check_permissions_callable_deny(apply_api_settings):
+    cfg = apply_api_settings(
         _minimal_graph_search(
             {"API": {"PERMISSION_CLASSES": ["tests.test_permissions.deny_permission"]}}
         )
@@ -84,8 +84,8 @@ def test_check_permissions_callable_deny(api_settings):
         check_permissions(request, cfg)
 
 
-def test_check_permissions_callable_allow(api_settings):
-    cfg = api_settings(
+def test_check_permissions_callable_allow(apply_api_settings):
+    cfg = apply_api_settings(
         _minimal_graph_search(
             {"API": {"PERMISSION_CLASSES": ["tests.test_permissions.allow_permission"]}}
         )
@@ -95,15 +95,15 @@ def test_check_permissions_callable_allow(api_settings):
     check_permissions(request, cfg)
 
 
-def test_check_throttle_skipped_when_no_classes(api_settings):
-    cfg = api_settings(_minimal_graph_search())
+def test_check_throttle_skipped_when_no_classes(apply_api_settings):
+    cfg = apply_api_settings(_minimal_graph_search())
     factory = RequestFactory()
     request = factory.get("/api/search/", {"q": "x"})
     check_throttle(request, cfg)
 
 
-def test_simple_scoped_throttle_blocks_second_request(api_settings):
-    cfg = api_settings(
+def test_simple_scoped_throttle_blocks_second_request(apply_api_settings):
+    cfg = apply_api_settings(
         _minimal_graph_search(
             {
                 "API": {
@@ -124,10 +124,10 @@ def test_simple_scoped_throttle_blocks_second_request(api_settings):
 
 
 @pytest.mark.django_db
-def test_search_api_view_returns_403_when_permission_denied(api_settings):
+def test_search_api_view_returns_403_when_permission_denied(apply_api_settings):
     from django_graph_search.views import SearchAPIView
 
-    api_settings(
+    apply_api_settings(
         _minimal_graph_search(
             {"API": {"PERMISSION_CLASSES": ["tests.test_permissions.deny_permission"]}}
         )
diff --git a/tests/test_signals_async.py b/tests/test_signals_async.py
@@ -13,8 +13,8 @@
 from .test_app.models import Category, Product
 
 
-@pytest.fixture
-def graph_search_signal_settings():
+@pytest.fixture(name="graph_search_signal_settings")
+def _graph_search_signal_settings_fixture():
     original = getattr(django_settings, "GRAPH_SEARCH", None)
     get_settings.cache_clear()
 
diff --git a/tests/test_views.py b/tests/test_views.py
