Merge pull request #58 from narumiruna/ordereddict

Support OrderedDict
narumiruna · Sep 2, 2022 · 7bf823e · 7bf823e
2 parents 8c2ea5a + 3934cee
commit 7bf823e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git a/mlconfig/collections.py b/mlconfig/collections.py
@@ -1,4 +1,7 @@
-class AttrDict(dict):
+from collections import OrderedDict
+
+
+class AttrDict(OrderedDict):
     IMMUTABLE = '__immutable__'
 
     def __init__(self, *args, **kwargs):
@@ -44,7 +47,7 @@ def is_immutable(self):
         return self.__dict__[AttrDict.IMMUTABLE]
 
     def to_dict(self):
-        data = {}
+        data = OrderedDict()
 
         for key, value in self.items():
             if isinstance(value, AttrDict):
@@ -55,7 +58,7 @@ def to_dict(self):
         return data
 
     def flat(self, prefix=None, sep='.'):
-        data = {}
+        data = OrderedDict()
 
         for key, value in self.items():
             if prefix is not None:

diff --git a/mlconfig/config.py b/mlconfig/config.py
@@ -1,6 +1,7 @@
 import copy
 import functools
 import inspect
+from collections import OrderedDict
 from string import Template
 from typing import Any
 from typing import Union
@@ -84,7 +85,7 @@ def merge_from_file(self, f: str, allow_new_key=False) -> None:
 
 
 def _flatten(data: dict, prefix=None, sep='.'):
-    d = {}
+    d = OrderedDict()
 
     for key, value in data.items():
         if prefix is not None:

diff --git a/mlconfig/utils.py b/mlconfig/utils.py
@@ -2,7 +2,7 @@
 import os
 from collections.abc import Sequence
 
-import yaml
+import oyaml as yaml
 
 
 def isextension(f: str, ext) -> bool:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,6 +8,7 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "^3.7"
 PyYAML = "^6.0"
+oyaml = "^1.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1.2"