Removed pydantic anmd isort from dependencies. Fix linters

docs/index.html

@@ -287,6 +287,7 @@
 </pre> <p class="alert alert-warning"> Note: Settings without default values are required. </p> </section> <hr class=small-divider> <section id=dashboard-widget-admins> <h2>Dashboard Widget Admins</h2> <section id=registering-widgets> <h3>Registering Widgets</h3> <p class=lead> Register Dashboard widgets </p> <ul class="nav nav-tabs" id=register_dashboard_widgets role=tablist> <li class=nav-item role=presentation> <button class="nav-link active" id=dashboard_tortoise_orm data-bs-toggle=tab data-bs-target=#dashboard_tortoise_orm-pane type=button role=tab aria-controls=dashboard_tortoise_orm aria-selected=true>Tortoise ORM</button> </li> <li class=nav-item role=presentation> <button class="nav-link " id=dashboard_django_orm data-bs-toggle=tab data-bs-target=#dashboard_django_orm-pane type=button role=tab aria-controls=dashboard_django_orm aria-selected=false>Django ORM</button> </li> <li class=nav-item role=presentation> <button class="nav-link " id=dashboard_sql_alchemy data-bs-toggle=tab data-bs-target=#dashboard_sql_alchemy-pane type=button role=tab aria-controls=dashboard_sql_alchemy aria-selected=false>SQL Alchemy</button> </li> <li class=nav-item role=presentation> <button class="nav-link " id=dashboard_pony_orm data-bs-toggle=tab data-bs-target=#dashboard_pony_orm-pane type=button role=tab aria-controls=dashboard_pony_orm aria-selected=false>Pony ORM</button> </li> </ul> <div class=tab-content id=register_dashboard_widgets-content> <div class="tab-pane fade show active" id=dashboard_tortoise_orm-pane role=tabpanel aria-labelledby=dashboard_tortoise_orm tabindex=0> <pre>
   <code class=language-python>
 from datetime import datetime, timedelta, timezone
+from typing import Any
 
 from tortoise import Tortoise, fields
 from tortoise.models import Model
@@ -311,8 +312,8 @@
     x_field = "date"
     y_field = "count"
     x_field_filter_widget_type = WidgetType.DatePicker
