From 949f6501b3dc8670a66ec5196f2f2dc1bdc9eb3c Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Mon, 16 Sep 2024 21:29:00 +1000
Subject: [PATCH] [8.x] OpenAI: Ignore chunks with an empty &#x60;choices&#x60;
 list (bis) (#192961) (#192978)

# Backport

This will backport the following commits from `main` to `8.x`:
- [OpenAI: Ignore chunks with an empty &#x60;choices&#x60; list (bis)
(#192961)](https://github.com/elastic/kibana/pull/192961)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Pierre
Gayvallet","email":"pierre.gayvallet@elastic.co"},"sourceCommit":{"committedDate":"2024-09-16T09:06:54Z","message":"OpenAI:
Ignore chunks with an empty `choices` list (bis) (#192961)\n\n##
Summary\r\n\r\nFollow-up of
https://github.com/elastic/kibana/pull/192951 to address\r\nthe missing
bits (given I don't know how to
grep)","sha":"08b682fbd5f78ac82b42ddc7109e79f89e4ed961","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-minor","Team:Obs
AI Assistant","ci:project-deploy-observability","v8.16.0","Team:AI
Infra"],"title":"OpenAI: Ignore chunks with an empty `choices` list
(bis)","number":192961,"url":"https://github.com/elastic/kibana/pull/192961","mergeCommit":{"message":"OpenAI:
Ignore chunks with an empty `choices` list (bis) (#192961)\n\n##
Summary\r\n\r\nFollow-up of
https://github.com/elastic/kibana/pull/192951 to address\r\nthe missing
bits (given I don't know how to
grep)","sha":"08b682fbd5f78ac82b42ddc7109e79f89e4ed961"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/192961","number":192961,"mergeCommit":{"message":"OpenAI:
Ignore chunks with an empty `choices` list (bis) (#192961)\n\n##
Summary\r\n\r\nFollow-up of
https://github.com/elastic/kibana/pull/192951 to address\r\nthe missing
bits (given I don't know how to
grep)","sha":"08b682fbd5f78ac82b42ddc7109e79f89e4ed961"}},{"branch":"8.x","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Pierre Gayvallet <pierre.gayvallet@elastic.co>
---
 .../actions/server/lib/get_token_count_from_invoke_stream.ts  | 4 +++-
 x-pack/plugins/elastic_assistant/server/lib/parse_stream.ts   | 4 +++-
 .../common/utils/process_openai_stream.ts                     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/actions/server/lib/get_token_count_from_invoke_stream.ts b/x-pack/plugins/actions/server/lib/get_token_count_from_invoke_stream.ts
index 604e623699136..909b7e09abda0 100644
--- a/x-pack/plugins/actions/server/lib/get_token_count_from_invoke_stream.ts
+++ b/x-pack/plugins/actions/server/lib/get_token_count_from_invoke_stream.ts
@@ -288,7 +288,9 @@ const parseOpenAIResponse = (responseBody: string) =>
           delta: { content?: string; function_call?: { name?: string; arguments: string } };
         }>;
       } => {
-        return 'object' in line && line.object === 'chat.completion.chunk';
+        return (
+          'object' in line && line.object === 'chat.completion.chunk' && line.choices.length > 0
+        );
       }
     )
     .reduce((prev, line) => {
diff --git a/x-pack/plugins/elastic_assistant/server/lib/parse_stream.ts b/x-pack/plugins/elastic_assistant/server/lib/parse_stream.ts
index 55be80cbb522d..3aef870be8116 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/parse_stream.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/parse_stream.ts
@@ -85,7 +85,9 @@ const parseOpenAIResponse = (responseBody: string) =>
           delta: { content?: string; function_call?: { name?: string; arguments: string } };
         }>;
       } => {
-        return 'object' in line && line.object === 'chat.completion.chunk';
+        return (
+          'object' in line && line.object === 'chat.completion.chunk' && line.choices.length > 0
+        );
       }
     )
     .reduce((prev, line) => {
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/process_openai_stream.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/process_openai_stream.ts
index 11fe48721812c..184b4817abf64 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/process_openai_stream.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/process_openai_stream.ts
@@ -42,7 +42,7 @@ export function processOpenAiStream(logger: Logger) {
       }),
       filter(
         (line): line is CreateChatCompletionResponseChunk =>
-          'object' in line && line.object === 'chat.completion.chunk'
+          'object' in line && line.object === 'chat.completion.chunk' && line.choices.length > 0
       ),
       map((chunk): ChatCompletionChunkEvent => {
         const delta = chunk.choices[0].delta;