Refactor Python interpreter

agents-api/agents_api/activities/task_steps/__init__.py

@@ -2,18 +2,7 @@
 
 from .base_evaluate import base_evaluate
 from .cozo_query_step import cozo_query_step
-from .evaluate_step import evaluate_step
-from .for_each_step import for_each_step
 from .get_value_step import get_value_step
-from .if_else_step import if_else_step
-from .log_step import log_step
-from .map_reduce_step import map_reduce_step
 from .prompt_step import prompt_step
 from .raise_complete_async import raise_complete_async
-from .return_step import return_step
-from .set_value_step import set_value_step
-from .switch_step import switch_step
-from .tool_call_step import tool_call_step
 from .transition_step import transition_step
-from .wait_for_input_step import wait_for_input_step
-from .yield_step import yield_step

agents-api/agents_api/activities/task_steps/base_evaluate.py

@@ -37,10 +37,14 @@ def __init__(self, error, expression, values):
 
 
 # Recursive evaluation helper function
-def _recursive_evaluate(expr, evaluator: SimpleEval):
+def _recursive_evaluate(expr, evaluator: SimpleEval, eval_prompt_prefix: str = "$ "):
     if isinstance(expr, str):
         try:
-            return evaluator.eval(expr)
+            result = expr
+            if expr.startswith(eval_prompt_prefix):
+                result = evaluator.eval(expr[len(eval_prompt_prefix) :].strip())
+
+            return result
         except Exception as e:
             if activity.in_activity():
                 evaluate_error = EvaluateError(e, expr, evaluator.names)
@@ -69,6 +73,7 @@ async def base_evaluate(
     exprs: Any,
     values: dict[str, Any] = {},
     extra_lambda_strs: dict[str, str] | None = None,
+    eval_prompt_prefix: str = "$_",
 ) -> Any | list[Any] | dict[str, Any]:
     input_len = 1 if isinstance(exprs, str) else len(exprs)
     assert input_len > 0, "exprs must be a non-empty string, list or dict"
@@ -100,7 +105,9 @@ async def base_evaluate(
     evaluator: SimpleEval = get_evaluator(names=values, extra_functions=extra_lambdas)
 
     # Recursively evaluate the expression
-    result = _recursive_evaluate(exprs, evaluator)
+    result = _recursive_evaluate(
+        exprs, evaluator, eval_prompt_prefix=eval_prompt_prefix
+    )
     return result