llama-index-llms-openai 0.2.8__tar.gz → 0.2.10__tar.gz

{llama_index_llms_openai-0.2.8 → llama_index_llms_openai-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-index-llms-openai
-Version: 0.2.8
+Version: 0.2.10
 Summary: llama-index llms openai integration
 License: MIT
 Author: llama-index
@@ -11,7 +11,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: llama-index-core (>=0.11.7,<0.12.0)
-Requires-Dist: llama-index-utils-openai (>=0.1.0,<0.2.0)
 Requires-Dist: openai (>=1.40.0,<2.0.0)
 Description-Content-Type: text/markdown
 

{llama_index_llms_openai-0.2.8 → llama_index_llms_openai-0.2.10}/llama_index/llms/openai/base.py

@@ -63,6 +63,7 @@ from llama_index.llms.openai.utils import (
     openai_modelname_to_contextsize,
     resolve_openai_credentials,
     to_openai_message_dicts,
+    resolve_tool_choice,
 )
 from llama_index.core.bridge.pydantic import (
     BaseModel,
@@ -76,7 +77,6 @@ from openai.types.chat.chat_completion_chunk import (
     ChoiceDeltaToolCall,
 )
 from llama_index.core.llms.utils import parse_partial_json
-from llama_index.utils.openai import resolve_tool_choice
 
 import llama_index.core.instrumentation as instrument
 

{llama_index_llms_openai-0.2.8 → llama_index_llms_openai-0.2.10}/llama_index/llms/openai/utils.py

@@ -67,6 +67,7 @@ GPT4_MODELS: Dict[str, int] = {
 
 AZURE_TURBO_MODELS: Dict[str, int] = {
     "gpt-4o": 128000,
+    "gpt-4o-mini": 128000,
     "gpt-35-turbo-16k": 16384,
     "gpt-35-turbo": 4096,
     # 0125 (2024) model (JSON mode)
@@ -428,3 +429,14 @@ def validate_openai_api_key(api_key: Optional[str] = None) -> None:
 
     if not openai_api_key:
         raise ValueError(MISSING_API_KEY_ERROR_MESSAGE)
+
+
+def resolve_tool_choice(tool_choice: Union[str, dict] = "auto") -> Union[str, dict]:
+    """Resolve tool choice.
+
+    If tool_choice is a function name string, return the appropriate dict.
+    """
+    if isinstance(tool_choice, str) and tool_choice not in ["none", "auto", "required"]:
+        return {"type": "function", "function": {"name": tool_choice}}
+
+    return tool_choice

{llama_index_llms_openai-0.2.8 → llama_index_llms_openai-0.2.10}/pyproject.toml

@@ -29,13 +29,12 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-llms-openai"
 readme = "README.md"
-version = "0.2.8"
+version = "0.2.10"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"
 openai = "^1.40.0"
 llama-index-core = "^0.11.7"
-llama-index-utils-openai = "^0.1.0"
 
 [tool.poetry.group.dev.dependencies]
 ipython = "8.10.0"