Fix the type used for annotation output types

Author: Dekker1

CHANGELOG.rst

@@ -46,6 +46,8 @@ Fixed
   the documentation.
 - Correctly pass the ``-O0`` flag to the CLI when ``optimisation_level`` is set
   to zero.
+- Set type of MiniZinc annotation output type `ann` to `str` in Python in
+  accordance with the JSON output format.
 
 0.4.2_ - 2020-11-25
 -------------------

src/minizinc/CLI/driver.py

@@ -48,6 +48,8 @@ def to_python_type(mzn_type: dict) -> Type:
         pytype = int
     elif basetype == "string":
         pytype = str
+    elif basetype == "ann":
+        pytype = str
     else:
         warnings.warn(
             f"Unable to determine minizinc type `{basetype}` assuming integer type",

tests/test_types.py

@@ -220,3 +220,19 @@ def test_npint64(self):
         self.instance["x"] = numpy.int64(0)
         result = self.instance.solve()
         assert result.status is Status.SATISFIED
+
+
+# Enable on MiniZinc 2.6+ (JSON output of annotations is broken before then)
+# class TestAnn(InstanceTestCase):
+#     def test_ann_atom(self):
+#         self.instance.add_string("ann: x :: add_to_output = promise_total;")
+#         result = self.instance.solve()
+#         assert result.status is Status.SATISFIED
+#         assert result["x"] == "promise_total"
+
+#     def test_ann_call(self):
+#         self.instance.add_string(
+#         'ann: x :: add_to_output = expression_name("test");')
+#         result = self.instance.solve()
+#         assert result.status is Status.SATISFIED
+#         assert result["x"] == 'expression_name("test")'