Skip to content
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
17 changes: 17 additions & 0 deletions src/features/monitoring/modelPriceCandidates.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import type { MonitoringEventRow } from './hooks/useMonitoringData';
import type { ModelPrice } from '@/utils/usage';

export const buildModelPriceCandidateModels = (
facetModels: readonly string[],
rows: readonly Pick<MonitoringEventRow, 'model'>[],
modelPrices: Record<string, ModelPrice>
) =>
Array.from(
new Set([
...facetModels.map((model) => model.trim()),
...rows.map((row) => row.model.trim()),
...Object.keys(modelPrices).map((model) => model.trim()),
])
)
.filter(Boolean)
.sort((left, right) => left.localeCompare(right));
36 changes: 36 additions & 0 deletions src/pages/MonitoringCenterPage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from './MonitoringCenterPage';
import { buildEmptyMonitoringStatusData } from '@/features/monitoring/accountOverviewState';
import { buildRealtimeSourceDisplay } from '@/features/monitoring/realtimeSourceDisplay';
import { buildModelPriceCandidateModels } from '@/features/monitoring/modelPriceCandidates';
import type { MonitoringEventRow } from '@/features/monitoring/hooks/useMonitoringData';

const t = ((key: string, options?: Record<string, unknown>) => {
Expand Down Expand Up @@ -129,6 +130,41 @@ const createMonitoringEventRow = (
});

describe('MonitoringCenterPage account card', () => {
it('builds model price candidates from summary facets when detail rows are empty', () => {
expect(
buildModelPriceCandidateModels(
[' gpt-5 ', 'gemini-2.5-flash', ''],
[],
{
'claude-sonnet-4-5': {
prompt: 3,
completion: 15,
cache: 0.3,
},
}
)
).toEqual(['claude-sonnet-4-5', 'gemini-2.5-flash', 'gpt-5']);
});

it('keeps legacy row and saved-price model candidates available', () => {
expect(
buildModelPriceCandidateModels(
[],
[
createMonitoringEventRow({ model: 'gpt-4.1' }),
createMonitoringEventRow({ id: 'row-2', model: ' gpt-4.1 ' }),
],
{
'codex-mini-latest': {
prompt: 1,
completion: 4,
cache: 0.1,
},
}
)
).toEqual(['codex-mini-latest', 'gpt-4.1']);
});

it('uses server realtime stream identities without duplicating final totals per row', () => {
const rows = buildRealtimeLogRows([
createMonitoringEventRow({
Expand Down
7 changes: 3 additions & 4 deletions src/pages/MonitoringCenterPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
getNextMonitoringStatusBlockIndex,
} from '@/features/monitoring/healthStatusAccessibility';
import { buildRealtimeSourceDisplay } from '@/features/monitoring/realtimeSourceDisplay';
import { buildModelPriceCandidateModels } from '@/features/monitoring/modelPriceCandidates';
import { MonitoringPanel } from '@/features/monitoring/components/MonitoringPanel';
import { useUsageData } from '@/features/monitoring/hooks/useUsageData';
import { useHeaderRefresh } from '@/hooks/useHeaderRefresh';
Expand Down Expand Up @@ -468,7 +469,7 @@
},
];

export const buildRealtimeLogRows = (rows: MonitoringEventRow[]): RealtimeLogRow[] => {

Check warning on line 472 in src/pages/MonitoringCenterPage.tsx

View workflow job for this annotation

GitHub Actions / Frontend

Fast refresh only works when a file only exports components. Use a new file to share constants or functions between components
const sortedAsc = [...rows].sort(
(left, right) => left.timestampMs - right.timestampMs || left.id.localeCompare(right.id)
);
Expand Down Expand Up @@ -2269,10 +2270,8 @@

const syncPriceModels = useMemo(
() =>
Array.from(new Set([...filteredRows.map((row) => row.model), ...Object.keys(modelPrices)]))
.filter(Boolean)
.sort((left, right) => left.localeCompare(right)),
[filteredRows, modelPrices]
buildModelPriceCandidateModels(filterFacets.models, filteredRows, modelPrices),
[filterFacets.models, filteredRows, modelPrices]
);

const priceModelOptions = useMemo(
Expand Down
Loading