Fixes #184, no longer call API twice for Chat streaming

OkGoDoIt · OkGoDoIt · commit 60e4c786dea0 · 2023-12-11T22:07:11.000-08:00
diff --git a/OpenAI_API/Chat/Conversation.cs b/OpenAI_API/Chat/Conversation.cs
@@ -254,7 +254,7 @@ public async IAsyncEnumerable<string> StreamResponseEnumerableFromChatbotAsync()
 
 			bool retrying = true;
 			ChatResult firstStreamedResult = null;
-
+			IAsyncEnumerator<ChatResult> enumerator = null;
 			while (retrying)
 			{
 				retrying = false;
@@ -263,14 +263,9 @@ public async IAsyncEnumerable<string> StreamResponseEnumerableFromChatbotAsync()
 				try
 				{
 					resStream = _endpoint.StreamChatEnumerableAsync(req);
-					await foreach (var res in resStream)
-					{
-						if (res != null)
-						{
-							firstStreamedResult = res;
-							break;
-						}
-					}
+					enumerator = resStream.GetAsyncEnumerator();
+					await enumerator.MoveNextAsync();
+					firstStreamedResult = enumerator.Current;
 				}
 				catch (HttpRequestException ex)
 				{
@@ -329,26 +324,9 @@ public async IAsyncEnumerable<string> StreamResponseEnumerableFromChatbotAsync()
 				throw new Exception("The chat result stream is null, but it shouldn't be");
 			}
 
-			if (firstStreamedResult != null)
-			{
-				if (firstStreamedResult.Choices.FirstOrDefault()?.Delta is ChatMessage delta)
-				{
-					if (delta.Role != null)
-						responseRole = delta.Role;
-
-					string deltaContent = delta.Content;
-
-					if (!string.IsNullOrEmpty(deltaContent))
-					{
-						responseStringBuilder.Append(deltaContent);
-						yield return deltaContent;
-					}
-				}
-				MostRecentApiResult = firstStreamedResult;
-			}
-
-			await foreach (var res in resStream)
+			do
 			{
+				ChatResult res = enumerator.Current;
 				if (res.Choices.FirstOrDefault()?.Delta is ChatMessage delta)
 				{
 					if (delta.Role != null)
@@ -363,8 +341,8 @@ public async IAsyncEnumerable<string> StreamResponseEnumerableFromChatbotAsync()
 					}
 				}
 				MostRecentApiResult = res;
-			}
-
+			} while (await enumerator.MoveNextAsync());
+			
 			if (responseRole != null)
 			{
 				AppendMessage(responseRole, responseStringBuilder.ToString());
