Merge pull request #200 from stephentoub/updatemeai

Update to M.E.AI 9.3.0-preview.1.25161.3

Author: awaescher

src/OllamaSharp/MicrosoftAi/AbstractionMapper.cs

@@ -30,11 +30,10 @@ internal static class AbstractionMapper
 		{
 			FinishReason = ToFinishReason(stream.DoneReason),
 			AdditionalProperties = ParseOllamaChatResponseProps(stream),
-			Choices = [chatMessage],
 			CreatedAt = stream.CreatedAt,
 			ModelId = usedModel ?? stream.Model,
 			RawRepresentation = stream,
-			ResponseId = stream.CreatedAtString,
+			ResponseId = stream.CreatedAtString ?? Guid.NewGuid().ToString("N"),
 			Usage = ParseOllamaChatResponseUsage(stream)
 		};
 	}
@@ -43,12 +42,12 @@ internal static class AbstractionMapper
 	/// Converts Microsoft.Extensions.AI <see cref="ChatMessage"/> objects and
 	/// an option <see cref="ChatOptions"/> instance to an OllamaSharp <see cref="ChatRequest"/>.
 	/// </summary>
-	/// <param name="chatMessages">A list of chat messages.</param>
+	/// <param name="messages">A list of chat messages.</param>
 	/// <param name="options">Optional chat options to configure the request.</param>
 	/// <param name="stream">Indicates if the request should be streamed.</param>
 	/// <param name="serializerOptions">Serializer options</param>
 	/// <returns>A <see cref="ChatRequest"/> object containing the converted data.</returns>
