Merge remote-tracking branch 'origin/dm/upgrade-simpleeval' into autostaging

Author: orangejenny

corehq/apps/userreports/expressions/evaluator/main.py

@@ -5,18 +5,21 @@
 from datetime import date, datetime
 from decimal import Decimal
 
-from corehq.util import eval_lazy
 from simpleeval import (
     DEFAULT_OPERATORS,
-    FeatureNotAvailable,
-    InvalidExpression,
     DISALLOW_FUNCTIONS,
-    FunctionNotDefined,
     EvalWithCompoundTypes,
+    FeatureNotAvailable,
+    FunctionNotDefined,
+    InvalidExpression,
+    MultipleExpressions,
 )
 
-from .functions import FUNCTIONS, CONTEXT_PARAM_NAME, NEEDS_CONTEXT_PARAM_NAME
+from corehq.util import eval_lazy
+from corehq.util.decorators import ignore_warning
+
 from ...specs import EvaluationContext, FactoryContext
+from .functions import CONTEXT_PARAM_NAME, FUNCTIONS, NEEDS_CONTEXT_PARAM_NAME
 
 
 def safe_pow_fn(a, b):
@@ -35,6 +38,10 @@ class CommCareEval(EvalWithCompoundTypes):
     users less options to do crazy things that might get them / us into
     hard to back out of situations."""
 
+    def __init__(self, *args, **kw):
+        super().__init__(*args, **kw)
+        self.nodes.pop(ast.DictComp)  # disallow dict comprehensions
+
     def set_context(self, context):
         self._context = context.scope(self)
 
@@ -46,7 +53,7 @@ def _eval_call(self, node):
             func = self.functions[node.func.id]
         except KeyError:
             raise FunctionNotDefined(node.func.id, self.expr)
-        except AttributeError as e:
+        except AttributeError:
             raise FeatureNotAvailable('Lambda Functions not implemented')
 
         if func in DISALLOW_FUNCTIONS:
@@ -79,15 +86,16 @@ def eval_statements(statement, variable_context, execution_context=None):
 
     evaluator = CommCareEval(operators=SAFE_OPERATORS, names=variable_context, functions=FUNCTIONS)
     evaluator.set_context(execution_context)
-    return evaluator.eval(statement)
+    with ignore_warning(MultipleExpressions):
+        return evaluator.eval(statement)
 
 
 @dataclasses.dataclass(frozen=True)
 class EvalExecutionContext:
     evaluation_context: EvaluationContext
     factory_context: FactoryContext
     evaluator: CommCareEval = None
-    
+
     @classmethod
     def empty(cls):
         return EvalExecutionContext(EvaluationContext.empty(), FactoryContext.empty())

requirements/base-requirements.in

@@ -99,8 +99,7 @@ requests
 schema
 sentry-sdk
 sh
-# Package has an unfixed issue https://github.com/danthedeckie/simpleeval/issues/90 Can use that once https://github.com/danthedeckie/simpleeval/pull/91 is merged
-simpleeval @ git+https://github.com/dimagi/simpleeval.git@d85c5a9f972c0f0416a1716bb06d1a3ebc83e7ec
+simpleeval
 simplejson
 six
 socketpool

requirements/dev-requirements.txt

@@ -604,7 +604,7 @@ sh==2.0.3
     #   -r base-requirements.in
     #   dependency-metrics
     #   git-build-branch
-simpleeval @ git+https://github.com/dimagi/simpleeval.git@d85c5a9f972c0f0416a1716bb06d1a3ebc83e7ec
+simpleeval==1.0.3
     # via -r base-requirements.in
 simplejson==3.17.6
     # via

requirements/docs-requirements.txt

@@ -491,7 +491,7 @@ sentry-sdk==2.8.0
     # via -r base-requirements.in
 sh==2.0.3
     # via -r base-requirements.in
-simpleeval @ git+https://github.com/dimagi/simpleeval.git@d85c5a9f972c0f0416a1716bb06d1a3ebc83e7ec
+simpleeval==1.0.3
     # via -r base-requirements.in
 simplejson==3.17.6
     # via

requirements/prod-requirements.txt

@@ -501,7 +501,7 @@ setproctitle==1.2.2
     # via -r prod-requirements.in
 sh==2.0.3
     # via -r base-requirements.in
-simpleeval @ git+https://github.com/dimagi/simpleeval.git@d85c5a9f972c0f0416a1716bb06d1a3ebc83e7ec
+simpleeval==1.0.3
     # via -r base-requirements.in
 simplejson==3.17.6
     # via

requirements/requirements.txt

@@ -461,7 +461,7 @@ sentry-sdk==2.8.0
     # via -r base-requirements.in
 sh==2.0.3
     # via -r base-requirements.in
-simpleeval @ git+https://github.com/dimagi/simpleeval.git@d85c5a9f972c0f0416a1716bb06d1a3ebc83e7ec
+simpleeval==1.0.3
     # via -r base-requirements.in
 simplejson==3.17.6
     # via

requirements/test-requirements.txt

@@ -511,7 +511,7 @@ sentry-sdk==2.8.0
     # via -r base-requirements.in
 sh==2.0.3
     # via -r base-requirements.in
-simpleeval @ git+https://github.com/dimagi/simpleeval.git@d85c5a9f972c0f0416a1716bb06d1a3ebc83e7ec
+simpleeval==1.0.3
     # via -r base-requirements.in
 simplejson==3.17.6
     # via