Fix: Premature configuration of default_yaml caused to be ineffective (#653)

Author: suluyana

ms_agent/agent/base.py

@@ -1,6 +1,7 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
 import importlib
 import inspect
+import os
 import sys
 from abc import abstractmethod
 from typing import Dict, List, Optional, Union
@@ -10,6 +11,9 @@
 from ms_agent.llm import Message
 from omegaconf import DictConfig
 
+DEFAULT_YAML = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), 'agent.yaml')
+
 
 class Agent:
     """
@@ -37,10 +41,13 @@ def __init__(self,
                  env: Optional[Dict[str, str]] = None,
                  tag: Optional[str] = None,
                  trust_remote_code: bool = False):
-        if config_dir_or_id is None:
+        if config_dir_or_id is not None:
+            self.config: DictConfig = Config.from_task(config_dir_or_id, env)
+        elif config is not None:
             self.config: DictConfig = config
         else:
-            self.config: DictConfig = Config.from_task(config_dir_or_id, env)
+            self.config: DictConfig = Config.from_task(DEFAULT_YAML)
+
         if tag is None:
             self.tag = getattr(config, 'tag', None) or self.DEFAULT_TAG
         else:

ms_agent/agent/llm_agent.py

@@ -24,9 +24,6 @@
 from .plan.utils import planer_mapping
 from .runtime import Runtime
 
-DEFAULT_YAML = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), 'agent.yaml')
-
 
 class LLMAgent(Agent):
     """
@@ -51,7 +48,7 @@ class LLMAgent(Agent):
     DEFAULT_SYSTEM = 'You are a helpful assistant.'
 
     def __init__(self,
-                 config_dir_or_id: Optional[str] = DEFAULT_YAML,
+                 config_dir_or_id: Optional[str] = None,
                  config: Optional[DictConfig] = None,
                  env: Optional[Dict[str, str]] = None,
                  **kwargs):