Some cleanup

dotnet · Jan 28, 2025 · b7bb5b9 · b7bb5b9
1 parent 7b01ed9
commit b7bb5b9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 17 deletions.
diff --git a/eng/MSBuild/Shared.props b/eng/MSBuild/Shared.props
@@ -46,8 +46,4 @@
   <ItemGroup Condition="'$(InjectStringSplitExtensions)' == 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\StringSplit\*.cs" LinkBase="Shared\StringSplit" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(InjectSharedAIExtensions)' == 'true'">
-    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\AIExtensions\*.cs" LinkBase="Shared\AIExtensions" />
-  </ItemGroup>
 </Project>
diff --git a/.../Microsoft.Extensions.AI.AzureAIInference/Microsoft.Extensions.AI.AzureAIInference.csproj b/.../Microsoft.Extensions.AI.AzureAIInference/Microsoft.Extensions.AI.AzureAIInference.csproj
@@ -25,7 +25,6 @@
     <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
     <InjectSharedEmptyCollections>true</InjectSharedEmptyCollections>
     <InjectStringHashOnLegacy>true</InjectStringHashOnLegacy>
-    <InjectSharedAIExtensions>true</InjectSharedAIExtensions>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Libraries/Microsoft.Extensions.AI.Ollama/Microsoft.Extensions.AI.Ollama.csproj b/src/Libraries/Microsoft.Extensions.AI.Ollama/Microsoft.Extensions.AI.Ollama.csproj
@@ -26,7 +26,6 @@
     <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
     <InjectSharedEmptyCollections>true</InjectSharedEmptyCollections>
     <InjectStringHashOnLegacy>true</InjectStringHashOnLegacy>
-    <InjectSharedAIExtensions>true</InjectSharedAIExtensions>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj b/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj
@@ -27,7 +27,6 @@
     <InjectSharedServerSentEvents>true</InjectSharedServerSentEvents>
     <InjectRequiredMemberOnLegacy>true</InjectRequiredMemberOnLegacy>
     <InjectCompilerFeatureRequiredOnLegacy>true</InjectCompilerFeatureRequiredOnLegacy>
-    <InjectSharedAIExtensions>true</InjectSharedAIExtensions>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIModelMapper.ChatMessage.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIModelMapper.ChatMessage.cs
@@ -220,9 +220,9 @@ private static List<ChatMessageContentPart> ToOpenAIChatContent(IList<AIContent>
                     break;
 
                 case DataContent dataContent when dataContent.HasMediaTypePrefix("image/"):
-                    if (dataContent.Data is { IsEmpty: false } data)
+                    if (dataContent.ContainsData)
                     {
-                        parts.Add(ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(data), dataContent.MediaType));
+                        parts.Add(ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(dataContent.Data!.Value), dataContent.MediaType));
                     }
                     else if (dataContent.Uri is string uri)
                     {

diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatMessageTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatMessageTests.cs
@@ -124,8 +124,8 @@ public void Text_GetSet_UsesFirstTextContent()
     {
         ChatMessage message = new(ChatRole.User,
         [
-            new DataContent("http://localhost/audio", mediaType: "audio/mpeg"),
-            new DataContent("http://localhost/image", mediaType: "image/png"),
+            new DataContent("http://localhost/audio"),
+            new DataContent("http://localhost/image"),
             new FunctionCallContent("callId1", "fc1"),
             new TextContent("text-1"),
             new TextContent("text-2"),
@@ -163,8 +163,8 @@ public void Text_Set_AddsTextMessageToListWithNoText()
     {
         ChatMessage message = new(ChatRole.User,
         [
-            new DataContent("http://localhost/audio", mediaType: "audio/mpeg"),
-            new DataContent("http://localhost/image", mediaType: "image/png"),
+            new DataContent("http://localhost/audio"),
+            new DataContent("http://localhost/image"),
             new FunctionCallContent("callId1", "fc1"),
         ]);
         Assert.Equal(3, message.Contents.Count);

diff --git a/...oft.Extensions.AI.Abstractions.Tests/ChatCompletion/StreamingChatCompletionUpdateTests.cs b/...oft.Extensions.AI.Abstractions.Tests/ChatCompletion/StreamingChatCompletionUpdateTests.cs
@@ -136,8 +136,8 @@ public void Text_Set_AddsTextMessageToListWithNoText()
         {
             Contents =
             [
-                new DataContent("http://localhost/audio", "audio/mpeg"),
-                new DataContent("http://localhost/image", "image/png"),
+                new DataContent("http://localhost/audio"),
+                new DataContent("http://localhost/image"),
                 new FunctionCallContent("callId1", "fc1"),
             ]
         };
@@ -169,7 +169,7 @@ public void JsonSerialization_Roundtrips()
             Contents =
             [
                 new TextContent("text-1"),
-                new DataContent("http://localhost/image", "image/png"),
+                new DataContent("http://localhost/image"),
                 new FunctionCallContent("callId1", "fc1"),
                 new DataContent("data"u8.ToArray()),
                 new TextContent("text-2"),

diff --git a/...Microsoft.Extensions.AI.Tests/ChatCompletion/ChatClientStructuredOutputExtensionsTests.cs b/...Microsoft.Extensions.AI.Tests/ChatCompletion/ChatClientStructuredOutputExtensionsTests.cs
@@ -148,7 +148,7 @@ public async Task FailureUsage_NullJson()
     [Fact]
     public async Task FailureUsage_NoJsonInResponse()
     {
-        var expectedCompletion = new ChatCompletion([new ChatMessage(ChatRole.Assistant, [new DataContent("https://example.com", "image/png")])]);
+        var expectedCompletion = new ChatCompletion([new ChatMessage(ChatRole.Assistant, [new DataContent("https://example.com")])]);
         using var client = new TestChatClient
         {
             CompleteAsyncCallback = (messages, options, cancellationToken) => Task.FromResult(expectedCompletion),