Compare commits

...

1 Commits

+16 -30
View File
@@ -241,39 +241,25 @@ class ActorConfiguration(BaseModel):
):
combined_provider, combined_model = _parse_combined_actor_field(data)
if not isinstance(model_value, str) or not model_value:
# First, check for a separate config.model key in the nested map.
model_from_separate: str | None = None
actors_val = data.get("actors")
if isinstance(actors_val, dict) and actors_val:
for _, first_entry in actors_val.items():
if isinstance(first_entry, dict):
config_block = first_entry.get("config")
if isinstance(config_block, dict):
mv = config_block.get("model")
if isinstance(mv, str) and mv:
model_from_separate = mv
break
break
if model_from_separate:
model_value = model_from_separate
for _, entry in (data.get("actors") or {}).items():
if isinstance(entry, dict):
config_block = entry.get("config")
if isinstance(config_block, dict):
mv = config_block.get("model")
if isinstance(mv, str) and mv:
model_value = mv
break
elif combined_model:
model_value = combined_model
if not isinstance(provider_value, str) or not provider_value:
# First, check for a separate config.provider key in the nested map.
provider_from_separate: str | None = None
actors_val = data.get("actors")
if isinstance(actors_val, dict) and actors_val:
for _, first_entry in actors_val.items():
if isinstance(first_entry, dict):
config_block = first_entry.get("config")
if isinstance(config_block, dict):
pv = config_block.get("provider")
if isinstance(pv, str) and pv:
provider_from_separate = pv
break
break
if provider_from_separate:
provider_value = provider_from_separate
for _, entry in (data.get("actors") or {}).items():
if isinstance(entry, dict):
config_block = entry.get("config")
if isinstance(config_block, dict):
pv = config_block.get("provider")
if isinstance(pv, str) and pv:
provider_value = pv
break
elif combined_provider:
provider_value = combined_provider