Fixes

Author: vsdudakov

Makefile

@@ -8,7 +8,7 @@ clean:
 .PHONY: fix
 fix:
 	@echo "Run ruff"
-	@exec poetry run ruff --fix fastadmin tests docs examples
+	@exec poetry run ruff check --fix fastadmin tests docs examples
 	@echo "Run isort"
 	@exec poetry run isort fastadmin tests docs examples
 	@echo "Run black"
@@ -21,7 +21,7 @@ fix:
 .PHONY: lint
 lint:
 	@echo "Run ruff"
-	@exec poetry run ruff fastadmin tests docs examples
+	@exec poetry run ruff check fastadmin tests docs examples
 	@echo "Run isort"
 	@exec poetry run isort --check-only fastadmin tests docs examples
 	@echo "Run black"

docs/build.py

@@ -1,12 +1,12 @@
 import inspect
 import os
+import re
 import sys
 from datetime import datetime, timezone
 from pathlib import Path
 
 from django.apps import apps
 from django.apps.registry import Apps
-from htmlmin import minify
 from jinja2 import Environment, FileSystemLoader, select_autoescape
 
 from fastadmin.settings import ROOT_DIR, Settings
@@ -18,6 +18,12 @@
 Apps.check_apps_ready = lambda x: None
 
 
+def html_minify(html: str) -> str:
+    html = re.sub(r">\s+<", "><", html)
+    html = re.sub(r"\s+", " ", html)
+    return html.strip()
+
+
 class App:
     label = "app"
 
@@ -654,7 +660,7 @@ def build():
     index_template = env.get_template("templates/index.html")
     index_html = index_template.render(**context)
     with Path.open(Path("index.html"), "w") as fh:
-        fh.write(minify(index_html))
+        fh.write(html_minify(index_html))
 
     readme_template = env.get_template("templates/readme.md")
     readme_md = readme_template.render(**context)

docs/index.html

@@ -41,7 +41,7 @@ def get_admin_urls():
             path("api/action/<str:model>/<str:action>", action),
             path("api/configuration", configuration),
             re_path(
-                r"^%s(?P<path>.*)$" % re.escape("static"),
+                r"^%s(?P<path>.*)$" % re.escape("static"),  # noqa: UP031
                 serve,
                 kwargs={"document_root": ROOT_DIR / "static"},
             ),

fastadmin/api/frameworks/django/app/urls.py

