llama-index-llms-openai 0.3.8__py3-none-any.whl → 0.3.10__py3-none-any.whl

llama_index/llms/openai/base.py

@@ -59,7 +59,6 @@ from llama_index.core.llms.llm import ToolSelection
 from llama_index.core.llms.utils import parse_partial_json
 from llama_index.core.types import BaseOutputParser, Model, PydanticProgramMode
 from llama_index.llms.openai.utils import (
-    ALL_AVAILABLE_MODELS,
     O1_MODELS,
     OpenAIToolCall,
     create_retry_decorator,
@@ -218,10 +217,6 @@ class OpenAI(FunctionCallingLLM):
         default=False,
         description="Whether to use strict mode for invoking tools/using schemas.",
     )
-    supports_content_blocks: bool = Field(
-        default=False,
-        description="Whether the model supports content blocks in chat messages.",
-    )
 
     _client: Optional[SyncOpenAI] = PrivateAttr()
     _aclient: Optional[AsyncOpenAI] = PrivateAttr()
@@ -267,10 +262,6 @@ class OpenAI(FunctionCallingLLM):
         if model in O1_MODELS:
             temperature = 1.0
 
-        supports_content_blocks = kwargs.pop(
-            "supports_content_blocks", model in ALL_AVAILABLE_MODELS
-        )
-
         super().__init__(
             model=model,
             temperature=temperature,
@@ -290,7 +281,6 @@ class OpenAI(FunctionCallingLLM):
             pydantic_program_mode=pydantic_program_mode,
             output_parser=output_parser,
             strict=strict,
-            supports_content_blocks=supports_content_blocks,
             **kwargs,
         )
 
@@ -436,7 +426,6 @@ class OpenAI(FunctionCallingLLM):
         message_dicts = to_openai_message_dicts(
             messages,
             model=self.model,
-            supports_content_blocks=self.supports_content_blocks,
         )
 
         if self.reuse_client:
@@ -475,7 +464,6 @@ class OpenAI(FunctionCallingLLM):
         message_dicts = to_openai_message_dicts(
             messages,
             model=self.model,
-            supports_content_blocks=self.supports_content_blocks,
         )
 
         def gen() -> ChatResponseGen:
@@ -689,7 +677,6 @@ class OpenAI(FunctionCallingLLM):
         message_dicts = to_openai_message_dicts(
             messages,
             model=self.model,
-            supports_content_blocks=self.supports_content_blocks,
         )
 
         if self.reuse_client:
@@ -726,7 +713,6 @@ class OpenAI(FunctionCallingLLM):
         message_dicts = to_openai_message_dicts(
             messages,
             model=self.model,
-            supports_content_blocks=self.supports_content_blocks,
         )
 
         async def gen() -> ChatResponseAsyncGen:

llama_index/llms/openai/utils.py

@@ -256,22 +256,14 @@ def to_openai_message_dict(
     message: ChatMessage,
     drop_none: bool = False,
     model: Optional[str] = None,
-    supports_content_blocks: bool = False,
 ) -> ChatCompletionMessageParam:
     """Convert a ChatMessage to an OpenAI message dict."""
     content = []
     content_txt = ""
     for block in message.blocks:
         if isinstance(block, TextBlock):
-            if (
-                message.role.value in ("assistant", "tool", "system")
-                or not supports_content_blocks
-            ):
-                # Despite the docs say otherwise, when role is ASSISTANT, SYSTEM
-                # or TOOL, 'content' cannot be a list and must be string instead.
-                content_txt += block.text
-            else:
-                content.append({"type": "text", "text": block.text})
+            content.append({"type": "text", "text": block.text})
+            content_txt += block.text
         elif isinstance(block, ImageBlock):
             if block.url:
                 content.append(
@@ -293,11 +285,19 @@ def to_openai_message_dict(
             msg = f"Unsupported content block type: {type(block).__name__}"
             raise ValueError(msg)
 
+    # NOTE: Sending a blank string to openai will cause an error.
+    # This will commonly happen with tool calls.
+    content_txt = None if content_txt == "" else content_txt
+
+    # NOTE: Despite what the openai docs say, if the role is ASSISTANT, SYSTEM
+    # or TOOL, 'content' cannot be a list and must be string instead.
+    # Furthermore, if all blocks are text blocks, we can use the content_txt
+    # as the content. This will avoid breaking openai-like APIs.
     message_dict = {
         "role": message.role.value,
         "content": content_txt
         if message.role.value in ("assistant", "tool", "system")
-        or not supports_content_blocks
+        or all(isinstance(block, TextBlock) for block in message.blocks)
         else content,
     }
 
@@ -324,7 +324,6 @@ def to_openai_message_dicts(
     messages: Sequence[ChatMessage],
     drop_none: bool = False,
     model: Optional[str] = None,
-    supports_content_blocks: bool = False,
 ) -> List[ChatCompletionMessageParam]:
     """Convert generic messages to OpenAI message dicts."""
     return [
@@ -332,7 +331,6 @@ def to_openai_message_dicts(
             message,
             drop_none=drop_none,
             model=model,
-            supports_content_blocks=supports_content_blocks,
         )
         for message in messages
     ]

{llama_index_llms_openai-0.3.8.dist-info → llama_index_llms_openai-0.3.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-index-llms-openai
-Version: 0.3.8
+Version: 0.3.10
 Summary: llama-index llms openai integration
 License: MIT
 Author: llama-index

llama_index_llms_openai-0.3.10.dist-info/RECORD

@@ -0,0 +1,6 @@
+llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
+llama_index/llms/openai/base.py,sha256=_kW22tTABTKQ-GFRN00P5OOcJS4IeVAI3vPqbjw1D8o,35777
+llama_index/llms/openai/utils.py,sha256=q4qfub-sbjdfszucQCIXUyxc54_SKNM5xt84GXjKaXY,18400
+llama_index_llms_openai-0.3.10.dist-info/METADATA,sha256=cDAY7NIsXdQDMDThNsifONnFKcsmWsbCaqeJw8TwXH0,3321
+llama_index_llms_openai-0.3.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+llama_index_llms_openai-0.3.10.dist-info/RECORD,,

llama_index_llms_openai-0.3.8.dist-info/RECORD

@@ -1,6 +0,0 @@
-llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
-llama_index/llms/openai/base.py,sha256=z176ueUBn4ZeKlDxqqTyUZ_1VrauaFAt6H4jl5bm_MI,36409
-llama_index/llms/openai/utils.py,sha256=a5BvfhjUO1lbKWR5kptQs9WaJ6Ykg_kSWWZQRpk-T3g,18383
-llama_index_llms_openai-0.3.8.dist-info/METADATA,sha256=ewX0c-U-io6xgRtyHQgXkax6m5FNtvk5Y3OCvoTORBs,3320
-llama_index_llms_openai-0.3.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-llama_index_llms_openai-0.3.8.dist-info/RECORD,,