llama-index-llms-openai 0.3.3__tar.gz → 0.3.5__tar.gz

{llama_index_llms_openai-0.3.3 → llama_index_llms_openai-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-index-llms-openai
-Version: 0.3.3
+Version: 0.3.5
 Summary: llama-index llms openai integration
 License: MIT
 Author: llama-index
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: llama-index-core (>=0.12.4,<0.13.0)
-Requires-Dist: openai (>=1.40.0,<2.0.0)
+Requires-Dist: openai (>=1.57.1,<2.0.0)
 Description-Content-Type: text/markdown
 
 # LlamaIndex Llms Integration: Openai

{llama_index_llms_openai-0.3.3 → llama_index_llms_openai-0.3.5}/llama_index/llms/openai/base.py

@@ -217,6 +217,10 @@ class OpenAI(FunctionCallingLLM):
         default=False,
         description="Whether to use strict mode for invoking tools/using schemas.",
     )
+    supports_content_blocks: bool = Field(
+        default=True,
+        description="Whether the model supports content blocks in chat messages.",
+    )
 
     _client: Optional[SyncOpenAI] = PrivateAttr()
     _aclient: Optional[AsyncOpenAI] = PrivateAttr()
@@ -423,7 +427,11 @@ class OpenAI(FunctionCallingLLM):
     @llm_retry_decorator
     def _chat(self, messages: Sequence[ChatMessage], **kwargs: Any) -> ChatResponse:
         client = self._get_client()
-        message_dicts = to_openai_message_dicts(messages, model=self.model)
+        message_dicts = to_openai_message_dicts(
+            messages,
+            model=self.model,
+            supports_content_blocks=self.supports_content_blocks,
+        )
 
         if self.reuse_client:
             response = client.chat.completions.create(
@@ -458,7 +466,11 @@ class OpenAI(FunctionCallingLLM):
         self, messages: Sequence[ChatMessage], **kwargs: Any
     ) -> ChatResponseGen:
         client = self._get_client()
-        message_dicts = to_openai_message_dicts(messages, model=self.model)
+        message_dicts = to_openai_message_dicts(
+            messages,
+            model=self.model,
+            supports_content_blocks=self.supports_content_blocks,
+        )
 
         def gen() -> ChatResponseGen:
             content = ""
@@ -668,7 +680,11 @@ class OpenAI(FunctionCallingLLM):
         self, messages: Sequence[ChatMessage], **kwargs: Any
     ) -> ChatResponse:
         aclient = self._get_aclient()
-        message_dicts = to_openai_message_dicts(messages, model=self.model)
+        message_dicts = to_openai_message_dicts(
+            messages,
+            model=self.model,
+            supports_content_blocks=self.supports_content_blocks,
+        )
 
         if self.reuse_client:
             response = await aclient.chat.completions.create(
@@ -701,7 +717,11 @@ class OpenAI(FunctionCallingLLM):
         self, messages: Sequence[ChatMessage], **kwargs: Any
     ) -> ChatResponseAsyncGen:
         aclient = self._get_aclient()
-        message_dicts = to_openai_message_dicts(messages, model=self.model)
+        message_dicts = to_openai_message_dicts(
+            messages,
+            model=self.model,
+            supports_content_blocks=self.supports_content_blocks,
+        )
 
         async def gen() -> ChatResponseAsyncGen:
             content = ""

{llama_index_llms_openai-0.3.3 → llama_index_llms_openai-0.3.5}/llama_index/llms/openai/utils.py

@@ -253,13 +253,22 @@ def is_function_calling_model(model: str) -> bool:
 
 
 def to_openai_message_dict(
-    message: ChatMessage, drop_none: bool = False, model: Optional[str] = None
+    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):
-            content.append({"type": "text", "text": block.text})
+            if message.role.value in ("assistant", "tool", "system"):
+                # 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})
         elif isinstance(block, ImageBlock):
             if block.url:
                 content.append(
@@ -283,7 +292,10 @@ def to_openai_message_dict(
 
     message_dict = {
         "role": message.role.value,
-        "content": content,
+        "content": content_txt
+        if message.role.value in ("assistant", "tool", "system")
+        or not supports_content_blocks
+        else content,
     }
 
     # TODO: O1 models do not support system prompts
@@ -309,10 +321,16 @@ 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 [
-        to_openai_message_dict(message, drop_none=drop_none, model=model)
+        to_openai_message_dict(
+            message,
+            drop_none=drop_none,
+            model=model,
+            supports_content_blocks=supports_content_blocks,
+        )
         for message in messages
     ]
 

{llama_index_llms_openai-0.3.3 → llama_index_llms_openai-0.3.5}/pyproject.toml

@@ -29,11 +29,11 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-llms-openai"
 readme = "README.md"
-version = "0.3.3"
+version = "0.3.5"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
-openai = "^1.40.0"
+openai = "^1.57.1"
 llama-index-core = "^0.12.4"
 
 [tool.poetry.group.dev.dependencies]