@@ -110,8 +110,7 @@ async def generate_models_schema(
     :return: A list of models / inline models schemas.
     """
     models_schemas: list[ModelSchema | InlineModelSchema] = []
-    for orm_model_cls in admin_models:
-        admin_model_obj: ModelAdmin | InlineModelAdmin = admin_models[orm_model_cls]
+    for orm_model_cls, admin_model_obj in admin_models.items():
         orm_model_fields = admin_model_obj.get_model_fields_with_widget_types()
         orm_model_fields_for_serialize = admin_model_obj.get_fields_for_serialize()
 

fastadmin/models/helpers.py

@@ -113,7 +113,18 @@ def get_model_fields_with_widget_types(
                     form_widget_props["mode"] = "tags"
                     filter_widget_type = WidgetType.Select
                     filter_widget_props["mode"] = "tags"
-                case "SmallAutoField" | "AutoField" | "BigAutoField" | "SmallIntegerField" | "BigIntegerField" | "PositiveIntegerField" | "PositiveSmallIntegerField" | "IntegerField" | "FloatField" | "DecimalField":
+                case (
+                    "SmallAutoField"
+                    | "AutoField"
+                    | "BigAutoField"
+                    | "SmallIntegerField"
+                    | "BigIntegerField"
+                    | "PositiveIntegerField"
+                    | "PositiveSmallIntegerField"
+                    | "IntegerField"
+                    | "FloatField"
+                    | "DecimalField"
+                ):
                     form_widget_type = WidgetType.InputNumber
                     filter_widget_type = WidgetType.InputNumber
                 case "DateField":

fastadmin/models/orms/django.py

@@ -267,7 +267,8 @@ def orm_get_list(
                 # 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]
+                objs = list(qs_ids)
+                ids += [o.id for o in objs]
             qs = qs.filter(lambda m: m.id in set(ids))
 
         ordering = [sort_by] if sort_by else self.ordering
@@ -298,7 +299,7 @@ def orm_get_obj(self, id: UUID | int) -> Any | None:
         :params id: an id of object.
         :return: An object.
         """
-        return next((i for i in self.model_cls.select(**{self.get_model_pk_name(self.model_cls): id})), None)
+        return self.model_cls.select(**{self.get_model_pk_name(self.model_cls): id}).first()
 
     @sync_to_async
     @db_session
@@ -310,7 +311,7 @@ def orm_save_obj(self, id: UUID | Any | None, payload: dict) -> Any:
         :return: An object.
         """
         if id:
-            obj = next((i for i in self.model_cls.select(**{self.get_model_pk_name(self.model_cls): id})), None)
+            obj = self.model_cls.select(**{self.get_model_pk_name(self.model_cls): id}).first()
             if not obj:
                 return None
             obj.set(**payload)
@@ -328,7 +329,7 @@ def orm_delete_obj(self, id: UUID | int) -> None:
         :params id: an id of object.
         :return: None.
         """
-        obj = next((i for i in self.model_cls.select(**{self.get_model_pk_name(self.model_cls): id})), None)
+        obj = self.model_cls.select(**{self.get_model_pk_name(self.model_cls): id}).first()
         if not obj:
             return
         obj.delete()
@@ -346,7 +347,7 @@ def orm_get_m2m_ids(self, obj: Any, field: str) -> list[int | UUID]:
         :return: A list of ids.
         """
         key_id = self.get_model_pk_name(self.model_cls)
-        obj = next((i for i in self.model_cls.select(**{key_id: getattr(obj, key_id)})), None)
+        obj = self.model_cls.select(**{key_id: getattr(obj, key_id)}).first()
         if not obj:
             return []
         rel_model_cls = getattr(self.model_cls, field).py_type
@@ -365,7 +366,7 @@ def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) -> None:
         :return: A list of ids.
         """
         key_id = self.get_model_pk_name(self.model_cls)
-        obj = next((i for i in self.model_cls.select(**{key_id: getattr(obj, key_id)})), None)
+        obj = self.model_cls.select(**{key_id: getattr(obj, key_id)}).first()
         if not obj:
             return
         getattr(obj, field).clear()
@@ -388,7 +389,6 @@ def orm_save_upload_field(self, obj: Any, field: str, base64: str) -> None:
 
         :return: A list of ids.
         """
-        ...
 
     @sync_to_async
     @db_session
@@ -403,7 +403,7 @@ def serialize_obj_attributes(
         """
         data = {}
         key_id = self.get_model_pk_name(self.model_cls)
-        obj = next((i for i in self.model_cls.select(**{key_id: getattr(obj, key_id)})), None)
+        obj = self.model_cls.select(**{key_id: getattr(obj, key_id)}).first()
         if not obj:
             return data
 

fastadmin/models/orms/ponyorm.py

@@ -437,7 +437,6 @@ async def orm_save_upload_field(self, obj: Any, field: str, base64: str) -> None
 
         :return: A list of ids.
         """
-        ...
 
 
 class SqlAlchemyModelAdmin(SqlAlchemyMixin, ModelAdmin):

fastadmin/models/orms/sqlalchemy.py

@@ -351,7 +351,6 @@ async def orm_save_upload_field(self, obj: Any, field: str, base64: str) -> None
 
         :return: A list of ids.
         """
-        ...
 
 
 class TortoiseModelAdmin(TortoiseMixin, ModelAdmin):