fastadmin 0.3.2__tar.gz → 0.3.3__tar.gz

{fastadmin-0.3.2 → fastadmin-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastadmin
-Version: 0.3.2
+Version: 0.3.3
 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.2 → fastadmin-0.3.3}/fastadmin/api/frameworks/django/app/views.py

@@ -1,9 +1,16 @@
+import os
+
 from django.http import HttpResponse
 
 from fastadmin.api.helpers import get_template
 from fastadmin.settings import ROOT_DIR, settings
 
 
+def _get_admin_prefix() -> str:
+    """Return admin URL prefix from env at request time so it respects os.environ set after import."""
+    return os.getenv("ADMIN_PREFIX", settings.ADMIN_PREFIX)
+
+
 def index(request):
     """This method is used to render index page.
 
@@ -13,7 +20,7 @@ def index(request):
     template = get_template(
         ROOT_DIR / "templates" / "index.html",
         {
-            "ADMIN_PREFIX": settings.ADMIN_PREFIX,
+            "ADMIN_PREFIX": _get_admin_prefix(),
         },
     )
     return HttpResponse(template)

{fastadmin-0.3.2 → fastadmin-0.3.3}/fastadmin/api/frameworks/fastapi/views.py

@@ -1,4 +1,5 @@
 import logging
+import os
 
 from fastapi import APIRouter
 from fastapi.responses import HTMLResponse
@@ -10,6 +11,11 @@ logger = logging.getLogger(__name__)
 router = APIRouter()
 
 
+def _get_admin_prefix() -> str:
+    """Return admin URL prefix from env at request time so it respects os.environ set after import."""
+    return os.getenv("ADMIN_PREFIX", settings.ADMIN_PREFIX)
+
+
 @router.get("/", response_class=HTMLResponse)
 def index():
     """This method is used to render index page.
@@ -20,6 +26,6 @@ def index():
     return get_template(
         ROOT_DIR / "templates" / "index.html",
         {
-            "ADMIN_PREFIX": settings.ADMIN_PREFIX,
+            "ADMIN_PREFIX": _get_admin_prefix(),
         },
     )

{fastadmin-0.3.2 → fastadmin-0.3.3}/fastadmin/api/frameworks/flask/views.py

@@ -1,4 +1,5 @@
 import logging
+import os
 
 from flask import Blueprint
 
@@ -12,6 +13,11 @@ views_router = Blueprint(
 )
 
 
+def _get_admin_prefix() -> str:
+    """Return admin URL prefix from env at request time so it respects os.environ set after import."""
+    return os.getenv("ADMIN_PREFIX", settings.ADMIN_PREFIX)
+
+
 @views_router.route("/")
 def index():
     """This method is used to render index page.
@@ -21,6 +27,6 @@ def index():
     return get_template(
         ROOT_DIR / "templates" / "index.html",
         {
-            "ADMIN_PREFIX": settings.ADMIN_PREFIX,
+            "ADMIN_PREFIX": _get_admin_prefix(),
         },
     )

{fastadmin-0.3.2 → fastadmin-0.3.3}/fastadmin/api/helpers.py

@@ -1,5 +1,3 @@
-import base64
-import binascii
 from pathlib import Path
 from uuid import UUID
 
@@ -105,19 +103,6 @@ def is_valid_id(id: UUID | int | str) -> bool:
     return False
 
 
-def is_valid_base64(value: str) -> bool:
-    """Check if a string is a valid base64.
-
-    :param value: A string to test.
-    :return: True if s is a valid base64, False otherwise.
-    """
-    try:
-        base64.decodebytes(value.encode("ascii"))
-        return True
-    except binascii.Error:
-        return False
-
-
 def get_template(template: Path, context: dict) -> str:
     with template.open("r") as file:
         content = file.read()

{fastadmin-0.3.2 → fastadmin-0.3.3}/fastadmin/models/base.py

@@ -247,6 +247,16 @@ class BaseModelAdmin:
         """
         raise NotImplementedError
 
