From 3a2fec07c9c6e7ef531a0f2c407557d9ef03fb7e Mon Sep 17 00:00:00 2001 From: Barry Hart Date: Thu, 13 Oct 2022 08:30:28 -0400 Subject: [PATCH 1/2] Raise an error at server startup if sqlfluff-templater-dbt is installed --- src/dbt_osmosis/main.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/dbt_osmosis/main.py b/src/dbt_osmosis/main.py index 31e16ff..c532121 100644 --- a/src/dbt_osmosis/main.py +++ b/src/dbt_osmosis/main.py @@ -1,4 +1,5 @@ import functools +import importlib.util import multiprocessing import subprocess import sys @@ -300,6 +301,10 @@ def serve( ): """Runs a lightweight server compatible with dbt-power-user and convenient for interactively running or compile dbt SQL queries with two simple endpoints accepting POST messages""" + if importlib.util.find_spec('sqlfluff_templater_dbt'): + raise ValueError("sqlfluff-templater-dbt is not compatible with dbt-osmosis server. " + "Please uninstall it to continue.") + logger().info(":water_wave: Executing dbt-osmosis\n") def _register_project(): From 36dc3212f8ea7d4a79cc5f50c5a0acb86ed11ef8 Mon Sep 17 00:00:00 2001 From: Barry Hart Date: Thu, 13 Oct 2022 17:23:03 -0400 Subject: [PATCH 2/2] If sqlfluff-templater-dbt installed, log an error and exit rather than throwing exception --- src/dbt_osmosis/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dbt_osmosis/main.py b/src/dbt_osmosis/main.py index c532121..797f874 100644 --- a/src/dbt_osmosis/main.py +++ b/src/dbt_osmosis/main.py @@ -302,8 +302,9 @@ def serve( """Runs a lightweight server compatible with dbt-power-user and convenient for interactively running or compile dbt SQL queries with two simple endpoints accepting POST messages""" if importlib.util.find_spec('sqlfluff_templater_dbt'): - raise ValueError("sqlfluff-templater-dbt is not compatible with dbt-osmosis server. " - "Please uninstall it to continue.") + logger().error("sqlfluff-templater-dbt is not compatible with dbt-osmosis server. " + "Please uninstall it to continue.") + sys.exit(1) logger().info(":water_wave: Executing dbt-osmosis\n")