align default cache and config directories under TIDY3D_BASE_DIR if set

Author: yaugenst-flex

tests/config/conftest.py

@@ -42,7 +42,7 @@ def mock_config_dir(tmp_path, monkeypatch):
 
     base_dir = tmp_path / "config_home"
     monkeypatch.setenv("TIDY3D_BASE_DIR", str(base_dir))
-    return base_dir / ".tidy3d"
+    return base_dir / "config"
 
 
 @pytest.fixture

tests/test_cli/test_migrate.py

@@ -18,7 +18,7 @@ def temp_config_dir(monkeypatch, tmp_path) -> Path:
     original_base = os.environ.get("TIDY3D_BASE_DIR")
     monkeypatch.setenv("TIDY3D_BASE_DIR", str(tmp_path))
     reload_config(profile="default")
-    config_dir = Path(tmp_path) / ".tidy3d"
+    config_dir = Path(tmp_path) / "config"
     config_dir.mkdir(parents=True, exist_ok=True)
     yield config_dir
     if original_base is None:

tidy3d/config/loader.py

@@ -247,7 +247,8 @@ def resolve_config_directory() -> Path:
 
     base_override = os.getenv("TIDY3D_BASE_DIR")
     if base_override:
-        path = Path(base_override).expanduser().resolve() / ".tidy3d"
+        base_path = Path(base_override).expanduser().resolve()
+        path = base_path / "config"
         if _is_writable(path.parent):
             return path
         log.warning(
@@ -281,7 +282,7 @@ def _xdg_config_home() -> Path:
 def _temporary_config_dir() -> Path:
     base = Path(tempfile.gettempdir()) / "tidy3d"
     base.mkdir(mode=0o700, exist_ok=True)
-    return base / ".tidy3d"
+    return base / "config"
 
 
 def _is_writable(path: Path) -> bool:

tidy3d/config/sections.py

@@ -391,7 +391,8 @@ def _default_cache_directory() -> Path:
 
     base_override = os.getenv("TIDY3D_BASE_DIR")
     if base_override:
-        base = Path(base_override).expanduser().resolve() / ".cache"
+        base = Path(base_override).expanduser().resolve()
+        return (base / "cache" / "simulations").resolve()
     else:
         xdg_cache = os.getenv("XDG_CACHE_HOME")
         if xdg_cache: