Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OPIK-625] [FE] Add average values for duration, usage, and total cost estimation in project list table #1131

Merged
merged 1 commit into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import uniq from "lodash/uniq";
import { AverageFeedbackScore } from "@/types/datasets";
import { ROW_HEIGHT } from "@/types/shared";
import { AverageFeedbackScore, ROW_HEIGHT } from "@/types/shared";

interface GetFeedbackScoreMapArguments {
experiments: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { ArrowRight } from "lucide-react";

import DataTable from "@/components/shared/DataTable/DataTable";
import DataTableNoData from "@/components/shared/DataTableNoData/DataTableNoData";
import CostCell from "@/components/shared/DataTableCells/CostCell";
import ResourceCell from "@/components/shared/DataTableCells/ResourceCell";
import useProjectsList from "@/api/projects/useProjectsList";
import Loader from "@/components/shared/Loader/Loader";
Expand Down Expand Up @@ -35,6 +36,12 @@ export const COLUMNS = convertColumnDataToColumn<Project, Project>(
resource: RESOURCE_TYPE.project,
},
},
{
id: "total_estimated_cost",
label: "Total cost",
type: COLUMN_TYPE.cost,
cell: CostCell as never,
},
{
id: "created_at",
label: "Created",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import React, { useCallback, useMemo, useRef, useState } from "react";
import { keepPreviousData } from "@tanstack/react-query";
import isNumber from "lodash/isNumber";

import { formatNumericData } from "@/lib/utils";
import DataTable from "@/components/shared/DataTable/DataTable";
import DataTableNoData from "@/components/shared/DataTableNoData/DataTableNoData";
import DataTablePagination from "@/components/shared/DataTablePagination/DataTablePagination";
import IdCell from "@/components/shared/DataTableCells/IdCell";
import DurationCell from "@/components/shared/DataTableCells/DurationCell";
import CostCell from "@/components/shared/DataTableCells/CostCell";
import ResourceCell from "@/components/shared/DataTableCells/ResourceCell";
import useProjectsList from "@/api/projects/useProjectsList";
import { Project } from "@/types/projects";
Expand Down Expand Up @@ -51,6 +56,60 @@ export const DEFAULT_COLUMNS: ColumnData<Project>[] = [
cell: IdCell as never,
sortable: true,
},
{
id: "duration.p50",
label: "Duration (p50)",
type: COLUMN_TYPE.duration,
accessorFn: (row) => row.duration?.p50,
cell: DurationCell as never,
},
{
id: "duration.p90",
label: "Duration (p90)",
type: COLUMN_TYPE.duration,
accessorFn: (row) => row.duration?.p90,
cell: DurationCell as never,
},
{
id: "duration.p99",
label: "Duration (p99)",
type: COLUMN_TYPE.duration,
accessorFn: (row) => row.duration?.p99,
cell: DurationCell as never,
},
{
id: "total_estimated_cost",
label: "Total cost",
type: COLUMN_TYPE.cost,
cell: CostCell as never,
},
{
id: "usage.total_tokens",
label: "Total tokens (average)",
type: COLUMN_TYPE.number,
accessorFn: (row) =>
row.usage && isNumber(row.usage.total_tokens)
? formatNumericData(row.usage.total_tokens)
: "-",
},
{
id: "usage.prompt_tokens",
label: "Input tokens (average)",
type: COLUMN_TYPE.number,
accessorFn: (row) =>
row.usage && isNumber(row.usage.prompt_tokens)
? formatNumericData(row.usage.prompt_tokens)
: "-",
},
{
id: "usage.completion_tokens",
label: "Output tokens (average)",
type: COLUMN_TYPE.number,
accessorFn: (row) =>
row.usage && isNumber(row.usage.completion_tokens)
? formatNumericData(row.usage.completion_tokens)
: "-",
},
{
id: "last_updated_at",
label: "Last updated",
Expand Down Expand Up @@ -84,6 +143,8 @@ export const DEFAULT_COLUMN_PINNING: ColumnPinningState = {
};

export const DEFAULT_SELECTED_COLUMNS: string[] = [
"total_estimated_cost",
"duration.p50",
"last_updated_at",
"created_at",
"description",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ColumnPinningState, RowSelectionState } from "@tanstack/react-table";
import { RotateCw } from "lucide-react";
import findIndex from "lodash/findIndex";
import isObject from "lodash/isObject";
import isNumber from "lodash/isNumber";
import get from "lodash/get";

import useTracesOrSpansList, {
Expand Down Expand Up @@ -123,19 +124,28 @@ const SHARED_COLUMNS: ColumnData<BaseTraceData>[] = [
id: "usage.total_tokens",
label: "Total tokens",
type: COLUMN_TYPE.number,
accessorFn: (row) => (row.usage ? `${row.usage.total_tokens}` : ""),
accessorFn: (row) =>
row.usage && isNumber(row.usage.total_tokens)
? `${row.usage.total_tokens}`
: "-",
},
{
id: "usage.prompt_tokens",
label: "Total input tokens",
type: COLUMN_TYPE.number,
accessorFn: (row) => (row.usage ? `${row.usage.prompt_tokens}` : ""),
accessorFn: (row) =>
row.usage && isNumber(row.usage.prompt_tokens)
? `${row.usage.prompt_tokens}`
: "-",
},
{
id: "usage.completion_tokens",
label: "Total output tokens",
type: COLUMN_TYPE.number,
accessorFn: (row) => (row.usage ? `${row.usage.completion_tokens}` : ""),
accessorFn: (row) =>
row.usage && isNumber(row.usage.completion_tokens)
? `${row.usage.completion_tokens}`
: "-",
},
{
id: "total_estimated_cost",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react";
import { ChevronDown } from "lucide-react";
import round from "lodash/round";
import get from "lodash/get";

import { formatNumericData } from "@/lib/utils";
import {
ColumnStatistic,
DropdownOption,
Expand All @@ -15,8 +15,6 @@ import {
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";

const ROUND_PRECISION = 3;

const OPTIONS: DropdownOption<string>[] = [
{
label: "Percentile 50",
Expand All @@ -32,16 +30,14 @@ const OPTIONS: DropdownOption<string>[] = [
},
];

const formatData = (value: number) => String(round(value, ROUND_PRECISION));

type HeaderStatisticProps = {
statistic?: ColumnStatistic;
dataFormater?: (value: number) => string;
};

const HeaderStatistic: React.FC<HeaderStatisticProps> = ({
statistic,
dataFormater = formatData,
dataFormater = formatNumericData,
}) => {
const [value, setValue] = React.useState<string>("p50");
switch (statistic?.type) {
Expand Down
4 changes: 4 additions & 0 deletions apps/opik-frontend/src/lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import isObject from "lodash/isObject";
import isArray from "lodash/isArray";
import last from "lodash/last";
import get from "lodash/get";
import round from "lodash/round";
import isUndefined from "lodash/isUndefined";
import times from "lodash/times";
import sample from "lodash/sample";
Expand Down Expand Up @@ -115,3 +116,6 @@ export const calculateWorkspaceName = (

export const extractIdFromLocation = (location: string) =>
last(location?.split("/"));

export const formatNumericData = (value: number, precision = 3) =>
String(round(value, precision));
7 changes: 1 addition & 6 deletions apps/opik-frontend/src/types/datasets.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TraceFeedbackScore } from "@/types/traces";
import { DYNAMIC_COLUMN_TYPE } from "@/types/shared";
import { AverageFeedbackScore, DYNAMIC_COLUMN_TYPE } from "@/types/shared";

export interface Dataset {
id: string;
Expand Down Expand Up @@ -40,11 +40,6 @@ export interface ExperimentOutputColumn {
types: DYNAMIC_COLUMN_TYPE[];
}

export interface AverageFeedbackScore {
name: string;
value: number;
}

export interface ExperimentPromptVersion {
id: string;
commit: string;
Expand Down
12 changes: 12 additions & 0 deletions apps/opik-frontend/src/types/projects.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
import { AverageFeedbackScore, UsageData } from "@/types/shared";

export interface ProjectDuration {
p50: number;
p90: number;
p99: number;
}

export interface Project {
id: string;
name: string;
description: string;
created_at: string;
created_by: string;
usage: UsageData;
feedback_scores: AverageFeedbackScore[];
total_estimated_cost: number;
duration?: ProjectDuration;
last_updated_at: string;
last_updated_by: string;
last_updated_trace_at?: string;
Expand Down
13 changes: 12 additions & 1 deletion apps/opik-frontend/src/types/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export type ColumnData<T> = {
id: string;
label: string;
disabled?: boolean;
accessorFn?: (row: T) => string | object;
accessorFn?: (row: T) => string | number | object | undefined;
size?: number;
type?: COLUMN_TYPE;
customMeta?: object;
Expand Down Expand Up @@ -117,3 +117,14 @@ export type JsonNode =
export type UsageType = {
[key: string]: number | UsageType;
};

export interface UsageData {
prompt_tokens: number;
completion_tokens: number;
total_tokens: number;
}

export interface AverageFeedbackScore {
name: string;
value: number;
}
8 changes: 2 additions & 6 deletions apps/opik-frontend/src/types/traces.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { UsageData } from "@/types/shared";

export enum FEEDBACK_SCORE_TYPE {
sdk = "sdk",
ui = "ui",
Expand All @@ -11,12 +13,6 @@ export interface TraceFeedbackScore {
value: number;
}

export interface UsageData {
prompt_tokens: number;
completion_tokens: number;
total_tokens: number;
}

export interface BaseTraceDataErrorInfo {
exception_type: string;
message?: string;
Expand Down
Loading