Fix filesystem tool (#816)

Author: tastelikefeet

ms_agent/config/config.py

@@ -124,6 +124,15 @@ def parse_args() -> Dict[str, Any]:
                 _dict_config[key[2:]] = value
         return _dict_config
 
+    @staticmethod
+    def safe_get_config(config: DictConfig, keys: str) -> Any:
+        node = config
+        for key in keys.split('.'):
+            if not hasattr(node, key):
+                return None
+            node = getattr(node, key)
+        return node
+
     @staticmethod
     def _update_config(config: Union[DictConfig, ListConfig],
                        extra: Dict[str, str] = None):

ms_agent/tools/filesystem_tool.py

@@ -8,6 +8,7 @@
 from typing import Optional
 
 import json
+from ms_agent.config import Config
 from ms_agent.llm import LLM
 from ms_agent.llm.utils import Message, Tool
 from ms_agent.tools.base import ToolBase
@@ -56,8 +57,10 @@ def __init__(self, config, **kwargs):
         index_dir = getattr(config, 'index_cache_dir', DEFAULT_INDEX_DIR)
         self.index_dir = os.path.join(self.output_dir, index_dir)
         self.system = self.SYSTEM_FOR_ABBREVIATIONS
-        if hasattr(self.config.tools.file_system, 'system_for_abbreviations'):
-            self.system = self.config.tools.file_system.system_for_abbreviations
+        system = Config.safe_get_config(
+            self.config, 'tools.file_system.system_for_abbreviations')
+        if system:
+            self.system = system
 
     async def connect(self):
         logger.warning_once(

tests/config/test_config.py

@@ -0,0 +1,31 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+import unittest
+
+from ms_agent.config import Config
+from omegaconf import DictConfig
+
+from modelscope.utils.test_utils import test_level
+
+
+class TestConfig(unittest.TestCase):
+
+    @unittest.skipUnless(test_level() >= 0, 'skip test in current test level')
+    def test_safe_get_config(self):
+        config = DictConfig(
+            {'tools': {
+                'file_system': {
+                    'system_for_abbreviations': 'test'
+                }
+            }})
+        self.assertEqual(
+            'test',
+            Config.safe_get_config(
+                config, 'tools.file_system.system_for_abbreviations'))
+        delattr(config.tools, 'file_system')
+        self.assertTrue(
+            Config.safe_get_config(
+                config, 'tools.file_system.system_for_abbreviations') is None)
+
+
+if __name__ == '__main__':
+    unittest.main()