mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-01-07 23:28:30 +00:00
b4dfb19a3a
Some checks failed
Notify Downstream / notify-downstream (push) Has been cancelled
* Enhance string interpolation to support hyphens in variable names and add corresponding test cases. Update existing tests for consistency and formatting. * Refactor tests in task_test.py by removing unused Task instances to streamline test cases for the interpolate_only method and related functions.
83 lines
3.0 KiB
Python
83 lines
3.0 KiB
Python
import re
|
|
from typing import Any, Dict, List, Optional, Union
|
|
|
|
|
|
def interpolate_only(
|
|
input_string: Optional[str],
|
|
inputs: Dict[str, Union[str, int, float, Dict[str, Any], List[Any]]],
|
|
) -> str:
|
|
"""Interpolate placeholders (e.g., {key}) in a string while leaving JSON untouched.
|
|
Only interpolates placeholders that follow the pattern {variable_name} where
|
|
variable_name starts with a letter/underscore and contains only letters, numbers, and underscores.
|
|
|
|
Args:
|
|
input_string: The string containing template variables to interpolate.
|
|
Can be None or empty, in which case an empty string is returned.
|
|
inputs: Dictionary mapping template variables to their values.
|
|
Supported value types are strings, integers, floats, and dicts/lists
|
|
containing only these types and other nested dicts/lists.
|
|
|
|
Returns:
|
|
The interpolated string with all template variables replaced with their values.
|
|
Empty string if input_string is None or empty.
|
|
|
|
Raises:
|
|
ValueError: If a value contains unsupported types or a template variable is missing
|
|
"""
|
|
|
|
# Validation function for recursive type checking
|
|
def validate_type(value: Any) -> None:
|
|
if value is None:
|
|
return
|
|
if isinstance(value, (str, int, float, bool)):
|
|
return
|
|
if isinstance(value, (dict, list)):
|
|
for item in value.values() if isinstance(value, dict) else value:
|
|
validate_type(item)
|
|
return
|
|
raise ValueError(
|
|
f"Unsupported type {type(value).__name__} in inputs. "
|
|
"Only str, int, float, bool, dict, and list are allowed."
|
|
)
|
|
|
|
# Validate all input values
|
|
for key, value in inputs.items():
|
|
try:
|
|
validate_type(value)
|
|
except ValueError as e:
|
|
raise ValueError(f"Invalid value for key '{key}': {str(e)}") from e
|
|
|
|
if input_string is None or not input_string:
|
|
return ""
|
|
if "{" not in input_string and "}" not in input_string:
|
|
return input_string
|
|
if not inputs:
|
|
raise ValueError(
|
|
"Inputs dictionary cannot be empty when interpolating variables"
|
|
)
|
|
|
|
# The regex pattern to find valid variable placeholders
|
|
# Matches {variable_name} where variable_name starts with a letter/underscore
|
|
# and contains only letters, numbers, and underscores
|
|
pattern = r"\{([A-Za-z_][A-Za-z0-9_\-]*)\}"
|
|
|
|
# Find all matching variables in the input string
|
|
variables = re.findall(pattern, input_string)
|
|
result = input_string
|
|
|
|
# Check if all variables exist in inputs
|
|
missing_vars = [var for var in variables if var not in inputs]
|
|
if missing_vars:
|
|
raise KeyError(
|
|
f"Template variable '{missing_vars[0]}' not found in inputs dictionary"
|
|
)
|
|
|
|
# Replace each variable with its value
|
|
for var in variables:
|
|
if var in inputs:
|
|
placeholder = "{" + var + "}"
|
|
value = str(inputs[var])
|
|
result = result.replace(placeholder, value)
|
|
|
|
return result
|