From f79cde5b0c051b72dc46ae05e402d2ebe7f3d01a Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Fri, 7 Nov 2025 22:55:33 +0800 Subject: [PATCH] chore: update --- pkg/config/manager.py | 5 ++--- pkg/core/stages/load_config.py | 19 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkg/config/manager.py b/pkg/config/manager.py index 405c89d5..d45a04ec 100644 --- a/pkg/config/manager.py +++ b/pkg/config/manager.py @@ -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) diff --git a/pkg/core/stages/load_config.py b/pkg/core/stages/load_config.py index 2ef5623e..7360c336 100644 --- a/pkg/core/stages/load_config.py +++ b/pkg/core/stages/load_config.py @@ -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' )