-	public static ChatRequest ToOllamaSharpChatRequest(IList<ChatMessage> chatMessages, ChatOptions? options, bool stream, JsonSerializerOptions serializerOptions)
+	public static ChatRequest ToOllamaSharpChatRequest(IEnumerable<ChatMessage> messages, ChatOptions? options, bool stream, JsonSerializerOptions serializerOptions)
 	{
 		object? format = null;
 
@@ -59,7 +58,7 @@ public static ChatRequest ToOllamaSharpChatRequest(IList<ChatMessage> chatMessag
 		{
 			Format = format,
 			KeepAlive = null,
-			Messages = ToOllamaSharpMessages(chatMessages, serializerOptions),
+			Messages = ToOllamaSharpMessages(messages, serializerOptions),
 			Model = options?.ModelId ?? string.Empty, // will be set OllamaApiClient.SelectedModel if not set
 			Options = new RequestOptions
 			{
@@ -198,18 +197,18 @@ private static string ToFunctionTypeString(JsonObject? schema)
 	/// <summary>
 	/// Converts a list of Microsoft.Extensions.AI.<see cref="ChatMessage"/> to a list of Ollama <see cref="Message"/>.
 	/// </summary>
-	/// <param name="chatMessages">The chat messages to convert.</param>
+	/// <param name="messages">The chat messages to convert.</param>
 	/// <param name="serializerOptions">Serializer options</param>
 	/// <returns>An enumeration of <see cref="Message"/> objects containing the converted data.</returns>
-	private static IEnumerable<Message> ToOllamaSharpMessages(IList<ChatMessage> chatMessages, JsonSerializerOptions serializerOptions)
+	private static IEnumerable<Message> ToOllamaSharpMessages(IEnumerable<ChatMessage> messages, JsonSerializerOptions serializerOptions)
 	{
-		foreach (var cm in chatMessages)
+		foreach (var cm in messages)
 		{
-			var images = cm.Contents.OfType<DataContent>().Where(dc => dc.MediaType is null || dc.MediaTypeStartsWith("image/")).Select(ToOllamaImage).Where(s => !string.IsNullOrEmpty(s)).ToArray();
+			var images = cm.Contents.OfType<DataContent>().Where(dc => dc.HasTopLevelMediaType("image")).Select(ToOllamaImage).ToArray();
 			var toolCalls = cm.Contents.OfType<FunctionCallContent>().Select(ToOllamaSharpToolCall).ToArray();
 
 			// Only generates a message if there is text/content, images or tool calls
-			if (cm.Text is not null || images.Length > 0 || toolCalls.Length > 0)
+			if (cm.Text is { Length: > 0 } || images.Length > 0 || toolCalls.Length > 0)
 			{
 				yield return new Message
 				{
@@ -243,15 +242,9 @@ private static IEnumerable<Message> ToOllamaSharpMessages(IList<ChatMessage> cha
 	/// </summary>
 	/// <param name="content">The data content to convert.</param>
 	/// <returns>A string containing the base64 image data.</returns>
-	private static string ToOllamaImage(DataContent? content)
+	private static string ToOllamaImage(DataContent content)
 	{
-		if (content is null)
-			return string.Empty;
-
-		if (content.Data.HasValue)
-			return Convert.ToBase64String(content.Data.Value.ToArray());
-
-		throw new NotSupportedException("Images have to be provided as content (byte-Array or base64-string) for Ollama to be used. Other image sources like links are not supported.");
+		return Convert.ToBase64String(content.Data.ToArray());
 	}
 
 	/// <summary>
@@ -312,20 +305,18 @@ private static Microsoft.Extensions.AI.ChatRole ToAbstractionRole(ChatRole? role
 	/// Converts a <see cref="ChatResponseStream"/> to a <see cref="ChatResponseUpdate"/>.
 	/// </summary>
 	/// <param name="response">The response stream to convert.</param>
+	/// <param name="responseId">The response ID to store onto the created update.</param>
 	/// <returns>A <see cref="ChatResponseUpdate"/> object containing the latest chat completion chunk.</returns>
-	public static ChatResponseUpdate ToChatResponseUpdate(ChatResponseStream? response)
+	public static ChatResponseUpdate ToChatResponseUpdate(ChatResponseStream? response, string responseId)
 	{
-		return new ChatResponseUpdate
+		// TODO: Check if "Message" can ever actually be null. If not, remove the null-coalescing operator
+		return new(ToAbstractionRole(response?.Message?.Role), response?.Message?.Content ?? string.Empty)
 		{
 			// no need to set "Contents" as we set the text
-			ChoiceIndex = 0, // should be left at 0 as Ollama does not support this
 			CreatedAt = response?.CreatedAt,
 			FinishReason = response?.Done == true ? ChatFinishReason.Stop : null,
 			RawRepresentation = response,
-			ResponseId = response?.CreatedAtString,
-			// TODO: Check if "Message" can ever actually be null. If not, remove the null-coalescing operator
-			Text = response?.Message?.Content ?? string.Empty,
-			Role = ToAbstractionRole(response?.Message?.Role),
+			ResponseId = responseId,
 			ModelId = response?.Model
 		};
 	}

src/OllamaSharp/MicrosoftAi/ChatResponseUpdateBuilder.cs

@@ -1,4 +1,3 @@
-using System.Text;
 using Microsoft.Extensions.AI;
 
 namespace OllamaSharp.MicrosoftAi;
@@ -8,7 +7,6 @@ namespace OllamaSharp.MicrosoftAi;
 /// </summary>
 internal class ChatResponseUpdateBuilder
 {
-	private readonly StringBuilder _contentBuilder = new();
 	private ChatResponseUpdate? _first;
 
 	/// <summary>
@@ -20,19 +18,16 @@ public void Append(ChatResponseUpdate? update)
 		if (update is null)
 			return;
 
-		_contentBuilder.Append(update.Text ?? "");
-
 		_first ??= update;
 
 		_first.AdditionalProperties = update.AdditionalProperties;
 		_first.AuthorName = update.AuthorName;
-		_first.ChoiceIndex = update.ChoiceIndex;
 		_first.CreatedAt = update.CreatedAt;
 		_first.FinishReason = update.FinishReason;
 		_first.ResponseId = update.ResponseId;
 		_first.Role = update.Role;
 
-		//_first.Contents and .Text will be set in Complete() with values collected from each update
+		//_first.Contents will be set in Complete() with values collected from each update
 		//_first.RawRepresentation makes no sense 
 
 		// TODO: Check if this can ever be null. The docs imply not.
@@ -50,7 +45,6 @@ public void Append(ChatResponseUpdate? update)
 		if (_first is null)
 			return null;
 
-		_first.Text = _contentBuilder.ToString();
 		_first.Contents = Contents;
 
 		return _first;

src/OllamaSharp/OllamaApiClient.cs

@@ -399,19 +399,21 @@ private async Task EnsureSuccessStatusCodeAsync(HttpResponseMessage response)
 	private EmbeddingGeneratorMetadata? _embeddingGeneratorMetadata;
 
 	/// <inheritdoc/>
-	async Task<ChatResponse> IChatClient.GetResponseAsync(IList<ChatMessage> chatMessages, ChatOptions? options, CancellationToken cancellationToken)
+	async Task<ChatResponse> IChatClient.GetResponseAsync(IEnumerable<ChatMessage> messages, ChatOptions? options, CancellationToken cancellationToken)
 	{
-		var request = AbstractionMapper.ToOllamaSharpChatRequest(chatMessages, options, stream: false, OutgoingJsonSerializerOptions);
+		var request = AbstractionMapper.ToOllamaSharpChatRequest(messages, options, stream: false, OutgoingJsonSerializerOptions);
 		var response = await ChatAsync(request, cancellationToken).StreamToEndAsync().ConfigureAwait(false);
 		return AbstractionMapper.ToChatResponse(response, response?.Model ?? request.Model ?? SelectedModel) ?? new ChatResponse([]);
 	}
 
 	/// <inheritdoc/>
-	async IAsyncEnumerable<ChatResponseUpdate> IChatClient.GetStreamingResponseAsync(IList<ChatMessage> chatMessages, ChatOptions? options, [EnumeratorCancellation] CancellationToken cancellationToken)
+	async IAsyncEnumerable<ChatResponseUpdate> IChatClient.GetStreamingResponseAsync(IEnumerable<ChatMessage> messages, ChatOptions? options, [EnumeratorCancellation] CancellationToken cancellationToken)
 	{
-		var request = AbstractionMapper.ToOllamaSharpChatRequest(chatMessages, options, stream: true, OutgoingJsonSerializerOptions);
+		var request = AbstractionMapper.ToOllamaSharpChatRequest(messages, options, stream: true, OutgoingJsonSerializerOptions);
+
+		string responseId = Guid.NewGuid().ToString("N");
 		await foreach (var response in ChatAsync(request, cancellationToken).ConfigureAwait(false))
-			yield return AbstractionMapper.ToChatResponseUpdate(response);
+			yield return AbstractionMapper.ToChatResponseUpdate(response, responseId);
 	}
 
 	/// <inheritdoc/>
@@ -430,7 +432,7 @@ async Task<GeneratedEmbeddings<Embedding<float>>> IEmbeddingGenerator<string, Em
 		null;
 
 	/// <inheritdoc />
-	object? IEmbeddingGenerator<string, Embedding<float>>.GetService(Type serviceKey, object? key) =>
+	object? IEmbeddingGenerator.GetService(Type serviceKey, object? key) =>
 		key is not null ? null :
 		serviceKey == typeof(EmbeddingGeneratorMetadata) ? (_embeddingGeneratorMetadata = new(Application.Ollama, Uri, SelectedModel)) :
 		serviceKey?.IsInstanceOfType(this) is true ? this :

src/OllamaSharp/OllamaSharp.csproj

@@ -43,7 +43,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
-		<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25114.11" />
+		<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25161.3" />
 	</ItemGroup>
 
 	<ItemGroup>