fastadmin 0.4.7__tar.gz → 0.4.9__tar.gz

{fastadmin-0.4.7 → fastadmin-0.4.9}/PKG-INFO

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

@@ -301,12 +301,14 @@ async def upload_file(
             return JsonResponse({"error": "File not found"}, status=400)
         file_name = file.name
         file_content = file.read()
+        obj_id = request.GET.get("id") or None
         file_url = await api_service.upload_file(
             request.COOKIES.get(settings.ADMIN_SESSION_ID_KEY, None),
             model,
             field_name,
             file_name,
             file_content,
+            id=obj_id,
             request=request,
         )
         return JsonResponse(file_url, safe=False)

{fastadmin-0.4.7 → fastadmin-0.4.9}/fastadmin/api/frameworks/fastapi/api.py

@@ -244,6 +244,7 @@ async def upload_file(
     model: str,
     field_name: str,
     file: UploadFile,
+    id: str | None = None,
 ) -> str:
     """This method is used to upload files.
 
@@ -251,6 +252,7 @@ async def upload_file(
     :params model: a name of model.
     :params field_name: a name of field.
     :params file: a file object.
+    :params id: an optional id of an existing object (change page). None on the add page.
     :return: A file url.
     """
     try:
@@ -264,6 +266,7 @@ async def upload_file(
             field_name,
             file_name,
             file_content,
+            id=id,
             request=request,
         )
     except AdminApiException as e:

{fastadmin-0.4.7 → fastadmin-0.4.9}/fastadmin/api/frameworks/flask/api.py

@@ -267,12 +267,14 @@ async def upload_file(
             http_exception.code = 422
             raise http_exception from None
         file_content = file.read()
+        obj_id = request.args.get("id") or None
         return await api_service.upload_file(
             request.cookies.get(settings.ADMIN_SESSION_ID_KEY, None),
             model,
             field_name,
             file_name,
             file_content,
+            id=obj_id,
             request=request,
         )
     except AdminApiException as e:

{fastadmin-0.4.7 → fastadmin-0.4.9}/fastadmin/api/service.py

@@ -329,6 +329,7 @@ class ApiService:
         field_name: str,
         file_name: str,
         file_content: bytes,
+        id: UUID | int | str | None = None,
         request: Any | None = None,
     ) -> str:
         _current_user_id, current_user = await self._get_authenticated_user(session_id)
@@ -339,6 +340,10 @@ class ApiService:
         self._bind_admin_context(admin_model, request=request, user=current_user)
 
         try:
+            obj = await admin_model.orm_get_obj(id) if id is not None else None
+            if id is not None and obj is None:
+                raise AdminApiException(404, detail=f"{model} with id {id} not found.")
+
             if inspect.iscoroutinefunction(admin_model.upload_file):
                 upload_file_fn = admin_model.upload_file
             else:
@@ -348,7 +353,10 @@ class ApiService:
                 field_name,
                 file_name,
                 file_content,
+                obj=obj,
             )
+        except AdminApiException:
+            raise
         except Exception as e:
             raise AdminApiException(500, detail=f"Error uploading file for {model}: {e}") from e
 

{fastadmin-0.4.7 → fastadmin-0.4.9}/fastadmin/models/base.py

@@ -14,6 +14,8 @@ from asgiref.sync import sync_to_async
 from fastadmin.api.schemas import ExportFormat
 from fastadmin.models.schemas import ModelFieldWidgetSchema, WidgetType
 
+Model = Any
+
 
 class BaseModelAdmin:
     """Base class for model admin"""
@@ -313,7 +315,7 @@ class BaseModelAdmin:
         """
         raise NotImplementedError
 
-    async def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) -> None:
+    async def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | str | UUID]) -> None:
         """This method is used to get m2m ids.
 
         :params obj: an object.
@@ -373,7 +375,7 @@ class BaseModelAdmin:
         return sort_by
 
     async def serialize_obj_attributes(
-        self, obj: Any, attributes_to_serizalize: list[ModelFieldWidgetSchema]
+        self, obj: Any, attributes_to_serizalize: list[ModelFieldWidgetSchema], list_view: bool = False
     ) -> dict[str, Any]:
         """Serialize orm model obj attribute to dict.
 
@@ -388,7 +390,10 @@ class BaseModelAdmin:
                 # Avoid scientific notation for Decimal values in API responses,
                 # e.g. 3.75E+3 -> "3750"
                 value = format(value, "f")
+
             serialized_dict[field.name] = value
+            if not list_view and field.form_widget_type in (WidgetType.UploadFile, WidgetType.UploadImage) and value:
+                serialized_dict[f"{field.name}__url"] = await self.get_file_url(field.name, value, obj)
         if inspect.iscoroutinefunction(obj.__str__):
             str_fn = obj.__str__
         else:
@@ -435,7 +440,7 @@ class BaseModelAdmin:
             else:
                 attributes_to_serizalize.append(field)
 
-        obj_dict.update(await self.serialize_obj_attributes(obj, attributes_to_serizalize))
+        obj_dict.update(await self.serialize_obj_attributes(obj, attributes_to_serizalize, list_view=list_view))
 
         for field_name in fields_for_serialize:
             display_field_function = getattr(self, field_name, None)
@@ -464,6 +469,7 @@ class BaseModelAdmin:
                 return datetime.datetime.fromisoformat(value).date()
             case WidgetType.DateTimePicker:
                 return datetime.datetime.fromisoformat(value)
+
             case _:
                 return value
 
@@ -541,17 +547,51 @@ class BaseModelAdmin:
         """
         await self.orm_delete_obj(id)
 
