feat: get default project within current tree, fix test fixture for sqlfluff 3.4

Author: z3z1ma

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dbt-core-interface"
-version = "1.0.2"
+version = "1.0.3"
 dynamic = []
 description = "Dbt Core Interface"
 authors = [
@@ -18,8 +18,8 @@ keywords = [
 ]
 dependencies = [
   "dbt-core>=1.8.0,<2.0.0",
-  "rich",
-  "typing-extensions; python_version < '3.10'"
+  "rich>10.0",
+  "typing-extensions; python_version < '3.10'",
 ]
 
 [project.urls]

src/dbt_core_interface/project.py

@@ -92,35 +92,38 @@ def _set_invocation_context() -> None:
 
 def _get_project_dir() -> Path:
     """Get the default project directory following dbt heuristics."""
-    return Path(os.getenv("DBT_PROJECT_DIR", os.getcwd())).expanduser().resolve()
+    if "DBT_PROJECT_DIR" in os.environ:
+        return Path(os.environ["DBT_PROJECT_DIR"]).expanduser().resolve()
+    cwd = Path.cwd()
+    for path in [cwd, *list(cwd.parents)]:
+        if (path / "dbt_project.yml").exists():
+            return path.resolve()
+        if path == Path.home():
+            break
+    return cwd.resolve()
 
 
 def _get_profiles_dir(project_dir: Path | str | None = None) -> Path:
     """Get the default profiles directory following dbt heuristics."""
-    if "DBT_PROFILES_DIR" not in os.environ:
-        _project_dir = Path(project_dir or _get_project_dir())
-        if _project_dir.is_dir() and _project_dir.joinpath("profiles.yml").exists():
-            return _project_dir
-        return Path.home() / ".dbt"
-    return Path(os.environ["DBT_PROFILES_DIR"]).expanduser().resolve()
-
-
-DEFAULT_PROFILES_DIR = str(_get_profiles_dir())
-DEFAULT_PROJECT_DIR = str(_get_project_dir())
+    if "DBT_PROFILES_DIR" in os.environ:
+        return Path(os.environ["DBT_PROFILES_DIR"]).expanduser().resolve()
+    _project_dir = Path(project_dir or _get_project_dir())
+    if _project_dir.is_dir() and _project_dir.joinpath("profiles.yml").exists():
+        return _project_dir
+    return Path.home() / ".dbt"
 
 
 @dataclass(frozen=True)
 class DbtConfiguration:
     """Minimal dbt configuration."""
 
-    project_dir: str = DEFAULT_PROJECT_DIR
-    profiles_dir: str = DEFAULT_PROFILES_DIR
+    project_dir: str = field(default_factory=lambda: str(_get_project_dir()))
+    profiles_dir: str = field(default_factory=lambda: str(_get_profiles_dir()))
     target: str | None = None
     threads: int = 1
     vars: dict[str, t.Any] = field(default_factory=dict)
     profile: str | None = None
 
-    single_threaded: bool = True
     quiet: bool = True
     use_experimental_parser: bool = True
     static_parser: bool = True
@@ -130,6 +133,11 @@ class DbtConfiguration:
     which: str = "zezima was here"
     REQUIRE_RESOURCE_NAMES_WITHOUT_SPACES: bool = field(default_factory=bool)
 
+    @property
+    def single_threaded(self) -> bool:
+        """Return whether the project is single-threaded."""
+        return self.threads <= 1
+
 
 _use_slots = {}
 if sys.version_info >= (3, 10):
@@ -181,14 +189,15 @@ def __new__(
         target: str | None = None,
         project_dir: str | None = None,
         profiles_dir: str | None = None,
+        profile: str | None = None,
         threads: int = 1,
         vars: dict[str, t.Any] | None = None,
         load: bool = True,
         autoregister: bool = True,
     ) -> DbtProject:
         """Create a new DbtProject instance, ensuring only one instance per project root."""
         with cls._instance_lock:
-            p = Path(project_dir or DEFAULT_PROJECT_DIR).expanduser().resolve()
+            p = Path(project_dir or _get_project_dir()).expanduser().resolve()
             project = cls._instances.get(p)
             if not project:
                 project = super().__new__(cls)
@@ -216,6 +225,7 @@ def __init__(
         target: str | None = None,
         project_dir: str | None = None,
         profiles_dir: str | None = None,
+        profile: str | None = None,
         threads: int = 1,
         vars: dict[str, t.Any] | None = None,
         load: bool = True,
@@ -228,15 +238,16 @@ def __init__(
         if project_dir is not None and profiles_dir is None:
             profiles_dir = str(_get_profiles_dir(project_dir).resolve())
 
-        project_dir = project_dir or DEFAULT_PROJECT_DIR
-        profiles_dir = profiles_dir or DEFAULT_PROFILES_DIR
+        project_dir = project_dir or str(_get_project_dir())
+        profiles_dir = profiles_dir or str(_get_project_dir())
 
         self._args = DbtConfiguration(
             target=target,
             profiles_dir=profiles_dir,
             project_dir=project_dir,
             threads=threads,
             vars=vars or {},
+            profile=profile,
         )
 
         set_from_args(self._args, None)  # pyright: ignore[reportArgumentType]

tests/sqlfluff_templater/fixtures/dbt/templater.py

@@ -42,4 +42,11 @@ def sqlfluff_config_path() -> str:
 @pytest.fixture()
 def dbt_templater() -> DbtTemplater:
     """Return an instance of the DbtTemplater."""
-    return t.cast(DbtTemplater, FluffConfig(overrides={"dialect": "ansi"}).get_templater("dbt"))
+    try:
+        return t.cast(DbtTemplater, FluffConfig(overrides={"dialect": "ansi"}).get_templater("dbt"))
+    except TypeError:
+        # 3.4+
+        return t.cast(
+            DbtTemplater,
+            FluffConfig(overrides={"dialect": "ansi", "templater": "dbt"}).get_templater(),
+        )