Skip to content

.Net - Convert message AuthorName whitespace or empty string assignment to null #6990

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
crickman merged 2 commits into from
Jun 27, 2024
Merged

.Net - Convert message AuthorName whitespace or empty string assignment to null #6990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f87dcf
Fix
crickman Jun 27, 2024
f7d310b
Update
crickman Jun 27, 2024
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
7 changes: 6 additions & 1 deletion dotnet/src/SemanticKernel.Abstractions/Contents/ChatMessageContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ public class ChatMessageContent : KernelContent
/// </summary>
[Experimental("SKEXP0001")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string? AuthorName { get; set; }
public string? AuthorName
{
get => this._authorName;
set => this._authorName = string.IsNullOrWhiteSpace(value) ? null : value;
}

/// <summary>
/// Role of the author of the message
Expand Down Expand Up @@ -171,4 +175,5 @@ public override string ToString()

private ChatMessageContentItemCollection? _items;
private Encoding _encoding;
private string? _authorName;
}
7 changes: 6 additions & 1 deletion dotnet/src/SemanticKernel.Abstractions/Contents/StreamingChatMessageContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ public StreamingKernelContentItemCollection Items
/// </summary>
[Experimental("SKEXP0001")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string? AuthorName { get; set; }
public string? AuthorName
{
get => this._authorName;
set => this._authorName = string.IsNullOrWhiteSpace(value) ? null : value;
}

/// <summary>
/// Role of the author of the message
Expand Down Expand Up @@ -126,4 +130,5 @@ public StreamingChatMessageContent(AuthorRole? role, string? content, object? in

private StreamingKernelContentItemCollection? _items;
private Encoding _encoding;
private string? _authorName;
}
19 changes: 19 additions & 0 deletions dotnet/src/SemanticKernel.UnitTests/Contents/ChatMessageContentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,25 @@ public void ContentPropertyGetterShouldReturnContentOfTheFirstTextContentItem()
Assert.Equal("fake-content-1", sut.Content);
}

[Theory]
[InlineData(null)]
[InlineData("")]
[InlineData(" ")]
[InlineData("\t")]
[InlineData("\n")]
[InlineData("\r\n")]
public void ContentPropertySetterShouldConvertEmptyOrWhitespaceAuthorNameToNull(string? authorName)
{
// Arrange
var message = new ChatMessageContent(AuthorRole.User, content: null)
{
AuthorName = authorName
};

// Assert
Assert.Null(message.AuthorName);
}

[Fact]
public void ItShouldBePossibleToSetAndGetEncodingEvenIfThereAreNoItems()
{
Expand Down
19 changes: 19 additions & 0 deletions dotnet/src/SemanticKernel.UnitTests/Contents/StreamingChatMessageContentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,25 @@ public void ContentPropertyGetterShouldReturnContentOfTheFirstTextContentItem()
Assert.Equal("fake-content-1", sut.Content);
}

[Theory]
[InlineData(null)]
[InlineData("")]
[InlineData(" ")]
[InlineData("\t")]
[InlineData("\n")]
[InlineData("\r\n")]
public void ContentPropertySetterShouldConvertEmptyOrWhitespaceAuthorNameToNull(string? authorName)
{
// Arrange
var message = new StreamingChatMessageContent(AuthorRole.User, content: null)
{
AuthorName = authorName
};

// Assert
Assert.Null(message.AuthorName);
}

[Fact]
public void ItShouldBePossibleToSetAndGetEncodingEvenIfThereAreNoItems()
{
Expand Down