refactor: prepare changes to have batching for every executor #2110

JoanFM · 2021-03-03T10:47:05Z

Changes introduced
The changes introduced include:

Changes in the way attributes are accessed in Document
Availability to extract full set of attributes from DocumentSet (beyond only embeddings so that it can be used for batching everywhere)
Extract multiple content from document in different batches (if I extract text and id from DocumentSet I want to extract a batch of text in one side and a batch of id in another)
Better testing and flat results for batching
Start integration test showing how different executors should implement batching

codecov · 2021-03-03T10:51:46Z

Codecov Report

Merging #2110 (ea2b21e) into master (caae3f6) will increase coverage by 0.01%.
The diff coverage is 96.29%.

@@            Coverage Diff             @@
##           master    #2110      +/-   ##
==========================================
+ Coverage   89.78%   89.80%   +0.01%     
==========================================
  Files         211      211              
  Lines       11153    11209      +56     
==========================================
+ Hits        10014    10066      +52     
- Misses       1139     1143       +4

Flag	Coverage Δ
daemon	`50.46% <19.75%> (-0.21%)`	⬇️
jina	`90.27% <96.29%> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
jina/types/sets/document.py	`95.27% <90.90%> (-1.22%)`	⬇️
jina/executors/decorators.py	`91.70% <97.14%> (+0.69%)`	⬆️
jina/types/document/__init__.py	`91.89% <100.00%> (+0.31%)`	⬆️
jina/clients/base.py	`80.83% <0.00%> (-2.50%)`	⬇️
jina/peapods/zmq/__init__.py	`79.87% <0.00%> (-2.14%)`	⬇️
jina/flow/base.py	`92.58% <0.00%> (+2.30%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update caae3f6...d1ab9ec. Read the comment docs.

github-actions · 2021-03-03T11:03:44Z

Latency summary

Current PR yields:

😶 index QPS at 1004, delta to last 3 avg.: +4%
😶 query QPS at 14, delta to last 3 avg.: -2%

Breakdown

Version	Index QPS	Query QPS
current	1004	14
`1.0.8`	963	14
`1.0.7`	963	14

Backed by latency-tracking. Further commits will update this comment.

tests/integration/executors_batching/test_encoder_executors_batching.py

tests/unit/types/document/test_document.py

…t-content

jina/executors/decorators.py

jina/types/sets/document.py

Co-authored-by: Nan Wang <nan.wang@jina.ai>

nan-wang

minor comments

tests/integration/executors_batching/test_craft_executors_batching.py

Co-authored-by: Nan Wang <nan.wang@jina.ai>

…t-content

nan-wang

LGTM

JoanFM requested a review from a team as a code owner March 3, 2021 10:47

JoanFM requested review from imsergiy and deepankarm March 3, 2021 10:47

jina-bot added size/S area/testing This issue/PR affects testing labels Mar 3, 2021

test: test _extract content from docset

939408b

JoanFM force-pushed the test-get-content branch from ac27b53 to 939408b Compare March 3, 2021 10:54

jina-bot added size/M area/core This issue/PR affects the core codebase component/type and removed size/S labels Mar 3, 2021

JoanFM force-pushed the test-get-content branch from 96f6acb to b438845 Compare March 3, 2021 12:34

feat: allow extracting multiple contents

f4aad55

JoanFM force-pushed the test-get-content branch from b438845 to f4aad55 Compare March 3, 2021 12:39

jina-bot added component/executor executor/meta labels Mar 3, 2021

JoanFM force-pushed the test-get-content branch 3 times, most recently from 3d48e16 to 8f876d8 Compare March 3, 2021 15:33

test: add tests for batching executors

d1297eb

JoanFM changed the title ~~test: test _extract content from docset~~ refactor: prepare changes to have batching for every executor Mar 3, 2021

JoanFM force-pushed the test-get-content branch from 8f876d8 to c794314 Compare March 3, 2021 16:10

docs: add docstrings in document

d9ce11b

JoanFM force-pushed the test-get-content branch 2 times, most recently from 76e45cb to d8d05fc Compare March 3, 2021 17:21

jina-bot added size/L and removed size/M labels Mar 3, 2021

docs: add docstrings in documentset

15b2257

jina-bot added the size/XL label Mar 5, 2021

refactor: rename arguments and test output type

720c2a4

JoanFM force-pushed the test-get-content branch from 415e4f5 to 720c2a4 Compare March 5, 2021 15:38

jina-bot added size/L and removed size/XL labels Mar 5, 2021

cristianmtr reviewed Mar 5, 2021

View reviewed changes

tests/integration/executors_batching/test_encoder_executors_batching.py Show resolved Hide resolved

cristianmtr reviewed Mar 5, 2021

View reviewed changes

tests/unit/types/document/test_document.py Outdated Show resolved Hide resolved

Merge branch 'master' of https://github.com/jina-ai/jina into test-ge…

3cd1dc8

…t-content

jina-bot added size/XL and removed size/L labels Mar 5, 2021

fix: fix black

650db8b

nan-wang requested changes Mar 8, 2021

View reviewed changes

JoanFM and others added 4 commits March 8, 2021 10:57

fix: update jina/executors/decorators.py

498135a

Co-authored-by: Nan Wang <nan.wang@jina.ai>

fix: update jina/executors/decorators.py

a48a96c

Co-authored-by: Nan Wang <nan.wang@jina.ai>

fix: update jina/types/sets/document.py

cef0f83

Co-authored-by: Nan Wang <nan.wang@jina.ai>

fix: improve readability extract content

0a822fe

JoanFM requested a review from nan-wang March 8, 2021 10:08

nan-wang reviewed Mar 8, 2021

View reviewed changes

tests/integration/executors_batching/test_craft_executors_batching.py Outdated Show resolved Hide resolved

fix: update jina/types/sets/document.py

b23c2d0

Co-authored-by: Nan Wang <nan.wang@jina.ai>

JoanFM requested a review from nan-wang March 8, 2021 10:23

JoanFM force-pushed the test-get-content branch from 7326b49 to cbe7f37 Compare March 8, 2021 10:31

fix: update test_craft_executors_batching.py

58588cd

Co-authored-by: Nan Wang <nan.wang@jina.ai>

JoanFM force-pushed the test-get-content branch from cbe7f37 to 58588cd Compare March 8, 2021 10:38

Merge branch 'master' of https://github.com/jina-ai/jina into test-ge…

78238ac

…t-content

JoanFM force-pushed the test-get-content branch from 4eb6e20 to 78238ac Compare March 8, 2021 10:46

Merge branch 'master' of https://github.com/jina-ai/jina into test-ge…

d1ab9ec

…t-content

JoanFM force-pushed the test-get-content branch from 89c61a9 to d1ab9ec Compare March 8, 2021 11:17

nan-wang approved these changes Mar 8, 2021

View reviewed changes

JoanFM merged commit f0b6a44 into master Mar 8, 2021

JoanFM deleted the test-get-content branch March 8, 2021 11:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: prepare changes to have batching for every executor #2110

refactor: prepare changes to have batching for every executor #2110

JoanFM commented Mar 3, 2021 •

edited

codecov bot commented Mar 3, 2021 •

edited

github-actions bot commented Mar 3, 2021 •

edited

nan-wang left a comment

nan-wang left a comment

refactor: prepare changes to have batching for every executor #2110

refactor: prepare changes to have batching for every executor #2110

Conversation

JoanFM commented Mar 3, 2021 • edited

codecov bot commented Mar 3, 2021 • edited

Codecov Report

github-actions bot commented Mar 3, 2021 • edited

Latency summary

Breakdown

nan-wang left a comment

Choose a reason for hiding this comment

nan-wang left a comment

Choose a reason for hiding this comment

JoanFM commented Mar 3, 2021 •

edited

codecov bot commented Mar 3, 2021 •

edited

github-actions bot commented Mar 3, 2021 •

edited