fastadmin 0.2.8__py3-none-any.whl → 0.2.10__py3-none-any.whl

fastadmin/api/service.py

@@ -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 @@ class ApiService:
     ) -> 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.")
 

fastadmin/models/orms/django.py

@@ -334,8 +334,6 @@ class DjangoORMMixin:
 
         :return: A list of ids.
         """
-        if not ids:
-            return
         m2m_rel = getattr(obj, field)
         m2m_rel.set(ids)
 

fastadmin/models/orms/ponyorm.py

@@ -3,7 +3,7 @@ from typing import Any
 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 @@ class PonyORMMixin:
         :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 @@ class PonyORMMixin:
                     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))
 
@@ -362,11 +365,12 @@ class PonyORMMixin:
         obj = next((i for i in self.model_cls.select(**{key_id: getattr(obj, key_id)})), None)
         if not obj:
             return
-        rel_model_cls = getattr(self.model_cls, field).py_type
-        rel_key_id = self.get_model_pk_name(rel_model_cls)
-        rel_objs = list(rel_model_cls.select(lambda o: getattr(o, rel_key_id) in ids))
         obj.participants.clear()
-        obj.participants.add(rel_objs)
+        if ids:
+            rel_model_cls = getattr(self.model_cls, field).py_type
+            rel_key_id = self.get_model_pk_name(rel_model_cls)
+            rel_objs = list(rel_model_cls.select(lambda o: getattr(o, rel_key_id) in ids))
+            obj.participants.add(rel_objs)
         flush()
         commit()
 

fastadmin/models/orms/sqlalchemy.py

@@ -400,7 +400,8 @@ class SqlAlchemyMixin:
                         obj_field_name: obj_id,
                     }
                 )
-            await session.execute(orm_model_field.secondary.insert().values(values))
+            if values:
+                await session.execute(orm_model_field.secondary.insert().values(values))
             await session.commit()
 
     async def orm_save_upload_field(self, obj: Any, field: str, base64: str) -> None:

fastadmin/models/orms/tortoise.py

@@ -1,6 +1,10 @@
+import functools
+import operator
 from typing import Any
 from uuid import UUID
 
+from tortoise.expressions import Q
+
 from fastadmin.models.base import InlineModelAdmin, ModelAdmin
 from fastadmin.models.schemas import ModelFieldWidgetSchema, WidgetType
 from fastadmin.settings import settings
@@ -244,11 +248,13 @@ class TortoiseMixin:
                 qs = qs.filter(**{f"{field}__{condition}" if condition != "exact" else field: value})
 
         if search and self.search_fields:
-            ids = []
-            for f in self.search_fields:
-                qs = qs.filter(**{f + "__icontains": search})
-                ids += await qs.values_list(self.get_model_pk_name(self.model_cls), flat=True)
-            qs = qs.filter(id__in=set(ids))
+            qs = qs.filter(
+                functools.reduce(
+                    operator.or_,
+                    (Q(**{f + "__icontains": search}) for f in self.search_fields),
+                    Q(),
+                )
+            )
 
         if sort_by:
             qs = qs.order_by(sort_by)
@@ -323,8 +329,6 @@ class TortoiseMixin:
 
         :return: A list of ids.
         """
-        if not ids:
-            return
         m2m_rel = getattr(obj, field)
 
         await m2m_rel.clear()
@@ -335,7 +339,8 @@ class TortoiseMixin:
             setattr(remote_model_obj, self.get_model_pk_name(remote_model), rel_id)
             remote_model_obj._saved_in_db = True
             remote_model_objs.append(remote_model_obj)
-        await m2m_rel.add(*remote_model_objs)
+        if remote_model_objs:
+            await m2m_rel.add(*remote_model_objs)
 
     async def orm_save_upload_field(self, obj: Any, field: str, base64: str) -> None:
         """This method is used to save upload field.