llama-index-llms-openai 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

llama_index/llms/openai/base.py

@@ -2,6 +2,7 @@ import functools
 from typing import (
     TYPE_CHECKING,
     Any,
+    Generator,
     Awaitable,
     Callable,
     Dict,
@@ -49,7 +50,7 @@ from llama_index.core.llms.callbacks import (
 )
 from llama_index.core.llms.function_calling import FunctionCallingLLM
 from llama_index.core.llms.llm import ToolSelection
-from llama_index.core.types import BaseOutputParser, PydanticProgramMode
+from llama_index.core.types import BaseOutputParser, PydanticProgramMode, Model
 from llama_index.llms.openai.utils import (
     OpenAIToolCall,
     create_retry_decorator,
@@ -62,6 +63,9 @@ from llama_index.llms.openai.utils import (
     resolve_openai_credentials,
     to_openai_message_dicts,
 )
+from llama_index.core.bridge.pydantic import (
+    BaseModel,
+)
 
 from openai import AsyncOpenAI, AzureOpenAI
 from openai import OpenAI as SyncOpenAI
@@ -72,6 +76,10 @@ from openai.types.chat.chat_completion_chunk import (
 )
 from llama_index.core.llms.utils import parse_partial_json
 
+import llama_index.core.instrumentation as instrument
+
+dispatcher = instrument.get_dispatcher(__name__)
+
 if TYPE_CHECKING:
     from llama_index.core.tools.types import BaseTool
 
@@ -574,7 +582,7 @@ class OpenAI(FunctionCallingLLM):
             text = ""
             for response in client.completions.create(
                 prompt=prompt,
-                **kwargs,
+                **all_kwargs,
             ):
                 if len(response.choices) > 0:
                     delta = response.choices[0].text
@@ -940,3 +948,55 @@ class OpenAI(FunctionCallingLLM):
             )
 
         return tool_selections
+
+    @dispatcher.span
+    def structured_predict(
+        self, *args: Any, llm_kwargs: Optional[Dict[str, Any]] = None, **kwargs: Any
+    ) -> BaseModel:
+        """Structured predict."""
+        llm_kwargs = llm_kwargs or {}
+        llm_kwargs["tool_choice"] = (
+            "required" if "tool_choice" not in llm_kwargs else llm_kwargs["tool_choice"]
+        )
+        # by default structured prediction uses function calling to extract structured outputs
+        # here we force tool_choice to be required
+        return super().structured_predict(*args, llm_kwargs=llm_kwargs, **kwargs)
+
+    @dispatcher.span
+    async def astructured_predict(
+        self, *args: Any, llm_kwargs: Optional[Dict[str, Any]] = None, **kwargs: Any
+    ) -> BaseModel:
+        """Structured predict."""
+        llm_kwargs = llm_kwargs or {}
+        llm_kwargs["tool_choice"] = (
+            "required" if "tool_choice" not in llm_kwargs else llm_kwargs["tool_choice"]
+        )
+        # by default structured prediction uses function calling to extract structured outputs
+        # here we force tool_choice to be required
+        return await super().astructured_predict(*args, llm_kwargs=llm_kwargs, **kwargs)
+
+    @dispatcher.span
+    def stream_structured_predict(
+        self, *args: Any, llm_kwargs: Optional[Dict[str, Any]] = None, **kwargs: Any
+    ) -> Generator[Union[Model, List[Model]], None, None]:
+        """Stream structured predict."""
+        llm_kwargs = llm_kwargs or {}
+        llm_kwargs["tool_choice"] = (
+            "required" if "tool_choice" not in llm_kwargs else llm_kwargs["tool_choice"]
+        )
+        # by default structured prediction uses function calling to extract structured outputs
+        # here we force tool_choice to be required
+        return super().stream_structured_predict(*args, llm_kwargs=llm_kwargs, **kwargs)
+
+    @dispatcher.span
+    def stream_structured_predict(
+        self, *args: Any, llm_kwargs: Optional[Dict[str, Any]] = None, **kwargs: Any
+    ) -> Generator[Union[Model, List[Model]], None, None]:
+        """Stream structured predict."""
+        llm_kwargs = llm_kwargs or {}
+        llm_kwargs["tool_choice"] = (
+            "required" if "tool_choice" not in llm_kwargs else llm_kwargs["tool_choice"]
+        )
+        # by default structured prediction uses function calling to extract structured outputs
+        # here we force tool_choice to be required
+        return super().stream_structured_predict(*args, llm_kwargs=llm_kwargs, **kwargs)

{llama_index_llms_openai-0.2.1.dist-info → llama_index_llms_openai-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-index-llms-openai
-Version: 0.2.1
+Version: 0.2.3
 Summary: llama-index llms openai integration
 License: MIT
 Author: llama-index
@@ -10,9 +10,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: llama-index-agent-openai (>=0.3.0,<0.4.0)
-Requires-Dist: llama-index-core (>=0.11.0,<0.12.0)
+Requires-Dist: llama-index-agent-openai (>=0.3.1,<0.4.0)
+Requires-Dist: llama-index-core (>=0.11.7,<0.12.0)
 Requires-Dist: openai (>=1.40.0,<2.0.0)
 Description-Content-Type: text/markdown
 

llama_index_llms_openai-0.2.3.dist-info/RECORD

@@ -0,0 +1,6 @@
+llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
+llama_index/llms/openai/base.py,sha256=gn87WGrKkZ2llOos1TishK2XVoWZc05hGK7YrBk8kh0,36757
+llama_index/llms/openai/utils.py,sha256=VuDXkLR_BGVqoZc9IJqiJlVloZwG9Z7s1nGPAhlbvWE,13079
+llama_index_llms_openai-0.2.3.dist-info/METADATA,sha256=ig-bKzvFZSaMSnTtS5NhHVkdr_3HFHRcg2KOXnkLZMo,654
+llama_index_llms_openai-0.2.3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+llama_index_llms_openai-0.2.3.dist-info/RECORD,,

{llama_index_llms_openai-0.2.1.dist-info → llama_index_llms_openai-0.2.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.6.1
 Root-Is-Purelib: true
 Tag: py3-none-any

llama_index_llms_openai-0.2.1.dist-info/RECORD

@@ -1,6 +0,0 @@
-llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
-llama_index/llms/openai/base.py,sha256=dbL-ikXVEnUsOc25TWyOfrct4EY1EiiiEJPX7W4TDJI,34060
-llama_index/llms/openai/utils.py,sha256=VuDXkLR_BGVqoZc9IJqiJlVloZwG9Z7s1nGPAhlbvWE,13079
-llama_index_llms_openai-0.2.1.dist-info/METADATA,sha256=g4iFMM7WSRILduOCTBfZlJpAVZqKWEizJ_TAZEwjLKQ,705
-llama_index_llms_openai-0.2.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-llama_index_llms_openai-0.2.1.dist-info/RECORD,,