WIP

Author: z3z1ma

src/dbt_core_interface/project.py

@@ -9,6 +9,7 @@
 
     dbt.adapters.factory.get_adapter = lambda config: config.adapter  # pyright: ignore[reportUnknownLambdaType]
 
+import atexit
 import contextlib
 import json
 import logging
@@ -66,7 +67,7 @@ def _get_profiles_dir(project_dir: Path | str | None = None) -> Path:
 DEFAULT_PROJECT_DIR = str(_get_project_dir())
 
 
-@dataclass
+@dataclass(frozen=True)
 class DbtConfiguration:
     """Minimal dbt configuration."""
 
@@ -87,11 +88,6 @@ class DbtConfiguration:
     which: str = "zezima was here"
     REQUIRE_RESOURCE_NAMES_WITHOUT_SPACES: bool = field(default_factory=bool)
 
-    def __post_init__(self) -> None:
-        """Post-init validation and cleanup."""
-        if self.target == "":
-            self.target = None
-
 
 @dataclass
 class ExecutionResult:
@@ -142,6 +138,7 @@ def __init__(
             vars=vars or {},
         )
 
+        set_from_args(self._args, None)  # pyright: ignore[reportArgumentType]
         self.runtime_config: RuntimeConfig = RuntimeConfig.from_args(self._args)
 
         self._adapter: BaseAdapter | None = None
@@ -265,14 +262,17 @@ def pool(self) -> ThreadPoolExecutor:
             raise RuntimeError("Thread pool not initialized")
         return self._pool
 
-    def _initialize_adapter(self, replace: bool = False) -> None:
+    def _initialize_adapter(self, replace: bool = False, verify_connectivity: bool = True) -> None:
         """Initialize or reinitialize the adapter."""
         if self._adapter is not None:
             if not replace:
                 return
             with contextlib.suppress(Exception):
+                if self._pool:
+                    self._pool.shutdown(wait=True, cancel_futures=True)
+                    self._pool = None
                 self._adapter.connections.cleanup_all()
-                self._pool = None
+                _ = atexit.unregister(self._adapter.connections.cleanup_all)
 
         adapter_cls = get_adapter_class_by_name(self.runtime_config.credentials.type)
         try:
@@ -283,14 +283,18 @@ def _initialize_adapter(self, replace: bool = False) -> None:
         except ValueError:
             self._adapter = t.cast(BaseAdapter, adapter_cls(self.runtime_config))  # pyright: ignore[reportInvalidCast]
 
-        with self._adapter.connection_named("master"):
-            self._adapter.debug_query()
+        if verify_connectivity:
+            with self._adapter.connection_named("dbt-core-interface"):
+                self._adapter.debug_query()
 
         logger.debug(f"Initialized adapter for {self.project_name}")
         self.runtime_config.adapter = self._adapter  # pyright: ignore[reportAttributeAccessIssue]
         self.__manifest_loader.macro_hook = self._adapter.connections.set_query_header  # pyright: ignore[reportAttributeAccessIssue]
         self._adapter.set_macro_context_generator(generate_runtime_macro_context)  # pyright: ignore[reportArgumentType]
 
+        _ = self._adapter.connections.set_connection_name()
+        _ = atexit.register(self._adapter.connections.cleanup_all)
+
     def parse_project(self, write_manifest: bool = True) -> None:
         """Parse the dbt project and load manifest."""
         self._initialize_adapter(replace=False)
@@ -379,6 +383,8 @@ def execute_sql(self, sql: str, compile: bool = True) -> ExecutionResult:
             compiled_code=compiled_code,
         )
 
+    query = execute_sql
+
     def compile_sql(self, sql: str) -> CompilationResult:
         """Compile SQL without execution.