fastadmin 0.3.5__tar.gz → 0.3.6__tar.gz

{fastadmin-0.3.5 → fastadmin-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastadmin
-Version: 0.3.5
+Version: 0.3.6
 Summary: FastAdmin is an easy-to-use Admin Dashboard App for FastAPI/Flask/Django inspired by Django Admin.
 License: MIT
 License-File: LICENSE

{fastadmin-0.3.5 → fastadmin-0.3.6}/fastadmin/models/base.py

@@ -248,8 +248,6 @@ class BaseModelAdmin:
         search: str | None = None,
         sort_by: str | None = None,
         filters: dict | None = None,
-        prefetch_related_fields: list[str] | None = None,
-        additional_search_fields: list[str] | None = None,
     ) -> tuple[list[Any], int]:
         """This method is used to get list of orm/db model objects.
 
@@ -258,8 +256,6 @@ class BaseModelAdmin:
         :params search: a search query.
         :params sort_by: a sort by field name.
         :params filters: a dict of filters.
-        :params prefetch_related_fields: a list of related fields to prefetch.
-        :params additional_search_fields: a list of additional search fields.
         :return: A tuple of list of objects and total count.
         """
         raise NotImplementedError

{fastadmin-0.3.5 → fastadmin-0.3.6}/fastadmin/models/orms/django.py

@@ -244,8 +244,6 @@ class DjangoORMMixin:
         search: str | None = None,
         sort_by: str | None = None,
         filters: dict | None = None,
-        prefetch_related_fields: list[str] | None = None,
-        additional_search_fields: list[str] | None = None,
     ) -> tuple[list[Any], int]:
         """This method is used to get list of orm/db model objects.
 
@@ -254,15 +252,10 @@ class DjangoORMMixin:
         :params search: a search query.
         :params sort_by: a sort by field name.
         :params filters: a dict of filters.
-        :params prefetch_related_fields: a list of related fields to prefetch.
-        :params additional_search_fields: a list of additional search fields.
         :return: A tuple of list of objects and total count.
         """
         qs = self.model_cls.objects.all()
 
-        if prefetch_related_fields:
-            qs = qs.prefetch_related(*prefetch_related_fields)
-
         if filters:
             for field_with_condition, value in filters.items():
                 field = field_with_condition[0]
@@ -270,9 +263,6 @@ class DjangoORMMixin:
                 qs = qs.filter(**{f"{field}__{condition}" if condition != "exact" else field: value})
 
         search_fields = list(self.search_fields)
-        if additional_search_fields:
-            search_fields.extend(additional_search_fields)
-
         if search and search_fields:
             search_conditions = [Q(**{f + "__icontains": search}) for f in search_fields]
             search_q = search_conditions[0]

{fastadmin-0.3.5 → fastadmin-0.3.6}/fastadmin/models/orms/ponyorm.py

@@ -224,8 +224,6 @@ class PonyORMMixin:
         search: str | None = None,
         sort_by: str | None = None,
         filters: dict | None = None,
-        prefetch_related_fields: list[str] | None = None,
-        additional_search_fields: list[str] | None = None,
     ) -> tuple[list[Any], int]:
         """This method is used to get list of orm/db model objects.
 
@@ -234,8 +232,6 @@ class PonyORMMixin:
         :params search: a search query.
         :params sort_by: a sort by field name.
         :params filters: a dict of filters.
-        :params prefetch_related_fields: a list of related fields to prefetch.
-        :params additional_search_fields: a list of additional search fields.
         :return: A tuple of list of objects and total count.
         """
 
@@ -276,9 +272,6 @@ class PonyORMMixin:
                 qs = qs.filter(filter_expr)
 
         search_fields = list(self.search_fields)
-        if additional_search_fields:
-            search_fields.extend(additional_search_fields)
-
         if search and search_fields:
             ids = []
             for search_field in search_fields:
@@ -304,9 +297,6 @@ class PonyORMMixin:
         if self.list_select_related:
             qs = qs.prefetch(*[getattr(self.model_cls, field) for field in self.list_select_related])
 
