fix: nettokostnad etter kreditter + anomaly detection + onboarding status

ml/billing_agent.py

@@ -21,7 +21,7 @@ class BillingAgent:
         query = f"""
             SELECT
                 service.description as service,
-                SUM(cost) as total_cost
+                SUM(cost) + SUM(IFNULL((SELECT SUM(c.amount) FROM UNNEST(credits) c), 0)) as total_cost
             FROM `{self.billing_table}`
             WHERE _PARTITIONTIME >= TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 30 DAY)
             GROUP BY 1
@@ -35,15 +35,22 @@ class BillingAgent:
         for row in results:
             summary.append({"service": row.service, "total_cost": row.total_cost})
             
+        if not summary:
+            return {
+                "onboarding_status": {
+                    "state": "awaiting_data",
+                    "message": "Første fakturaeksport fra BigQuery kan ta 24-48 timer. Data er på vei."
+                }
+            }
+            
         return {"summary": summary}
 
     def get_forecast(self):
         """
         Retrieves a billing forecast based on the last 7 days.
         """
-        # Get total cost for the last 7 days
         query_last_7_days = f"""
-            SELECT SUM(cost) as total_cost
+            SELECT SUM(cost) + SUM(IFNULL((SELECT SUM(c.amount) FROM UNNEST(credits) c), 0)) as total_cost
             FROM `{self.billing_table}`
             WHERE _PARTITIONTIME >= TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 7 DAY)
         """
@@ -56,17 +63,18 @@ class BillingAgent:
 
         daily_average = total_cost_last_7_days / 7
 
-        # Calculate remaining days in the month
         today = datetime.date.today()
-        last_day_of_month = datetime.date(today.year, today.month, 1) + datetime.timedelta(days=32)
+        if today.month == 12:
-        last_day_of_month = last_day_of_month.replace(day=1) - datetime.timedelta(days=1)
+            next_month_first_day = datetime.date(today.year + 1, 1, 1)
+        else:
+            next_month_first_day = datetime.date(today.year, today.month + 1, 1)
+        last_day_of_month = next_month_first_day - datetime.timedelta(days=1)
         remaining_days = (last_day_of_month - today).days
 
         forecasted_cost = daily_average * remaining_days
         
-        # Get current month-to-date cost
         query_mtd = f"""
-            SELECT SUM(cost) as total_cost
+            SELECT SUM(cost) + SUM(IFNULL((SELECT SUM(c.amount) FROM UNNEST(credits) c), 0)) as total_cost
             FROM `{self.billing_table}`
             WHERE EXTRACT(MONTH FROM _PARTITIONTIME) = EXTRACT(MONTH FROM CURRENT_DATE())
               AND EXTRACT(YEAR FROM _PARTITIONTIME) = EXTRACT(YEAR FROM CURRENT_DATE())
@@ -84,9 +92,57 @@ class BillingAgent:
             "month_to_date_cost": mtd_cost,
             "forecasted_remaining_cost": forecasted_cost,
             "total_monthly_forecast": total_forecast,
+            "data_note": "Prognose basert på siste 7 dager. Fakturadata fra BigQuery kan ha 24-48 timers forsinkelse."
         }
 
+    def get_anomalies(self):
+        """
+        Detects anomalies in billing data by comparing today's cost to the 7-day average.
+        """
+        query = f"""
+            WITH daily_costs AS (
+                SELECT
+                    service.description AS service,
+                    DATE(_PARTITIONTIME) AS usage_date,
+                    SUM(cost) + SUM(IFNULL((SELECT SUM(c.amount) FROM UNNEST(credits) c), 0)) AS daily_cost
+                FROM `{self.billing_table}`
+                WHERE _PARTITIONTIME >= TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 14 DAY)
+                GROUP BY 1, 2
+            ),
+            costs_with_avg AS (
+                SELECT
+                    service,
+                    usage_date,
+                    daily_cost,
+                    AVG(daily_cost) OVER (PARTITION BY service ORDER BY usage_date ROWS BETWEEN 7 PRECEDING AND 1 PRECEDING) AS avg_7day
+                FROM daily_costs
+            )
+            SELECT
+                service,
+                daily_cost AS today_cost,
+                avg_7day,
+                (daily_cost / avg_7day) AS ratio
+            FROM costs_with_avg
+            WHERE usage_date = CURRENT_DATE()
+              AND avg_7day > 0
+              AND daily_cost > (2.0 * avg_7day)
+        """
+        query_job = self.bq_client.query(query)
+        results = query_job.result()
+
+        anomalies = []
+        for row in results:
+            anomalies.append({
+                "service": row.service,
+                "today_cost": row.today_cost,
+                "avg_7d": row.avg_7day,
+                "ratio": row.ratio
+            })
+
+        return {"anomalies": anomalies}
+
 if __name__ == '__main__':
     agent = BillingAgent()
     print("Summary:", agent.get_summary())
     print("Forecast:", agent.get_forecast())
+    print("Anomalies:", agent.get_anomalies())