fix /global/spend/end_users

litellm/proxy/proxy_server.py

@@ -5792,35 +5792,28 @@ async def global_spend_end_users(data: Optional[GlobalEndUsersSpend] = None):
     if prisma_client is None:
         raise HTTPException(status_code=500, detail={"error": "No db connected"})
 
-    if data is None:
-        sql_query = f"""SELECT * FROM "Last30dTopEndUsersSpend";"""
-
-        response = await prisma_client.db.query_raw(query=sql_query)
-    else:
     """
     Gets the top 100 end-users for a given api key
     """
-        current_date = datetime.now()
+    startTime = datetime.now() - timedelta(days=30)
-        past_date = current_date - timedelta(days=30)
+    endTime = datetime.now()
-        response = await prisma_client.db.litellm_spendlogs.group_by(  # type: ignore
+
-            by=["end_user"],
+    sql_query = """
-            where={
+SELECT
-                "AND": [{"startTime": {"gte": past_date}}, {"api_key": data.api_key}]  # type: ignore
+  end_user,
-            },
+  COUNT(*) AS total_count,
-            sum={"spend": True},
+  SUM(spend) AS total_spend
-            order={"_sum": {"spend": "desc"}},  # type: ignore
+FROM
-            take=100,
+  "LiteLLM_SpendLogs"
-            count=True,
+GROUP BY
-        )
+  end_user
-        if response is not None and isinstance(response, list):
+WHERE
-            new_response = []
+  "startTime" >= $1 AND "startTime" < $2
-            for r in response:
+ORDER BY
-                new_r = r
+  total_spend DESC
-                new_r["total_spend"] = r["_sum"]["spend"]
+LIMIT 100
-                new_r["total_count"] = r["_count"]["_all"]
+    """
-                new_r.pop("_sum")
+    response = await prisma_client.db.query_raw(sql_query, startTime, endTime)
-                new_r.pop("_count")
-                new_response.append(new_r)
 
     return response