+    async def orm_serialize_obj_by_id(self, id: UUID | int | str) -> dict | None:
+        """Serialize object by id (e.g. in a single session to avoid DetachedInstanceError).
+
+        Override in ORM layer to run get+serialize inside one session when needed.
+        """
+        obj = await self.orm_get_obj(id)
+        if obj is None:
+            return None
+        return await self.serialize_obj(obj)
+
     async def orm_save_obj(self, id: UUID | Any | None, payload: dict) -> Any:
         """This method is used to save orm/db model object.
 
@@ -361,6 +371,23 @@ class BaseModelAdmin:
         serialized_dict["__str__"] = await str_fn()
         return serialized_dict
 
+    async def _serialize_obj_after_save(self, obj: Any) -> dict:
+        """Serialize object after save; re-fetch if detached (e.g. SQLAlchemy after commit)."""
+        try:
+            return await self.serialize_obj(obj)
+        except Exception as exc:
+            # SQLAlchemy DetachedInstanceError when session is closed after commit
+            if exc.__class__.__name__ != "DetachedInstanceError":
+                raise
+            pk_name = self.get_model_pk_name(self.model_cls)
+            pk = getattr(obj, pk_name, None)
+            if pk is None:
+                raise
+            result = await self.orm_serialize_obj_by_id(pk)
+            if result is None:
+                raise
+            return result
+
     async def serialize_obj(self, obj: Any, list_view: bool = False) -> dict:
         """Serialize orm model obj to dict.
 
@@ -404,8 +431,13 @@ class BaseModelAdmin:
             return value
         match field.form_widget_type:
             case WidgetType.TimePicker:
-                return datetime.datetime.fromisoformat(value).time()
-            case WidgetType.DatePicker | WidgetType.DateTimePicker:
+                try:
+                    return datetime.datetime.fromisoformat(value).time()
+                except ValueError:
+                    return datetime.time.fromisoformat(value)
+            case WidgetType.DatePicker:
+                return datetime.datetime.fromisoformat(value).date()
+            case WidgetType.DateTimePicker:
                 return datetime.datetime.fromisoformat(value)
             case _:
                 return value
@@ -483,7 +515,7 @@ class BaseModelAdmin:
             if m2m_field.name in payload:
                 await self.orm_save_m2m_ids(obj, m2m_field.column_name, payload[m2m_field.name])
 
-        return await self.serialize_obj(obj)
+        return await self._serialize_obj_after_save(obj)
 
     async def delete_model(self, id: UUID | int | str) -> None:
         """This method is used to delete orm/db model object.

{fastadmin-0.3.2 → fastadmin-0.3.3}/fastadmin/models/helpers.py

@@ -198,7 +198,7 @@ async def generate_models_schema(
                         empty_value_display=admin_model_obj.empty_value_display,
                         filter_widget_type=None,
                         filter_widget_props=None,
-                        width=None,
+                        width=admin_model_obj.list_display_widths.get(field_name, None),
                     ),
                     add_configuration=None,
                     change_configuration=None,

{fastadmin-0.3.2 → fastadmin-0.3.3}/fastadmin/models/orms/sqlalchemy.py

@@ -329,6 +329,15 @@ class SqlAlchemyMixin:
         async with sessionmaker() as session:
             return await session.get(self.model_cls, id)
 
+    async def orm_serialize_obj_by_id(self, id: UUID | int | str) -> dict | None:
+        """Serialize object by id inside a single session to avoid DetachedInstanceError."""
+        sessionmaker = self.get_sessionmaker()
+        async with sessionmaker() as session:
+            obj = await session.get(self.model_cls, id)
+            if obj is None:
+                return None
+            return await self.serialize_obj(obj)
+
     def _get_foreign_key_fields(self) -> list[str]:
         """Returns a list of foreign key fields for the model.