feat - clea up usage tab

ui/litellm-dashboard/src/components/networking.tsx

@@ -979,7 +979,8 @@ export const teamSpendLogsCall = async (accessToken: String) => {
 export const tagsSpendLogsCall = async (
   accessToken: String,
   startTime: String | undefined,
-  endTime: String | undefined
+  endTime: String | undefined,
+  tags: String[] | undefined
 ) => {
   try {
     let url = proxyBaseUrl
@@ -990,6 +991,11 @@ export const tagsSpendLogsCall = async (
       url = `${url}?start_date=${startTime}&end_date=${endTime}`;
     }
 
+    // if tags, convert the list to a comma separated string
+    if (tags) {
+      url += `${url}&tags=${tags.join(",")}`;
+    }
+
     console.log("in tagsSpendLogsCall:", url);
     const response = await fetch(`${url}`, {
       method: "GET",

ui/litellm-dashboard/src/components/usage.tsx

@@ -144,6 +144,7 @@ const UsagePage: React.FC<UsagePageProps> = ({
   const [globalActivity, setGlobalActivity] = useState<GlobalActivityData>({} as GlobalActivityData);
   const [globalActivityPerModel, setGlobalActivityPerModel] = useState<any[]>([]);
   const [selectedKeyID, setSelectedKeyID] = useState<string | null>("");
+  const [selectedTags, setSelectedTags] = useState<string[]>(["all-tags"]);
   const [dateValue, setDateValue] = useState<DateRangePickerValue>({
     from: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000), 
     to: new Date(),
@@ -175,6 +176,10 @@ const UsagePage: React.FC<UsagePageProps> = ({
   
     return formatter.format(number);
   }
+
+  useEffect(() => {
+    updateTagSpendData(dateValue.from, dateValue.to);
+  }, [dateValue, selectedTags]);
   
 
   const updateEndUserData = async (startTime:  Date | undefined, endTime:  Date | undefined, uiSelectedKey: string | null) => {
@@ -212,12 +217,15 @@ const UsagePage: React.FC<UsagePageProps> = ({
     // startTime put it to the first hour of the selected date
     startTime.setHours(0, 0, 0, 0);
 
-    let top_tags = await tagsSpendLogsCall(accessToken, startTime.toISOString(), endTime.toISOString());
+    let top_tags = await tagsSpendLogsCall(
+      accessToken, 
+      startTime.toISOString(), 
+      endTime.toISOString(),
+      selectedTags.length === 0 ? undefined : selectedTags
+    );
     setTopTagsData(top_tags.spend_per_tag);
     console.log("Tag spend data updated successfully");
 
-
-
   }
 
   function formatDate(date: Date) {
@@ -293,14 +301,15 @@ const UsagePage: React.FC<UsagePageProps> = ({
 
             setTotalSpendPerTeam(total_spend_per_team);
 
-            //get top tags
+            // all_tag_names -> used for dropdown
-            const top_tags = await tagsSpendLogsCall(accessToken, dateValue.from?.toISOString(), dateValue.to?.toISOString());
-            setTopTagsData(top_tags.spend_per_tag);
-
-            // all_tag_names
             const all_tag_names = await allTagNamesCall(accessToken);
             setAllTagNames(all_tag_names.tag_names);
 
+            //get top tags
+            const top_tags = await tagsSpendLogsCall(accessToken, dateValue.from?.toISOString(), dateValue.to?.toISOString(), undefined);
+            setTopTagsData(top_tags.spend_per_tag);
+
+
             // get spend per end-user
             let spend_user_call = await adminTopEndUsersCall(accessToken, null, undefined, undefined);
             setTopUsers(spend_user_call);
@@ -362,13 +371,7 @@ const UsagePage: React.FC<UsagePageProps> = ({
 
   return (
     <div style={{ width: "100%" }} className="p-8">
-      <ViewUserSpend
+      
-            userID={userID}
-            userRole={userRole}
-            accessToken={accessToken}
-            userSpend={null}
-            selectedTeam={null}
-          />
       <TabGroup>
         <TabList className="mt-2">
           <Tab>All Up</Tab>
@@ -387,6 +390,13 @@ const UsagePage: React.FC<UsagePageProps> = ({
         <TabPanels>
           <TabPanel>
             <Grid numItems={2} className="gap-2 h-[100vh] w-full">
+            <ViewUserSpend
+            userID={userID}
+            userRole={userRole}
+            accessToken={accessToken}
+            userSpend={null}
+            selectedTeam={null}
+          />
               <Col numColSpan={2}>
                 <Card>
                   <Title>Monthly Spend</Title>
@@ -763,26 +773,30 @@ const UsagePage: React.FC<UsagePageProps> = ({
               <Col>
 
               <MultiSelect
-                defaultValue={["all-tags"]}>
+                  value={selectedTags}
-              <MultiSelectItem
+                  onValueChange={(value) => setSelectedTags(value as string[])}
-                  key={"all-tags"}
-                  value={"All Tags"}
                 >
-                  All Tags
+  <MultiSelectItem
-                </MultiSelectItem>
+    key={"all-tags"}
-                {
+    value={"all-tags"}
-                  allTagNames && allTagNames?.map((tag: any, index: number) => {
+    onClick={() => setSelectedTags(["all-tags"])}
-                    return (
+  >
-                      <MultiSelectItem
+    All Tags
-                        key={index}
+  </MultiSelectItem>
-                        value={String(index)}
+  {allTagNames &&
-                      >
+    allTagNames
-                        {tag}
+      .filter((tag) => tag !== "all-tags")
-                      </MultiSelectItem>
+      .map((tag: any, index: number) => {
-                    );
+        return (
-                  })
+          <MultiSelectItem
-                }
+            key={tag}
-              </MultiSelect>
+            value={String(tag)}
+          >
+            {tag}
+          </MultiSelectItem>
+        );
+      })}
+</MultiSelect>
               </Col>
 
               </Grid>

ui/litellm-dashboard/src/components/view_user_spend.tsx

@@ -131,7 +131,7 @@ const ViewUserSpend: React.FC<ViewUserSpendProps> = ({ userID, userRole, accessT
             ${roundedSpend}
           </p>
         </div>
-        <div className="ml-auto">
+        {/* <div className="ml-auto">
           <Accordion>
             <AccordionHeader><Text>Team Models</Text></AccordionHeader>
             <AccordionBody className="absolute right-0 z-10 bg-white p-2 shadow-lg max-w-xs">
@@ -144,7 +144,7 @@ const ViewUserSpend: React.FC<ViewUserSpendProps> = ({ userID, userRole, accessT
               </List>
             </AccordionBody>
           </Accordion>
-        </div>
+        </div> */}
       </div>
     );
 }