+    async def get_file_url(self, field_name: str, value: str, obj: Any | None = None) -> str:
+        """Return the display URL for an uploaded file field.
+
+        Called during serialization for every ``UploadFile`` and ``UploadImage``
+        field that has a non-empty stored value.  The result is emitted alongside
+        the stored value as ``{field_name}__url`` and forwarded to the upload
+        widget as ``valueRepr`` so the clickable link can differ from the raw
+        stored key (e.g. an S3 presigned URL instead of an ``s3://`` URI).
+
+        The stored ``value`` is never modified — it is still what the form
+        submits on save — so there is no risk of data corruption.
+
+        Override to return a dynamic URL.  Example using aiobotocore:
+
+        .. code-block:: python
+
+            async def get_file_url(self, field_name: str, value: str, obj=None) -> str:
+                bucket, key = value.replace("s3://", "").split("/", 1)
+                async with aiobotocore.session.get_session().create_client("s3") as s3:
+                    return await s3.generate_presigned_url(
+                        "get_object",
+                        Params={"Bucket": bucket, "Key": key},
+                        ExpiresIn=3600,
+                    )
+
+        :params field_name: name of the upload field being serialized.
+        :params value: raw stored value (e.g. ``"s3://bucket/key"`` or ``"/media/file.pdf"``).
+        :params obj: the orm/db model instance being serialized, or None.
+        :return: URL string to expose to the frontend for display/download.
+        """
+        return value
+
     async def upload_file(
         self,
         field_name: str,
         file_name: str,
         file_content: bytes,
+        obj: Any | None = None,
     ) -> str:
         """This method is used to upload files.
 
         :params field_name: a name of field.
         :params file_name: a name of file.
         :params file_content: a content of file.
+        :params obj: an orm/db model object. None on the add (create) page; the existing model instance on the change (edit) page.
         :return: A file url.
         """
         raise NotImplementedError

{fastadmin-0.4.7 → fastadmin-0.4.9}/fastadmin/models/orms/django.py

@@ -331,7 +331,7 @@ class DjangoORMMixin:
         return list(m2m_rel.all().values_list(self.get_model_pk_name(remote_model), flat=True))
 
     @sync_to_async
-    def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) -> None:
+    def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | str | UUID]) -> None:
         """This method is used to get m2m ids.
 
         :params obj: an object.

{fastadmin-0.4.7 → fastadmin-0.4.9}/fastadmin/models/orms/ponyorm.py

@@ -408,7 +408,7 @@ class PonyORMMixin:
 
     @sync_to_async
     @db_session
-    def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) -> None:
+    def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | str | UUID]) -> None:
         """This method is used to get m2m ids.
 
         :params obj: an object.
@@ -425,7 +425,17 @@ class PonyORMMixin:
         if ids:
             rel_model_cls = getattr(self.model_cls, field).py_type
             rel_key_id = self.get_model_pk_name(rel_model_cls)
-            rel_objs = list(rel_model_cls.select(lambda o: getattr(o, rel_key_id) in ids))
+            rel_id_type = getattr(getattr(rel_model_cls, "_pk_", None), "py_type", None)
+            normalized_ids = []
+            for rel_id in ids:
+                normalized_id = rel_id
+                if rel_id_type:
+                    try:
+                        normalized_id = rel_id_type(rel_id)
+                    except (ValueError, TypeError) as e:
+                        raise ValueError(f"Invalid id {rel_id!r} for relation {field}.") from e
+                normalized_ids.append(normalized_id)
+            rel_objs = list(rel_model_cls.select(lambda o: getattr(o, rel_key_id) in normalized_ids))
             getattr(obj, field).add(rel_objs)
         flush()
         commit()
@@ -433,7 +443,7 @@ class PonyORMMixin:
     @sync_to_async
     @db_session
     def serialize_obj_attributes(
-        self, obj: Any, attributes_to_serizalize: list[ModelFieldWidgetSchema]
+        self, obj: Any, attributes_to_serizalize: list[ModelFieldWidgetSchema], list_view: bool = False
     ) -> dict[str, Any]:
         """Serialize orm model obj attribute to dict.
 

{fastadmin-0.4.7 → fastadmin-0.4.9}/fastadmin/models/orms/sqlalchemy.py

@@ -467,7 +467,7 @@ class SqlAlchemyMixin:
             rel_pk_name = self.get_model_pk_name(related_class)
             return [getattr(related_obj, rel_pk_name) for related_obj in getattr(loaded, field, [])]
 
-    async def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) -> None:
+    async def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | str | UUID]) -> None:
         """This method is used to get m2m ids.
 
         :params obj: an object.

{fastadmin-0.4.7 → fastadmin-0.4.9}/fastadmin/models/orms/tortoise.py

@@ -338,7 +338,7 @@ class TortoiseMixin:
         remote_model = m2m_rel.remote_model
         return await m2m_rel.all().values_list(self.get_model_pk_name(remote_model), flat=True)
 
-    async def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) -> None:
+    async def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | str | UUID]) -> None:
         """This method is used to get m2m ids.
 
         :params obj: an object.

{fastadmin-0.4.7 → fastadmin-0.4.9}/fastadmin/models/schemas.py

@@ -256,7 +256,7 @@ class ModelFieldWidgetSchema:
 class ActionInputSchema:
     """Action input schema"""
 
-    ids: list[int | UUID]
+    ids: list[int | str | UUID]
 
 
 @dataclass