Merge pull request #57 from aitomatic/dep-upgrade

upgrade core deps & fix backward-incompatible API calls

openssa/core/ooda_rag/custom.py

@@ -1,6 +1,6 @@
 from llama_index import Document, Response, SimpleDirectoryReader, ServiceContext, OpenAIEmbedding
 from llama_index.evaluation import DatasetGenerator
-from llama_index.llms.base import LLM as RAGLLM
+from llama_index.llms.llm import LLM as RAGLLM
 from llama_index.node_parser import SimpleNodeParser
 
 from openssa.core.backend.abstract_backend import AbstractBackend

openssa/integrations/llama_index/backend.py

@@ -10,7 +10,7 @@
 from llama_index.llms import OpenAI
 from llama_index.indices.base import BaseIndex
 from llama_index.indices.query.base import BaseQueryEngine
-from llama_index.llms.base import LLM as RAGLLM
+from llama_index.llms.llm import LLM as RAGLLM
 from llama_index.storage import StorageContext
 from openssa.core.backend.rag_backend import AbstractRAGBackend
 

openssa/integrations/llama_index/ssm.py

@@ -1,4 +1,4 @@
-from llama_index.llms.base import LLM as RAGLLM
+from llama_index.llms.llm import LLM as RAGLLM
 from llama_index.llms import OpenAI, AzureOpenAI
 from openssa.integrations.llama_index.backend import Backend as LlamaIndexBackend
 from openssa.integrations.openai.ssm import GPT3ChatCompletionSLM

openssa/utils/llm_config.py

@@ -4,7 +4,7 @@
 from llama_index import ServiceContext
 from llama_index.embeddings import AzureOpenAIEmbedding, OpenAIEmbedding
 from llama_index.llms import AzureOpenAI, OpenAI
-from llama_index.llms.base import LLM
+from llama_index.llms.llm import LLM
 from llama_index.llms.openai_utils import ALL_AVAILABLE_MODELS, CHAT_MODELS
 
 # exetend ALL_AVAILABLE_MODELS to include the models we want to use

pyproject.toml

@@ -59,8 +59,8 @@ python = ">=3.10,<3.12"
 # OpenAI & related
 openai = ">=1.3"
 # LlamaIndex & related
-llama-index = ">=0.9"
-llama-hub = ">=0.0.55"
+llama-index = ">=0.9.14"  # should keep up-to-date with Llama-Index's minor releases (often backward-incompatible)
+llama-hub = ">=0.0.56"
 docx2txt = ">=0.8"  # for reading .docx files
 pypdf = ">=3.17"  # for reading .pdf files
 pycryptodome = ">=3.19"  # for reading .pdf files: PyCryptodome is required for AES algorithm
@@ -74,7 +74,7 @@ click = ">=8.1"
 pydantic = ">=2.5"
 python-dotenv = ">=1.0"
 httpx = ">=0.25"
-google-api-python-client = ">=2.109"
+google-api-python-client = ">=2.110"
 
 # optional dependencies required by extras
 pylint = {version = ">=3.0", optional = true}
@@ -84,7 +84,7 @@ python-pptx = {version = ">=0.6", optional = true}
 streamlit = {version = ">=1.29", optional = true}
 streamlit-mic-recorder = {version = ">=0.0.4", optional = true}
 torch = {version = ">=2.0", optional = true}
-transformers = {version = ">=4.35", optional = true}
+transformers = {version = ">=4.36", optional = true}
 
 [tool.poetry.extras]
 lint = [