Merge pull request #19 from StructuralPython/fixes/envelope_error

fix: merge_trees altering original trees; fix: envelope error

Author: connorferster

src/jsonchain/envelope.py

@@ -23,7 +23,14 @@ def envelope_tree(
             tree = {idx: value for idx, value in enumerate(tree)}
         elif isinstance(tree, dict):
             orig_tree = tree
-            tree = {idx: branch[leaf] for idx, branch in enumerate(tree.values())}
+            tree = {}
+
+            for idx, branch in enumerate(orig_tree.values()):
+                if isinstance(branch, dict):
+                    tree.update({idx: branch[leaf]})
+                else:
+                    tree.update({idx: branch})
+            # tree = {idx: branch[leaf] for idx, branch in enumerate(tree.values())}
             trace_tree = {idx: key for idx, key in enumerate(orig_tree.keys())}
 
         # leaf_acc = {}

src/jsonchain/tree.py

@@ -1,4 +1,4 @@
-from copy import copy
+from copy import deepcopy
 from typing import Hashable, Union, Optional, Any
 import operator
 import deepmerge
@@ -249,6 +249,7 @@ def merge_trees(trees: list[dict[str, dict]]) -> dict[str, dict]:
     within each branch, no matter how deep the branches go.
     """
     acc = {}
-    for result_tree in trees:
+    trees_copy = deepcopy(trees)
+    for result_tree in trees_copy:
         acc = deepmerge.always_merger.merge(acc, result_tree)
     return acc