Skip to content

Commit

Permalink
fix: address review from kavinvalli
Browse files Browse the repository at this point in the history
  • Loading branch information
@use-tusk
use-tusk[bot] authored Oct 8, 2024
1 parent 09efd99 commit 1400bdf
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 21 deletions.
21 changes: 13 additions & 8 deletions web/components/templates/properties/propertyPanel.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import ExportButton from "../../shared/themed/table/exportButton";
import { UIFilterRow } from "../../shared/themed/themedAdvancedFilters";
import ThemedTableHeader from "../../shared/themed/themedHeader";
import useSearchParams from "../../shared/utils/useSearchParams";
import { formatNumber } from "../users/initialColumns";

interface PropertyPanelProps {
property: string;
Expand Down Expand Up @@ -173,7 +174,7 @@ const PropertyPanel = (props: PropertyPanelProps) => {
) : (
<dd className="text-gray-900 dark:text-gray-100 text-xl font-semibold">
{keyMetrics.totalCost.data?.data
? `$${keyMetrics.totalCost.data?.data.toFixed(5)}`
? `$${formatNumber(keyMetrics.totalCost.data?.data)}`
: "$0.00"}
</dd>
)}
Expand All @@ -188,7 +189,7 @@ const PropertyPanel = (props: PropertyPanelProps) => {
) : (
<dd className="text-gray-900 dark:text-gray-100 text-xl font-semibold">
{keyMetrics.totalRequests.data?.data
? keyMetrics.totalRequests.data.data.toFixed(2)
? formatNumber(keyMetrics.totalRequests.data.data)
: 0}
</dd>
)}
Expand All @@ -203,7 +204,7 @@ const PropertyPanel = (props: PropertyPanelProps) => {
) : (
<dd className="text-gray-900 dark:text-gray-100 text-xl font-semibold">
{keyMetrics.averageLatency.data?.data
? (keyMetrics.averageLatency.data.data / 1000).toFixed(2)
? formatNumber(keyMetrics.averageLatency.data.data / 1000)
: "n/a"}
</dd>
)}
Expand Down Expand Up @@ -286,18 +287,22 @@ const PropertyPanel = (props: PropertyPanelProps) => {
</TableCell>
<TableCell>{propertyValue.total_requests}</TableCell>
<TableCell>
${propertyValue.total_cost.toFixed(6)}
${formatNumber(propertyValue.total_cost)}
</TableCell>
<TableCell>
{propertyValue.avg_completion_tokens_per_request.toFixed(
6
{formatNumber(
propertyValue.avg_completion_tokens_per_request
)}
</TableCell>
<TableCell>
{propertyValue.avg_latency_per_request.toFixed(6)}
{formatNumber(
propertyValue.avg_latency_per_request
)}
</TableCell>
<TableCell>
${propertyValue.average_cost_per_request.toFixed(6)}
${formatNumber(
propertyValue.average_cost_per_request
)}
</TableCell>
</>
</TableRow>
Expand Down
5 changes: 3 additions & 2 deletions web/components/templates/requestsV2/requestCard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CostPill from "./costPill";
import { CustomProperties } from "./customProperties";
import ModelPill from "./modelPill";
import StatusBadge from "./statusBadge";
import { formatNumber } from "../users/initialColumns";

interface RequestCardProps {
request: NormalizedRequest;
Expand Down Expand Up @@ -75,12 +76,12 @@ const RequestCard = (props: RequestCardProps) => {
<ModelPill model={request.model} />

<p className="text-sm font-semibold">
{Number(request.latency) / 1000}s
{formatNumber(Number(request.latency) / 1000)}s
</p>
{!request.cost && request.status.code === 200 ? (
<CostPill />
) : request.cost ? (
<p className="text-sm font-semibold">${request.cost.toFixed(4)}</p>
<p className="text-sm font-semibold">${formatNumber(request.cost)}</p>
) : (
<p className="text-sm font-semibold"></p>
)}
Expand Down
5 changes: 3 additions & 2 deletions web/components/templates/requestsV2/requestRow.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import StatusBadge from "./statusBadge";
import ThemedModal from "../../shared/themed/themedModal";
import NewDataset from "../datasets/NewDataset";
import { convertToUSDateFormat } from "../../shared/utils/dateConvertor";
import { formatNumber } from "../users/initialColumns";

function getPathName(url: string) {
try {
Expand Down Expand Up @@ -259,7 +260,7 @@ const RequestRow = (props: {
Latency
</p>
<p className="text-gray-700 dark:text-gray-300 truncate">
<span>{Number(request.latency) / 1000}s</span>
<span>{formatNumber(Number(request.latency) / 1000)}s</span>
</p>
</li>
<li className="flex flex-row justify-between items-center py-2 gap-4">
Expand All @@ -268,7 +269,7 @@ const RequestRow = (props: {
</p>
<p className="text-gray-700 dark:text-gray-300 truncate">
{request.cost !== null && request.cost !== undefined
? `$${request.cost.toFixed(4)}`
? `$${formatNumber(request.cost)}`
: request.status.statusType === "success"
? "Calculating..."
: "N/A"}
Expand Down
9 changes: 5 additions & 4 deletions web/components/templates/users/id/userIdPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
import { useRouter } from "next/router";
import HcBreadcrumb from "../../../ui/hcBreadcrumb";
import { IslandContainer } from "@/components/ui/islandContainer";
import { formatNumber } from "../initialColumns";

interface UserIdPageProps {
userId: string;
Expand Down Expand Up @@ -84,7 +85,7 @@ const UserIdPage = (props: UserIdPageProps) => {
<div className="flex flex-col items-start space-y-1">
<p className="text-sm font-semibold">Total Cost</p>
<p className="text-sm text-gray-500">
${Number(user.cost || 0).toFixed(6)}
${formatNumber(Number(user.cost || 0))}
</p>
</div>
<div className="flex flex-col items-start space-y-1">
Expand Down Expand Up @@ -121,15 +122,15 @@ const UserIdPage = (props: UserIdPageProps) => {
Average Requests per day
</p>
<p className="text-sm text-gray-500">
{user.average_requests_per_day_active.toFixed(4)}
{formatNumber(user.average_requests_per_day_active)}
</p>
</div>{" "}
<div className="flex flex-col items-start space-y-1">
<p className="text-sm font-semibold">
Average Tokens per request
</p>
<p className="text-sm text-gray-500">
{user.average_tokens_per_request.toFixed(4)}
{formatNumber(user.average_tokens_per_request)}
</p>
</div>{" "}
</div>
Expand Down Expand Up @@ -191,7 +192,7 @@ const UserIdPage = (props: UserIdPageProps) => {
colors={["green"]}
showLegend={false}
valueFormatter={(value) => {
return `$${Number(value).toFixed(6)}`;
return `$${formatNumber(value)}`;
}}
curveType="monotone"
/>
Expand Down
12 changes: 7 additions & 5 deletions web/components/templates/users/userModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import { getTimeMap } from "../../../lib/timeCalculations/constants";
import { useRouter } from "next/router";
import ThemedTabs from "../../../components/shared/themed/themedTabs";
import { UIFilterRow } from "../../shared/themed/themedAdvancedFilters";
import { formatNumber } from "./initialColumns";

interface UserModalProps {
open: boolean;
setOpen: (open: boolean) => void;
Expand All @@ -45,7 +47,7 @@ const UserModal = (props: UserModalProps) => {
const router = useRouter();

const valueFormatter = function (number: number) {
return "$" + number;
return "$" + formatNumber(number);
};
const filterMap = DASHBOARD_PAGE_TABLE_FILTERS as SingleFilterDef<any>[];

Expand Down Expand Up @@ -271,8 +273,8 @@ const UserModal = (props: UserModalProps) => {
<p className="font-semibold text-gray-900 dark:text-gray-100">
Total Cost
</p>
<p className="text-gray-700 dark:text-gray-300 truncate">{`$${user.cost.toFixed(
4
<p className="text-gray-700 dark:text-gray-300 truncate">{`$${formatNumber(
user.cost
)}`}</p>
</li>
<li className="flex flex-row justify-between items-center py-2 gap-4">
Expand Down Expand Up @@ -302,7 +304,7 @@ const UserModal = (props: UserModalProps) => {
Average Requests per Day
</p>
<p className="text-gray-700 dark:text-gray-300 truncate">
{user.average_requests_per_day_active.toFixed(4)}
{formatNumber(user.average_requests_per_day_active)}
</p>
</li>
<li className="flex flex-row justify-between items-center py-2 gap-4">
Expand All @@ -311,7 +313,7 @@ const UserModal = (props: UserModalProps) => {
</p>
<p className="text-gray-700 dark:text-gray-300 truncate">
{user.average_tokens_per_request
? user.average_tokens_per_request.toFixed(4)
? formatNumber(user.average_tokens_per_request)
: "N/A"}
</p>
</li>
Expand Down

0 comments on commit 1400bdf

Please sign in to comment.