Commit 23c8197
authored
Divide retrieval module to 'hybrid', 'semantic' and 'lexical' (#1135)
* make run_util.py for reproduce code easily
* new semantic_retrieval node and complete the feature of it (now semantic retrieval returns _semantic suffix like "retrieved_contents_semantic")
* add lexical retrieval
* refactor hybrid cc and hybrid rrf to hybridretrieval node
* test non overlap
* working hybrid cc
* working hybrid rrf
* cast retrieved_contents and etc infos
* finally test_evaluator simple.yaml passed!
* change test yaml files to the modified version
* change sample config yaml files to the modified version
* change documentations to the latest version
* delete 'retrieval' at support.py
* Fix query expansion with new retrieval
* fix several errors
* make again retrieval/base.py and run_util.py
* change path for evaluate_retrieval_node
* replace resources result_project to latest version
* re-add test_retrieval_base.py for test files
* do not track tests/resources/result_project/resources/chroma
* re-add test_hybrid_base.py
* fix test codes
* remove 'frequent error' test code in g_eval
* fix test codes and errors
* re-add pseudo_project_dir again
* fix hybrid retrieval errors
* fix test_restart_evaluate_leads_start_evaluate code
* re-fix test_restart_evaluate_leads_start_evaluate
* track lfs file "resources/chroma.sqlite3"
* just skip test_restart_evaluate_leads_start_evaluate in github actions
* resolve import issue on github issue
* Edit readme
* delete resources/chroma again1 parent b97f680 commit 23c8197
File tree
204 files changed
+4274
-3310
lines changed- autorag
- autorag
- data/legacy/qacreation
- deploy
- nodes
- hybridretrieval
- lexicalretrieval
- passageaugmenter
- passagecompressor
- passagefilter
- passagereranker
- promptmaker
- queryexpansion
- retrieval
- semanticretrieval
- schema
- utils
- sample_config/rag
- english
- gpu_api
- gpu
- non_gpu
- korean
- gpu_api
- gpu
- non_gpu
- docs/source
- integration
- llm
- vectordb
- nodes
- query_expansion
- retrieval
- optimization
- tests
- autorag
- evaluate/metric
- nodes
- generator
- hybridretrieval
- lexicalretrieval
- queryexpansion
- retrieval
- semanticretrieval
- schema
- utils
- resources
- result_project
- 0
- post_retrieve_node_line
- generator
- prompt_maker
- pre_retrieve_node_line
- query_expansion
- retrieve_node_line
- hybrid_retrieval
- lexical_retrieval
- passage_compressor
- passage_reranker
- retrieval
- semantic_retrieval
- 1
- pre_retrieve_node_line
- query_expansion
- retrieve_node_line
- hybrid_retrieval
- lexical_retrieval
- passage_filter
- passage_reranker
- retrieval
- semantic_retrieval
- 2
- post_retrieve_node_line/prompt_maker
- pre_retrieve_node_line
- query_expansion
- retrieve_node_line
- hybrid_retrieval
- lexical_retrieval
- passage_compressor
- passage_reranker
- retrieval
- semantic_retrieval
- 3
- resources/chroma
- 6595d304-5270-4d9f-a267-c191366804ce
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
204 files changed
+4274
-3310
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
| |||
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
49 | 32 | | |
50 | 33 | | |
51 | 34 | | |
| |||
293 | 276 | | |
294 | 277 | | |
295 | 278 | | |
296 | | - | |
| 279 | + | |
297 | 280 | | |
298 | 281 | | |
299 | 282 | | |
300 | | - | |
| 283 | + | |
301 | 284 | | |
302 | | - | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
303 | 292 | | |
304 | | - | |
| 293 | + | |
305 | 294 | | |
306 | 295 | | |
307 | 296 | | |
308 | 297 | | |
309 | | - | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
310 | 303 | | |
311 | 304 | | |
312 | | - | |
| 305 | + | |
313 | 306 | | |
314 | 307 | | |
315 | 308 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
248 | 248 | | |
249 | 249 | | |
250 | 250 | | |
251 | | - | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
252 | 263 | | |
253 | | - | |
254 | 264 | | |
255 | 265 | | |
256 | 266 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
| 15 | + | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
Lines changed: 46 additions & 33 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
7 | 6 | | |
8 | | - | |
9 | | - | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
| 56 | + | |
58 | 57 | | |
59 | 58 | | |
60 | 59 | | |
61 | 60 | | |
62 | 61 | | |
63 | 62 | | |
64 | 63 | | |
65 | | - | |
66 | | - | |
| 64 | + | |
| 65 | + | |
67 | 66 | | |
68 | 67 | | |
69 | 68 | | |
| |||
79 | 78 | | |
80 | 79 | | |
81 | 80 | | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
86 | 109 | | |
| 110 | + | |
87 | 111 | | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
110 | 123 | | |
111 | 124 | | |
112 | 125 | | |
| |||
0 commit comments