🐸 Fix pytest, add 'extra_attrs_to_save' to _save_mapper, load other keys in _load_mapper.

Author: dathudeptrai

tensorflow_tts/configs/fastspeech.py

@@ -16,8 +16,8 @@
 
 import collections
 
-from tensorflow_tts.processor.ljspeech import symbols as lj_symbols
-from tensorflow_tts.processor.kss import symbols as kss_symbols
+from tensorflow_tts.processor.ljspeech import LJSPEECH_SYMBOLS as lj_symbols
+from tensorflow_tts.processor.kss import KSS_SYMBOLS as kss_symbols
 from tensorflow_tts.processor.baker import symbols as bk_symbols
 
 

tensorflow_tts/configs/tacotron2.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 """Tacotron-2 Config object."""
 
-from tensorflow_tts.processor.ljspeech import symbols as lj_symbols
-from tensorflow_tts.processor.kss import symbols as kss_symbols
+from tensorflow_tts.processor.ljspeech import LJSPEECH_SYMBOLS as lj_symbols
+from tensorflow_tts.processor.kss import KSS_SYMBOLS as kss_symbols
 from tensorflow_tts.processor.baker import symbols as bk_symbols
 
 

tensorflow_tts/processor/base_processor.py

@@ -178,7 +178,13 @@ def _load_mapper(self, loaded_path: str = None):
         self.symbol_to_id = data["symbol_to_id"]
         self.id_to_symbol = {int(k): v for k, v in data["id_to_symbol"].items()}
 
-    def _save_mapper(self, saved_path: str = None):
+        # other keys
+        all_data_keys = data.keys()
+        for key in all_data_keys:
+            if key not in ["speakers_map", "symbol_to_id", "id_to_symbol"]:
+                setattr(self, key, data[key])
+
+    def _save_mapper(self, saved_path: str = None, extra_attrs_to_save: dict = None):
         """
         Save all needed mappers to file
         """
@@ -193,4 +199,6 @@ def _save_mapper(self, saved_path: str = None):
                 "id_to_symbol": self.id_to_symbol,
                 "speakers_map": self.speakers_map,
             }
+            if extra_attrs_to_save:
+                full_mapper = {**full_mapper, **extra_attrs_to_save}
             json.dump(full_mapper, f)