Fix an exception bug in Cache. Template context is not deleted from S…

…equence after it was set (thus we can overwrite it with better values).
ynikitenko · Sep 5, 2023 · 257b9ed · 257b9ed
1 parent 5831496
commit 257b9ed
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/lena/core/lena_sequence.py b/lena/core/lena_sequence.py
@@ -65,7 +65,10 @@ def __init__(self, *args):
                 update_recursively(context, el_context)
 
         # Render that context that we can. Context is updated.
-        unknown_contexts = _update_unknown_contexts(unknown_contexts, context)
+        _update_unknown_contexts(unknown_contexts, context)
+        # unknown_contexts of this sequence are left as they are.
+        # We shall set them every time we update context.
+        # unknown_contexts = _update_unknown_contexts(unknown_contexts, context)
         # There is no way to check (during init)
         # that all static context was set,
         # because sequences are allowed to separate/wrap any elements.
@@ -75,13 +78,13 @@ def __init__(self, *args):
             # context is same for the whole sequence
             # (and external ones, but not for Split)
             if hasattr(el, "_set_context"):
-                if not unknown_contexts:
-                    # we set context after all unknowns are known.
-                    # el can't have unknown contexts
-                    # (except subsequences of Split);
-                    # at least not contexts
-                    # that shall update the current context
-                    el._set_context(context)
+                # if not unknown_contexts:
+                # we set context after all unknowns are known.
+                # el can't have unknown contexts
+                # (except subsequences of Split);
+                # at least not contexts
+                # that shall update the current context
+                el._set_context(context)
                 need_context.append(el)
 
             # todo 0.7: or has context

diff --git a/lena/flow/cache.py b/lena/flow/cache.py
@@ -151,7 +151,7 @@ def _set_context(self, context):
             return
         try:
             filename = self._format_context(context)
-        except LenaKeyError:
+        except lena.core.LenaKeyError:
             pass
         else:
             self._filename = filename

diff --git a/tests/meta/test_elements.py b/tests/meta/test_elements.py
@@ -105,8 +105,8 @@ def test_set_template_context_split():
         # todo: this is too complicated for now
         # # this will be overwritten
         # SetContext("cycle", "{{cycle}}_indeed"),
-        SetContext("detector", "{{data.detector}}"),
         SetContext("detector", "maybe_{{detector}}"),
+        SetContext("detector", "{{data.detector}}"),
     )
     # print(seq[-1]._context)
     assert seq._get_context()["detector"] == "maybe_near"
@@ -132,16 +132,18 @@ def test_set_template_context_split():
         split,
         store4
     )
-    assert store1._context == {'data': {'cycle': 1, 'lost': True}}
+    assert store1._context == {
+        'data': {'cycle': 1, 'lost': True},
+        'cycle': '1',
+    }
     assert store2._context == {
         'data': {'cycle': 1, 'detector': 'far', 'lost': True},
         'cycle': '1',
     }
     assert store3._context == {
         'data': {'cycle': 1, 'detector': 'near', 'lost': True},
         'detector': 'maybe_near',
-        # todo: maybe this is indended?..
-        'cycle': '2',
+        'cycle': '1',
         # 'cycle': '2_indeed',
     }
     # static context is the same for the same level of nesting