Revert the creation of anonymous enumerated types

Author: Dekker1

CHANGELOG.rst

@@ -15,6 +15,14 @@ Fixed
 - Terminate the MiniZinc process when stopping early (instead of killing it).
   This allows MiniZinc to correctly stop any solver processes.
 
+Changed
+^^^^^^^
+
+- Revert change from 0.4.1 where enumerated types unknown to Python would be
+  made stored as anonymous enumerations. Interoperability between the MiniZinc
+  driver and the MiniZinc Python has instead changed to allow JSON strings as
+  valid input for enumerated types. (required MiniZinc 2.5.3)
+
 0.4.1_ - 2020-11-11
 -------------------
 

src/minizinc/json.py

@@ -24,16 +24,6 @@ def __init__(self, enum_map=None, *args, **kwargs):
             self.enum_map = enum_map
         JSONDecoder.__init__(self, object_hook=self.object_hook, *args, **kwargs)
 
-    def _lookup_enum(self, name: str):
-        if name in self.enum_map:
-            return self.enum_map[name]
-        else:
-            # TODO: mypy seems to believe name the elements should be literals,
-            # but I cannot find this anywhere in the documentation
-            anon_enum = Enum("AnonymousEnum", name)  # type: ignore
-            self.enum_map[name] = anon_enum(1)
-            return anon_enum(1)
-
     def object_hook(self, obj):
         if len(obj) == 1 and "set" in obj:
             if len(obj["set"]) == 1 and isinstance(obj["set"][0], list):
@@ -46,11 +36,11 @@ def object_hook(self, obj):
                     assert len(item) == 2
                     li.extend([i for i in range(item[0], item[1] + 1)])
                 elif len(obj) == 1 and "e" in obj:
-                    li.append(self._lookup_enum(obj["e"]))
+                    li.append(self.enum_map.get(obj["e"], obj["e"]))
                 else:
                     li.append(item)
             return set(li)
         elif len(obj) == 1 and "e" in obj:
-            return self._lookup_enum(obj["e"])
+            return self.enum_map.get(obj["e"], obj["e"])
         else:
             return obj

tests/test_types.py

@@ -17,15 +17,15 @@ class TestEnum(InstanceTestCase):
     def test_value(self):
         self.instance.add_string("constraint d == Mo;")
         result = self.instance.solve()
-        assert isinstance(result["d"], enum.Enum)
-        assert result["d"].name == "Mo"
+        assert isinstance(result["d"], str)
+        assert result["d"] == "Mo"
 
     def test_cmp_in_instance(self):
         self.instance.add_string("var DAY: d2;")
         self.instance.add_string("constraint d < d2;")
         result = self.instance.solve()
-        assert isinstance(result["d"], enum.Enum)
-        assert isinstance(result["d2"], enum.Enum)
+        assert isinstance(result["d"], str)
+        assert isinstance(result["d2"], str)
         # TODO: assert result["d"] < result["d2"]
 
     def test_cmp_between_instances(self):
@@ -36,9 +36,9 @@ def test_cmp_between_instances(self):
         inst = Instance(self.solver)
         inst.add_string(self.code + append)
         result2 = inst.solve()
-        assert isinstance(result["d"], enum.Enum)
-        assert isinstance(result2["d"], enum.Enum)
-        assert result["d"].name == result2["d"].name
+        assert isinstance(result["d"], str)
+        assert isinstance(result2["d"], str)
+        assert result["d"] == result2["d"]
 
         inst = Instance(self.solver)
         inst.add_string(
@@ -49,7 +49,7 @@ def test_cmp_between_instances(self):
             + append
         )
         result2 = inst.solve()
-        assert result["d"].name == result2["d"].name
+        assert result["d"] == result2["d"]
 
     def test_assign(self):
         self.instance = Instance(self.solver)