fastapi-basekit 0.5.4__tar.gz → 0.5.5__tar.gz

{fastapi_basekit-0.5.4 → fastapi_basekit-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-basekit
-Version: 0.5.4
+Version: 0.5.5
 Summary: Utilities and base classes for FastAPI async projects (Beanie, SQLAlchemy or SQLModel)
 Author-email: Jerson Moreno <jerson.ml820@hotmail.com>
 License: MIT

{fastapi_basekit-0.5.4 → fastapi_basekit-0.5.5}/fastapi_basekit/aio/beanie/repository/base.py

@@ -2,6 +2,8 @@ import logging
 from typing import Any, Dict, Generic, List, Optional, Type, TypeVar, Union
 from typing import get_args, get_origin
 import re
+import unicodedata
+from functools import lru_cache
 
 from bson import ObjectId
 from pydantic import BaseModel
@@ -11,6 +13,35 @@ from beanie.operators import Or, RegEx
 
 logger = logging.getLogger(__name__)
 
+
+@lru_cache(maxsize=None)
+def _accent_class(letter: str) -> str:
+    """Clase regex que matchea `letter` con y sin tilde/diéresis, y en mayúscula."""
+    variants = {letter, letter.upper()}
+    for cp in range(0x00C0, 0x0100):  # Latin-1: á é í ó ú ü ñ… (mantiene el patrón corto)
+        ch = chr(cp)
+        if unicodedata.normalize("NFD", ch)[0].lower() == letter:
+            variants.add(ch)
+    return "[" + "".join(sorted(variants)) + "]"
+
+
+def build_search_regex(term: str) -> str:
+    """Patrón regex para búsqueda de texto (usar con `options="i"`).
+
+    - Todo lo que escribe el usuario se escapa: `(`, `[`, `*`… son literales y
+      no rompen la query ni cambian el significado del patrón.
+    - Cada letra ASCII matchea también sus variantes acentuadas: `a` ↔ `á`,
+      `n` ↔ `ñ`, `o` ↔ `Ó`. Así "descripcion" encuentra "descripción".
+    """
+    parts = []
+    for ch in term:
+        base = unicodedata.normalize("NFD", ch)[0]
+        if base.isascii() and base.isalpha():
+            parts.append(_accent_class(base.lower()))
+        else:
+            parts.append(re.escape(ch))
+    return ".*" + "".join(parts) + ".*"
+
 #: Tipo del Document Beanie que gestiona el repositorio. Parametrízalo al
 #: declarar la subclase — ``class UserRepository(BaseRepository[User])`` — para
 #: que ``get_by_id``/``create``/``update``/``list_all`` devuelvan el Document
@@ -233,7 +264,7 @@ class BaseRepository(Generic[ModelT]):
                     *[
                         RegEx(
                             getattr(self.model, f),
-                            f".*{search}.*",
+                            build_search_regex(search),
                             options="i",
                         )
                         for f in search_fields
@@ -352,7 +383,7 @@ class BaseRepository(Generic[ModelT]):
 
         if search and search_fields:
             search_conditions = [
-                {field: {"$regex": f".*{search}.*", "$options": "i"}}
+                {field: {"$regex": build_search_regex(search), "$options": "i"}}
                 for field in search_fields
             ]
             if search_conditions:

{fastapi_basekit-0.5.4 → fastapi_basekit-0.5.5}/fastapi_basekit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-basekit
-Version: 0.5.4
+Version: 0.5.5
 Summary: Utilities and base classes for FastAPI async projects (Beanie, SQLAlchemy or SQLModel)
 Author-email: Jerson Moreno <jerson.ml820@hotmail.com>
 License: MIT

{fastapi_basekit-0.5.4 → fastapi_basekit-0.5.5}/fastapi_basekit.egg-info/SOURCES.txt

@@ -113,6 +113,7 @@ tests/test_beanie_aggregation_hooks.py
 tests/test_beanie_aggregation_integration.py
 tests/test_beanie_keyset_pagination.py
 tests/test_beanie_repository_regression.py
+tests/test_beanie_search_regex.py
 tests/test_beanie_service_mutable_defaults.py
 tests/test_beanie_service_regression.py
 tests/test_controller_auto_permissions.py

{fastapi_basekit-0.5.4 → fastapi_basekit-0.5.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fastapi-basekit"
-version = "0.5.4"
+version = "0.5.5"
 description = "Utilities and base classes for FastAPI async projects (Beanie, SQLAlchemy or SQLModel)"
 readme = "README.md"
 requires-python = ">=3.11"

{fastapi_basekit-0.5.4 → fastapi_basekit-0.5.5}/tests/test_beanie_aggregation_hooks.py

@@ -13,6 +13,8 @@ Covers:
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
+
+from fastapi_basekit.aio.beanie.repository.base import build_search_regex
 from beanie import Document
 from pydantic import Field
 
@@ -97,8 +99,8 @@ class TestBuildListPipeline:
         assert len(pipeline) == 1
         match = pipeline[0]["$match"]
         assert "$or" in match
-        assert {"name": {"$regex": ".*ana.*", "$options": "i"}} in match["$or"]
-        assert {"email": {"$regex": ".*ana.*", "$options": "i"}} in match["$or"]
+        assert {"name": {"$regex": build_search_regex("ana"), "$options": "i"}} in match["$or"]
+        assert {"email": {"$regex": build_search_regex("ana"), "$options": "i"}} in match["$or"]
 
     def test_filters_plus_search_combined_with_and(self):
         repo = FakeRepo()
@@ -110,7 +112,7 @@ class TestBuildListPipeline:
         match = pipeline[0]["$match"]
         assert "$and" in match
         assert {"is_active": True} in match["$and"]
-        assert {"$or": [{"name": {"$regex": ".*ana.*", "$options": "i"}}]} in match["$and"]
+        assert {"$or": [{"name": {"$regex": build_search_regex("ana"), "$options": "i"}}]} in match["$and"]
 
     def test_simple_order_by_appends_sort_stage(self):
         repo = FakeRepo()

fastapi_basekit-0.5.5/tests/test_beanie_search_regex.py

@@ -0,0 +1,53 @@
+"""build_search_regex: escape del término y búsqueda sin acentos (Beanie)."""
+
+import re
+
+import pytest
+
+from fastapi_basekit.aio.beanie.repository.base import build_search_regex
+
+
+def _matches(term: str, text: str) -> bool:
+    # Mismo significado que Mongo `$regex` con `$options: "i"`.
+    return re.search(build_search_regex(term), text, re.IGNORECASE) is not None
+
+
+@pytest.mark.parametrize(
+    "text",
+    ["Descripción", "descripcion", "DESCRIPCIÓN", "Descripcíon"],
+)
+def test_sin_tilde_encuentra_con_tilde_y_viceversa(text):
+    assert _matches("descripcion", text)
+    assert _matches("descripción", text)
+
+
+def test_enie_y_n_son_equivalentes():
+    assert _matches("ano", "Año nuevo")
+    assert _matches("año", "ANO")
+
+
+def test_mayusculas_acentuadas_del_termino():
+    assert _matches("ÑANDÚ", "el ñandu corre")
+    assert _matches("ñandú", "NANDU")
+
+
+@pytest.mark.parametrize("term", ["(", "[", "*", "+", "?", "\\", "a.*", "$", "^"])
+def test_caracteres_especiales_son_literales(term):
+    # No deben romper la regex ni comportarse como metacaracteres.
+    assert re.compile(build_search_regex(term))  # compila
+    assert not _matches(term, "xyz")
+
+
+def test_punto_asterisco_no_es_comodin():
+    assert not _matches("a.*", "abc")
+    assert _matches("a.*", "zza.*zz")
+
+
+def test_parentesis_se_busca_literal():
+    assert _matches("(beta)", "versión (beta) 2")
+    assert not _matches("(beta)", "versión beta 2")
+
+
+def test_termino_sin_acentos_no_cambia_el_resto_del_texto():
+    assert _matches("whats", "WhatsApp")
+    assert not _matches("telegram", "WhatsApp")