llama-index-llms-openai 0.6.11__py3-none-any.whl → 0.6.13__py3-none-any.whl

llama_index/llms/openai/base.py

@@ -1,4 +1,5 @@
 import functools
+import re
 from json.decoder import JSONDecodeError
 from typing import (
     TYPE_CHECKING,
@@ -1070,7 +1071,14 @@ class OpenAI(FunctionCallingLLM):
         )
 
         llm_kwargs = llm_kwargs or {}
-        llm_kwargs["response_format"] = _type_to_response_format(output_cls)
+        response_format = _type_to_response_format(output_cls)
+        if isinstance(response_format, dict):
+            json_schema = response_format.get("json_schema")
+            if isinstance(json_schema, dict) and "name" in json_schema:
+                json_schema["name"] = re.sub(
+                    r"[^a-zA-Z0-9_-]", "_", str(json_schema["name"])
+                )
+        llm_kwargs["response_format"] = response_format
         if "tool_choice" in llm_kwargs:
             del llm_kwargs["tool_choice"]
         return llm_kwargs

llama_index/llms/openai/responses.py

@@ -415,7 +415,7 @@ class OpenAIResponses(FunctionCallingLLM):
             "previous_response_id": self._previous_response_id,
             "store": self.store,
             "temperature": self.temperature,
-            "tools": [*initial_tools, *kwargs.pop("tools", [])],
+            "tools": [*initial_tools, *(kwargs.pop("tools", []) or [])],
             "top_p": self.top_p,
             "truncation": self.truncation,
             "user": self.user,

{llama_index_llms_openai-0.6.11.dist-info → llama_index_llms_openai-0.6.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llama-index-llms-openai
-Version: 0.6.11
+Version: 0.6.13
 Summary: llama-index llms openai integration
 Author: llama-index
 License-Expression: MIT

llama_index_llms_openai-0.6.13.dist-info/RECORD

@@ -0,0 +1,9 @@
+llama_index/llms/openai/__init__.py,sha256=8nmgixeXifQ4eVSgtCic54WxXqrrpXQPL4rhACWCSFs,229
+llama_index/llms/openai/base.py,sha256=_qz2DdX1NnoQ03u1LSEpNeIsKsCODrYbAJFFPE-tk9s,45313
+llama_index/llms/openai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+llama_index/llms/openai/responses.py,sha256=h3-CHAjoG975I2vA4JOwqdto2YCrm8LIOibXn6c6dWE,38020
+llama_index/llms/openai/utils.py,sha256=x7phvKKQxBfGHaARmDW_03BYtmvALJ0v50cXYIvNHC8,33919
+llama_index_llms_openai-0.6.13.dist-info/METADATA,sha256=FPN4stCKE8kLGnnbrP0tXRw4Bik_JFesUyNnuowaXWM,3040
+llama_index_llms_openai-0.6.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+llama_index_llms_openai-0.6.13.dist-info/licenses/LICENSE,sha256=JPQLUZD9rKvCTdu192Nk0V5PAwklIg6jANii3UmTyMs,1065
+llama_index_llms_openai-0.6.13.dist-info/RECORD,,

llama_index_llms_openai-0.6.11.dist-info/RECORD

@@ -1,9 +0,0 @@
-llama_index/llms/openai/__init__.py,sha256=8nmgixeXifQ4eVSgtCic54WxXqrrpXQPL4rhACWCSFs,229
-llama_index/llms/openai/base.py,sha256=7L0zXvLW2h5w2XzZJ6sglcJf_rhNw6EannKcDYAS0qU,44949
-llama_index/llms/openai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llama_index/llms/openai/responses.py,sha256=R7Y0GRptw5tXKQKiz9Mt-lrB6VLNG6HruMvZXiFUrYM,38012
-llama_index/llms/openai/utils.py,sha256=x7phvKKQxBfGHaARmDW_03BYtmvALJ0v50cXYIvNHC8,33919
-llama_index_llms_openai-0.6.11.dist-info/METADATA,sha256=yJ7gSElqj_xMYQq8vXGsemqbJg5v0fcInLwN3zTrUtU,3040
-llama_index_llms_openai-0.6.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-llama_index_llms_openai-0.6.11.dist-info/licenses/LICENSE,sha256=JPQLUZD9rKvCTdu192Nk0V5PAwklIg6jANii3UmTyMs,1065
-llama_index_llms_openai-0.6.11.dist-info/RECORD,,