chore: update

This commit is contained in:
Junyan Qin
2025-11-07 22:55:33 +08:00
parent d43c2c498c
commit f79cde5b0c
2 changed files with 10 additions and 14 deletions

View File

@@ -85,7 +85,6 @@ async def load_json_config(
async def load_yaml_config(
config_name: str,
template_name: str = None,
template_resource_name: str = None,
template_data: dict = None,
completion: bool = True,
@@ -94,14 +93,14 @@ async def load_yaml_config(
Args:
config_name (str): Config file name
template_name (str): Template file name
template_resource_name (str): Template resource name
template_data (dict): Template data
completion (bool): Whether to automatically complete the config file in memory
Returns:
ConfigManager: Config file manager
"""
cfg_inst = yaml_file.YAMLConfigFile(config_name, template_name, template_data)
cfg_inst = yaml_file.YAMLConfigFile(config_name, template_resource_name, template_data)
cfg_mgr = ConfigManager(cfg_inst)
await cfg_mgr.load_config(completion=completion)

View File

@@ -133,9 +133,7 @@ class LoadConfigStage(stage.BootingStage):
# ======= deprecated =======
ap.instance_config = await config.load_yaml_config(
'data/config.yaml', 'templates/config.yaml', completion=False
)
ap.instance_config = await config.load_yaml_config('data/config.yaml', 'config.yaml', completion=False)
# Apply environment variable overrides to data/config.yaml
ap.instance_config.data = _apply_env_overrides_to_config(ap.instance_config.data)
@@ -144,22 +142,21 @@ class LoadConfigStage(stage.BootingStage):
ap.sensitive_meta = await config.load_json_config(
'data/metadata/sensitive-words.json',
'templates/metadata/sensitive-words.json',
'metadata/sensitive-words.json',
)
await ap.sensitive_meta.dump_config()
ap.pipeline_config_meta_trigger = await config.load_yaml_config(
'templates/metadata/pipeline/trigger.yaml',
'templates/metadata/pipeline/trigger.yaml',
'metadata/pipeline/trigger.yaml',
'metadata/pipeline/trigger.yaml',
)
ap.pipeline_config_meta_safety = await config.load_yaml_config(
'templates/metadata/pipeline/safety.yaml',
'templates/metadata/pipeline/safety.yaml',
'metadata/pipeline/safety.yaml',
'metadata/pipeline/safety.yaml',
)
ap.pipeline_config_meta_ai = await config.load_yaml_config(
'templates/metadata/pipeline/ai.yaml', 'templates/metadata/pipeline/ai.yaml'
'metadata/pipeline/ai.yaml', 'metadata/pipeline/ai.yaml'
)
ap.pipeline_config_meta_output = await config.load_yaml_config(
'templates/metadata/pipeline/output.yaml',
'templates/metadata/pipeline/output.yaml',
'metadata/pipeline/output.yaml', 'metadata/pipeline/output.yaml'
)