Merge pull request #98 from andrewm4894/develop

Develop

Author: andrewm4894

anomstack/external/gcp/gcs.py

@@ -40,12 +40,12 @@ def get_credentials():
     credentials_path = os.getenv("ANOMSTACK_GOOGLE_APPLICATION_CREDENTIALS")
     credentials_json = os.getenv("ANOMSTACK_GOOGLE_APPLICATION_CREDENTIALS_JSON")
 
-    if credentials_path:
-        return service_account.Credentials.from_service_account_file(credentials_path)
-    elif credentials_json:
+    if credentials_json:
         return service_account.Credentials.from_service_account_info(
             json.loads(credentials_json)
         )
+    elif credentials_path:
+        return service_account.Credentials.from_service_account_file(credentials_path)
     else:
         return None
 

anomstack/sql/read.py

@@ -2,6 +2,7 @@
 This module provides functions for reading data from SQL databases using different database connectors.
 """
 
+import re
 import pandas as pd
 import sqlglot
 from dagster import get_dagster_logger
@@ -23,9 +24,14 @@ def db_translate(sql: str, db: str) -> str:
     Returns:
         str: The translated SQL query.
     """
-    sql = sqlglot.transpile(sql, write=db, identify=True)[0]
+    # Transpile the SQL query to the target database dialect
+    sql = sqlglot.transpile(sql, write=db, identify=True, pretty=True)[0]
+    # Replace some functions with their db-specific equivalents
     if db == "sqlite":
         sql = sql.replace("GET_CURRENT_TIMESTAMP()", "DATETIME('now')")
+    elif db == "bigquery":
+        sql = sql.replace("GET_CURRENT_TIMESTAMP()", "CURRENT_TIMESTAMP()")
+        sql = re.sub(r"DATE\('now', '(-?\d+) day'\)", "DATE_ADD(CURRENT_DATE(), INTERVAL \\1 DAY)", sql)
 
     return sql
 

metrics/defaults/sql/alerts.sql

@@ -120,7 +120,7 @@ data_alerts AS (
     metric_has_recent_alert,
     CASE
       WHEN metric_score_recency_rank <= {{ alert_recent_n }}
-        AND (metric_score_smooth >= {{ alert_threshold }} OR {{ alert_always }} = 1)
+        AND (metric_score_smooth >= {{ alert_threshold }} OR {{ alert_always }} = True)
         AND metric_has_recent_alert = 0
       THEN 1
       ELSE 0