fastadmin 0.4.7__tar.gz → 0.4.8__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastadmin
-Version: 0.4.7
+Version: 0.4.8
 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.8}/fastadmin/models/base.py

@@ -313,7 +313,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.

{fastadmin-0.4.7 → fastadmin-0.4.8}/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.8}/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()

{fastadmin-0.4.7 → fastadmin-0.4.8}/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.8}/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.8}/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