llama-index-llms-openai 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

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,
@@ -873,9 +874,6 @@ class OpenAI(FunctionCallingLLM):
         **kwargs: Any,
     ) -> Dict[str, Any]:
         """Predict and call the tool."""
-        from llama_index.agent.openai.utils import resolve_tool_choice
-
-        # misralai uses the same openai tool format
         tool_specs = [tool.metadata.to_openai_tool() for tool in tools]
 
         # if strict is passed in, use, else default to the class-level attribute, else default to True`

llama_index/llms/openai/utils.py

@@ -428,3 +428,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.7.dist-info → llama_index_llms_openai-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-index-llms-openai
-Version: 0.2.7
+Version: 0.2.9
 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
 Classifier: Programming Language :: Python :: 3.12
-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.9.dist-info/RECORD

@@ -0,0 +1,6 @@
+llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
+llama_index/llms/openai/base.py,sha256=h3jab2lijnvWRFwx2M7dlWsY48JBMmehDsU55ebjHBE,36997
+llama_index/llms/openai/utils.py,sha256=zduRqlmGGNy7c1uoDIdDcExD47Myq9WpczVTvRid2cI,14025
+llama_index_llms_openai-0.2.9.dist-info/METADATA,sha256=SzGCTND1cCtoBjU3qmCE5k_qhvV105uQISfoMmmj0Pw,648
+llama_index_llms_openai-0.2.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+llama_index_llms_openai-0.2.9.dist-info/RECORD,,

llama_index_llms_openai-0.2.7.dist-info/RECORD

@@ -1,6 +0,0 @@
-llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
-llama_index/llms/openai/base.py,sha256=3_D2p15hJZwjAlA_fGBWqD7gPG1TcsaS65pEGhNRP5s,37096
-llama_index/llms/openai/utils.py,sha256=n-7uzAE23knhSCxrDS-C87Xsm_icH1nPbrdZaMPxz5I,13642
-llama_index_llms_openai-0.2.7.dist-info/METADATA,sha256=f84gfZu1WBl2RFKrcA2EiTlql9LpO7ritPhuNtqLyWs,705
-llama_index_llms_openai-0.2.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-llama_index_llms_openai-0.2.7.dist-info/RECORD,,