Skip to content
This repository was archived by the owner on Sep 9, 2026. It is now read-only.

feat: add filter capability to DocumentArray - #1051

Merged
JoanFM merged 24 commits into
feat-rewrite-v2from
v2-filter
Jan 27, 2023
Merged

JoanFM merged 24 commits into
feat-rewrite-v2from
v2-filter

Conversation

@JoanFM

@JoanFM JoanFM commented Jan 25, 2023

Copy link
Copy Markdown
Member

Goals:

Add filtering capability with the same QueryLanguage as in v1 docarray.

TODO:

  • Implement the operators in every Document Type
  • Test

Comment thread docarray/utils/lookup.py
Comment thread docarray/utils/filter.py Outdated
Jackmin801 and others added 15 commits January 26, 2023 18:33
#1026)

* test: add tensor ops tests

Signed-off-by: Jackmin801 <[email protected]>

* feat: instances of parametrized types are not parametrized anymore

Signed-off-by: Jackmin801 <[email protected]>

* test: fix test that have been changed by this feature

Signed-off-by: Jackmin801 <[email protected]>

* refactor: change class name and add comments

Signed-off-by: Jackmin801 <[email protected]>

* test: add tests to make sure isinstance does not do coercion

Signed-off-by: Jackmin801 <[email protected]>

* fix: parametrized isinstance check should not perform coercion

Signed-off-by: Jackmin801 <[email protected]>

* test: add more tests to parametrized class name tests

Signed-off-by: Jackmin801 <[email protected]>

* style: small black fix

Signed-off-by: Jackmin801 <[email protected]>

Signed-off-by: Jackmin801 <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
* feat: add rich display for doc and da

Signed-off-by: anna-charlotte <[email protected]>

* fix: wip plot

Signed-off-by: anna-charlotte <[email protected]>

* fix: wip plot

Signed-off-by: anna-charlotte <[email protected]>

* fix: wip plot

Signed-off-by: anna-charlotte <[email protected]>

* feat: add math package and minmax normalize

Signed-off-by: anna-charlotte <[email protected]>

* fix: summary for document

Signed-off-by: anna-charlotte <[email protected]>

* chore: update poetry lock after rebase

Signed-off-by: anna-charlotte <[email protected]>

* fix: move all from plotmixin to base document

Signed-off-by: anna-charlotte <[email protected]>

* feat: add docs schema summary

Signed-off-by: anna-charlotte <[email protected]>

* feat: add document array summary

Signed-off-by: anna-charlotte <[email protected]>

* fix: display doc within doc

Signed-off-by: anna-charlotte <[email protected]>

* fix: in notebook print docs summary

Signed-off-by: anna-charlotte <[email protected]>

* fix: move summary from da to abstract da

Signed-off-by: anna-charlotte <[email protected]>

* fix: get schema for doc

Signed-off-by: anna-charlotte <[email protected]>

* fix: wip doc summary

Signed-off-by: anna-charlotte <[email protected]>

* fix: wip clean up

Signed-off-by: anna-charlotte <[email protected]>

* test: add test for da pretty print

Signed-off-by: anna-charlotte <[email protected]>

* docs: update note

Signed-off-by: anna-charlotte <[email protected]>

* docs: add some documentation

Signed-off-by: anna-charlotte <[email protected]>

* fix: apply samis suggestion

Signed-off-by: anna-charlotte <[email protected]>

* fix: mypy checks

Signed-off-by: anna-charlotte <[email protected]>

* fix: move to plot mixin

Signed-off-by: anna-charlotte <[email protected]>

* fix: remove redundant line

Signed-off-by: anna-charlotte <[email protected]>

* fix: remove comments

Signed-off-by: anna-charlotte <[email protected]>

* feat: add schema highlighter

Signed-off-by: anna-charlotte <[email protected]>

* fix: add plotmixin to mixin init

Signed-off-by: anna-charlotte <[email protected]>

* fix: adjust da summary

Signed-off-by: anna-charlotte <[email protected]>

* fix: move minmaxnormalize to comp backend

Signed-off-by: anna-charlotte <[email protected]>

* fix: remove redundant lines

Signed-off-by: anna-charlotte <[email protected]>

* fix: add squeeze and detach to comp backend

Signed-off-by: anna-charlotte <[email protected]>

* fix: apply suggestion from code review

Signed-off-by: anna-charlotte <[email protected]>

* refactor: rename iterable attrs

Signed-off-by: anna-charlotte <[email protected]>

* fix: clean up

Signed-off-by: anna-charlotte <[email protected]>

* fix: import

Signed-off-by: anna-charlotte <[email protected]>

* fix: iterate over fields instead of annotations

Signed-off-by: anna-charlotte <[email protected]>

* fix: remove math package since moved to comp backends

Signed-off-by: anna-charlotte <[email protected]>

* refactor: use single quotes

Signed-off-by: anna-charlotte <[email protected]>

* fix: apply suggestions from code review

Signed-off-by: anna-charlotte <[email protected]>

* fix: extract summary to doc summary class

Signed-off-by: anna-charlotte <[email protected]>

* fix: add pretty print for base document

Signed-off-by: anna-charlotte <[email protected]>

* fix: use rich capture instead of string io

Signed-off-by: anna-charlotte <[email protected]>

* fix: add colors for optional and union and use only single quotes

Signed-off-by: anna-charlotte <[email protected]>

* fix: extract display classes to display package

Signed-off-by: anna-charlotte <[email protected]>

* fix: make da not optional in da summary

Signed-off-by: anna-charlotte <[email protected]>

* fix: set _console instead of initializing new one everytime in __str__

Signed-off-by: anna-charlotte <[email protected]>

* fix: put console at module level

Signed-off-by: anna-charlotte <[email protected]>

Signed-off-by: anna-charlotte <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
* feat: add python 3.7 support

Signed-off-by: samsja <[email protected]>

* feat: remove get args

Signed-off-by: samsja <[email protected]>

* fix: fix

Signed-off-by: samsja <[email protected]>

* fix: fix

Signed-off-by: samsja <[email protected]>

* chore(ci): bump ci

Signed-off-by: samsja <[email protected]>

Signed-off-by: samsja <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Comment thread docarray/utils/filter.py Outdated
Comment thread docarray/utils/filter.py Outdated
Comment thread docarray/utils/lookup.py Outdated
Comment thread docarray/utils/lookup.py Outdated
Comment thread docarray/utils/query_parser.py Outdated
Signed-off-by: Joan Fontanals Martinez <[email protected]>
@JoanFM
JoanFM marked this pull request as ready for review January 27, 2023 10:51
@JoanFM
JoanFM requested a review from samsja January 27, 2023 10:52
Comment thread docarray/base_document/document.py Outdated
Comment thread docarray/documents/text.py
Comment thread docarray/documents/text.py Outdated
Comment thread docarray/utils/lookup.py
Joan Fontanals Martinez added 2 commits January 27, 2023 12:02
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
Signed-off-by: Joan Fontanals Martinez <[email protected]>
@github-actions

Copy link
Copy Markdown

📝 Docs are deployed on https://ft-v2-filter--jina-docs.netlify.app 🎉

@JoanFM
JoanFM merged commit f870b87 into feat-rewrite-v2 Jan 27, 2023
@JoanFM
JoanFM deleted the v2-filter branch January 27, 2023 13:36
This was referenced Jan 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants