Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: upgrade llamaindex to 0.10.28 #316

Merged
merged 16 commits into from
Apr 15, 2024
Merged

Conversation

nicoloboschi
Copy link
Contributor

No description provided.

@nicoloboschi nicoloboschi force-pushed the prepare-llamaindex010 branch from 3a907d5 to acd63f7 Compare March 13, 2024 10:26
@nicoloboschi
Copy link
Contributor Author

waiting for run-llama/llama_index#11896 to be released

@cbornet
Copy link
Collaborator

cbornet commented Mar 19, 2024

There's a conflict in transitive dependencies between langchain and llama-index...

Because langchain-google-genai (0.0.11) @ git+https://github.com/langchain-ai/langchain-google.git@main#subdirectory=libs/genai depends on google-generativeai (^0.4.1)
 and llama-index-embeddings-gemini (0.1.4) depends on google-generativeai (>=0.3.2,<0.4.0), langchain-google-genai (0.0.11) @ git+https://github.com/langchain-ai/langchain-google.git@main#subdirectory=libs/genai is incompatible with llama-index-embeddings-gemini (0.1.4).

@nicoloboschi
Copy link
Contributor Author

There's a conflict in transitive dependencies between langchain and llama-index...

Because langchain-google-genai (0.0.11) @ git+https://github.com/langchain-ai/langchain-google.git@main#subdirectory=libs/genai depends on google-generativeai (^0.4.1)
 and llama-index-embeddings-gemini (0.1.4) depends on google-generativeai (>=0.3.2,<0.4.0), langchain-google-genai (0.0.11) @ git+https://github.com/langchain-ai/langchain-google.git@main#subdirectory=libs/genai is incompatible with llama-index-embeddings-gemini (0.1.4).

run-llama/llama_index#12085

note this is only for langchain dev, but yeah, we need that before merging this PR

@nicoloboschi nicoloboschi force-pushed the prepare-llamaindex010 branch from c4750a9 to 60c2c46 Compare March 22, 2024 09:08
@nicoloboschi
Copy link
Contributor Author

Update to 0.10.22 now, let's see if everything passes

@nicoloboschi nicoloboschi changed the title deps: upgrade llamaindex to 0.10.18 deps: upgrade llamaindex to 0.10.22 Mar 22, 2024
@@ -24,7 +24,7 @@ nemoguardrails = "^0.8.0"
beautifulsoup4 = "^4"

llama-index = { git = "https://github.com/run-llama/llama_index.git", branch = "main" }
llama-index-readers-llama-parse = { git = "https://github.com/run-llama/llama_index.git", branch = "main", subdirectory = "llama-index-integrations/readers/llama-index-readers-llama-parse" }
llama-index-readers-llama-parse = { git = "https://github.com/nicoloboschi/llama_index.git", branch = "llama-parse", subdirectory = "llama-index-integrations/readers/llama-index-readers-llama-parse" }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, I did the same PR then run-llama/llama_index#12236

@nicoloboschi
Copy link
Contributor Author

so they reverted llama-index gemini upgrade with run-llama/llama_index#12126 ...

let's wait for more clarity

@nicoloboschi nicoloboschi force-pushed the prepare-llamaindex010 branch from 0763e7d to fcffcba Compare April 5, 2024 11:50
@nicoloboschi nicoloboschi reopened this Apr 5, 2024
@nicoloboschi nicoloboschi force-pushed the prepare-llamaindex010 branch from 05f69af to 22e3561 Compare April 15, 2024 07:55
@nicoloboschi nicoloboschi changed the title deps: upgrade llamaindex to 0.10.22 deps: upgrade llamaindex to 0.10.28 Apr 15, 2024
@nicoloboschi nicoloboschi merged commit 6eca9c1 into main Apr 15, 2024
7 of 15 checks passed
@nicoloboschi nicoloboschi deleted the prepare-llamaindex010 branch April 15, 2024 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants