From c243f96b64a7b484955c21c21a20167e0ef49ba9 Mon Sep 17 00:00:00 2001 From: Pankaj Date: Thu, 18 Jul 2024 01:31:26 +0530 Subject: [PATCH 1/4] Use DBT LS as the default parser when profile_config is provided --- cosmos/dbt/graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cosmos/dbt/graph.py b/cosmos/dbt/graph.py index 4b33c67b32..e0b7f26ce2 100644 --- a/cosmos/dbt/graph.py +++ b/cosmos/dbt/graph.py @@ -320,7 +320,7 @@ def load( if self.project.is_manifest_available(): self.load_from_dbt_manifest() else: - if execution_mode == ExecutionMode.LOCAL and self.profile_config: + if self.profile_config: try: self.load_via_dbt_ls() except FileNotFoundError: From 593ae63a68b2f1eacc7494be90cc5653ac985cfa Mon Sep 17 00:00:00 2001 From: Pankaj Date: Thu, 18 Jul 2024 16:17:46 +0530 Subject: [PATCH 2/4] Apply review suggestions --- cosmos/dbt/graph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cosmos/dbt/graph.py b/cosmos/dbt/graph.py index e0b7f26ce2..fc6c9d8393 100644 --- a/cosmos/dbt/graph.py +++ b/cosmos/dbt/graph.py @@ -320,9 +320,10 @@ def load( if self.project.is_manifest_available(): self.load_from_dbt_manifest() else: - if self.profile_config: + if self.profile_config and self.project_path: try: self.load_via_dbt_ls() + logger.info("Using DBT ls") except FileNotFoundError: self.load_via_custom_parser() else: From c0563934b422dd35eafc4743b3606a59d76b51c4 Mon Sep 17 00:00:00 2001 From: Pankaj Date: Thu, 18 Jul 2024 16:21:47 +0530 Subject: [PATCH 3/4] Remove debug log --- cosmos/dbt/graph.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cosmos/dbt/graph.py b/cosmos/dbt/graph.py index fc6c9d8393..fcfff070b8 100644 --- a/cosmos/dbt/graph.py +++ b/cosmos/dbt/graph.py @@ -323,7 +323,6 @@ def load( if self.profile_config and self.project_path: try: self.load_via_dbt_ls() - logger.info("Using DBT ls") except FileNotFoundError: self.load_via_custom_parser() else: From f4032929d393479d605945a11fc6ee8d545ed8cb Mon Sep 17 00:00:00 2001 From: Pankaj Date: Thu, 18 Jul 2024 18:48:11 +0530 Subject: [PATCH 4/4] Fix tests --- tests/dbt/test_graph.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/dbt/test_graph.py b/tests/dbt/test_graph.py index 4591dd03f3..e53d5dd710 100644 --- a/tests/dbt/test_graph.py +++ b/tests/dbt/test_graph.py @@ -369,9 +369,9 @@ def test_load_manifest_with_manifest(mock_load_from_dbt_manifest): "exec_mode,method,expected_function", [ (ExecutionMode.LOCAL, LoadMode.AUTOMATIC, "mock_load_via_dbt_ls"), - (ExecutionMode.VIRTUALENV, LoadMode.AUTOMATIC, "mock_load_via_custom_parser"), - (ExecutionMode.KUBERNETES, LoadMode.AUTOMATIC, "mock_load_via_custom_parser"), - (ExecutionMode.DOCKER, LoadMode.AUTOMATIC, "mock_load_via_custom_parser"), + (ExecutionMode.VIRTUALENV, LoadMode.AUTOMATIC, "mock_load_via_dbt_ls"), + (ExecutionMode.KUBERNETES, LoadMode.AUTOMATIC, "mock_load_via_dbt_ls"), + (ExecutionMode.DOCKER, LoadMode.AUTOMATIC, "mock_load_via_dbt_ls"), (ExecutionMode.LOCAL, LoadMode.DBT_LS, "mock_load_via_dbt_ls"), (ExecutionMode.LOCAL, LoadMode.CUSTOM, "mock_load_via_custom_parser"), ],