From 3c34929fc676d128df7f10093e97957962b6f762 Mon Sep 17 00:00:00 2001 From: gmega Date: Thu, 19 Dec 2024 21:14:24 -0300 Subject: [PATCH] chore: minor refactoring --- benchmarks/k8s/parameter_expander.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/benchmarks/k8s/parameter_expander.py b/benchmarks/k8s/parameter_expander.py index 4cf0a77..59968d1 100644 --- a/benchmarks/k8s/parameter_expander.py +++ b/benchmarks/k8s/parameter_expander.py @@ -14,23 +14,21 @@ def expand(parameters: Dict[str, Any], run_id: bool = False) -> List[Dict[str, A if not isinstance(v, list): fixed[k] = v continue - if k.startswith("constrained__"): constrained[k] = v else: simple[k] = v - simple_expansion = _expand_simple(simple) - constrained_expansion = _expand_constrained(constrained) - - if not constrained_expansion: - final_expansion = [dict(item, **fixed) for item in simple_expansion] + if not constrained: + expanded_items = _expand_simple(simple) else: - final_expansion = [ - dict(simple + constrained, **fixed) for simple, constrained in - itertools.product(simple_expansion, constrained_expansion) + expanded_items = [ + simple + constrained for simple, constrained in + itertools.product(_expand_simple(simple), _expand_constrained(constrained)) ] + final_expansion = [dict(item, **fixed) for item in expanded_items] + if run_id: for i, item in enumerate(final_expansion, start=1): item["runId"] = i