llama-index-llms-openai 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

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/utils.py

@@ -253,14 +253,17 @@ 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):
-            if message.role.value in ("assistant", "tool", "system"):
+            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
@@ -291,6 +294,7 @@ def to_openai_message_dict(
         "role": message.role.value,
         "content": content_txt
         if message.role.value in ("assistant", "tool", "system")
+        or not supports_content_blocks
         else content,
     }
 
@@ -317,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.4.dist-info → llama_index_llms_openai-0.3.6.dist-info}/METADATA

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

llama_index_llms_openai-0.3.6.dist-info/RECORD

@@ -0,0 +1,6 @@
+llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
+llama_index/llms/openai/base.py,sha256=oyXczVpX-IF9MvTZ1xDY7OpiEmlywwiG1eTsyUGFrns,36195
+llama_index/llms/openai/utils.py,sha256=aF2gP-Aef7rMUIYp9bG2Ke45pNszl_Jagga781Hul-A,18335
+llama_index_llms_openai-0.3.6.dist-info/METADATA,sha256=ZzJAPLc3-rJCZG76WUO9uJuCLYlU14dLUQqNTWcnvAg,3320
+llama_index_llms_openai-0.3.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+llama_index_llms_openai-0.3.6.dist-info/RECORD,,

llama_index_llms_openai-0.3.4.dist-info/RECORD

@@ -1,6 +0,0 @@
-llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
-llama_index/llms/openai/base.py,sha256=V__JjM8FSTuvQdeb-kqJOzIX3d1v9x4bbOGDxs-O56s,35637
-llama_index/llms/openai/utils.py,sha256=cCmcpS2wMN7xTrq18UV012aC0_Fn3nHz6aA5bYypRkQ,18062
-llama_index_llms_openai-0.3.4.dist-info/METADATA,sha256=36ZOZUGYVoJcjSaYHG2FkLugRtcYKfTM2M1AxycS9n8,3320
-llama_index_llms_openai-0.3.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-llama_index_llms_openai-0.3.4.dist-info/RECORD,,