tests(cli): improve test coverage.

Author: Davidyz

src/vectorcode/cli_utils.py

@@ -127,6 +127,7 @@ async def import_from(cls, config_dict: dict[str, Any]) -> "Config":
         default_config = Config()
         db_path = config_dict.get("db_path")
 
+        expand_envs_in_dict(config_dict)
         if db_path is None:
             db_path = os.path.expanduser("~/.local/share/vectorcode/chromadb/")
         elif not os.path.isdir(db_path):
@@ -470,7 +471,7 @@ async def parse_cli_args(args: Optional[Sequence[str]] = None):
 
 
 def expand_envs_in_dict(d: dict):
-    if not isinstance(d, dict):
+    if not isinstance(d, dict):  # pragma: nocover
         return
     stack = [d]
     while stack:
@@ -485,6 +486,7 @@ def expand_envs_in_dict(d: dict):
 async def load_config_file(path: str | Path | None = None) -> Config:
     """
     Load config object by merging the project-local and the global config files.
+    `path` can be a _file path_ or a _project-root_ path.
 
     Raises `ValueError` if the config file is not a valid json dictionary.
     """
@@ -554,13 +556,12 @@ def find_project_root(
         start_from = start_from.parent
 
 
-async def get_project_config(project_root: Union[str, Path]) -> Config:
+async def get_project_config(project_root: str | Path) -> Config:
     """
     Load config file for `project_root`.
     Fallback to global config, and then default config.
     """
-    if not os.path.isabs(project_root):
-        project_root = os.path.abspath(project_root)
+    project_root = os.path.abspath(os.path.expanduser(project_root))
     exts = ("json5", "json")
     config = None
     for ext in exts:

src/vectorcode/main.py

@@ -24,7 +24,7 @@ async def async_main():
     if cli_args.no_stderr:
         sys.stderr = open(os.devnull, "w")
 
-    if cli_args.debug:
+    if cli_args.debug:  # pragma: nocover
         from vectorcode import debugging
 
         debugging.enable()

tests/test_cli_utils.py

@@ -207,6 +207,52 @@ async def test_load_config_file_invalid_json():
             await load_config_file(config_path)
 
 
+@pytest.mark.asyncio
+async def test_load_config_file_merging():
+    with tempfile.TemporaryDirectory() as dummy_home:
+        global_config_dir = os.path.join(dummy_home, ".config", "vectorcode")
+        os.makedirs(global_config_dir, exist_ok=True)
+        with open(os.path.join(global_config_dir, "config.json"), mode="w") as fin:
+            fin.writelines(['{"embedding_function": "DummyEmbeddingFunction"}'])
+
+        with tempfile.TemporaryDirectory(dir=dummy_home) as proj_root:
+            os.makedirs(os.path.join(proj_root, ".vectorcode"), exist_ok=True)
+            with open(
+                os.path.join(proj_root, ".vectorcode", "config.json"), mode="w"
+            ) as fin:
+                fin.writelines(
+                    ['{"embedding_function": "AnotherDummyEmbeddingFunction"}']
+                )
+
+            with patch(
+                "vectorcode.cli_utils.GLOBAL_CONFIG_DIR", new=str(global_config_dir)
+            ):
+                assert (
+                    await load_config_file()
+                ).embedding_function == "DummyEmbeddingFunction"
+                assert (
+                    await load_config_file(proj_root)
+                ).embedding_function == "AnotherDummyEmbeddingFunction"
+
+
+@pytest.mark.asyncio
+async def test_load_config_file_with_envs():
+    with tempfile.TemporaryDirectory() as proj_root:
+        os.makedirs(os.path.join(proj_root, ".vectorcode"), exist_ok=True)
+        with (
+            open(
+                os.path.join(proj_root, ".vectorcode", "config.json"), mode="w"
+            ) as fin,
+        ):
+            fin.writelines(['{"embedding_function": "$DUMMY_EMBEDDING_FUNCTION"}'])
+        with patch.dict(
+            os.environ, {"DUMMY_EMBEDDING_FUNCTION": "DummyEmbeddingFunction"}
+        ):
+            assert (
+                await load_config_file(proj_root)
+            ).embedding_function == "DummyEmbeddingFunction"
+
+
 @pytest.mark.asyncio
 async def test_load_from_default_config():
     for name in ("config.json5", "config.json"):