mirror of
https://github.com/NousResearch/atropos.git
synced 2026-04-22 16:48:57 +00:00
on policy changes
This commit is contained in:
parent
3fdaff9bb4
commit
b492ac4fce
2 changed files with 20 additions and 13 deletions
|
|
@ -1654,20 +1654,29 @@ class BaseEnv(ABC):
|
|||
cli_passed_flags, openai_full_prefix
|
||||
) # CLI args
|
||||
yaml_oai_config = yaml_config.get(OPENAI_NAMESPACE, {})
|
||||
if isinstance(default_server_configs, ServerBaseline) and (
|
||||
|
||||
# Auto-convert ServerBaseline to APIServerConfig when CLI/YAML overrides are provided
|
||||
# This allows any environment to use --openai.* CLI args without modifying config_init
|
||||
# Use a new variable to avoid UnboundLocalError from closure scoping
|
||||
effective_server_configs = default_server_configs
|
||||
if isinstance(effective_server_configs, ServerBaseline) and (
|
||||
oai_cli_passed_args or yaml_oai_config
|
||||
):
|
||||
raise ValueError(
|
||||
"ServerBaseline is not compatible with OpenAI-namespaced CLI arguments. Please edit `config_init` directly or use APIServerConfig." # noqa: E501
|
||||
# Convert ServerBaseline to APIServerConfig, preserving common fields
|
||||
baseline_dict = effective_server_configs.model_dump()
|
||||
effective_server_configs = APIServerConfig(**baseline_dict)
|
||||
logger.info(
|
||||
"Auto-converted ServerBaseline to APIServerConfig for CLI/YAML overrides"
|
||||
)
|
||||
|
||||
if (
|
||||
isinstance(default_server_configs, list)
|
||||
and len(default_server_configs) == 1
|
||||
isinstance(effective_server_configs, list)
|
||||
and len(effective_server_configs) == 1
|
||||
):
|
||||
# can't use the same var name because it shadows the class variable and we get an error
|
||||
default_openai_config_ = default_server_configs[0]
|
||||
default_openai_config_ = effective_server_configs[0]
|
||||
else:
|
||||
default_openai_config_ = default_server_configs
|
||||
default_openai_config_ = effective_server_configs
|
||||
if isinstance(yaml_oai_config, list) and len(yaml_oai_config) == 1:
|
||||
yaml_oai_config = yaml_oai_config[0]
|
||||
if isinstance(default_openai_config_, APIServerConfig) and isinstance(
|
||||
|
|
@ -1717,7 +1726,7 @@ class BaseEnv(ABC):
|
|||
# Determine the final server_configs, handling single, multiple servers, and overrides.
|
||||
|
||||
openai_configs = resolve_openai_configs(
|
||||
default_server_configs=default_server_configs,
|
||||
default_server_configs=effective_server_configs,
|
||||
openai_config_dict=openai_config_dict,
|
||||
yaml_config=yaml_config,
|
||||
cli_passed_flags=cli_passed_flags,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue