Remove circular package dep (#16070)

run-llama · Sep 18, 2024 · 044a439 · 044a439
1 parent 0a5d302
commit 044a439
Show file tree

Hide file tree

Showing 37 changed files with 28 additions and 212 deletions.
diff --git a/llama-index-experimental/pyproject.toml b/llama-index-experimental/pyproject.toml
@@ -25,10 +25,10 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-experimental"
 readme = "README.md"
-version = "0.3.1"
+version = "0.3.2"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<4.0"
+python = ">=3.10,<4.0"
 llama-index-core = "^0.11.0"
 llama-index-finetuning = "^0.2.0"
 pandas = "*"

diff --git a/llama-index-experimental/tests/BUILD b/llama-index-experimental/tests/BUILD
@@ -1 +1,3 @@
-python_tests()
+python_tests(
+	interpreter_constraints=["==3.10.*"]
+)
diff --git a/llama-index-experimental/tests/param_tuner/BUILD b/llama-index-experimental/tests/param_tuner/BUILD
diff --git a/llama-index-experimental/tests/param_tuner/__init__.py b/llama-index-experimental/tests/param_tuner/__init__.py
diff --git a/llama-index-experimental/tests/param_tuner/test_base.py b/llama-index-experimental/tests/param_tuner/test_base.py
diff --git a/llama-index-experimental/tests/param_tuner/test_param_tuner_classes.py b/llama-index-experimental/tests/param_tuner/test_param_tuner_classes.py
diff --git a/llama-index-finetuning/pyproject.toml b/llama-index-finetuning/pyproject.toml
@@ -25,18 +25,16 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-finetuning"
 readme = "README.md"
-version = "0.2.0"
+version = "0.2.1"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<4.0"
+python = ">=3.10,<4.0"
 llama-index-core = "^0.11.0"
-llama-index-llms-openai = "^0.2.0"
+llama-index-llms-azure-openai = "^0.2.0"
 llama-index-llms-mistralai = "^0.2.0"
 llama-index-postprocessor-cohere-rerank = "^0.2.0"
 llama-index-embeddings-adapter = "^0.2.0"
-sentence-transformers = "^2.3.0"
-tenacity = ">=8.2.0,<8.4.0"
-llama-index-llms-azure-openai = "^0.2.0"
+sentence-transformers = ">=2.3.0"
 
 [tool.poetry.group.dev.dependencies]
 ipython = "8.10.0"

diff --git a/llama-index-finetuning/tests/BUILD b/llama-index-finetuning/tests/BUILD
diff --git a/llama-index-finetuning/tests/__init__.py b/llama-index-finetuning/tests/__init__.py
diff --git a/llama-index-finetuning/tests/azure_openai/BUILD b/llama-index-finetuning/tests/azure_openai/BUILD
diff --git a/llama-index-finetuning/tests/azure_openai/__init__.py b/llama-index-finetuning/tests/azure_openai/__init__.py
diff --git a/llama-index-finetuning/tests/azure_openai/test_azure_openai_classes.py b/llama-index-finetuning/tests/azure_openai/test_azure_openai_classes.py
diff --git a/llama-index-finetuning/tests/callbacks/BUILD b/llama-index-finetuning/tests/callbacks/BUILD
diff --git a/llama-index-finetuning/tests/callbacks/__init__.py b/llama-index-finetuning/tests/callbacks/__init__.py
diff --git a/llama-index-finetuning/tests/callbacks/test_callback_classes.py b/llama-index-finetuning/tests/callbacks/test_callback_classes.py
diff --git a/llama-index-finetuning/tests/cross_encoders/BUILD b/llama-index-finetuning/tests/cross_encoders/BUILD
diff --git a/llama-index-finetuning/tests/cross_encoders/__init__.py b/llama-index-finetuning/tests/cross_encoders/__init__.py
diff --git a/llama-index-finetuning/tests/cross_encoders/test_cross_encoder_classes.py b/llama-index-finetuning/tests/cross_encoders/test_cross_encoder_classes.py
diff --git a/llama-index-finetuning/tests/embeddings/BUILD b/llama-index-finetuning/tests/embeddings/BUILD
diff --git a/llama-index-finetuning/tests/embeddings/__init__.py b/llama-index-finetuning/tests/embeddings/__init__.py
diff --git a/llama-index-finetuning/tests/embeddings/test_embeddings_classes.py b/llama-index-finetuning/tests/embeddings/test_embeddings_classes.py
diff --git a/llama-index-finetuning/tests/mistralai/BUILD b/llama-index-finetuning/tests/mistralai/BUILD
diff --git a/llama-index-finetuning/tests/mistralai/__init__.py b/llama-index-finetuning/tests/mistralai/__init__.py
diff --git a/llama-index-finetuning/tests/mistralai/test_mistralai_classes.py b/llama-index-finetuning/tests/mistralai/test_mistralai_classes.py
diff --git a/llama-index-finetuning/tests/openai/BUILD b/llama-index-finetuning/tests/openai/BUILD
diff --git a/llama-index-finetuning/tests/openai/__init__.py b/llama-index-finetuning/tests/openai/__init__.py
diff --git a/llama-index-finetuning/tests/openai/test_openai_classes.py b/llama-index-finetuning/tests/openai/test_openai_classes.py
diff --git a/llama-index-finetuning/tests/rerankers/BUILD b/llama-index-finetuning/tests/rerankers/BUILD
diff --git a/llama-index-finetuning/tests/rerankers/__init__.py b/llama-index-finetuning/tests/rerankers/__init__.py
diff --git a/llama-index-finetuning/tests/rerankers/test_rerankers_classes.py b/llama-index-finetuning/tests/rerankers/test_rerankers_classes.py
diff --git a/llama-index-finetuning/tests/test_base.py b/llama-index-finetuning/tests/test_base.py
diff --git a/llama-index-integrations/agent/llama-index-agent-openai/llama_index/agent/openai/utils.py b/llama-index-integrations/agent/llama-index-agent-openai/llama_index/agent/openai/utils.py
@@ -1,14 +1,5 @@
 """Utils for OpenAI agent."""
 
-from typing import Union
+from llama_index.llms.openai.utils import resolve_tool_choice
 
-
-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
+__all__ = ["resolve_tool_choice"]
diff --git a/llama-index-integrations/agent/llama-index-agent-openai/pyproject.toml b/llama-index-integrations/agent/llama-index-agent-openai/pyproject.toml
@@ -28,12 +28,12 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-agent-openai"
 readme = "README.md"
-version = "0.3.1"
+version = "0.3.3"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"
-llama-index-llms-openai = "^0.2.0"
 openai = ">=1.14.0"
+llama-index-llms-openai = "^0.2.0"
 llama-index-core = "^0.11.0"
 
 [tool.poetry.group.dev.dependencies]

diff --git a/llama-index-integrations/embeddings/llama-index-embeddings-adapter/pyproject.toml b/llama-index-integrations/embeddings/llama-index-embeddings-adapter/pyproject.toml
@@ -28,11 +28,11 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-embeddings-adapter"
 readme = "README.md"
-version = "0.2.1"
+version = "0.2.2"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"
-torch = "^2.1.2"
+torch = ">=2.0.0"
 llama-index-core = "^0.11.0"
 
 [tool.poetry.group.dev.dependencies]

diff --git a/llama-index-integrations/llms/llama-index-llms-openai/llama_index/llms/openai/base.py b/llama-index-integrations/llms/llama-index-llms-openai/llama_index/llms/openai/base.py
@@ -63,6 +63,7 @@
     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 @@ def _prepare_chat_with_tools(
         **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`

diff --git a/llama-index-integrations/llms/llama-index-llms-openai/llama_index/llms/openai/utils.py b/llama-index-integrations/llms/llama-index-llms-openai/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
diff --git a/llama-index-integrations/llms/llama-index-llms-openai/pyproject.toml b/llama-index-integrations/llms/llama-index-llms-openai/pyproject.toml
@@ -29,13 +29,12 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-llms-openai"
 readme = "README.md"
-version = "0.2.7"
+version = "0.2.9"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"
 openai = "^1.40.0"
 llama-index-core = "^0.11.7"
-llama-index-agent-openai = "^0.3.1"
 
 [tool.poetry.group.dev.dependencies]
 ipython = "8.10.0"