fix: skip processing of choice.delta when it is None (#16636)

run-llama · Oct 22, 2024 · 5b4c114 · 5b4c114
1 parent 4779843
commit 5b4c114
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 2 deletions.
diff --git a/llama-index-integrations/llms/llama-index-llms-openai/llama_index/llms/openai/base.py b/llama-index-integrations/llms/llama-index-llms-openai/llama_index/llms/openai/base.py
@@ -478,6 +478,9 @@ def gen() -> ChatResponseGen:
                     else:
                         delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # check if this chunk is the start of a function call
                 if delta.tool_calls:
                     is_function = True
@@ -729,6 +732,9 @@ async def gen() -> ChatResponseAsyncGen:
                         delta = ChoiceDelta()
                 first_chat_chunk = False
 
+                if delta is None:
+                    continue
+
                 # check if this chunk is the start of a function call
                 if delta.tool_calls:
                     is_function = True

diff --git a/llama-index-integrations/llms/llama-index-llms-openai/pyproject.toml b/llama-index-integrations/llms/llama-index-llms-openai/pyproject.toml
@@ -29,7 +29,7 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-llms-openai"
 readme = "README.md"
-version = "0.2.15"
+version = "0.2.16"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"

diff --git a/...odal_llms/llama-index-multi-modal-llms-openai/llama_index/multi_modal_llms/openai/base.py b/...odal_llms/llama-index-multi-modal-llms-openai/llama_index/multi_modal_llms/openai/base.py
@@ -270,6 +270,9 @@ def gen() -> CompletionResponseGen:
                 else:
                     delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # update using deltas
                 content_delta = delta.content or ""
                 text += content_delta
@@ -305,6 +308,9 @@ def gen() -> ChatResponseGen:
                 else:
                     delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # check if this chunk is the start of a function call
                 if delta.tool_calls:
                     is_function = True
@@ -406,6 +412,9 @@ async def gen() -> CompletionResponseAsyncGen:
                 else:
                     delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # update using deltas
                 content_delta = delta.content or ""
                 text += content_delta
@@ -461,6 +470,9 @@ async def gen() -> ChatResponseAsyncGen:
                 else:
                     delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # check if this chunk is the start of a function call
                 if delta.tool_calls:
                     is_function = True

diff --git a/llama-index-integrations/multi_modal_llms/llama-index-multi-modal-llms-openai/pyproject.toml b/llama-index-integrations/multi_modal_llms/llama-index-multi-modal-llms-openai/pyproject.toml
@@ -27,7 +27,7 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-multi-modal-llms-openai"
 readme = "README.md"
-version = "0.2.2"
+version = "0.2.3"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"

diff --git a/llama-index-legacy/llama_index/legacy/llms/openai.py b/llama-index-legacy/llama_index/legacy/llms/openai.py
@@ -378,6 +378,9 @@ def gen() -> ChatResponseGen:
                     else:
                         delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # check if this chunk is the start of a function call
                 if delta.tool_calls:
                     is_function = True
@@ -581,6 +584,10 @@ async def gen() -> ChatResponseAsyncGen:
                         continue
                     else:
                         delta = ChoiceDelta()
+
+                if delta is None:
+                    continue
+
                 first_chat_chunk = False
 
                 # check if this chunk is the start of a function call

diff --git a/llama-index-legacy/llama_index/legacy/multi_modal_llms/openai.py b/llama-index-legacy/llama_index/legacy/multi_modal_llms/openai.py
@@ -268,6 +268,9 @@ def gen() -> CompletionResponseGen:
                 else:
                     delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # update using deltas
                 content_delta = delta.content or ""
                 text += content_delta
@@ -302,6 +305,9 @@ def gen() -> ChatResponseGen:
                 else:
                     delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # check if this chunk is the start of a function call
                 if delta.tool_calls:
                     is_function = True
@@ -401,6 +407,9 @@ async def gen() -> CompletionResponseAsyncGen:
                 else:
                     delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # update using deltas
                 content_delta = delta.content or ""
                 text += content_delta
@@ -454,6 +463,9 @@ async def gen() -> ChatResponseAsyncGen:
                 else:
                     delta = ChoiceDelta()
 
+                if delta is None:
+                    continue
+
                 # check if this chunk is the start of a function call
                 if delta.tool_calls:
                     is_function = True