Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions controller/breeder_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,25 +191,34 @@ def __init__(self, archive_db_config, meta_db_config):
def _normalize_constraints(self, config):
"""Normalize constraint formats in config for breeder workers

Converts dict format {"values": [...]} to list format [{"values": [...]}]
to ensure workers receive consistent constraint structure.
Recursively converts dict format {"values": [...]} to list format [{"values": [...]}]
to ensure workers receive consistent constraint structure. Handles arbitrary nesting
(e.g., ethtool -> interface -> param -> constraints).

Args:
config: Breeder configuration dict (modified in place)
"""
settings = config.get('settings', {})
for category_name, category_settings in settings.items():
if not isinstance(category_settings, dict):
continue

for param_name, param_config in category_settings.items():
if not isinstance(param_config, dict):
continue

constraints = param_config.get('constraints')
if constraints and isinstance(constraints, dict) and 'values' in constraints:
# Normalize dict to list format (same logic as ConfigValidator.validate_constraints_v03)
param_config['constraints'] = [constraints]
def normalize_dict(obj):
"""Recursively normalize constraint dicts to list format"""
if isinstance(obj, dict):
# Check if this is a constraints dict that needs normalization
if 'values' in obj and len(obj) == 1:
# This is a simple constraints dict: {"values": [...]}
return [obj] # Wrap in list

# Recursively process all values in the dict
for key, value in obj.items():
obj[key] = normalize_dict(value)
return obj
elif isinstance(obj, list):
# Process lists (though constraints shouldn't be nested in lists)
return [normalize_dict(item) for item in obj]
else:
return obj

# Normalize only the settings section
if 'settings' in config:
config['settings'] = normalize_dict(config['settings'])

def create_breeder(self, breeder_config, name):
"""Create a new breeder instance
Expand Down