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
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,14 @@ export const MetricDisplay = ({ metric }: { metric: MetricWithNoValue | NumericM
const classes = useCardStyles();
const { fg, bg } = useCardColors(metric.interpretation);

const pillClass = mergeClasses(
bg,
classes.metricPill,
const pillClass = mergeClasses(bg, classes.metricPill);
const valueClass = mergeClasses(fg, classes.metricValueText);

return (
<Tooltip content={`${metric.name}: ${metricValue}`} relationship="description">
<div className={pillClass}>
<span className={valueClass}>{metricValue}</span>
</div>
</Tooltip>
);
return (<div className={pillClass}><span className={fg}>{metricValue}</span></div>);
};
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ namespace Microsoft.Extensions.AI.Evaluation.Safety;

internal sealed class ContentSafetyChatClient : IChatClient
{
private const string Moniker = "Azure AI Foundry Evaluation";
private const string ProviderName = "azure.ai.foundry";
private const string ModelId = $"{ProviderName}.evaluation";

private readonly ContentSafetyService _service;
private readonly IChatClient? _originalChatClient;
Expand All @@ -35,38 +36,14 @@ public ContentSafetyChatClient(

ChatClientMetadata? originalMetadata = _originalChatClient?.GetService<ChatClientMetadata>();

string providerName;
Uri? providerUri = originalMetadata?.ProviderUri;

if (contentSafetyServiceConfiguration.IsHubBasedProject)
{
providerName =
$"{Moniker} (" +
$"Subscription: {contentSafetyServiceConfiguration.SubscriptionId}, " +
$"Resource Group: {contentSafetyServiceConfiguration.ResourceGroupName}, " +
$"Project: {contentSafetyServiceConfiguration.ProjectName})";
}
else
{
providerName = $"{Moniker} (Endpoint: {contentSafetyServiceConfiguration.Endpoint})";
providerUri = contentSafetyServiceConfiguration.Endpoint;
}

string providerName = ProviderName;
if (originalMetadata?.ProviderName is string originalProviderName &&
!string.IsNullOrWhiteSpace(originalProviderName))
{
providerName = $"{providerName}; {originalProviderName}";
}

string modelId = Moniker;

if (originalMetadata?.DefaultModelId is string originalModelId &&
!string.IsNullOrWhiteSpace(originalModelId))
{
modelId = $"{modelId}; {originalModelId}";
}

_metadata = new ChatClientMetadata(providerName, providerUri, modelId);
_metadata = new ChatClientMetadata(providerName, defaultModelId: ModelId);
}

public async Task<ChatResponse> GetResponseAsync(
Expand All @@ -88,7 +65,7 @@ await _service.AnnotateAsync(

return new ChatResponse(new ChatMessage(ChatRole.Assistant, annotationResult))
{
ModelId = Moniker
ModelId = ModelId
};
}
else
Expand Down Expand Up @@ -121,7 +98,7 @@ await _service.AnnotateAsync(

yield return new ChatResponseUpdate(ChatRole.Assistant, annotationResult)
{
ModelId = Moniker
ModelId = ModelId
};
}
else
Expand Down
Loading