replace GCP Firestore asdict with Model core version

fractal/__init__.py

@@ -1,6 +1,6 @@
 """Fractal is a scaffolding toolkit for building SOLID logic for your Python applications."""
 
-__version__ = "0.4.13"
+__version__ = "0.4.14"
 
 from abc import ABC
 

fractal/contrib/gcp/firestore/repositories.py

@@ -1,6 +1,4 @@
 from dataclasses import asdict
-from datetime import date
-from decimal import Decimal
 from typing import Iterator, Optional
 
 from google.cloud import firestore
@@ -107,28 +105,30 @@ def is_healthy(self) -> bool:
         return True
 
 
-class FirestoreDict(dict):
-    def __init__(self, obj):
-        for i, v in enumerate(obj):
-            if type(v[1]) is Decimal:
-                obj[i] = (v[0], f"{v[1]:.2f}")
-            if type(v[1]) is date:
-                obj[i] = (v[0], v[1].isoformat())
-        super(FirestoreDict, self).__init__(obj)
+# class FirestoreDict(dict):
+#     def __init__(self, obj):
+#         for i, v in enumerate(obj):
+#             if type(v[1]) is Decimal:
+#                 obj[i] = (v[0], f"{v[1]:.2f}")
+#             if type(v[1]) is date:
+#                 obj[i] = (v[0], v[1].isoformat())
+#         super(FirestoreDict, self).__init__(obj)
 
 
 class FirestoreRepositoryDictMixin(FirestoreRepositoryMixin[Entity]):
     def add(self, entity: Entity) -> Entity:
         doc_ref = self.collection.document(entity.id)
-        doc_ref.set(asdict(entity, dict_factory=FirestoreDict))
+        # doc_ref.set(asdict(entity, dict_factory=FirestoreDict))
+        doc_ref.set(entity.asdict())
         return entity
 
     def update(self, entity: Entity, *, upsert=False) -> Entity:
         if not upsert:
             doc_ref = self.collection.document(entity.id)
             doc = doc_ref.get()
             if doc.exists:
-                doc_ref.set(asdict(entity, dict_factory=FirestoreDict))
+                # doc_ref.set(asdict(entity, dict_factory=FirestoreDict))
+                doc_ref.set(entity.asdict())
             return entity
         return self.add(entity)
 

fractal/core/models/__init__.py

@@ -1,4 +1,6 @@
 from dataclasses import asdict, dataclass, fields
+from datetime import date
+from decimal import Decimal
 from enum import Enum
 from typing import Dict
 
@@ -29,6 +31,10 @@ def _asdict(v):
                 return v.asdict()
             elif isinstance(v, list):
                 return [_asdict(i) for i in v]
+            elif isinstance(v, Decimal):
+                return f"{v:.2f}"
+            elif isinstance(v, date):
+                return v.isoformat()
             return v
 
         ret = {k: _asdict(v) for k, v in self.__dict__.items() if k in field_names}