Optimisation on unit tests. Fix for pony orm.

Author: vsdudakov

.gitignore

@@ -135,3 +135,5 @@ dmypy.json
 
 *.code-workspace
 .idea/
+
+:sharedmemory:

Makefile

@@ -31,10 +31,10 @@ lint:
 	@echo "Run frontend linters"
 	@exec make -C frontend lint
 
+# -n auto : fix django
 .PHONY: test
 test:
-	@exec poetry run python generate_db.py
-	@exec env ADMIN_ENV_FILE=example.env poetry run pytest --cov=fastadmin --cov-report=term-missing --cov-report=xml --cov-fail-under=80 -s tests
+	@exec poetry run pytest --cov=fastadmin --cov-report=term-missing --cov-report=xml --cov-fail-under=80 -s tests
 	@exec make -C frontend test
 
 .PHONY: kill

docs/build.py

@@ -39,6 +39,12 @@ def read_cls_docstring(cls):
 
 def get_versions():
     return [
+        {
+            "version": "0.2.11",
+            "changes": [
+                "Optimisation on unit tests. Fix for pony orm. Optimisation on search for tortoise orm.",
+            ],
+        },
         {
             "version": "0.2.10",
             "changes": [

docs/index.html

@@ -53,7 +53,7 @@ def convert_id(id: str | int | UUID) -> int | UUID | None:
     if re.fullmatch(r"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}", id):
         return UUID(id)
 
-    logger.error("Invalid id: %s", id)
+    logger.warning("Invalid id: %s", id)
     return None
 
 
@@ -101,6 +101,7 @@ async def sign_in(
     ) -> str:
         model = settings.ADMIN_USER_MODEL
         admin_model = get_admin_model(model)
+
         if not admin_model:
             raise AdminApiException(401, detail=f"{model} model is not registered.")
 

example.env

@@ -3,7 +3,7 @@
 from uuid import UUID
 
 from asgiref.sync import sync_to_async
-from pony.orm import commit, db_session, desc, flush, select
+from pony.orm import commit, db_session, desc, flush
 
 from fastadmin.models.base import InlineModelAdmin, ModelAdmin
 from fastadmin.models.schemas import ModelFieldWidgetSchema, WidgetType
@@ -233,7 +233,7 @@ def orm_get_list(
         :return: A tuple of list of objects and total count.
         """
 
-        qs = select(m for m in self.model_cls)
+        qs = getattr(self.model_cls, "select")(lambda m: m)  # noqa: B009
         if filters:
             for field_with_condition, value in filters.items():
                 field = field_with_condition[0]
@@ -256,14 +256,17 @@ def orm_get_list(
                     case "contains":
                         pony_condition = "in"
                     case "icontains":
+                        # TODO: support icontains here
                         pony_condition = "in"
                 filter_expr = f""""{value}" {pony_condition}  m.{field}"""
                 qs = qs.filter(filter_expr)
 
         if search and self.search_fields:
             ids = []
-            for f in self.search_fields:
-                qs_ids = qs.filter(lambda m: search.lower() in getattr(m, f).lower())  # noqa: B023
+            for search_field in self.search_fields:
+                # TODO: support icontains here
+                filter_expr = f""""{search}" in m.{search_field}"""
+                qs_ids = qs.filter(filter_expr)
                 ids += [o.id for o in qs_ids]
             qs = qs.filter(lambda m: m.id in set(ids))