fix: move optree to pypi dependencies

Author: abelaba

pixi.lock

@@ -15,6 +15,7 @@ dependencies = [
     "sqlalchemy>=2.0",
     "annotated-types>=0.4",
     "typing-extensions>=4.5",
+		"optree>=0.19",
 ]
 dynamic = ["version"]
 keywords = [
@@ -437,7 +438,6 @@ cma = ">=3.3"
 pygad = ">=3.2"
 pytorch-cpu = ">=2.2"
 ruff = ">=0.15.5,<0.16"
-optree = ">=0.19.0,<0.20"
 
 [tool.pixi.pypi-dependencies]
 optimagic = { path = ".", editable = true }

pyproject.toml

@@ -4,7 +4,6 @@
 from typing import Any, Literal, Sequence
 
 import numpy as np
-import optree
 from numpy.typing import NDArray
 from scipy.optimize import Bounds as ScipyBounds
 
@@ -180,20 +179,17 @@ def _update_bounds_and_flatten(
         np.ndarray: The updated and flattened bounds.
 
     """
-    with optree.dict_insertion_ordered(True, namespace=kind):
-        flat_nan_tree = tree_leaves(nan_tree, namespace=kind)
+    flat_nan_tree = tree_leaves(nan_tree, namespace=kind)
     if bounds is not None:
-        with optree.dict_insertion_ordered(True, namespace=VALUE_NAMESPACE):
-            flat_bounds = tree_leaves(bounds, namespace=VALUE_NAMESPACE)
+        flat_bounds = tree_leaves(bounds, namespace=VALUE_NAMESPACE)
 
         seperator = 10 * "$"
-        with optree.dict_insertion_ordered(True, namespace=VALUE_NAMESPACE):
-            params_names = leaf_names(
-                nan_tree, namespace=VALUE_NAMESPACE, separator=seperator
-            )
-            bounds_names = leaf_names(
-                bounds, namespace=VALUE_NAMESPACE, separator=seperator
-            )
+        params_names = leaf_names(
+            nan_tree, namespace=VALUE_NAMESPACE, separator=seperator
+        )
+        bounds_names = leaf_names(
+            bounds, namespace=VALUE_NAMESPACE, separator=seperator
+        )
 
         flat_nan_dict = dict(zip(params_names, flat_nan_tree, strict=False))
 

src/optimagic/parameters/bounds.py

@@ -182,7 +182,7 @@ def _flatten_df(df, data_col):
 
 
 def _unflatten_df(aux_data, leaves, data_col):
-    """Reconstrut a dataframe."""
+    """Reconstruct a dataframe."""
     if aux_data["is_value_df"]:
         out = aux_data["df"].assign(**{data_col: leaves})
     else:
@@ -204,7 +204,7 @@ def _flatten_series(series):
 
 
 def _unflatten_series(aux_data, leaves):
-    """Reconstrut a series."""
+    """Reconstruct a series."""
     return pd.Series(leaves, **aux_data)
 
 

src/optimagic/parameters/tree_registry.py

@@ -18,7 +18,6 @@
 from numpy._typing import NDArray
 
 PyTree = Any
-PyTreeRegistry = dict[type | str, dict[str, Callable[[Any], Any]]]
 Scalar = Any
 
 T = TypeVar("T")

src/optimagic/typing.py

@@ -156,7 +156,7 @@ def test_dict_insertion_ordering_is_respected_for_registered_namespaces():
     assert names == ["b_0", "b_1", "a_0", "a_1"]
 
 
-def test_dict_ordering_is_default_behaviour_is_by_name():
+def test_dict_ordering_default_behaviour_is_by_name():
     params = {"b": [1, 4], "a": [8, 9]}
     leaves, _ = tree_flatten(params)
     assert leaves == [8, 9, 1, 4]