llama-index-llms-openai 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

llama_index/llms/openai/base.py

@@ -926,8 +926,10 @@ class OpenAI(FunctionCallingLLM):
     ) -> BaseModel:
         """Structured predict."""
         llm_kwargs = llm_kwargs or {}
+        all_kwargs = {**llm_kwargs, **kwargs}
+
         llm_kwargs["tool_choice"] = (
-            "required" if "tool_choice" not in llm_kwargs else llm_kwargs["tool_choice"]
+            "required" if "tool_choice" not in all_kwargs else all_kwargs["tool_choice"]
         )
         # by default structured prediction uses function calling to extract structured outputs
         # here we force tool_choice to be required
@@ -939,8 +941,10 @@ class OpenAI(FunctionCallingLLM):
     ) -> BaseModel:
         """Structured predict."""
         llm_kwargs = llm_kwargs or {}
+        all_kwargs = {**llm_kwargs, **kwargs}
+
         llm_kwargs["tool_choice"] = (
-            "required" if "tool_choice" not in llm_kwargs else llm_kwargs["tool_choice"]
+            "required" if "tool_choice" not in all_kwargs else all_kwargs["tool_choice"]
         )
         # by default structured prediction uses function calling to extract structured outputs
         # here we force tool_choice to be required
@@ -952,8 +956,10 @@ class OpenAI(FunctionCallingLLM):
     ) -> Generator[Union[Model, List[Model]], None, None]:
         """Stream structured predict."""
         llm_kwargs = llm_kwargs or {}
+        all_kwargs = {**llm_kwargs, **kwargs}
+
         llm_kwargs["tool_choice"] = (
-            "required" if "tool_choice" not in llm_kwargs else llm_kwargs["tool_choice"]
+            "required" if "tool_choice" not in all_kwargs else all_kwargs["tool_choice"]
         )
         # by default structured prediction uses function calling to extract structured outputs
         # here we force tool_choice to be required
@@ -965,8 +971,10 @@ class OpenAI(FunctionCallingLLM):
     ) -> Generator[Union[Model, List[Model]], None, None]:
         """Stream structured predict."""
         llm_kwargs = llm_kwargs or {}
+        all_kwargs = {**llm_kwargs, **kwargs}
+
         llm_kwargs["tool_choice"] = (
-            "required" if "tool_choice" not in llm_kwargs else llm_kwargs["tool_choice"]
+            "required" if "tool_choice" not in all_kwargs else all_kwargs["tool_choice"]
         )
         # by default structured prediction uses function calling to extract structured outputs
         # here we force tool_choice to be required

llama_index/llms/openai/utils.py

@@ -54,6 +54,7 @@ GPT4_MODELS: Dict[str, int] = {
     "gpt-4o": 128000,
     "gpt-4o-2024-05-13": 128000,
     "gpt-4o-2024-08-06": 128000,
+    "gpt-4o-2024-11-20": 128000,
     # Intended for research and evaluation
     "chatgpt-4o-latest": 128000,
     "gpt-4o-mini": 128000,

{llama_index_llms_openai-0.3.0.dist-info → llama_index_llms_openai-0.3.2.dist-info}/METADATA

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

llama_index_llms_openai-0.3.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
+llama_index/llms/openai/base.py,sha256=msUhTxmOq3JVzKPW_gr4qOuKsoQWAaAPtcmCI0hK6lY,35648
+llama_index/llms/openai/utils.py,sha256=3fHw4U-fRa6yADE5DjFbJWs6gagSt3-aqUn8oHdm8Ec,16180
+llama_index_llms_openai-0.3.2.dist-info/METADATA,sha256=suUFtKfPQU5-6OAJUxwwGake3TQffyNZm3ZR7ErE2Y8,3320
+llama_index_llms_openai-0.3.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+llama_index_llms_openai-0.3.2.dist-info/RECORD,,

llama_index_llms_openai-0.3.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
-llama_index/llms/openai/base.py,sha256=wg509NgBHVLgB1Z9bevMjJenu3BFf4WZvlGP40eVhj8,35460
-llama_index/llms/openai/utils.py,sha256=VPRR9leKro1InT-12v1tE9qsu6DzFncmlIzHqApCPfo,16147
-llama_index_llms_openai-0.3.0.dist-info/METADATA,sha256=c_108MozjVz1erz8Nj9brgj4pAZS_dKLT2jHoC07sX4,3320
-llama_index_llms_openai-0.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-llama_index_llms_openai-0.3.0.dist-info/RECORD,,