Mirror structure of serialize in deserialize

Author: DarkLight1337

fsspec/spec.py

@@ -1486,10 +1486,15 @@ def from_dict(dct: Dict[str, Any]) -> AbstractFileSystem:
 
         json_decoder = FilesystemJSONDecoder()
 
-        def deserialize(obj: Any):
+        def deserialize(obj: Any) -> Any:
             if isinstance(obj, dict):
-                return json_decoder.custom_object_hook(obj)
-            
+                obj = json_decoder.custom_object_hook(obj)
+                if isinstance(obj, dict):
+                    return {k: deserialize(v) for k, v in obj.items()}
+
+            if isinstance(obj, (list, tuple)):
+                return [deserialize(v) for v in obj]
+
             return obj
 
         dct = dict(dct)  # Defensive copy
@@ -1501,10 +1506,10 @@ def deserialize(obj: Any):
         dct.pop("cls", None)
         dct.pop("protocol", None)
 
-        args = tuple(deserialize(arg) for arg in dct.pop("args", ()))
-        kwargs = {k: deserialize(v) for k, v in dct.items()}
-
-        return cls(*args, **kwargs)
+        return cls(
+            *deserialize(dct.pop("args", ())),
+            **deserialize(dct),
+        )
 
     def _get_pyarrow_filesystem(self):
         """

fsspec/tests/test_spec.py

@@ -891,6 +891,24 @@ def test_json_fs_attr():
     assert DummyTestFS.from_json(outc) is c
 
 
+def test_json_dict_attr():
+    a = DummyTestFS(1)
+    b = DummyTestFS(2, bar=Path("baz"))
+    c = DummyTestFS(3, baz={"key": b})
+
+    outa = a.to_json()
+    outb = b.to_json()
+    outc = c.to_json()
+
+    assert json.loads(outc)  # is valid JSON
+    assert b != c
+    assert "baz" in outc
+
+    assert DummyTestFS.from_json(outa) is a
+    assert DummyTestFS.from_json(outb) is b
+    assert DummyTestFS.from_json(outc) is c
+
+
 def test_dict():
     a = DummyTestFS(1)
     b = DummyTestFS(2, bar=1)
@@ -939,6 +957,24 @@ def test_dict_fs_attr():
     assert DummyTestFS.from_dict(outc) is c
 
 
+def test_dict_dict_attr():
+    a = DummyTestFS(1)
+    b = DummyTestFS(2, bar=Path("baz"))
+    c = DummyTestFS(3, baz={"key": b})
+
+    outa = a.to_dict()
+    outb = b.to_dict()
+    outc = c.to_dict()
+
+    assert isinstance(outc, dict)
+    assert b != c
+    assert outc["baz"]["key"] == outb
+
+    assert DummyTestFS.from_dict(outa) is a
+    assert DummyTestFS.from_dict(outb) is b
+    assert DummyTestFS.from_dict(outc) is c
+
+
 def test_dict_idempotent():
     a = DummyTestFS(1)