Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add hierarchy categories support with LTREE and filter_lib #28

Merged
merged 54 commits into from
Dec 1, 2022

Conversation

khyurri
Copy link
Contributor

@khyurri khyurri commented Nov 17, 2022

No description provided.

@khyurri khyurri changed the title Add mock categoty relation Add hierarchy categories support with LTREE and filter_lib Nov 17, 2022
MagicTearsAsunder and others added 24 commits November 17, 2022 13:16
* ci/cd: fix env vars, add parameters to charts and docker files (#6)

Repalce artifactory url with ECR. Add as default value to docker files
and helm charts.
Remove env vars flow control to simplify deployment.

* docs: add CONTRIBUTING.md

* Feature: LTREE supported operations#2 (#19)

* feat: Add ltree operations support
* Ltree operations support to create_filter function.
* Add visit_LTREE method monkey-patching for SQLiteTypeCompiler
* Add sqlalchemy_utils dependency

* feat: Add LTREE filter tests
* Add Category table to conftest.py.
* Add tests to cover ltree filter functionality

* feat: Add new operations to registry
* To _FilterOperations
* To README.md

* docs: Add comment to filter_lib/tests/conftest.pyt

* feat: Add ltree not supported operation test

* feature: add arrow to link target side (#26)

* feat: add arrow to link target side

* delete comments

Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>

* feat: support multilabeling (#25)

Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>

Co-authored-by: theoriginmm <theorigin.mm@gmail.com>
Co-authored-by: Denis Rybakov <minefrs@gmail.com>
Co-authored-by: minev-dev <90937832+minev-dev@users.noreply.github.com>
Co-authored-by: Svetlana Bilevich <69203629+sbilevich@users.noreply.github.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
Co-authored-by: Kirill Sosnovskiy <Kirill_Sosnovskii@epam.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
Add basic infra and taxonomy crud
Fixed taxon search, linting errors and filter_lib ltree support
MagicTearsAsunder and others added 14 commits November 28, 2022 03:44
Added filter_lib search tests
commit da477d4
Author: Ruslan Khyurri <ruslan.khyurri@gmail.com>
Date:   Thu Nov 24 18:59:09 2022 +0000

    hotfix: patch fetch_bunch_categories_db to skip category checking

commit afe5d07
Author: Denis Rybakov <minefrs@gmail.com>
Date:   Thu Nov 24 18:21:45 2022 +0200

    feat: filter categories parents and childs by job_id

commit 00612d1
Author: Ruslan Khyurri <ruslan.khyurri@gmail.com>
Date:   Tue Nov 22 11:14:56 2022 +0000

    fix isort

commit 6702779
Merge: 71929b8 6acb499
Author: Ruslan Khyurri <ruslan.khyurri@gmail.com>
Date:   Tue Nov 22 09:46:08 2022 +0000

    Merge branch 'add-mock-categoty-relation' of https://github.com/epam/badgerdoc into add-mock-categoty-relation

commit 71929b8
Author: Ruslan Khyurri <ruslan.khyurri@gmail.com>
Date:   Tue Nov 22 09:44:44 2022 +0000

    Return insert_category_tree function

commit 6acb499
Author: Ruslan <ruslan.khyurri@gmail.com>
Date:   Mon Nov 21 18:58:08 2022 +0000

    Add is_leaf, change extraction parents algorithm (#34)

commit 3cb671a
Author: Ruslan Khyurri <ruslan.khyurri@gmail.com>
Date:   Mon Nov 21 18:56:12 2022 +0000

    Add is_leaf, change extraction parents algorithm

commit fa12b30
Author: Ruslan Khyurri <ruslan.khyurri@gmail.com>
Date:   Fri Nov 18 21:44:59 2022 +0000

    feat: make tests more robust. Add LTREE installation on start-up

commit 12c1ff9
Author: Svetlana Bilevich <69203629+sbilevich@users.noreply.github.com>
Date:   Fri Nov 18 17:52:40 2022 +0400

    fix:tree view sync with API (#33)

    Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>

commit 80abfc2
Author: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Date:   Thu Nov 17 17:16:29 2022 +0400

    fix: merge conflict (#29)

    * ci/cd: fix env vars, add parameters to charts and docker files (#6)

    Repalce artifactory url with ECR. Add as default value to docker files
    and helm charts.
    Remove env vars flow control to simplify deployment.

    * docs: add CONTRIBUTING.md

    * Feature: LTREE supported operations#2 (#19)

    * feat: Add ltree operations support
    * Ltree operations support to create_filter function.
    * Add visit_LTREE method monkey-patching for SQLiteTypeCompiler
    * Add sqlalchemy_utils dependency

    * feat: Add LTREE filter tests
    * Add Category table to conftest.py.
    * Add tests to cover ltree filter functionality

    * feat: Add new operations to registry
    * To _FilterOperations
    * To README.md

    * docs: Add comment to filter_lib/tests/conftest.pyt

    * feat: Add ltree not supported operation test

    * feature: add arrow to link target side (#26)

    * feat: add arrow to link target side

    * delete comments

    Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>

    * feat: support multilabeling (#25)

    Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>

    Co-authored-by: theoriginmm <theorigin.mm@gmail.com>
    Co-authored-by: Denis Rybakov <minefrs@gmail.com>
    Co-authored-by: minev-dev <90937832+minev-dev@users.noreply.github.com>
    Co-authored-by: Svetlana Bilevich <69203629+sbilevich@users.noreply.github.com>
    Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
    Co-authored-by: Kirill Sosnovskiy <Kirill_Sosnovskii@epam.com>

commit f7fa3e9
Author: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Date:   Thu Nov 17 13:52:38 2022 +0400

    refactor: add compatibility with filter_lib (#23)

commit 805cd43
Author: Ruslan <ruslan.khyurri@gmail.com>
Date:   Mon Nov 14 14:00:57 2022 +0000

    Get CI/CD pipelines into category hierarchy branch (#20)

commit 335108c
Author: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Date:   Mon Nov 14 14:44:57 2022 +0400

    feat: add hierarchy support to categories

    #2

commit 4c45cbc
Author: Svetlana Bilevich <svetlana_bilevich@epam.com>
Date:   Tue Nov 8 12:24:14 2022 +0400

    feat: add categories tree, categories search

commit c084311
Author: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Date:   Mon Nov 7 11:45:22 2022 +0300

    Add category hierarchy response (#5)

    This PR adds hierarchy categories support to responses
feat: taxonomies support and versioning
…ndpoint#27

Add endpoint to support linking taxonomy to category (Taxonomy microservice implementation)
Fixed import errors and other bugs.
Fixed bug when filter_lib operators 'children_recursive' and 'children' returned
corresponding siblings instead of direct children.
@khyurri khyurri changed the base branch from main to develop December 1, 2022 14:07
@khyurri khyurri merged commit 379754b into develop Dec 1, 2022
cakeinsauce pushed a commit that referenced this pull request Dec 8, 2022
* Add category hierarchy response (#5)
Co-authored-by: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
Co-authored-by: theoriginmm <theorigin.mm@gmail.com>
Co-authored-by: Denis Rybakov <minefrs@gmail.com>
Co-authored-by: minev-dev <90937832+minev-dev@users.noreply.github.com>
Co-authored-by: Svetlana Bilevich <69203629+sbilevich@users.noreply.github.com>
Co-authored-by: Kirill Sosnovskiy <Kirill_Sosnovskii@epam.com>
Co-authored-by: Shulaev Andrei <andrei_shulaev@epam.com>
Co-authored-by: Andrey Shulaev <35524482+andrejshulaev@users.noreply.github.com>
cakeinsauce pushed a commit that referenced this pull request Dec 8, 2022
* Add category hierarchy response (#5)
Co-authored-by: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
Co-authored-by: theoriginmm <theorigin.mm@gmail.com>
Co-authored-by: Denis Rybakov <minefrs@gmail.com>
Co-authored-by: minev-dev <90937832+minev-dev@users.noreply.github.com>
Co-authored-by: Svetlana Bilevich <69203629+sbilevich@users.noreply.github.com>
Co-authored-by: Kirill Sosnovskiy <Kirill_Sosnovskii@epam.com>
Co-authored-by: Shulaev Andrei <andrei_shulaev@epam.com>
Co-authored-by: Andrey Shulaev <35524482+andrejshulaev@users.noreply.github.com>
cakeinsauce pushed a commit that referenced this pull request Dec 9, 2022
* Add category hierarchy response (#5)
Co-authored-by: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
Co-authored-by: theoriginmm <theorigin.mm@gmail.com>
Co-authored-by: Denis Rybakov <minefrs@gmail.com>
Co-authored-by: minev-dev <90937832+minev-dev@users.noreply.github.com>
Co-authored-by: Svetlana Bilevich <69203629+sbilevich@users.noreply.github.com>
Co-authored-by: Kirill Sosnovskiy <Kirill_Sosnovskii@epam.com>
Co-authored-by: Shulaev Andrei <andrei_shulaev@epam.com>
Co-authored-by: Andrey Shulaev <35524482+andrejshulaev@users.noreply.github.com>
khyurri added a commit that referenced this pull request Dec 9, 2022
* feat: link category with taxonomy if data attribute was provided.

* feat: add taxonomy version support, update url to reach taxonomy service

* feat: minor fix for test

* feat: add hierarchy categories support with LTREE and filter_lib (#28)

* Add category hierarchy response (#5)
Co-authored-by: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
Co-authored-by: theoriginmm <theorigin.mm@gmail.com>
Co-authored-by: Denis Rybakov <minefrs@gmail.com>
Co-authored-by: minev-dev <90937832+minev-dev@users.noreply.github.com>
Co-authored-by: Svetlana Bilevich <69203629+sbilevich@users.noreply.github.com>
Co-authored-by: Kirill Sosnovskiy <Kirill_Sosnovskii@epam.com>
Co-authored-by: Shulaev Andrei <andrei_shulaev@epam.com>
Co-authored-by: Andrey Shulaev <35524482+andrejshulaev@users.noreply.github.com>

* feat: change taxonomy category relation into many to many (#61)

* ci: add initial github actions with precommit actions (#40)

Co-authored-by: thinklab <anton_alekseev2@epam.com>

* feat: add S3_PREFIX and authorization with AWS IAM Role support

* fix: change login with SSO button name

* ci: add postgresql to annotation tests github action (#70)

Co-authored-by: Shulaev Andrei <andrei_shulaev@epam.com>
Co-authored-by: Kirill Sosnovskiy <The.Magic.Tears.Asunder@protonmail.com>
Co-authored-by: Anton Alekseev <thinklab@yandex.ru>
Co-authored-by: thinklab <anton_alekseev2@epam.com>
Co-authored-by: Fedor Spiridonov <fedor_spiridonov@epam.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
khyurri added a commit that referenced this pull request Dec 19, 2022
* feat: link category with taxonomy if data attribute was provided.

* feat: add taxonomy version support, update url to reach taxonomy service

* feat: minor fix for test

* feat: add hierarchy categories support with LTREE and filter_lib (#28)

* Add category hierarchy response (#5)
Co-authored-by: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
Co-authored-by: theoriginmm <theorigin.mm@gmail.com>
Co-authored-by: Denis Rybakov <minefrs@gmail.com>
Co-authored-by: minev-dev <90937832+minev-dev@users.noreply.github.com>
Co-authored-by: Svetlana Bilevich <69203629+sbilevich@users.noreply.github.com>
Co-authored-by: Kirill Sosnovskiy <Kirill_Sosnovskii@epam.com>
Co-authored-by: Shulaev Andrei <andrei_shulaev@epam.com>
Co-authored-by: Andrey Shulaev <35524482+andrejshulaev@users.noreply.github.com>

* feat: change taxonomy category relation into many to many (#61)

* ci: add initial github actions with precommit actions (#40)

Co-authored-by: thinklab <anton_alekseev2@epam.com>

* feat: add S3_PREFIX and authorization with AWS IAM Role support

* fix: change login with SSO button name

* ci: add postgresql to annotation tests github action (#70)

* fix linter issue in filter_lib tests (#80)

Co-authored-by: Fedor Spiridonov <fedor_spiridonov@epam.com>

* ci: fix postgres

* ci: fix postgres

* ci: fix postgres

* fix: Fixed AttributeError in filter_lib (#83)

Co-authored-by: Roman Kuzianov <roman_kuzianov@epam.com>

* fix: fix failing tests for 'annotation'

* fix: bug with datasets filters

* feat: add progress report per annotator (#81)

* feat: add progress report per annotator

Added add endpoint to save document stats. Add external service request
to get agreement store. Add table to save all metrics between annotator and validator.

* added post requests on task opening/closing

* feat: create export .csv file

Added feature to download generated .csv export file
for annotator progress and task statistics.

* fix: add ability to create export with the list of users

* fix: minor fix

* test: add task stats tests

* fix: fix bug stats for task not found

* fix: alembic downgrade bug fix

Fixed issue when alembic is not deleting ENUM types automatically

* added reports page, added simple form for downloaded periodical reports

* fixed lint error

* fix: category search and delete ltree bug fix

* test: basic generate export tests

Add basic generate export tests. Requires for .csv file validation tests.

* fix: category id underscore bug fix and related tests

* fixed file saving, added notifcations on errors

* fix: minor typo fix

* fix: export data not found status code

* fix: test fix

* fixed showing eror notification thrown from BE

* fix: various fixes

* fix: datetime fix

Co-authored-by: Iurii Topychkanov <iurii_topychkanov@epam.com>

* Add support for extensive coverage (#76)

Annotation: ability to assign multiple (separate) tasks for multiple annotators to annotate the same page (for extensive coverage)

* fix: alembic migration conflict (#98)

fix: alembic migration conflict, conflict test, fetch categories with parents

* Hotfix/merge main to develop (#104)

merge main to develop

Co-authored-by: Shulaev Andrei <andrei_shulaev@epam.com>
Co-authored-by: Kirill Sosnovskiy <The.Magic.Tears.Asunder@protonmail.com>
Co-authored-by: Anton Alekseev <thinklab@yandex.ru>
Co-authored-by: thinklab <anton_alekseev2@epam.com>
Co-authored-by: Fedor Spiridonov <fedor_spiridonov@epam.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
Co-authored-by: Fedor Spiridonov <76848937+spiridonovfed@users.noreply.github.com>
Co-authored-by: Nathicanaa <65856011+Nathicanaa@users.noreply.github.com>
Co-authored-by: Roman Kuzianov <roman_kuzianov@epam.com>
Co-authored-by: Anna Iustus <ajustusa@gmail.com>
Co-authored-by: Anna Justus <50149163+Iogsotot@users.noreply.github.com>
Co-authored-by: Kirill Sosnovskiy <Kirill_Sosnovskii@epam.com>
Co-authored-by: Iurii Topychkanov <iurii_topychkanov@epam.com>
Co-authored-by: Andrey Shulaev <35524482+andrejshulaev@users.noreply.github.com>
spiridonovfed pushed a commit that referenced this pull request Dec 26, 2022
* Add category hierarchy response (#5)
Co-authored-by: Magic Tears Asunder <The.Magic.Tears.Asunder@protonmail.com>
Co-authored-by: Svetlana Bilevich <svetlana_bilevich@epam.com>
Co-authored-by: theoriginmm <theorigin.mm@gmail.com>
Co-authored-by: Denis Rybakov <minefrs@gmail.com>
Co-authored-by: minev-dev <90937832+minev-dev@users.noreply.github.com>
Co-authored-by: Svetlana Bilevich <69203629+sbilevich@users.noreply.github.com>
Co-authored-by: Kirill Sosnovskiy <Kirill_Sosnovskii@epam.com>
Co-authored-by: Shulaev Andrei <andrei_shulaev@epam.com>
Co-authored-by: Andrey Shulaev <35524482+andrejshulaev@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants