Merge pull request #32 from coqui-ai/revert-15-allow-file-objects

Revert "Allow file-like objects when saving and loading"

Author: erogol

coqpit/coqpit.py

@@ -1,5 +1,4 @@
 import argparse
-import contextlib
 import functools
 import json
 import operator
@@ -697,35 +696,28 @@ def to_json(self) -> str:
         """Returns a JSON string representation."""
         return json.dumps(asdict(self), indent=4, default=_coqpit_json_default)
 
-    def save_json(self, file_name: Union[str, Path, Any]) -> None:
+    def save_json(self, file_name: str) -> None:
         """Save Coqpit to a json file.
 
         Args:
-            file_name (str, Path or file-like object): path to the output json file or a file-like object to write to.
+            file_name (str): path to the output json file.
         """
-        if isinstance(file_name, (Path, str)):
-            opened = open(file_name, "w", encoding="utf8")
-        else:
-            opened = contextlib.nullcontext(file_name)
-        with opened as f:
+        with open(file_name, "w", encoding="utf8") as f:
             json.dump(asdict(self), f, indent=4)
 
-    def load_json(self, file_name: Union[str, Path, Any]) -> None:
+    def load_json(self, file_name: str) -> None:
         """Load a json file and update matching config fields with type checking.
         Non-matching parameters in the json file are ignored.
 
         Args:
-            file_name (str, Path or file-like object): Path to the json file or a file-like object to read from.
+            file_name (str): path to the json file.
 
         Returns:
             Coqpit: new Coqpit with updated config fields.
         """
-        if isinstance(file_name, (Path, str)):
-            opened = open(file_name, "r", encoding="utf8")
-        else:
-            opened = contextlib.nullcontext(file_name)
-        with opened as f:
-            dump_dict = json.load(f)
+        with open(file_name, "r", encoding="utf8") as f:
+            input_str = f.read()
+            dump_dict = json.loads(input_str)
         # TODO: this looks stupid 💆
         self = self.deserialize(dump_dict)  # pylint: disable=self-cls-assignment
         self.check_values()

tests/test_serialization.py

@@ -31,18 +31,6 @@ class Reference(Coqpit):
     )
 
 
-def assert_equal(a: Reference, b: Reference):
-    assert len(a) == len(b)
-    assert a.name == b.name
-    assert a.size == b.size
-    assert a.people[0].name == b.people[0].name
-    assert a.people[1].name == b.people[1].name
-    assert a.people[2].name == b.people[2].name
-    assert a.people[0].age == b.people[0].age
-    assert a.people[1].age == b.people[1].age
-    assert a.people[2].age == b.people[2].age
-
-
 def test_serizalization():
     file_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "test_serialization.json")
 
@@ -53,20 +41,13 @@ def test_serizalization():
     new_config.load_json(file_path)
     new_config.pprint()
 
-    assert_equal(ref_config, new_config)
-
-
-def test_serizalization_fileobject():
-    """Test serialization to and from file-like objects instead of paths"""
-    file_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "test_serialization_file.json")
-
-    ref_config = Reference()
-    with open(file_path, "w", encoding="utf-8") as f:
-        ref_config.save_json(f)
-
-    new_config = Group()
-    with open(file_path, "r", encoding="utf-8") as f:
-        new_config.load_json(f)
-    new_config.pprint()
-
-    assert_equal(ref_config, new_config)
+    # check values
+    assert len(ref_config) == len(new_config)
+    assert ref_config.name == new_config.name
+    assert ref_config.size == new_config.size
+    assert ref_config.people[0].name == new_config.people[0].name
+    assert ref_config.people[1].name == new_config.people[1].name
+    assert ref_config.people[2].name == new_config.people[2].name
+    assert ref_config.people[0].age == new_config.people[0].age
+    assert ref_config.people[1].age == new_config.people[1].age
+    assert ref_config.people[2].age == new_config.people[2].age