Skip to content

Only display tags from the latest execution #6251

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 5, 2025
Merged

Only display tags from the latest execution #6251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 14 deletions src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript/components/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

import { useState } from 'react';
import { Settings28Regular, FilterDismissRegular, Dismiss20Regular, ArrowDownloadRegular } from '@fluentui/react-icons';
import { Settings28Regular, FilterDismissRegular, DismissRegular, ArrowDownloadRegular } from '@fluentui/react-icons';
import { Button, Drawer, DrawerBody, DrawerHeader, DrawerHeaderTitle, Switch, Tooltip } from '@fluentui/react-components';
import { makeStyles } from '@fluentui/react-components';
import './App.css';
Expand Down Expand Up @@ -40,17 +40,6 @@ const useStyles = makeStyles({
position: 'absolute',
top: '1.5rem',
right: '1rem',
cursor: 'pointer',
fontSize: '2rem',
width: '28px',
height: '28px',
borderRadius: '6px',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
'&:hover': {
backgroundColor: tokens.colorNeutralBackground4,
},
},
switchLabel: { fontSize: '1rem', paddingTop: '1rem' },
drawerBody: { paddingTop: '1rem' },
Expand All @@ -61,7 +50,7 @@ function App() {
const { dataset, scoreSummary, selectedTags, clearFilters } = useReportContext();
const [isSettingsOpen, setIsSettingsOpen] = useState(false);
const { renderMarkdown, setRenderMarkdown } = useReportContext();
const { globalTags, filterableTags } = categorizeAndSortTags(dataset);
const { globalTags, filterableTags } = categorizeAndSortTags(dataset, scoreSummary.primaryResult.executionName);

const toggleSettings = () => setIsSettingsOpen(!isSettingsOpen);
const closeSettings = () => setIsSettingsOpen(false);
Expand Down Expand Up @@ -122,7 +111,7 @@ function App() {
<Drawer open={isSettingsOpen} onOpenChange={toggleSettings} position="end">
<DrawerHeader>
<DrawerHeaderTitle>Settings</DrawerHeaderTitle>
<span className={classes.closeButton} onClick={closeSettings}><Dismiss20Regular /></span>
<Button className={classes.closeButton} icon={<DismissRegular />} appearance="subtle" onClick={closeSettings} />
</DrawerHeader>
<DrawerBody className={classes.drawerBody}>
<Switch
Expand Down
2 changes: 1 addition & 1 deletion ...s/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript/components/ScoreNodeHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const ScoreNodeHistory = () => {
const historyData = calculateScoreNodeHistoryData(scoreSummary, summaryNode);

return (<div className={classes.section}>
<div className={classes.sectionHeader}>
<div className={classes.dismissableSectionHeader}>
<Button icon={<DismissRegular />} appearance="subtle" onClick={() => selectScenarioLevel(selectedScenarioLevel)} />
<h3 className={classes.sectionHeaderText}>Pass/Fail Trends for {summaryNode.name}</h3>
</div>
Expand Down
4 changes: 4 additions & 0 deletions src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript/components/Styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ export const useStyles = makeStyles({
right: '0',
maxWidth: '80rem',
},
dismissableSectionHeader: {
display: 'flex',
alignItems: 'center',
},
sectionHeader: {
display: 'flex',
alignItems: 'center',
Expand Down
10 changes: 6 additions & 4 deletions ...raries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript/components/TagsDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ const useStyles = makeStyles({
cursor: 'default',
':hover': {
backgroundColor: tokens.colorBrandBackground2,
boxShadow: 'none'
boxShadow: 'none',
cursor: 'default'
},
'&.selected': {
backgroundColor: tokens.colorBrandBackground2
Expand All @@ -56,14 +57,15 @@ const useStyles = makeStyles({

export type TagInfo = { tag: string; count: number };

export function categorizeAndSortTags(dataset: Dataset): {
export function categorizeAndSortTags(dataset: Dataset, primaryExecutionName: string): {
globalTags: TagInfo[];
filterableTags: TagInfo[];
} {
const tagCounts = new Map<string, number>();
const totalResults = dataset.scenarioRunResults.length;
const primaryResults = dataset.scenarioRunResults.filter(result => result.executionName === primaryExecutionName);
const totalResults = primaryResults.length;

dataset.scenarioRunResults.forEach(result => {
primaryResults.forEach(result => {
if (result.tags) {
result.tags.forEach(tag => {
const currentCount = tagCounts.get(tag) || 0;
Expand Down
Loading