From d1d568a162bd857c20fc7ffd214a21f8b86b58e5 Mon Sep 17 00:00:00 2001
From: Thuc Pham <51660321+thucpn@users.noreply.github.com>
Date: Mon, 19 Feb 2024 15:06:29 +0700
Subject: [PATCH] feat: using pack from llamaindex (#10962)
---
.../examples/example.py | 7 +------
.../examples/example.py | 7 +------
.../examples/example.py | 10 ++--------
.../examples/example.py | 7 +------
.../examples/example.py | 5 +----
.../examples/example.py | 5 +----
.../examples/example.py | 8 ++------
.../examples/example.py | 10 ++--------
.../examples/example.py | 10 +++-------
9 files changed, 14 insertions(+), 55 deletions(-)
diff --git a/llama-index-packs/llama-index-packs-agent-search-retriever/examples/example.py b/llama-index-packs/llama-index-packs-agent-search-retriever/examples/example.py
index 2dd458202..e036d48ba 100644
--- a/llama-index-packs/llama-index-packs-agent-search-retriever/examples/example.py
+++ b/llama-index-packs/llama-index-packs-agent-search-retriever/examples/example.py
@@ -2,12 +2,7 @@
import os
from llama_index.core.query_engine import RetrieverQueryEngine
-from llama_index.core.llama_pack import download_llama_pack
-
-# download and install dependencies
-AgentSearchRetrieverPack = download_llama_pack(
- "AgentSearchRetrieverPack", "./agent_search_pack"
-)
+from llama_index.packs.agent_search_retriever import AgentSearchRetrieverPack
# create the pack
agent_search_pack = AgentSearchRetrieverPack(
diff --git a/llama-index-packs/llama-index-packs-arize-phoenix-query-engine/examples/example.py b/llama-index-packs/llama-index-packs-arize-phoenix-query-engine/examples/example.py
index 2c1501788..41b2d92e2 100644
--- a/llama-index-packs/llama-index-packs-arize-phoenix-query-engine/examples/example.py
+++ b/llama-index-packs/llama-index-packs-arize-phoenix-query-engine/examples/example.py
@@ -1,15 +1,10 @@
# Required Environment Variables: OPENAI_API_KEY
-from llama_index.core.llama_pack import download_llama_pack
+from llama_index.packs.arize_phoenix_query_engine import ArizePhoenixQueryEnginePack
from llama_index.core.node_parser import SentenceSplitter
from llama_index.core.readers.web import SimpleWebPageReader
from tqdm.auto import tqdm
-# download and install dependencies
-ArizePhoenixQueryEnginePack = download_llama_pack(
- "ArizePhoenixQueryEnginePack", "./arize_pack"
-)
-
# load documents and create the pack
documents = SimpleWebPageReader().load_data(
[
diff --git a/llama-index-packs/llama-index-packs-auto-merging-retriever/examples/example.py b/llama-index-packs/llama-index-packs-auto-merging-retriever/examples/example.py
index 5b3e0a967..1ed08477d 100644
--- a/llama-index-packs/llama-index-packs-auto-merging-retriever/examples/example.py
+++ b/llama-index-packs/llama-index-packs-auto-merging-retriever/examples/example.py
@@ -1,12 +1,6 @@
from pathlib import Path
-from llama_index.core.readers import download_loader
-from llama_index.core.llama_pack import download_llama_pack
-
-# download and install dependencies
-AutoMergingRetrieverPack = download_llama_pack(
- "AutoMergingRetrieverPack", "./auto_merging_retriever_pack"
-)
-PDFReader = download_loader("PDFReader")
+from llama_index.readers.file.docs import PDFReader
+from llama_index.packs.auto_merging_retriever import AutoMergingRetrieverPack
# get documents from any data loader
loader = PDFReader()
diff --git a/llama-index-packs/llama-index-packs-cogniswitch-agent/examples/example.py b/llama-index-packs/llama-index-packs-cogniswitch-agent/examples/example.py
index 66556ba66..698e39941 100644
--- a/llama-index-packs/llama-index-packs-cogniswitch-agent/examples/example.py
+++ b/llama-index-packs/llama-index-packs-cogniswitch-agent/examples/example.py
@@ -1,6 +1,6 @@
# Required Environment Variables: OPENAI_API_KEY, CS_TOKEN, CS_API_KEY
import os
-from llama_index.core.llama_pack import download_llama_pack
+from llama_index.packs.cogniswitch_agent import CogniswitchAgentPack
# Set up Cogniswitch Credentials
cogniswitch_tool_args = {
@@ -8,11 +8,6 @@ cogniswitch_tool_args = {
"apiKey": os.getenv("CS_API_KEY"),
}
-# download and install dependencies
-CogniswitchAgentPack = download_llama_pack(
- "CogniswitchAgentPack", "./cogniswitch_agent_pack"
-)
-
# create the pack
cogniswitch_agent_pack = CogniswitchAgentPack(cogniswitch_tool_args)
diff --git a/llama-index-packs/llama-index-packs-corrective-rag/examples/example.py b/llama-index-packs/llama-index-packs-corrective-rag/examples/example.py
index 932b1ae6f..07ca8acfd 100644
--- a/llama-index-packs/llama-index-packs-corrective-rag/examples/example.py
+++ b/llama-index-packs/llama-index-packs-corrective-rag/examples/example.py
@@ -1,10 +1,7 @@
# Required Environment Variables: OPENAI_API_KEY
# Required TavilyAI API KEY for web searches - https://tavily.com/
from llama_index.core import SimpleDirectoryReader
-from llama_index.core.llama_pack import download_llama_pack
-
-# download and install dependencies
-CorrectiveRAGPack = download_llama_pack("CorrectiveRAGPack", "./corrective_rag_pack")
+from llama_index.packs.corrective_rag import CorrectiveRAGPack
# load documents
documents = SimpleDirectoryReader("./data").load_data()
diff --git a/llama-index-packs/llama-index-packs-dense-x-retrieval/examples/example.py b/llama-index-packs/llama-index-packs-dense-x-retrieval/examples/example.py
index 2fbd8ec0e..66817fe4a 100644
--- a/llama-index-packs/llama-index-packs-dense-x-retrieval/examples/example.py
+++ b/llama-index-packs/llama-index-packs-dense-x-retrieval/examples/example.py
@@ -1,10 +1,7 @@
# Required Environment Variables: OPENAI_API_KEY
from llama_index.core import SimpleDirectoryReader
-from llama_index.core.llama_pack import download_llama_pack
-
-# download and install dependencies
-DenseXRetrievalPack = download_llama_pack("DenseXRetrievalPack", "./dense_pack")
+from llama_index.packs.dense_x_retrieval import DenseXRetrievalPack
# load documents
documents = SimpleDirectoryReader("./data").load_data()
diff --git a/llama-index-packs/llama-index-packs-rag-evaluator/examples/example.py b/llama-index-packs/llama-index-packs-rag-evaluator/examples/example.py
index f806d9457..d2c12c39c 100644
--- a/llama-index-packs/llama-index-packs-rag-evaluator/examples/example.py
+++ b/llama-index-packs/llama-index-packs-rag-evaluator/examples/example.py
@@ -1,8 +1,8 @@
# Required Environment Variables: OPENAI_API_KEY
from llama_index.core.llama_dataset import download_llama_dataset
-from llama_index.core.llama_pack import download_llama_pack
-from llama_index.core import VectorStoreIndex
+from llama_index.packs.rag_evaluator import RagEvaluatorPack
+from llama_index.legacy import VectorStoreIndex
# download a LabelledRagDataset from llama-hub
rag_dataset, documents = download_llama_dataset(
@@ -13,10 +13,6 @@ rag_dataset, documents = download_llama_dataset(
index = VectorStoreIndex.from_documents(documents=documents)
query_engine = index.as_query_engine()
-# Time to benchmark/evaluate this RAG pipeline
-# Download and install dependencies
-RagEvaluatorPack = download_llama_pack("RagEvaluatorPack", "./rag_evaluator_pack")
-
# construction requires a query_engine, a rag_dataset, and optionally a judge_llm
rag_evaluator_pack = RagEvaluatorPack(
query_engine=query_engine, rag_dataset=rag_dataset
diff --git a/llama-index-packs/llama-index-packs-rag-fusion-query-pipeline/examples/example.py b/llama-index-packs/llama-index-packs-rag-fusion-query-pipeline/examples/example.py
index 15ef364aa..638261382 100644
--- a/llama-index-packs/llama-index-packs-rag-fusion-query-pipeline/examples/example.py
+++ b/llama-index-packs/llama-index-packs-rag-fusion-query-pipeline/examples/example.py
@@ -1,16 +1,10 @@
# Required Environment Variables: OPENAI_API_KEY
from pathlib import Path
-from llama_index.core import download_loader
-from llama_index.core.llama_pack import download_llama_pack
+from llama_index.readers.file.docs import PDFReader
+from llama_index.packs.rag_fusion_query_pipeline import RAGFusionPipelinePack
from llama_index.llms.openai import OpenAI
-# download and install dependencies
-RAGFusionPipelinePack = download_llama_pack(
- "RAGFusionPipelinePack", "./rag_fusion_pipeline_pack"
-)
-PDFReader = download_loader("PDFReader")
-
# load documents
loader = PDFReader()
document_path = Path("./data/101.pdf") # replace with your own document
diff --git a/llama-index-packs/llama-index-packs-voyage-query-engine/examples/example.py b/llama-index-packs/llama-index-packs-voyage-query-engine/examples/example.py
index e3217cf70..a7675f077 100644
--- a/llama-index-packs/llama-index-packs-voyage-query-engine/examples/example.py
+++ b/llama-index-packs/llama-index-packs-voyage-query-engine/examples/example.py
@@ -1,12 +1,8 @@
# Required Environment Variables: OPENAI_API_KEY, VOYAGE_API_KEY
from pathlib import Path
-from llama_index.core.readers import download_loader
-from llama_index.core.llama_pack import download_llama_pack
-
-# download and install dependencies
-VoyageQueryEnginePack = download_llama_pack("VoyageQueryEnginePack", "./voyage_pack")
-PDFReader = download_loader("PDFReader")
+from llama_index.readers.file.docs import PDFReader
+from llama_index.packs.voyage_query_engine import VoyageQueryEnginePack
# load documents
loader = PDFReader()
@@ -17,5 +13,5 @@ documents = loader.load_data(file=document_path)
voyage_pack = VoyageQueryEnginePack(documents)
# run the pack
-response = voyage_pack.run("How to rewrite history?", similarity_top_k=2)
+response = voyage_pack.run("Physical Standards for Letters", similarity_top_k=2)
print(response)
--
GitLab