Restrict NumberNode _from_zip return type

Previously accepted list of tuples and list of lists.
Now simply list of tuples for consistency.

Author: fastbodin

dwave/optimization/model.py

@@ -180,14 +180,14 @@ def binary(self, shape: None | _ShapeLike = None,
                 each variable). Non-boolean values are rounded down to the domain
                 [0,1]. If None, the default value of 1 is used.
             subject_to (optional): Axis-wise bounds for the symbol. Must be an
-                array of tuples or lists. Each tuple/list is of the form:
-                (axis, operator(s), bound(s)) where `axis` (int) is the axis in
-                which to apply the bound, `operator(s)` (str | array[str]) is
-                the operator(s) ("<=", "==", or ">=") defined per hyperslice or
-                for all hyperslice along the bound axis, and `bound(s)` (float
-                | array[float]) is the bound(s) defined per hyperslice or for
-                all hyperslice along the bound axis. If provided, the sum of
-                the values within each hyperslice along each bound axis will
+                array of tuples. Each tuple is of the form: (axis, operator(s),
+                bound(s)) where `axis` (int) is the axis to apply the bound(s),
+                `operator(s)` (str | array[str]) is the operator(s) ("<=",
+                "==", or ">=") defined for all hyperslice or per hyperslice
+                along the bound axis, and `bound(s)` (float | array[float]) is
+                the bound(s) defined for all hyperslice or per hyperslice
+                hyperslice along the bound axis. If provided, the sum of the
+                values within each hyperslice along each bound axis will
                 satisfy the axis-wise bounds. Note: At most one axis-wise bound
                 may be provided.
 
@@ -530,14 +530,14 @@ def integer(
                 each variable). Non-integer values are down up. If None, the
                 default value is used.
             subject_to (optional): Axis-wise bounds for the symbol. Must be an
-                array of tuples or lists. Each tuple/list is of the form:
-                (axis, operator(s), bound(s)) where `axis` (int) is the axis in
-                which to apply the bound, `operator(s)` (str | array[str]) is
-                the operator(s) ("<=", "==", or ">=") defined per hyperslice or
-                for all hyperslice along the bound axis, and `bound(s)` (float
-                | array[float]) is the bound(s) defined per hyperslice or for
-                all hyperslice along the bound axis. If provided, the sum of
-                the values within each hyperslice along each bound axis will
+                array of tuples. Each tuple is of the form: (axis, operator(s),
+                bound(s)) where `axis` (int) is the axis to apply the bound(s),
+                `operator(s)` (str | array[str]) is the operator(s) ("<=",
+                "==", or ">=") defined for all hyperslice or per hyperslice
+                along the bound axis, and `bound(s)` (float | array[float]) is
+                the bound(s) defined for all hyperslice or per hyperslice
+                hyperslice along the bound axis. If provided, the sum of the
+                values within each hyperslice along each bound axis will
                 satisfy the axis-wise bounds. Note: At most one axis-wise bound
                 may be provided.
 

dwave/optimization/symbols/numbers.pyx

@@ -58,10 +58,9 @@ cdef vector[NumberNode.BoundAxisInfo] _convert_python_bound_axes(
     cdef double[:] mem
 
     for bound_axis_data in bound_axes_data:
-        # We allow lists and tuples because the _from_zipfile method yields
-        # a list of lists not a list of tuples.
-        if not isinstance(bound_axis_data, (tuple, list)) or len(bound_axis_data) != 3:
-            raise TypeError("Each bound axis entry must be a tuple or list with"
+        if not isinstance(bound_axis_data, tuple) or len(bound_axis_data) != 3:
+            print(bound_axis_data)
+            raise TypeError("Each bound axis entry must be a tuple with"
                             " three elements: axis, operator(s), bound(s)")
 
         axis, py_ops, py_bounds = bound_axis_data
@@ -200,8 +199,10 @@ cdef class BinaryVariable(ArraySymbol):
             subject_to = None
         else:
             with zf.open(info, "r") as f:
-                # Note that import is a list of lists, not a list of tuples
                 subject_to = json.load(f)
+                # Note that import is a list of lists, not a list of tuples,
+                # hence we convert to tuple. We could also support lists.
+                subject_to = [(axis, ops, bounds) for axis, ops, bounds in subject_to]
 
         return BinaryVariable(model,
                               shape=shape_info["shape"],
@@ -409,6 +410,9 @@ cdef class IntegerVariable(ArraySymbol):
             with zf.open(info, "r") as f:
                 # Note that import is a list of lists, not a list of tuples
                 subject_to = json.load(f)
+                # Note that import is a list of lists, not a list of tuples,
+                # hence we convert to tuple. We could also support lists.
+                subject_to = [(axis, ops, bounds) for axis, ops, bounds in subject_to]
 
         return IntegerVariable(model,
                                shape=shape_info["shape"],