diff --git a/jina/resources/executors.requests.BaseVecIndexer.yml b/jina/resources/executors.requests.BaseVectorIndexer.yml similarity index 59% rename from jina/resources/executors.requests.BaseVecIndexer.yml rename to jina/resources/executors.requests.BaseVectorIndexer.yml index 2eaea26ac4506..ea537eb5fcb38 100644 --- a/jina/resources/executors.requests.BaseVecIndexer.yml +++ b/jina/resources/executors.requests.BaseVectorIndexer.yml @@ -2,6 +2,6 @@ on: ControlRequest: - !ControlReqDriver {} SearchRequest: - - !ChunkSearchDriver {} + - !VectorSearchDriver {} IndexRequest: - - !ChunkIndexDriver {} \ No newline at end of file + - !VectorIndexDriver {} \ No newline at end of file diff --git a/jina/resources/executors.requests.ChunkIndexer.yml b/jina/resources/executors.requests.ChunkIndexer.yml new file mode 100644 index 0000000000000..028f132e1a1b1 --- /dev/null +++ b/jina/resources/executors.requests.ChunkIndexer.yml @@ -0,0 +1,35 @@ +on: + SearchRequest: + - !VectorSearchDriver + with: + executor: BaseVectorIndexer + - !PruneDriver + with: + level: chunk + pruned: + - embedding + - raw_bytes + - blob + - text + - !KVSearchDriver + with: + executor: BaseKVIndexer + level: chunk + IndexRequest: + - !VectorIndexDriver + with: + executor: BaseVectorIndexer + - !PruneDriver + with: + level: chunk + pruned: + - embedding + - raw_bytes + - blob + - text + - !KVIndexDriver + with: + level: chunk + executor: BaseKVIndexer + ControlRequest: + - !ControlReqDriver {} \ No newline at end of file diff --git a/jina/resources/executors.requests.ChunkPbIndexer.yml b/jina/resources/executors.requests.ChunkPbIndexer.yml index 44c041bc4ce9d..e776a8228f521 100644 --- a/jina/resources/executors.requests.ChunkPbIndexer.yml +++ b/jina/resources/executors.requests.ChunkPbIndexer.yml @@ -2,6 +2,10 @@ on: ControlRequest: - !ControlReqDriver {} SearchRequest: - - !ChunkPbSearchDriver {} + - !KVSearchDriver + with: + level: chunk IndexRequest: - - !ChunkPbIndexDriver {} + - !KVIndexDriver + with: + level: chunk diff --git a/jina/resources/executors.requests.DocPbIndexer.yml b/jina/resources/executors.requests.DocPbIndexer.yml index 2d4f2b5e2d107..7aba9a07484f7 100644 --- a/jina/resources/executors.requests.DocPbIndexer.yml +++ b/jina/resources/executors.requests.DocPbIndexer.yml @@ -2,10 +2,17 @@ on: ControlRequest: - !ControlReqDriver {} SearchRequest: - - !DocPbSearchDriver + - !KVSearchDriver with: - method: query + level: doc - !TopKFilterDriver {} IndexRequest: - - !DocPruneDriver {} - - !DocPbIndexDriver {} + - !PruneDriver + with: + level: doc + pruned: + - chunks + - raw_bytes + - !KVIndexDriver + with: + level: doc diff --git a/tests/yaml/test-driver.yml b/tests/yaml/test-driver.yml index 54d0aa89268a3..de0f192b7dcf7 100644 --- a/tests/yaml/test-driver.yml +++ b/tests/yaml/test-driver.yml @@ -1,6 +1,7 @@ -- !DocPbSearchDriver +- !KVSearchDriver with: executor: blah method: goto + level: doc - !ControlReqDriver {} - !BaseDriver {} \ No newline at end of file diff --git a/tests/yaml/test-exec-with-driver.yml b/tests/yaml/test-exec-with-driver.yml index 345703401f2b1..18d38f49f0c8d 100644 --- a/tests/yaml/test-exec-with-driver.yml +++ b/tests/yaml/test-exec-with-driver.yml @@ -8,6 +8,4 @@ requests: - !EncodeDriver with: method: encode - - !ChunkPruneDriver {} - ControlRequest: - - !ControlReqDriver {} \ No newline at end of file + - !ChunkPruneDriver {} \ No newline at end of file diff --git a/tests/yaml/test-index.yml b/tests/yaml/test-index.yml index 86e18f84e1343..dc353377d95b7 100644 --- a/tests/yaml/test-index.yml +++ b/tests/yaml/test-index.yml @@ -6,11 +6,11 @@ metas: requests: on: SearchRequest: - - !ChunkSearchDriver + - !VectorSearchDriver with: method: query IndexRequest: - - !ChunkIndexDriver + - !VectorIndexDriver with: method: add ControlRequest: diff --git a/tests/yaml/test-joint.yml b/tests/yaml/test-joint.yml new file mode 100644 index 0000000000000..ed2f53d6d14fa --- /dev/null +++ b/tests/yaml/test-joint.yml @@ -0,0 +1,17 @@ +!ChunkIndexer +components: + - !NumpyIndexer + with: + index_filename: vec.gz + metas: + name: vecidx # a customized name + workspace: $TEST_WORKDIR + - !BasePbIndexer + with: + index_filename: chunk.gz + metas: + name: chunkidx + workspace: $TEST_WORKDIR +metas: + name: chunk_compound_indexer + workspace: $TEST_WORKDIR \ No newline at end of file