From 5d6c445d278722e640174b8108813682ad8ebed6 Mon Sep 17 00:00:00 2001
From: Eric Laurello <eric.laurello@flipsidecrypto.com>
Date: Wed, 20 Nov 2024 10:38:52 -0500
Subject: [PATCH] use fsc-utils

---
 dbt_project.yml          |  2 +-
 macros/set_query_tag.sql | 37 -------------------------------------
 packages.yml             |  2 +-
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 macros/set_query_tag.sql

diff --git a/dbt_project.yml b/dbt_project.yml
index 2392bda..f66c35b 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -39,7 +39,7 @@ models:
     columns: true
   +on_schema_change: "append_new_columns"
   osmosis_models:
-    +pre-hook: '{{ set_query_tag() }}'  # Changed from query_tag to pre-hook
+    +pre-hook: '{{ fsc_utils.set_query_tag() }}'  # Changed from query_tag to pre-hook
 
   
 tests:
diff --git a/macros/set_query_tag.sql b/macros/set_query_tag.sql
deleted file mode 100644
index 7e36b26..0000000
--- a/macros/set_query_tag.sql
+++ /dev/null
@@ -1,37 +0,0 @@
-{% macro get_query_tag() %}
-    {# Get the full path of the model #}
-    {% set model_path = model.path | string %}
-    {% set folder_path = '/'.join(model_path.split('/')[:-1]) %}
-    
-    {# Get core folders from vars #}
-    {% set core_folders = var('core_folders') %}
-    
-    {# Initialize is_core and check each path pattern #}
-    {% set ns = namespace(is_core=false) %}
-    
-    {% for folder in core_folders %}
-        {% if folder in folder_path %}
-            {% set ns.is_core = true %}
-        {% endif %}
-    {% endfor %}
-    
-    {# Build the JSON query tag #}
-    {% set tag_dict = {
-        "project": project_name,
-        "model": model.name,
-        "model_type": "core" if ns.is_core else "non_core",
-        "invocation_id": invocation_id,
-        "dbt_tags": config.get('tags', [])
-    } %}
-    
-    {% set query_tag = tojson(tag_dict) %}
-    
-    {# Return the properly escaped string #}
-    {{ return("'" ~ query_tag ~ "'") }}
-{% endmacro %}
-
-{% macro set_query_tag() %}
-    {% set tag = get_query_tag() %}
-    {% do run_query("alter session set query_tag = " ~ tag) %}
-    {{ return("") }}
-{% endmacro %}
\ No newline at end of file
diff --git a/packages.yml b/packages.yml
index fbf4b4c..80dc246 100644
--- a/packages.yml
+++ b/packages.yml
@@ -6,6 +6,6 @@ packages:
   - package: dbt-labs/dbt_external_tables
     version: 0.8.0
   - git: https://github.com/FlipsideCrypto/fsc-utils.git
-    revision: v1.29.0
+    revision: v1.32.0
   - package: get-select/dbt_snowflake_query_tags
     version: [">=2.0.0", "<3.0.0"]
\ No newline at end of file