-    x_field_filter_widget_props = {"picker": "month"}
-    x_field_periods = ["day", "week", "month", "year"]
+    x_field_filter_widget_props: dict[str, Any] = {"picker": "month"}  # noqa: RUF012
+    x_field_periods = ["day", "week", "month", "year"]  # noqa: RUF012
 
     async def get_data(
         self,
@@ -331,7 +332,7 @@
         else:
             max_x_field_date = datetime.fromisoformat(max_x_field.replace("Z", "+00:00"))
 
-        if not period_x_field or period_x_field not in self.x_field_periods:
+        if not period_x_field or period_x_field not in (self.x_field_periods or []):
             period_x_field = "month"
 
         results = await conn.execute_query_dict(
@@ -380,8 +381,8 @@
     x_field = "date"
     y_field = "count"
     x_field_filter_widget_type = WidgetType.DatePicker
-    x_field_filter_widget_props = {"picker": "month"}
-    x_field_periods = ["day", "week", "month", "year"]
+    x_field_filter_widget_props = {"picker": "month"}  # noqa: RUF012
+    x_field_periods = ["day", "week", "month", "year"]  # noqa: RUF012
 
     def get_data(  # type: ignore [override]
         self,
@@ -512,7 +513,7 @@
         (None, {"fields": ("username", "hash_password")}),
         ("Permissions", {"fields": ("is_active", "is_superuser")}),
     )
-    formfield_overrides = {
+    formfield_overrides = {  # noqa: RUF012
         "username": (WidgetType.SlugInput, {"required": True}),
         "password": (WidgetType.PasswordInput, {"passwordModalForm": True}),
     }
@@ -622,7 +623,7 @@
     # formfield_overrides = {
     #     "description": (WidgetType.RichTextArea, {})
     # }
-    formfield_overrides: dict[str, tuple[WidgetType, dict]] = {}
+    formfield_overrides: dict[str, tuple[WidgetType, dict]] = {}  # noqa: RUF012
 
     # Set list_display to control which fields are displayed on the list page of the admin.
     # If you don't set list_display, the admin site will display a single column that displays the __str__() representation of each object
@@ -639,7 +640,7 @@
     # list_display_widths = {
     #     "id": "100px",
     # }
-    list_display_widths: dict[str, str] = {}
+    list_display_widths: dict[str, str] = {}  # noqa: RUF012
 
     # Set list_filter to activate filters in the tabel columns of the list page of the admin.
     # Example of usage: list_filter = ("is_superuser", "is_active", "created_at")
@@ -1206,7 +1207,7 @@
         (None, {"fields": ("username", "hash_password")}),
         ("Permissions", {"fields": ("is_active", "is_superuser")}),
     )
-    formfield_overrides = {
+    formfield_overrides = {  # noqa: RUF012
         "username": (WidgetType.SlugInput, {"required": True}),
         "password": (WidgetType.PasswordInput, {"passwordModalForm": True}),
     }

examples/dashboard/djangoorm.py

@@ -23,8 +23,8 @@ class UsersDashboardWidgetAdmin(DashboardWidgetAdmin):
     x_field = "date"
     y_field = "count"
     x_field_filter_widget_type = WidgetType.DatePicker
-    x_field_filter_widget_props = {"picker": "month"}
-    x_field_periods = ["day", "week", "month", "year"]
+    x_field_filter_widget_props = {"picker": "month"}  # noqa: RUF012
+    x_field_periods = ["day", "week", "month", "year"]  # noqa: RUF012
 
     def get_data(  # type: ignore [override]
         self,

examples/dashboard/tortoise.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timedelta, timezone
+from typing import Any
 
 from tortoise import Tortoise, fields
 from tortoise.models import Model
@@ -23,8 +24,8 @@ class UsersDashboardWidgetAdmin(DashboardWidgetAdmin):
     x_field = "date"
     y_field = "count"
     x_field_filter_widget_type = WidgetType.DatePicker
-    x_field_filter_widget_props = {"picker": "month"}
-    x_field_periods = ["day", "week", "month", "year"]
+    x_field_filter_widget_props: dict[str, Any] = {"picker": "month"}  # noqa: RUF012
+    x_field_periods = ["day", "week", "month", "year"]  # noqa: RUF012
 
     async def get_data(
         self,
@@ -43,7 +44,7 @@ async def get_data(
         else:
             max_x_field_date = datetime.fromisoformat(max_x_field.replace("Z", "+00:00"))
 
-        if not period_x_field or period_x_field not in self.x_field_periods:
+        if not period_x_field or period_x_field not in (self.x_field_periods or []):
             period_x_field = "month"
 
         results = await conn.execute_query_dict(

examples/inlines/tortoise.py

@@ -50,7 +50,7 @@ class UserAdmin(TortoiseModelAdmin):
         (None, {"fields": ("username", "hash_password")}),
         ("Permissions", {"fields": ("is_active", "is_superuser")}),
     )
-    formfield_overrides = {
+    formfield_overrides = {  # noqa: RUF012
         "username": (WidgetType.SlugInput, {"required": True}),
         "password": (WidgetType.PasswordInput, {"passwordModalForm": True}),
     }

examples/models/tortoise.py

@@ -34,7 +34,7 @@ class UserAdmin(TortoiseModelAdmin):
         (None, {"fields": ("username", "hash_password")}),
         ("Permissions", {"fields": ("is_active", "is_superuser")}),
     )
-    formfield_overrides = {
+    formfield_overrides = {  # noqa: RUF012
         "username": (WidgetType.SlugInput, {"required": True}),
         "password": (WidgetType.PasswordInput, {"passwordModalForm": True}),
     }

fastadmin/api/frameworks/fastapi/api.py

@@ -117,7 +117,7 @@ async def list_objs(
     request: Request,
     model: str,
     search: str | None = None,
-    sort_by: str = None,
+    sort_by: str | None = None,
     offset: int | None = 0,
     limit: int | None = 10,
 ):
@@ -238,7 +238,7 @@ async def export(
     model: str,
     payload: ExportInputSchema,
     search: str | None = None,
-    sort_by: str = None,
+    sort_by: str | None = None,
 ):
     """This method is used to export a list of objects.
 

fastadmin/api/frameworks/flask/api.py

@@ -37,7 +37,7 @@ async def sign_in() -> Response:
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/sign-out", methods=["POST"])
@@ -57,7 +57,7 @@ async def sign_out() -> Response:
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/me", methods=["GET"])
@@ -79,7 +79,7 @@ async def me() -> dict:
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/dashboard-widget/<string:model>", methods=["GET"])
@@ -109,7 +109,7 @@ async def dashboard_widget(model: str) -> dict:
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/list/<string:model>", methods=["GET"])
@@ -143,14 +143,14 @@ async def list_objs(model: str) -> dict:
             "total": total,
             "results": objs,
         }
-    except ValueError:
+    except ValueError as e:
         http_exception = HTTPException("Invalid format of get parameters")
         http_exception.code = 422
-        raise http_exception
+        raise http_exception from e
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/retrieve/<string:model>/<string:id>", methods=["GET"])
@@ -174,7 +174,7 @@ async def get(model: str, id: UUID | int) -> dict:
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/add/<string:model>", methods=["POST"])
@@ -195,7 +195,7 @@ async def add(model: str) -> dict:
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/change-password/<string:id>", methods=["PATCH"])  # type: ignore [type-var]
@@ -221,7 +221,7 @@ async def change_password(id: UUID | int) -> UUID | int:
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/change/<string:model>/<string:id>", methods=["PATCH"])
@@ -248,7 +248,7 @@ async def change(model: str, id: UUID | int) -> dict:
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/export/<string:model>", methods=["POST"])
@@ -282,7 +282,7 @@ async def export(model: str) -> Response:
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/delete/<string:model>/<string:id>", methods=["DELETE"])  # type: ignore [type-var]
@@ -309,7 +309,7 @@ async def delete(
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/action/<string:model>/<string:action>", methods=["POST"])
@@ -337,7 +337,7 @@ async def action(
     except AdminApiException as e:
         http_exception = HTTPException(e.detail)
         http_exception.code = e.status_code
-        raise http_exception
+        raise http_exception from e
 
 
 @api_router.route("/configuration", methods=["GET"])

fastadmin/models/base.py

@@ -87,7 +87,7 @@ class BaseModelAdmin:
     # formfield_overrides = {
     #     "description": (WidgetType.RichTextArea, {})
     # }
-    formfield_overrides: dict[str, tuple[WidgetType, dict]] = {}
+    formfield_overrides: dict[str, tuple[WidgetType, dict]] = {}  # noqa: RUF012
 
     # Set list_display to control which fields are displayed on the list page of the admin.
     # If you don't set list_display, the admin site will display a single column that displays the __str__() representation of each object
@@ -104,7 +104,7 @@ class BaseModelAdmin:
     # list_display_widths = {
     #     "id": "100px",
     # }
-    list_display_widths: dict[str, str] = {}
+    list_display_widths: dict[str, str] = {}  # noqa: RUF012
 
     # Set list_filter to activate filters in the tabel columns of the list page of the admin.
     # Example of usage: list_filter = ("is_superuser", "is_active", "created_at")

fastadmin/models/decorators.py

@@ -1,4 +1,4 @@
-def action(function=None, *, description: str = None):
+def action(function=None, *, description: str | None = None):
     """Conveniently add attributes to an action function:
 
     Example of usage: