Update app.py

app.py

@@ -26,46 +26,70 @@ def ensure_package(package_name: str):
 # =========================================================
 # ✅ DAX → SQL SUPPORT (NEW)
 # =========================================================
-LAST_DAX_FORMULA = ""
+def clean_column(col):
+    col = col.replace("'", "")
+    col = col.replace("[", ".")
+    col = col.replace("]", "")
+    return col.strip()
 
 def convert_dax_to_sql(dax_formula: str):
+
     if not dax_formula:
         return "No DAX formula available"
 
-    dax = dax_formula.strip()
+    dax = dax_formula.replace("\n", " ")
     dax_upper = dax.upper()
 
-    # DISTINCTCOUNT → Snowflake
-    m = re.search(r"DISTINCTCOUNT\s*\((.*?)\)", dax_upper)
-    if m:
-        col = m.group(1)
-        return f"SELECT COUNT(DISTINCT {col})\nFROM YOUR_TABLE"
+    # ✅ Extract main table
+    table_match = re.search(r"'(.*?)'\[", dax)
+    main_table = table_match.group(1) if table_match else "YOUR_TABLE"
 
-    # SUM
-    m = re.search(r"SUM\s*\((.*?)\)", dax_upper)
+    # ✅ DISTINCTCOUNT
+    col = None
+    m = re.search(r"DISTINCTCOUNT\s*\((.*?)\)", dax, re.IGNORECASE)
     if m:
-        col = m.group(1)
-        return f"SELECT SUM({col})\nFROM YOUR_TABLE"
+        col = clean_column(m.group(1))
+
+    # ✅ Build SELECT
+    select_part = f"COUNT(DISTINCT {col})" if col else "AGG_FUNCTION"
+
+    # ✅ Extract filters (basic logic)
+    filters = []
+
+    # INTERACTED = 1
+    m = re.findall(r"'(.*?)'\[(.*?)\]\s*=\s*(\d+)", dax)
+    for t, c, v in m:
+        filters.append(f"{t}.{c} = {v}")
+
+    # TEXT filters
+    m = re.findall(r"'(.*?)'\[(.*?)\]\s*=\s*\"(.*?)\"", dax)
+    for t, c, v in m:
+        filters.append(f"{t}.{c} = '{v}'")
+
+    # ISBLANK → IS NULL
+    m = re.findall(r"ISBLANK\s*\((.*?)\)", dax, re.IGNORECASE)
+    for expr in m:
+        expr = clean_column(expr)
+        filters.append(f"{expr} IS NULL")
+
+    # OR conditions (basic support)
+    if "||" in dax:
+        filters.append("(OR condition detected — refine manually)")
+
+    # ✅ WHERE clause
+    where_clause = ""
+    if filters:
+        where_clause = "\nWHERE " + "\n  AND ".join(filters)
+
+    # ✅ FINAL SQL
+    sql = f"""
+SELECT {select_part}
+FROM {main_table}
+{where_clause}
+""".strip()
+
+    return sql
 
-    # AVERAGE
-    m = re.search(r"AVERAGE\s*\((.*?)\)", dax_upper)
-    if m:
-        col = m.group(1)
-        return f"SELECT AVG({col})\nFROM YOUR_TABLE"
-
-    # DIVIDE → Snowflake
-    if "DIVIDE" in dax_upper:
-        return """SELECT 
-    (numerator / NULLIF(denominator, 0)) 
-FROM YOUR_TABLE"""
-
-    # CALCULATE → WHERE clause
-    if "CALCULATE" in dax_upper:
-        return """SELECT AGG_FUNCTION
-FROM YOUR_TABLE
-WHERE <filters>"""
-
-    return "⚠️ Complex DAX detected — enhance parser for full conversion"
 
 
 def convert_to_sql(dax_input):