llama-index-llms-openai 0.2.10__py3-none-any.whl → 0.2.12__py3-none-any.whl

llama_index/llms/openai/base.py

@@ -64,6 +64,7 @@ from llama_index.llms.openai.utils import (
     resolve_openai_credentials,
     to_openai_message_dicts,
     resolve_tool_choice,
+    update_tool_calls,
 )
 from llama_index.core.bridge.pydantic import (
     BaseModel,
@@ -450,53 +451,6 @@ class OpenAI(FunctionCallingLLM):
             additional_kwargs=self._get_response_token_counts(response),
         )
 
-    def _update_tool_calls(
-        self,
-        tool_calls: List[ChoiceDeltaToolCall],
-        tool_calls_delta: Optional[List[ChoiceDeltaToolCall]],
-    ) -> List[ChoiceDeltaToolCall]:
-        """
-        Use the tool_calls_delta objects received from openai stream chunks
-        to update the running tool_calls object.
-
-        Args:
-            tool_calls (List[ChoiceDeltaToolCall]): the list of tool calls
-            tool_calls_delta (ChoiceDeltaToolCall): the delta to update tool_calls
-
-        Returns:
-            List[ChoiceDeltaToolCall]: the updated tool calls
-        """
-        # openai provides chunks consisting of tool_call deltas one tool at a time
-        if tool_calls_delta is None:
-            return tool_calls
-
-        tc_delta = tool_calls_delta[0]
-
-        if len(tool_calls) == 0:
-            tool_calls.append(tc_delta)
-        else:
-            # we need to either update latest tool_call or start a
-            # new tool_call (i.e., multiple tools in this turn) and
-            # accumulate that new tool_call with future delta chunks
-            t = tool_calls[-1]
-            if t.index != tc_delta.index:
-                # the start of a new tool call, so append to our running tool_calls list
-                tool_calls.append(tc_delta)
-            else:
-                # not the start of a new tool call, so update last item of tool_calls
-
-                # validations to get passed by mypy
-                assert t.function is not None
-                assert tc_delta.function is not None
-                assert t.function.arguments is not None
-                assert t.function.name is not None
-                assert t.id is not None
-
-                t.function.arguments += tc_delta.function.arguments or ""
-                t.function.name += tc_delta.function.name or ""
-                t.id += tc_delta.id or ""
-        return tool_calls
-
     @llm_retry_decorator
     def _stream_chat(
         self, messages: Sequence[ChatMessage], **kwargs: Any
@@ -533,8 +487,9 @@ class OpenAI(FunctionCallingLLM):
 
                 additional_kwargs = {}
                 if is_function:
-                    tool_calls = self._update_tool_calls(tool_calls, delta.tool_calls)
-                    additional_kwargs["tool_calls"] = tool_calls
+                    tool_calls = update_tool_calls(tool_calls, delta.tool_calls)
+                    if tool_calls:
+                        additional_kwargs["tool_calls"] = tool_calls
 
                 yield ChatResponse(
                     message=ChatMessage(
@@ -783,8 +738,9 @@ class OpenAI(FunctionCallingLLM):
 
                 additional_kwargs = {}
                 if is_function:
-                    tool_calls = self._update_tool_calls(tool_calls, delta.tool_calls)
-                    additional_kwargs["tool_calls"] = tool_calls
+                    tool_calls = update_tool_calls(tool_calls, delta.tool_calls)
+                    if tool_calls:
+                        additional_kwargs["tool_calls"] = tool_calls
 
                 yield ChatResponse(
                     message=ChatMessage(

llama_index/llms/openai/utils.py

@@ -285,7 +285,7 @@ def from_openai_message(openai_message: ChatCompletionMessage) -> ChatMessage:
     # function_call = None  # deprecated in OpenAI v 1.1.0
 
     additional_kwargs: Dict[str, Any] = {}
-    if openai_message.tool_calls is not None:
+    if openai_message.tool_calls:
         tool_calls: List[ChatCompletionMessageToolCall] = openai_message.tool_calls
         additional_kwargs.update(tool_calls=tool_calls)
 
@@ -440,3 +440,50 @@ def resolve_tool_choice(tool_choice: Union[str, dict] = "auto") -> Union[str, di
         return {"type": "function", "function": {"name": tool_choice}}
 
     return tool_choice
+
+
+def update_tool_calls(
+    tool_calls: List[ChoiceDeltaToolCall],
+    tool_calls_delta: Optional[List[ChoiceDeltaToolCall]],
+) -> List[ChoiceDeltaToolCall]:
+    """
+    Use the tool_calls_delta objects received from openai stream chunks
+    to update the running tool_calls object.
+
+    Args:
+        tool_calls (List[ChoiceDeltaToolCall]): the list of tool calls
+        tool_calls_delta (ChoiceDeltaToolCall): the delta to update tool_calls
+
+    Returns:
+        List[ChoiceDeltaToolCall]: the updated tool calls
+    """
+    # openai provides chunks consisting of tool_call deltas one tool at a time
+    if tool_calls_delta is None:
+        return tool_calls
+
+    tc_delta = tool_calls_delta[0]
+
+    if len(tool_calls) == 0:
+        tool_calls.append(tc_delta)
+    else:
+        # we need to either update latest tool_call or start a
+        # new tool_call (i.e., multiple tools in this turn) and
+        # accumulate that new tool_call with future delta chunks
+        t = tool_calls[-1]
+        if t.index != tc_delta.index:
+            # the start of a new tool call, so append to our running tool_calls list
+            tool_calls.append(tc_delta)
+        else:
+            # not the start of a new tool call, so update last item of tool_calls
+
+            # validations to get passed by mypy
+            assert t.function is not None
+            assert tc_delta.function is not None
+            assert t.function.arguments is not None
+            assert t.function.name is not None
+            assert t.id is not None
+
+            t.function.arguments += tc_delta.function.arguments or ""
+            t.function.name += tc_delta.function.name or ""
+            t.id += tc_delta.id or ""
+    return tool_calls

{llama_index_llms_openai-0.2.10.dist-info → llama_index_llms_openai-0.2.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-index-llms-openai
-Version: 0.2.10
+Version: 0.2.12
 Summary: llama-index llms openai integration
 License: MIT
 Author: llama-index
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: llama-index-core (>=0.11.7,<0.12.0)
 Requires-Dist: openai (>=1.40.0,<2.0.0)
 Description-Content-Type: text/markdown

llama_index_llms_openai-0.2.12.dist-info/RECORD

@@ -0,0 +1,6 @@
+llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
+llama_index/llms/openai/base.py,sha256=tyapzQX3I3WMgH4qwAKU4A7eaa73lnJh9Bc34pvMD0k,35197
+llama_index/llms/openai/utils.py,sha256=o1_DwqNIvmrL8KcF6IfBXOOll0aXVgGNhVPhbUYTWic,15759
+llama_index_llms_openai-0.2.12.dist-info/METADATA,sha256=OrUK6ucgrWE7bz791ZY3t60lafxD2EPMLL5PcA7O6As,649
+llama_index_llms_openai-0.2.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+llama_index_llms_openai-0.2.12.dist-info/RECORD,,

{llama_index_llms_openai-0.2.10.dist-info → llama_index_llms_openai-0.2.12.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any

llama_index_llms_openai-0.2.10.dist-info/RECORD

@@ -1,6 +0,0 @@
-llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
-llama_index/llms/openai/base.py,sha256=h3jab2lijnvWRFwx2M7dlWsY48JBMmehDsU55ebjHBE,36997
-llama_index/llms/openai/utils.py,sha256=f1oqKXXfZER1DGNVZvlJACKiEPH_2rCcgduwlaxazEs,14052
-llama_index_llms_openai-0.2.10.dist-info/METADATA,sha256=ktNcXZfq_JOaH0ex6Z3wWSysHxjCtXWuOVzk2miZ_-I,598
-llama_index_llms_openai-0.2.10.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-llama_index_llms_openai-0.2.10.dist-info/RECORD,,