Logan/cli fixes (#11068)

run-llama · Feb 21, 2024 · 6fb1fa8 · 6fb1fa8
1 parent da5f941
commit 6fb1fa8
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 191 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # ChangeLog
 
+## [0.10.11] - 2024-02-21
+
+### Bug Fixes / Nits
+
+- Fixed multi-modal LLM for async acomplete (#11064)
+- Fixed issue with llamaindex-cli imports (#11068)
+
 ## [0.10.10] - 2024-02-20
 
 I'm still a bit wonky with our publishing process -- apologies. This is just a version

diff --git a/llama-index-cli/llama_index/cli/command_line.py b/llama-index-cli/llama_index/cli/command_line.py
@@ -1,8 +1,8 @@
 import argparse
 from typing import Any, Optional
 
-from llama_index.cli.command_line.rag import RagCLI, default_ragcli_persist_dir
-from llama_index.cli.command_line.upgrade import upgrade_dir, upgrade_file
+from llama_index.cli.rag import RagCLI, default_ragcli_persist_dir
+from llama_index.cli.upgrade import upgrade_dir, upgrade_file
 from llama_index.core.ingestion import IngestionCache, IngestionPipeline
 from llama_index.core.llama_dataset.download import (
     LLAMA_DATASETS_LFS_URL,
@@ -17,7 +17,7 @@
 from llama_index.core.storage.docstore import SimpleDocumentStore
 from llama_index.core.text_splitter import SentenceSplitter
 
-from llama_index.cli.command_line.new_package.base import init_new_package
+from llama_index.cli.new_package.base import init_new_package
 
 
 def handle_init_package(

diff --git a/llama-index-cli/pyproject.toml b/llama-index-cli/pyproject.toml
@@ -31,7 +31,7 @@ maintainers = [
 name = "llama-index-cli"
 packages = [{include = "llama_index/"}]
 readme = "README.md"
-version = "0.1.2post1"
+version = "0.1.3"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"

diff --git a/llama-index-core/llama_index/core/__init__.py b/llama-index-core/llama_index/core/__init__.py
@@ -1,6 +1,6 @@
 """Init file of LlamaIndex."""
 
-__version__ = "0.10.10"
+__version__ = "0.10.11.post1"
 
 import logging
 from logging import NullHandler

diff --git a/llama-index-core/llama_index/core/evaluation/eval_utils.py b/llama-index-core/llama_index/core/evaluation/eval_utils.py
@@ -9,7 +9,7 @@
 import subprocess
 import tempfile
 from collections import defaultdict
-from typing import Any, List, Optional, Tuple
+from typing import Any, List, Optional, Tuple, TYPE_CHECKING
 
 import numpy as np
 import pandas as pd
@@ -22,7 +22,9 @@
 from llama_index.core.base.base_query_engine import BaseQueryEngine
 from llama_index.core.constants import DEFAULT_BASE_URL, DEFAULT_PROJECT_NAME
 from llama_index.core.evaluation.base import EvaluationResult
-from llama_index.core.llama_dataset import LabelledRagDataset
+
+if TYPE_CHECKING:
+    from llama_index.core.llama_dataset import LabelledRagDataset
 
 
 async def aget_responses(
@@ -71,8 +73,10 @@ def get_results_df(
     return pd.DataFrame(metric_dict)
 
 
-def _download_llama_dataset_from_hub(llama_dataset_id: str) -> LabelledRagDataset:
+def _download_llama_dataset_from_hub(llama_dataset_id: str) -> "LabelledRagDataset":
     """Uses a subprocess and llamaindex-cli to download a dataset from llama-hub."""
+    from llama_index.core.llama_dataset import LabelledRagDataset
+
     with tempfile.TemporaryDirectory() as tmp:
         try:
             subprocess.run(

diff --git a/llama-index-core/pyproject.toml b/llama-index-core/pyproject.toml
@@ -42,7 +42,7 @@ name = "llama-index-core"
 packages = [{include = "llama_index"}]
 readme = "README.md"
 repository = "https://github.com/run-llama/llama_index"
-version = "0.10.10"
+version = "0.10.11.post1"
 
 [tool.poetry.dependencies]
 SQLAlchemy = {extras = ["asyncio"], version = ">=1.4.49"}

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -47,7 +47,7 @@ repository = "https://github.com/run-llama/llama_index"
 version = "0.10.10"
 
 [tool.poetry.dependencies]
-python = ">=3.8.1,<4.0"
+python = ">=3.8.1,<3.12"
 llama-index-legacy = "^0.9.48"
 llama-index-llms-openai = "^0.1.5"
 llama-index-embeddings-openai = "^0.1.5"
@@ -57,7 +57,7 @@ llama-index-agent-openai = "^0.1.4"
 llama-index-readers-file = "^0.1.4"
 llama-index-readers-llama-parse = "^0.1.2"
 llama-index-indices-managed-llama-cloud = "^0.1.2"
-llama-index-core = "^0.10.9"
+llama-index-core = "^0.10.11.post1"
 llama-index-multi-modal-llms-openai = "^0.1.3"
 llama-index-cli = "^0.1.2"
 
@@ -94,7 +94,7 @@ sphinx-rtd-theme = "^1.3.0"
 sphinxcontrib-gtagjs = "^0.2.1"
 
 [tool.poetry.scripts]
-llamaindex-cli = 'llama_index.core.command_line.command_line:main'
+llamaindex-cli = 'llama_index.cli.command_line:main'
 
 [[tool.poetry.source]]
 name = "nvidia-pypi"