Fix ModelOutput instantiation form dictionaries (#13067)
* Fix ModelOutput instantiation form dictionaries * Style
This commit is contained in:
@@ -1850,11 +1850,15 @@ class ModelOutput(OrderedDict):
|
|||||||
other_fields_are_none = all(getattr(self, field.name) is None for field in class_fields[1:])
|
other_fields_are_none = all(getattr(self, field.name) is None for field in class_fields[1:])
|
||||||
|
|
||||||
if other_fields_are_none and not is_tensor(first_field):
|
if other_fields_are_none and not is_tensor(first_field):
|
||||||
try:
|
if isinstance(first_field, dict):
|
||||||
iterator = iter(first_field)
|
iterator = first_field.items()
|
||||||
first_field_iterator = True
|
first_field_iterator = True
|
||||||
except TypeError:
|
else:
|
||||||
first_field_iterator = False
|
try:
|
||||||
|
iterator = iter(first_field)
|
||||||
|
first_field_iterator = True
|
||||||
|
except TypeError:
|
||||||
|
first_field_iterator = False
|
||||||
|
|
||||||
# if we provided an iterator as first field and the iterator is a (key, value) iterator
|
# if we provided an iterator as first field and the iterator is a (key, value) iterator
|
||||||
# set the associated fields
|
# set the associated fields
|
||||||
|
|||||||
@@ -101,3 +101,9 @@ class ModelOutputTester(unittest.TestCase):
|
|||||||
x["a"] = 10
|
x["a"] = 10
|
||||||
self.assertEqual(x.a, 10)
|
self.assertEqual(x.a, 10)
|
||||||
self.assertEqual(x["a"], 10)
|
self.assertEqual(x["a"], 10)
|
||||||
|
|
||||||
|
def test_instantiate_from_dict(self):
|
||||||
|
x = ModelOutputTest({"a": 30, "b": 10})
|
||||||
|
self.assertEqual(list(x.keys()), ["a", "b"])
|
||||||
|
self.assertEqual(x.a, 30)
|
||||||
|
self.assertEqual(x.b, 10)
|
||||||
|
|||||||
Reference in New Issue
Block a user