refactor(dataclass): follow the order of dataclass field on assign (#176)

hanxiao · web-flow · commit 371eb74640de · 2022-03-07T18:55:45.000+01:00
diff --git a/docarray/base.py b/docarray/base.py
@@ -32,10 +32,9 @@ def __init__(
             if field_resolver:
                 kwargs = {field_resolver.get(k, k): v for k, v in kwargs.items()}
 
+            _fields = fields(self._data_class)
             _unknown_kwargs = None
-            _unresolved = set(kwargs.keys()).difference(
-                {f.name for f in fields(self._data_class)}
-            )
+            _unresolved = set(kwargs.keys()).difference({f.name for f in _fields})
 
             if _unresolved:
                 if unknown_fields_handler == 'raise':
@@ -47,12 +46,9 @@ def __init__(
 
             self._data = self._data_class(self)
 
-            # ``id`` need to be set at the first place, since some other attributes would depends on it.
-            if 'id' in kwargs:
-                setattr(self._data, 'id', kwargs.pop('id'))
-
-            for k, v in kwargs.items():
-                setattr(self._data, k, v)
+            for field in _fields:
+                if field.name in kwargs:
+                    setattr(self._data, field.name, kwargs[field.name])
 
             if _unknown_kwargs and unknown_fields_handler == 'catch':
                 getattr(self, self._unresolved_fields_dest).update(_unknown_kwargs)
diff --git a/tests/unit/document/test_converters.py b/tests/unit/document/test_converters.py
@@ -181,9 +181,9 @@ def test_convert_uri_to_text(uri, mimetype):
 
 def test_convert_text_to_uri_and_back():
     text_from_file = open(__file__).read()
-    doc = Document(content=text_from_file, mime_type='text/x-python')
+    doc = Document(content=text_from_file)
     assert doc.text
-    assert doc.mime_type == 'text/x-python'
+    assert doc.mime_type == 'text/plain'
     doc.convert_text_to_datauri()
     doc.load_uri_to_text()
     assert doc.mime_type == 'text/plain'
