fastadmin 0.1.41__tar.gz → 0.2.2__tar.gz

{fastadmin-0.1.41 → fastadmin-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastadmin
-Version: 0.1.41
+Version: 0.2.2
 Summary: 
 Home-page: https://github.com/vsdudakov/fastadmin
 License: MIT
@@ -17,6 +17,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Documentation
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Widget Sets
@@ -26,14 +27,13 @@ Provides-Extra: flask
 Provides-Extra: pony
 Provides-Extra: sqlalchemy
 Provides-Extra: tortoise-orm
-Requires-Dist: asgiref (>=3.6.0,<4.0.0)
+Requires-Dist: asgiref (==3.6.0)
 Requires-Dist: django (==4.*) ; extra == "django"
 Requires-Dist: fastapi (==0.*) ; extra == "fastapi"
 Requires-Dist: flask (==2.*) ; extra == "flask"
-Requires-Dist: isort (>=5.12.0,<6.0.0)
+Requires-Dist: greenlet (>=3.0.3,<4.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: pony (==0.*) ; extra == "pony"
-Requires-Dist: pydantic (>=1.10.7,<2.0.0)
 Requires-Dist: pyjwt (>=2.6.0,<3.0.0)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: sqlalchemy (==2.*) ; extra == "sqlalchemy"
@@ -43,11 +43,12 @@ Description-Content-Type: text/markdown
 
 ## Admin Dashboard App for FastAPI/Flask/Django
 
-[![Build Status](https://github.com/vsdudakov/fastadmin/workflows/CI/badge.svg?branch=main)](https://github.com/vsdudakov/fastadmin/workflows/CI/badge.svg?branch=main)
 [![codecov](https://codecov.io/gh/vsdudakov/fastadmin/branch/main/graph/badge.svg?token=RNGX5HOW3T)](https://codecov.io/gh/vsdudakov/fastadmin)
 [![License](https://img.shields.io/github/license/vsdudakov/fastadmin)](https://github.com/vsdudakov/fastadmin/blob/master/LICENSE)
 [![PyPi](https://badgen.net/pypi/v/fastadmin)](https://pypi.org/project/fastadmin/)
 [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3100/)
+[![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3110/)
+[![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3120/)
 
 ## Screenshots
 
@@ -65,7 +66,7 @@ Description-Content-Type: text/markdown
 
 ## Introduction
 
-
+  
 <a href='https://github.com/vsdudakov/fastadmin' target='_blank'>FastAdmin</a> is an easy-to-use Admin Dashboard App for FastAPI/Django/Flask inspired by Django Admin.
 
 
@@ -81,7 +82,7 @@ Description-Content-Type: text/markdown
 
 
 
-
+  
 FastAdmin was built with relations in mind and admiration for the excellent and popular Django Admin. It's engraved in its design that you may configure your admin dashboard for FastAPI/Django/Flask easiest way.
 
 
@@ -97,7 +98,7 @@ FastAdmin was built with relations in mind and admiration for the excellent and
 
 
 
-
+  
 FastAdmin is designed to be minimalistic, functional and yet familiar.
 
 
@@ -119,7 +120,7 @@ FastAdmin is designed to be minimalistic, functional and yet familiar.
 
 ## Getting Started
 
-
+  
 
 
 
@@ -139,7 +140,7 @@ If you have any questions that are beyond the scope of the documentation, Please
 
 ### Installation
 
-
+  
 
 
 Follow the steps below to setup FastAdmin:
@@ -155,7 +156,7 @@ Follow the steps below to setup FastAdmin:
 
 
 
-
+  
 Install the package using pip:
 
 
@@ -171,7 +172,7 @@ Install the package using pip:
 
 
 
-
+  
 
 
 
@@ -187,7 +188,7 @@ Note: For zsh and macos use: <code>pip install fastadmin[fastapi,django]</code>
 
 
 
-
+  
 
 
 
@@ -213,7 +214,7 @@ pip install fastadmin[flask,sqlalchemy]  # for flask with sqlalchemy
 
 
 
-
+  
 Install the package using poetry:
 
 
@@ -229,7 +230,7 @@ Install the package using poetry:
 
 
 
-
+  
 
 
 
@@ -255,7 +256,7 @@ poetry add 'fastadmin[flask,sqlalchemy]'  # for flask with sqlalchemy
 
 
 
-
+  
 Configure required settings using virtual environment variables:
 
 
@@ -271,7 +272,7 @@ Configure required settings using virtual environment variables:
 
 
 
-
+  
 
 
 
@@ -287,7 +288,7 @@ Note: You can add these variables to .env and use python-dotenv to load them. Se
 
 
 
-
+  
 
 
 
@@ -312,7 +313,7 @@ export ADMIN_SECRET_KEY=secret_key
 
 ### Quick Tutorial
 
-
+  
 
 
 Setup FastAdmin for a framework
@@ -328,7 +329,7 @@ Setup FastAdmin for a framework
 
 
 
-
+  
 
 
 
@@ -432,7 +433,7 @@ app.register_blueprint(admin_app, url_prefix="/admin")
 
 
 
-
+  
 
 
 Register ORM models
@@ -448,7 +449,7 @@ Register ORM models
 
 
 
-
+  
 
 
 
@@ -722,4 +723,3 @@ See full documentation [here](https://vsdudakov.github.io/fastadmin).
 
 ## License
 This project is licensed under the MIT License - see the [LICENSE](https://github.com/vsdudakov/fastadmin/blob/main/LICENSE) file for details.
-

{fastadmin-0.1.41 → fastadmin-0.2.2}/README.md

@@ -1,10 +1,11 @@
 ## Admin Dashboard App for FastAPI/Flask/Django
 
-[![Build Status](https://github.com/vsdudakov/fastadmin/workflows/CI/badge.svg?branch=main)](https://github.com/vsdudakov/fastadmin/workflows/CI/badge.svg?branch=main)
 [![codecov](https://codecov.io/gh/vsdudakov/fastadmin/branch/main/graph/badge.svg?token=RNGX5HOW3T)](https://codecov.io/gh/vsdudakov/fastadmin)
 [![License](https://img.shields.io/github/license/vsdudakov/fastadmin)](https://github.com/vsdudakov/fastadmin/blob/master/LICENSE)
 [![PyPi](https://badgen.net/pypi/v/fastadmin)](https://pypi.org/project/fastadmin/)
 [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3100/)
+[![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3110/)
+[![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3120/)
 
 ## Screenshots
 
@@ -22,7 +23,7 @@
 
 ## Introduction
 
-
+  
 <a href='https://github.com/vsdudakov/fastadmin' target='_blank'>FastAdmin</a> is an easy-to-use Admin Dashboard App for FastAPI/Django/Flask inspired by Django Admin.
 
 
@@ -38,7 +39,7 @@
 
 
 
-
+  
 FastAdmin was built with relations in mind and admiration for the excellent and popular Django Admin. It's engraved in its design that you may configure your admin dashboard for FastAPI/Django/Flask easiest way.
 
 
@@ -54,7 +55,7 @@ FastAdmin was built with relations in mind and admiration for the excellent and
 
 
 
-
+  
 FastAdmin is designed to be minimalistic, functional and yet familiar.
 
 
@@ -76,7 +77,7 @@ FastAdmin is designed to be minimalistic, functional and yet familiar.
 
 ## Getting Started
 
-
+  
 
 
 
@@ -96,7 +97,7 @@ If you have any questions that are beyond the scope of the documentation, Please
 
 ### Installation
 
-
+  
 
 
 Follow the steps below to setup FastAdmin:
@@ -112,7 +113,7 @@ Follow the steps below to setup FastAdmin:
 
 
 
-
+  
 Install the package using pip:
 
 
@@ -128,7 +129,7 @@ Install the package using pip:
 
 
 
-
+  
 
 
 
@@ -144,7 +145,7 @@ Note: For zsh and macos use: <code>pip install fastadmin[fastapi,django]</code>
 
 
 
-
+  
 
 
 
@@ -170,7 +171,7 @@ pip install fastadmin[flask,sqlalchemy]  # for flask with sqlalchemy
 
 
 
-
+  
 Install the package using poetry:
 
 
@@ -186,7 +187,7 @@ Install the package using poetry:
 
 
 
-
+  
 
 
 
@@ -212,7 +213,7 @@ poetry add 'fastadmin[flask,sqlalchemy]'  # for flask with sqlalchemy
 
 
 
-
+  
 Configure required settings using virtual environment variables:
 
 
@@ -228,7 +229,7 @@ Configure required settings using virtual environment variables:
 
 
 
-
+  
 
 
 
@@ -244,7 +245,7 @@ Note: You can add these variables to .env and use python-dotenv to load them. Se
 
 
 
-
+  
 
 
 
@@ -269,7 +270,7 @@ export ADMIN_SECRET_KEY=secret_key
 
 ### Quick Tutorial
 
-
+  
 
 
 Setup FastAdmin for a framework
@@ -285,7 +286,7 @@ Setup FastAdmin for a framework
 
 
 
-
+  
 
 
 
@@ -389,7 +390,7 @@ app.register_blueprint(admin_app, url_prefix="/admin")
 
 
 
-
+  
 
 
 Register ORM models
@@ -405,7 +406,7 @@ Register ORM models
 
 
 
-
+  
 
 
 
@@ -678,4 +679,4 @@ class UserAdmin(PonyORMModelAdmin):
 See full documentation [here](https://vsdudakov.github.io/fastadmin).
 
 ## License
-This project is licensed under the MIT License - see the [LICENSE](https://github.com/vsdudakov/fastadmin/blob/main/LICENSE) file for details.
+This project is licensed under the MIT License - see the [LICENSE](https://github.com/vsdudakov/fastadmin/blob/main/LICENSE) file for details.

{fastadmin-0.1.41 → fastadmin-0.2.2}/fastadmin/api/frameworks/django/app/api.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from dataclasses import asdict
-from datetime import datetime
+from datetime import datetime, time
 from functools import wraps
 from uuid import UUID
 
@@ -23,7 +23,7 @@ api_service = ApiService()
 
 class JsonEncoder(DjangoJSONEncoder):
     def default(self, o):
-        if isinstance(o, datetime):
+        if isinstance(o, datetime | time):
             return o.isoformat()
         if isinstance(o, UUID):
             return str(o)

{fastadmin-0.1.41 → fastadmin-0.2.2}/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-0.1.41 → fastadmin-0.2.2}/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-0.1.41 → fastadmin-0.2.2}/fastadmin/api/frameworks/flask/app.py

@@ -1,5 +1,5 @@
 import logging
-from datetime import date
+from datetime import date, time
 
 from flask import Blueprint
 from flask.json.provider import DefaultJSONProvider
@@ -14,7 +14,7 @@ logger = logging.getLogger(__name__)
 
 class JSONProvider(DefaultJSONProvider):
     def default(self, o):
-        if isinstance(o, date):
+        if isinstance(o, date | time):
             return o.isoformat()
         return super().default(o)
 

{fastadmin-0.1.41 → fastadmin-0.2.2}/fastadmin/api/helpers.py

@@ -30,12 +30,11 @@ def sanitize_filter_key(key: str, fields: list[ModelFieldWidgetSchema]) -> tuple
     :return: A tuple of sanitized key and condition.
     """
     if "__" not in key:
-        key = f"{key}__exact"
-    field_name = key.split("__", 1)[0]
-    condition = key.split("__", 1)[1]
+        key += "__exact"
+    field_name, _, condition = key.partition("__")
     field: ModelFieldWidgetSchema | None = next((field for field in fields if field.name == field_name), None)
     if field and field.filter_widget_props.get("parentModel") and not field.is_m2m:
-        field_name = f"{field_name}_id"
+        field_name += "_id"
     return field_name, condition
 
 
@@ -52,32 +51,26 @@ def is_valid_uuid(uuid_to_test: str) -> bool:
     return str(uuid_obj) == uuid_to_test
 
 
-def is_digit(digit_to_test: str) -> bool:
-    """Check if digit_to_test is a digit.
-
-    :param digit_to_test: A digit to test.
-    :return: True if digit_to_test is a digit, False otherwise.
-    """
-    try:
-        int(digit_to_test)
-    except ValueError:
-        return False
-    return True
-
-
 def is_valid_id(id: UUID | int) -> bool:
     """Check if id is a valid id.
 
     :param id: An id to test.
     :return: True if id is a valid id, False otherwise.
     """
-    return is_digit(str(id)) or is_valid_uuid(str(id))
+    if is_valid_uuid(str(id)):
+        return True
+    try:
+        int(id)
+        return True
+    except ValueError:
+        pass
+    return False
 
 
 def is_valid_base64(value: str) -> bool:
-    """Check if s is a valid base64.
+    """Check if a string is a valid base64.
 
-    :param s: A string to test.
+    :param value: A string to test.
     :return: True if s is a valid base64, False otherwise.
     """
     try:

{fastadmin-0.1.41 → fastadmin-0.2.2}/fastadmin/api/service.py

@@ -107,7 +107,7 @@ class ApiService:
         if inspect.iscoroutinefunction(admin_model.authenticate):
             authenticate_fn = admin_model.authenticate
         else:
-            authenticate_fn = sync_to_async(admin_model.authenticate)
+            authenticate_fn = sync_to_async(admin_model.authenticate)  # type: ignore [arg-type]
 
         user_id = await authenticate_fn(payload.username, payload.password)
 
@@ -162,7 +162,7 @@ class ApiService:
         if inspect.iscoroutinefunction(dashboard_widget_model.get_data):
             get_data = dashboard_widget_model.get_data
         else:
-            get_data = sync_to_async(dashboard_widget_model.get_data)
+            get_data = sync_to_async(dashboard_widget_model.get_data)  # type: ignore [arg-type]
         data = await get_data(
             min_x_field=query_params.min_x_field,
             max_x_field=query_params.max_x_field,
@@ -178,7 +178,7 @@ class ApiService:
         model: str,
         search: str | None = None,
         sort_by: str | None = None,
-        filters: dict = None,
+        filters: dict | None = None,
         offset: int | None = 0,
         limit: int | None = 10,
     ) -> tuple[list[dict], int]:
@@ -302,7 +302,7 @@ class ApiService:
         if inspect.iscoroutinefunction(admin_model.change_password):
             change_password_fn = admin_model.change_password
         else:
-            change_password_fn = sync_to_async(admin_model.change_password)
+            change_password_fn = sync_to_async(admin_model.change_password)  # type: ignore [arg-type]
         await change_password_fn(id, payload.password)
 
     async def change(
@@ -332,7 +332,7 @@ class ApiService:
         payload: ExportInputSchema,
         search: str | None = None,
         sort_by: str | None = None,
-        filters: dict = None,
+        filters: dict | None = None,
     ) -> tuple[str, str, StringIO | BytesIO | None]:
         current_user_id = await get_user_id_from_session_id(session_id)
         if not current_user_id:

{fastadmin-0.1.41 → fastadmin-0.2.2}/fastadmin/models/base.py

@@ -1,4 +1,5 @@
 import csv
+import datetime
 import inspect
 import json
 from collections.abc import Sequence
@@ -87,7 +88,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 +105,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")
@@ -383,6 +384,17 @@ class BaseModelAdmin:
 
         return obj_dict
 
+    def deserialize_value(self, field: ModelFieldWidgetSchema, value: Any) -> Any:
+        if not value:
+            return value
+        match field.form_widget_type:
+            case WidgetType.TimePicker:
+                return datetime.datetime.fromisoformat(value).time()
+            case WidgetType.DatePicker | WidgetType.DateTimePicker:
+                return datetime.datetime.fromisoformat(value)
+            case _:
+                return value
+
     async def get_list(
         self,
         offset: int | None = None,
@@ -434,7 +446,11 @@ class BaseModelAdmin:
         m2m_fields = self.get_model_fields_with_widget_types(with_m2m=True)
         upload_fields = self.get_model_fields_with_widget_types(with_upload=True)
 
-        fields_payload = {field.column_name: payload[field.name] for field in fields if field.name in payload}
+        fields_payload = {
+            field.column_name: self.deserialize_value(field, payload[field.name])
+            for field in fields
+            if field.name in payload
+        }
         obj = await self.orm_save_obj(id, fields_payload)
         if not obj:
             return None

{fastadmin-0.1.41 → fastadmin-0.2.2}/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: