diff --git a/sage_datamart/dashboards.py b/sage_datamart/dashboards.py index 63d3bd3..08412bf 100644 --- a/sage_datamart/dashboards.py +++ b/sage_datamart/dashboards.py @@ -191,7 +191,7 @@ async def get_currency_breakdown(env, sor): COALESCE(SUM(amount_cny), 0) as amount_cny FROM dm_model_call_fact WHERE call_date = ${today}$ - GROUP BY currency + GROUP BY dm_model_call_fact.currency ORDER BY call_count DESC""" recs = await sor.sqlExe(sql, {'today': env.curDateString()}) return [{ diff --git a/sage_datamart/etl.py b/sage_datamart/etl.py index cc31984..2f9698a 100644 --- a/sage_datamart/etl.py +++ b/sage_datamart/etl.py @@ -178,7 +178,7 @@ async def aggregate_daily_perf(sor, stat_date=None): SUM(amount) as total_amount FROM dm_model_call_fact WHERE call_date = ${stat_date}$ - GROUP BY call_date, llmid, model, catelogid, providerid, ownerid, userorgid, currency + GROUP BY call_date, llmid, model, catelogid, providerid, ownerid, userorgid, dm_model_call_fact.currency """ rows = await sor.sqlExe(sql, {'stat_date': stat_date}) info('sage_datamart AGG: aggregating ' + str(len(rows)) + ' groups for ' + stat_date) @@ -236,7 +236,7 @@ async def aggregate_provider_cost(sor, stat_date=None): AVG(ttft_ms) as avg_ttft FROM dm_model_call_fact WHERE call_date = ${stat_date}$ - GROUP BY model, providerid, currency + GROUP BY model, providerid, dm_model_call_fact.currency """ rows = await sor.sqlExe(sql, {'stat_date': stat_date})