llama-index-llms-openai 0.3.13__py3-none-any.whl → 0.3.14__py3-none-any.whl

llama_index/llms/openai/utils.py

@@ -2,7 +2,13 @@ import logging
 import os
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Type, Union
 
+import openai
 from deprecated import deprecated
+from openai.types.chat import ChatCompletionMessageParam, ChatCompletionMessageToolCall
+from openai.types.chat.chat_completion_chunk import ChoiceDeltaToolCall
+from openai.types.chat.chat_completion_message import ChatCompletionMessage
+from openai.types.chat.chat_completion_token_logprob import ChatCompletionTokenLogprob
+from openai.types.completion_choice import Logprobs
 from tenacity import (
     before_sleep_log,
     retry,
@@ -14,20 +20,15 @@ from tenacity import (
 )
 from tenacity.stop import stop_base
 
-import openai
 from llama_index.core.base.llms.generic_utils import get_from_param_or_env
 from llama_index.core.base.llms.types import (
     ChatMessage,
     ImageBlock,
     LogProb,
+    MessageRole,
     TextBlock,
 )
 from llama_index.core.bridge.pydantic import BaseModel
-from openai.types.chat import ChatCompletionMessageParam, ChatCompletionMessageToolCall
-from openai.types.chat.chat_completion_chunk import ChoiceDeltaToolCall
-from openai.types.chat.chat_completion_message import ChatCompletionMessage
-from openai.types.chat.chat_completion_token_logprob import ChatCompletionTokenLogprob
-from openai.types.completion_choice import Logprobs
 
 DEFAULT_OPENAI_API_TYPE = "open_ai"
 DEFAULT_OPENAI_API_BASE = "https://api.openai.com/v1"
@@ -292,9 +293,14 @@ 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: Sending a null value (None) for Tool Message to OpenAI will cause error
+    # It's only Allowed to send None if it's an Assistant Message
+    # Reference: https://platform.openai.com/docs/api-reference/chat/create
+    content_txt = (
+        None
+        if content_txt == "" and message.role == MessageRole.ASSISTANT
+        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.
@@ -302,10 +308,12 @@ def to_openai_message_dict(
     # 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 all(isinstance(block, TextBlock) for block in message.blocks)
-        else content,
+        "content": (
+            content_txt
+            if message.role.value in ("assistant", "tool", "system")
+            or all(isinstance(block, TextBlock) for block in message.blocks)
+            else content
+        ),
     }
 
     # TODO: O1 models do not support system prompts

{llama_index_llms_openai-0.3.13.dist-info → llama_index_llms_openai-0.3.14.dist-info}/METADATA

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

llama_index_llms_openai-0.3.14.dist-info/RECORD

@@ -0,0 +1,7 @@
+llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
+llama_index/llms/openai/base.py,sha256=uvYlJz3TXZIsptoicHCSv8zIc8wK187RhY1lwU7lOVc,35777
+llama_index/llms/openai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+llama_index/llms/openai/utils.py,sha256=nE6XrWRJXSMbMRuP4c0pw39ftoGNYpMNH4m7kzwnsS8,18801
+llama_index_llms_openai-0.3.14.dist-info/METADATA,sha256=H9yu_YIoyDxD2uen-qQwqzwRp4w0JCqpmebOLvQizco,3321
+llama_index_llms_openai-0.3.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+llama_index_llms_openai-0.3.14.dist-info/RECORD,,

llama_index_llms_openai-0.3.13.dist-info/RECORD

@@ -1,7 +0,0 @@
-llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
-llama_index/llms/openai/base.py,sha256=uvYlJz3TXZIsptoicHCSv8zIc8wK187RhY1lwU7lOVc,35777
-llama_index/llms/openai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llama_index/llms/openai/utils.py,sha256=xGmeX1TbJaLjdtryETTGHR3-OSdrBm-79UxC9FlrrdE,18563
-llama_index_llms_openai-0.3.13.dist-info/METADATA,sha256=L9Uc2A1uxhFVX-GNzUo1OFssYWg6HTgSO0ZEeIVNDeo,3321
-llama_index_llms_openai-0.3.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-llama_index_llms_openai-0.3.13.dist-info/RECORD,,