Skip to content

Commit 6c591a7

Browse files
rbs333rbs333
authored
update index creation (#28)
* update index creation * update llamaindex example
1 parent 328a1cc commit 6c591a7

File tree

7 files changed

+314
-357
lines changed

7 files changed

+314
-357
lines changed

‎.github/workflows/test.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Install dependencies
3838
run: |
39-
pip install -r requirements.txt
39+
pip install --no-cache-dir -r requirements.txt
4040
4141
- name: Set Redis version
4242
run: |
@@ -49,10 +49,5 @@ jobs:
4949
LLAMA_CLOUD_API_KEY: ${{ secrets.LLAMA_CLOUD_API_KEY }}
5050
GCP_REGION: ${{ secrets.GCP_REGION }}
5151
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
52-
# COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
53-
# AZURE_OPENAI_API_KEY: ${{secrets.AZURE_OPENAI_API_KEY}}
54-
# AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}}
55-
# AZURE_OPENAI_DEPLOYMENT_NAME: ${{secrets.AZURE_OPENAI_DEPLOYMENT_NAME}}
56-
# OPENAI_API_VERSION: ${{secrets.OPENAI_API_VERSION}}
5752
run: |
58-
pytest --nbval-lax python-recipes/RAG/01_redisvl.ipynb python-recipes/RAG/02_langchain.ipynb python-recipes/RAG/03_llamaindex.ipynb python-recipes/RAG/04_advanced_redisvl.ipynb python-recipes/RAG/06_ragas_evaluation.ipynb python-recipes/vector-search python-recipes/redis-intro
53+
pytest --verbose --nbval-lax python-recipes/RAG/ python-recipes/vector-search python-recipes/redis-intro --ignore python-recipes/RAG/05_nvidia_ai_rag_redis.ipynb

‎python-recipes/RAG/01_redisvl.ipynb

Lines changed: 152 additions & 137 deletions
Large diffs are not rendered by default.

‎python-recipes/RAG/02_langchain.ipynb

Lines changed: 33 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,13 @@
131131
},
132132
{
133133
"cell_type": "code",
134-
"execution_count": 2,
134+
"execution_count": 1,
135135
"metadata": {},
136136
"outputs": [],
137137
"source": [
138138
"import os\n",
139+
"import warnings\n",
140+
"warnings.filterwarnings('ignore')\n",
139141
"\n",
140142
"# Replace values below with your own if using Redis Cloud instance\n",
141143
"REDIS_HOST = os.getenv(\"REDIS_HOST\", \"localhost\") # ex: \"redis-18374.c253.us-central1-1.gce.cloud.redislabs.com\"\n",
@@ -170,7 +172,7 @@
170172
},
171173
{
172174
"cell_type": "code",
173-
"execution_count": 3,
175+
"execution_count": 2,
174176
"metadata": {
175177
"colab": {
176178
"base_uri": "https://localhost:8080/"
@@ -200,22 +202,14 @@
200202
},
201203
{
202204
"cell_type": "code",
203-
"execution_count": 4,
205+
"execution_count": 3,
204206
"metadata": {},
205207
"outputs": [
206-
{
207-
"name": "stderr",
208-
"output_type": "stream",
209-
"text": [
210-
"/Users/justin.cechmanek/.pyenv/versions/3.11.9/envs/redis-ai-res/lib/python3.11/site-packages/langchain_core/_api/deprecation.py:139: LangChainDeprecationWarning: The class `UnstructuredFileLoader` was deprecated in LangChain 0.2.8 and will be removed in 0.4.0. An updated version of the class exists in the langchain-unstructured package and should be used instead. To use it run `pip install -U langchain-unstructured` and import as `from langchain_unstructured import UnstructuredLoader`.\n",
211-
" warn_deprecated(\n"
212-
]
213-
},
214208
{
215209
"name": "stdout",
216210
"output_type": "stream",
217211
"text": [
218-
"Done preprocessing. Created 180 chunks of the original pdf resources/nke-10k-2023.pdf\n"
212+
"Done preprocessing. Created 179 chunks of the original pdf resources/nke-10k-2023.pdf\n"
219213
]
220214
}
221215
],
@@ -249,7 +243,7 @@
249243
},
250244
{
251245
"cell_type": "code",
252-
"execution_count": 5,
246+
"execution_count": 4,
253247
"metadata": {
254248
"colab": {
255249
"base_uri": "https://localhost:8080/",
@@ -414,16 +408,7 @@
414408
"id": "_h1e-L9yZfaY",
415409
"outputId": "fd540dd7-a0aa-4827-e001-f6d4ef603c6a"
416410
},
417-
"outputs": [
418-
{
419-
"name": "stderr",
420-
"output_type": "stream",
421-
"text": [
422-
"/Users/justin.cechmanek/.pyenv/versions/3.11.9/envs/redis-ai-res/lib/python3.11/site-packages/langchain_core/_api/deprecation.py:139: LangChainDeprecationWarning: The class `HuggingFaceEmbeddings` was deprecated in LangChain 0.2.2 and will be removed in 0.3.0. An updated version of the class exists in the langchain-huggingface package and should be used instead. To use it run `pip install -U langchain-huggingface` and import as `from langchain_huggingface import HuggingFaceEmbeddings`.\n",
423-
" warn_deprecated(\n"
424-
]
425-
}
426-
],
411+
"outputs": [],
427412
"source": [
428413
"from langchain.embeddings.huggingface import HuggingFaceEmbeddings\n",
429414
"\n",
@@ -446,7 +431,7 @@
446431
},
447432
{
448433
"cell_type": "code",
449-
"execution_count": 6,
434+
"execution_count": 5,
450435
"metadata": {
451436
"colab": {
452437
"base_uri": "https://localhost:8080/"
@@ -503,7 +488,7 @@
503488
},
504489
{
505490
"cell_type": "code",
506-
"execution_count": 7,
491+
"execution_count": 6,
507492
"metadata": {
508493
"id": "_Z3KpL8q1vmw"
509494
},
@@ -520,7 +505,7 @@
520505
},
521506
{
522507
"cell_type": "code",
523-
"execution_count": 8,
508+
"execution_count": 7,
524509
"metadata": {
525510
"colab": {
526511
"base_uri": "https://localhost:8080/"
@@ -549,7 +534,7 @@
549534
" 'epsilon': 0.01}]}"
550535
]
551536
},
552-
"execution_count": 8,
537+
"execution_count": 7,
553538
"metadata": {},
554539
"output_type": "execute_result"
555540
}
@@ -561,7 +546,7 @@
561546
},
562547
{
563548
"cell_type": "code",
564-
"execution_count": 9,
549+
"execution_count": 8,
565550
"metadata": {
566551
"colab": {
567552
"base_uri": "https://localhost:8080/"
@@ -573,10 +558,10 @@
573558
{
574559
"data": {
575560
"text/plain": [
576-
"180"
561+
"179"
577562
]
578563
},
579-
"execution_count": 9,
564+
"execution_count": 8,
580565
"metadata": {},
581566
"output_type": "execute_result"
582567
}
@@ -795,29 +780,20 @@
795780
},
796781
{
797782
"cell_type": "code",
798-
"execution_count": 16,
783+
"execution_count": 9,
799784
"metadata": {
800785
"colab": {
801786
"base_uri": "https://localhost:8080/"
802787
},
803788
"id": "GSpH-cur1vmz",
804789
"outputId": "b00de5c7-1684-4e8e-c146-6d402910cdc5"
805790
},
806-
"outputs": [
807-
{
808-
"name": "stderr",
809-
"output_type": "stream",
810-
"text": [
811-
"/Users/justin.cechmanek/.pyenv/versions/3.11.9/envs/redis-ai-res/lib/python3.11/site-packages/langchain_core/_api/deprecation.py:139: LangChainDeprecationWarning: The class `OpenAI` was deprecated in LangChain 0.0.10 and will be removed in 0.3.0. An updated version of the class exists in the langchain-openai package and should be used instead. To use it run `pip install -U langchain-openai` and import as `from langchain_openai import OpenAI`.\n",
812-
" warn_deprecated(\n"
813-
]
814-
}
815-
],
791+
"outputs": [],
816792
"source": [
817793
"import getpass\n",
818-
"from langchain.llms import OpenAI\n",
794+
"from langchain_openai import ChatOpenAI\n",
819795
"\n",
820-
"llm = OpenAI(openai_api_key=os.getenv(\"OPENAI_API_KEY\") or getpass.getpass(prompt=\"OpenAI API Key:\"))"
796+
"llm = ChatOpenAI(openai_api_key=os.getenv(\"OPENAI_API_KEY\") or getpass.getpass(prompt=\"OpenAI API Key:\"))"
821797
]
822798
},
823799
{
@@ -832,7 +808,7 @@
832808
},
833809
{
834810
"cell_type": "code",
835-
"execution_count": 17,
811+
"execution_count": 10,
836812
"metadata": {
837813
"id": "yKKn2KKp3TQ4"
838814
},
@@ -879,7 +855,7 @@
879855
},
880856
{
881857
"cell_type": "code",
882-
"execution_count": 18,
858+
"execution_count": 11,
883859
"metadata": {
884860
"id": "RKNSP0zqZq98"
885861
},
@@ -909,7 +885,7 @@
909885
},
910886
{
911887
"cell_type": "code",
912-
"execution_count": 19,
888+
"execution_count": 13,
913889
"metadata": {
914890
"colab": {
915891
"base_uri": "https://localhost:8080/",
@@ -919,34 +895,26 @@
919895
"outputId": "813fffe6-3d8b-4df7-a035-c54e421c0856"
920896
},
921897
"outputs": [
922-
{
923-
"name": "stderr",
924-
"output_type": "stream",
925-
"text": [
926-
"/Users/justin.cechmanek/.pyenv/versions/3.11.9/envs/redis-ai-res/lib/python3.11/site-packages/langchain_core/_api/deprecation.py:139: LangChainDeprecationWarning: The method `Chain.__call__` was deprecated in langchain 0.1.0 and will be removed in 0.3.0. Use invoke instead.\n",
927-
" warn_deprecated(\n"
928-
]
929-
},
930898
{
931899
"data": {
932900
"text/plain": [
933-
"\" Nike's revenue for the fiscal year ended May 31, 2022 was $51,217 million, while their revenue for the previous fiscal year ended May 31, 2021 was $46,710 million. This represents a 10% increase in revenue year-over-year.\""
901+
"\"Nike's revenue last year was $46,710 million, and this year it was $51,217 million.\""
934902
]
935903
},
936-
"execution_count": 19,
904+
"execution_count": 13,
937905
"metadata": {},
938906
"output_type": "execute_result"
939907
}
940908
],
941909
"source": [
942910
"query = \"What was Nike's revenue last year compared to this year??\"\n",
943-
"res=qa(query)\n",
911+
"res=qa.invoke(query)\n",
944912
"res['result']"
945913
]
946914
},
947915
{
948916
"cell_type": "code",
949-
"execution_count": 20,
917+
"execution_count": 14,
950918
"metadata": {
951919
"colab": {
952920
"base_uri": "https://localhost:8080/",
@@ -959,23 +927,23 @@
959927
{
960928
"data": {
961929
"text/plain": [
962-
"' Nike offers thousands of products in athletic footwear, apparel, equipment, and accessories. Nike is part of the athletic and leisure industry, specifically the athletic footwear, apparel, and equipment industry.'"
930+
"'Nike offers three main categories of products: footwear, apparel, and equipment. Nike is part of the athletic footwear, apparel, and equipment industry.'"
963931
]
964932
},
965-
"execution_count": 20,
933+
"execution_count": 14,
966934
"metadata": {},
967935
"output_type": "execute_result"
968936
}
969937
],
970938
"source": [
971939
"query = \"How many products does Nike offer? What is the industry that Nike is part of?\"\n",
972-
"res=qa(query)\n",
940+
"res=qa.invoke(query)\n",
973941
"res['result']"
974942
]
975943
},
976944
{
977945
"cell_type": "code",
978-
"execution_count": 21,
946+
"execution_count": 15,
979947
"metadata": {
980948
"colab": {
981949
"base_uri": "https://localhost:8080/",
@@ -988,46 +956,17 @@
988956
{
989957
"data": {
990958
"text/plain": [
991-
"\" I cannot answer this question as it is subjective and not stated in the provided context. The financial 10k filings only provide information about the company's operations and financial performance, not its ethical practices.\""
959+
"\"I don't know.\""
992960
]
993961
},
994-
"execution_count": 21,
962+
"execution_count": 15,
995963
"metadata": {},
996964
"output_type": "execute_result"
997965
}
998966
],
999967
"source": [
1000968
"query = \"Is Nike an ethical company?\"\n",
1001-
"res=qa(query)\n",
1002-
"res['result']"
1003-
]
1004-
},
1005-
{
1006-
"cell_type": "code",
1007-
"execution_count": 22,
1008-
"metadata": {
1009-
"colab": {
1010-
"base_uri": "https://localhost:8080/",
1011-
"height": 35
1012-
},
1013-
"id": "kjTO0RtH1vm1",
1014-
"outputId": "f415c57b-1612-450a-db33-6b9616bff84b"
1015-
},
1016-
"outputs": [
1017-
{
1018-
"data": {
1019-
"text/plain": [
1020-
"' As of May 31, 2023, Nike had a total of 74,400 employees globally.'"
1021-
]
1022-
},
1023-
"execution_count": 22,
1024-
"metadata": {},
1025-
"output_type": "execute_result"
1026-
}
1027-
],
1028-
"source": [
1029-
"query = \"How many employees work at Nike???\"\n",
1030-
"res=qa(query)\n",
969+
"res=qa.invoke(query)\n",
1031970
"res['result']"
1032971
]
1033972
},

0 commit comments

Comments
 (0)