-        if prefetch_related_fields:
-            qs = qs.prefetch(*[getattr(self.model_cls, field) for field in prefetch_related_fields])
-
         if offset is not None and limit is not None:
             qs = qs.limit(limit, offset=offset)
 

{fastadmin-0.3.5 → fastadmin-0.3.6}/fastadmin/models/orms/sqlalchemy.py

@@ -300,8 +300,6 @@ class SqlAlchemyMixin:
         search: str | None = None,
         sort_by: str | None = None,
         filters: dict | None = None,
-        prefetch_related_fields: list[str] | None = None,
-        additional_search_fields: list[str] | None = None,
     ) -> tuple[list[Any], int]:
         """This method is used to get list of orm/db model objects.
 
@@ -310,8 +308,6 @@ class SqlAlchemyMixin:
         :params search: a search query.
         :params sort_by: a sort by field name.
         :params filters: a dict of filters.
-        :params prefetch_related_fields: a list of related fields to prefetch.
-        :params additional_search_fields: a list of additional search fields.
         :return: A tuple of list of objects and total count.
         """
 
@@ -324,7 +320,6 @@ class SqlAlchemyMixin:
         sessionmaker = self.get_sessionmaker()
         async with sessionmaker() as session:
             qs = select(self.model_cls)
-
             if filters:
                 q = []
                 for field_with_condition, value in filters.items():
@@ -359,9 +354,6 @@ class SqlAlchemyMixin:
                 qs = qs.where(and_(*q))
 
             search_fields = list(self.search_fields)
-            if additional_search_fields:
-                search_fields.extend(additional_search_fields)
-
             if search and search_fields:
                 q = []
                 for field in search_fields:
@@ -385,28 +377,6 @@ class SqlAlchemyMixin:
                 for field in self.list_select_related:
                     qs = qs.options(selectinload(getattr(self.model_cls, field)))
 
-            if prefetch_related_fields:
-                for field_path in prefetch_related_fields:
-                    parts = field_path.split("__")
-                    current_model = self.model_cls
-                    attr = getattr(current_model, parts[0], None)
-                    if attr is None:
-                        continue
-                    option = selectinload(attr)
-                    current_model = getattrs(attr, "property.mapper.class_")
-                    for part in parts[1:]:
-                        if current_model is None:
-                            break
-                        nested_attr = getattr(current_model, part, None)
-                        if nested_attr is None:
-                            break
-                        next_model = getattrs(nested_attr, "property.mapper.class_")
-                        if next_model is None:
-                            break
-                        option = option.selectinload(nested_attr)
-                        current_model = next_model
-                    qs = qs.options(option)
-
             if offset is not None and limit is not None:
                 qs = qs.offset(offset)
                 qs = qs.limit(limit)

{fastadmin-0.3.5 → fastadmin-0.3.6}/fastadmin/models/orms/tortoise.py

@@ -254,8 +254,6 @@ class TortoiseMixin:
         search: str | None = None,
         sort_by: str | None = None,
         filters: dict | None = None,
-        prefetch_related_fields: list[str] | None = None,
-        additional_search_fields: list[str] | None = None,
     ) -> tuple[list[Any], int]:
         """This method is used to get list of orm/db model objects.
 
@@ -264,15 +262,10 @@ class TortoiseMixin:
         :params search: a search query.
         :params sort_by: a sort by field name.
         :params filters: a dict of filters.
-        :params prefetch_related_fields: a list of related fields to prefetch.
-        :params additional_search_fields: a list of additional search fields.
         :return: A tuple of list of objects and total count.
         """
         qs = self.model_cls.all()
 
-        if prefetch_related_fields:
-            qs = qs.prefetch_related(*prefetch_related_fields).distinct()
-
         if filters:
             for field_with_condition, value in filters.items():
                 field = field_with_condition[0]
@@ -280,9 +273,6 @@ class TortoiseMixin:
                 qs = qs.filter(**{f"{field}__{condition}" if condition != "exact" else field: value})
 
         search_fields = list(self.search_fields)
-        if additional_search_fields:
-            search_fields.extend(additional_search_fields)
-
         if search and search_fields:
             qs = qs.filter(
                 functools.reduce(