From 2bfdc03927ebeb62e68f0054459d3595abb11ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fred=20Lef=C3=A9v=C3=A8re-Laoide?= Date: Thu, 14 Nov 2024 11:01:37 +0100 Subject: [PATCH 1/3] add current scope variables when evaluating an expression resolves #2242 --- taipy/gui/utils/_evaluator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/taipy/gui/utils/_evaluator.py b/taipy/gui/utils/_evaluator.py index b124324858..339531bf4b 100644 --- a/taipy/gui/utils/_evaluator.py +++ b/taipy/gui/utils/_evaluator.py @@ -256,6 +256,7 @@ def evaluate_expr( # evaluate expressions ctx: t.Dict[str, t.Any] = {} ctx.update(self.__global_ctx) + ctx.update(gui._get_locals_bind()) # entries in var_val are not always seen (NameError) when passed as locals ctx.update(var_val) with gui._get_authorization(): From b6a0b91bf7a2d99de73fa63d3aea85a30ae58805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fred=20Lef=C3=A9v=C3=A8re-Laoide?= Date: Thu, 14 Nov 2024 14:49:52 +0100 Subject: [PATCH 2/3] - add locals only when evaluating a lambda - with test --- taipy/gui/utils/_evaluator.py | 3 ++- tests/gui/gui_specific/test_evaluator.py | 25 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tests/gui/gui_specific/test_evaluator.py diff --git a/taipy/gui/utils/_evaluator.py b/taipy/gui/utils/_evaluator.py index 339531bf4b..e4aee67954 100644 --- a/taipy/gui/utils/_evaluator.py +++ b/taipy/gui/utils/_evaluator.py @@ -256,7 +256,8 @@ def evaluate_expr( # evaluate expressions ctx: t.Dict[str, t.Any] = {} ctx.update(self.__global_ctx) - ctx.update(gui._get_locals_bind()) + if lambda_expr: + ctx.update(gui._get_locals_bind()) # entries in var_val are not always seen (NameError) when passed as locals ctx.update(var_val) with gui._get_authorization(): diff --git a/tests/gui/gui_specific/test_evaluator.py b/tests/gui/gui_specific/test_evaluator.py new file mode 100644 index 0000000000..c139ab9ca4 --- /dev/null +++ b/tests/gui/gui_specific/test_evaluator.py @@ -0,0 +1,25 @@ +# Copyright 2021-2024 Avaiga Private Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on +# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the +# specific language governing permissions and limitations under the License. + +from taipy.gui import Gui +from taipy.gui.utils._evaluator import _Evaluator + + +def _create_chart(x): + return x + +def test_evaluate_expr_lambda_from_element(gui: Gui, test_client, helpers): + gui._Gui__evaluator = _Evaluator({}, []) # type: ignore[attr-defined] + gui._Gui__locals_context.add("a_module", {"create_chart": _create_chart}) # type: ignore[attr-defined] + with gui._set_locals_context("a_module"): + evaluated_expr: str = gui._evaluate_expr("lambda x: create_chart(x)", lambda_expr=True) + assert evaluated_expr.startswith("__lambda_") + assert evaluated_expr.endswith("_TPMDL_0") From 12a9f5fe81febaa882f9eb1661a84c9ade4b7cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fred=20Lef=C3=A9v=C3=A8re-Laoide?= Date: Thu, 14 Nov 2024 17:34:10 +0100 Subject: [PATCH 3/3] fab's comment --- tests/gui/gui_specific/test_evaluator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/gui/gui_specific/test_evaluator.py b/tests/gui/gui_specific/test_evaluator.py index c139ab9ca4..72b8700fe8 100644 --- a/tests/gui/gui_specific/test_evaluator.py +++ b/tests/gui/gui_specific/test_evaluator.py @@ -13,13 +13,13 @@ from taipy.gui.utils._evaluator import _Evaluator -def _create_chart(x): +def _identity(x): return x def test_evaluate_expr_lambda_from_element(gui: Gui, test_client, helpers): gui._Gui__evaluator = _Evaluator({}, []) # type: ignore[attr-defined] - gui._Gui__locals_context.add("a_module", {"create_chart": _create_chart}) # type: ignore[attr-defined] + gui._Gui__locals_context.add("a_module", {"identity": _identity}) # type: ignore[attr-defined] with gui._set_locals_context("a_module"): - evaluated_expr: str = gui._evaluate_expr("lambda x: create_chart(x)", lambda_expr=True) + evaluated_expr: str = gui._evaluate_expr("lambda x: identity(x)", lambda_expr=True) assert evaluated_expr.startswith("__lambda_") assert evaluated_expr.endswith("_TPMDL_0")