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.

Sign up for GitHub

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

Jump to bottom

feat(back): Choose Pre-annotation or Model run in InferenceModel #91

Merged
merged 7 commits into from
Feb 5, 2024
Merged

feat(back): Choose Pre-annotation or Model run in InferenceModel #91

merged 7 commits into from
Feb 5, 2024

Conversation

cpvannier
Copy link
Member

@cpvannier cpvannier commented Feb 5, 2024 •
edited
Loading

Description

Fixes #90

Changes

Added

  • Add option in pre-annotation notebook to save annotations as "Pre-annotation" or "Model run"
    • The process_type argument in InferenceModel.process_dataset() is now split from "obj" to either "pre_ann" or "model_run" to let the user choose if they want the generated annotations to appear as "Pre-annotation" or "Model run" in the app.
    • The pre-annotation notebook is also updated to reflect this new choice.

Fixed

  • Update "Ignore" pre-annotation button to "Reject" in the app
    • As discussed during the latest sprint demo (Fri 02/02/2024), "Reject" makes more sense for the end users, and better reflects the fact that the annotation will not be shown again.
    • This update also improves consistency with new documentation in inference_model.py and pre_annotation.ipynb describing the choice between "Pre-annotation" and "Model run".
  • Update Prettier config for 3.2.5
    • Prettier 3.2.5 makes a change to the parser used for tsconfig.json files (more info in their changelog). Update the Prettier config to keep formatting those files with the jsonc parser.

@cpvannier
feat(back): Add ann_type to choose between "Pre-annotation" and "Mode…
4a3660b 
…l run"
@cpvannier
fix(ci): Update Pylint local variables limit
e6a3a8e
@cpvannier
feat(front): Update "Ignore" pre-annotation button to "Reject"
7b51a32 
As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb
@cpvannier cpvannier added enhancement New feature or request scope: back Related to Pixano backend labels Feb 5, 2024
@cpvannier cpvannier added this to the Pixano 0.5.0 milestone Feb 5, 2024
@cpvannier cpvannier self-assigned this Feb 5, 2024
@cpvannier cpvannier mentioned this pull request Feb 5, 2024
Merged
@cpvannier cpvannier changed the title feat(back): Add option for "Pre-annotation" or "Model run" feat(back): Choose Pre-annotation or Model run in InferenceModel Feb 5, 2024
timothee-LJN
timothee-LJN approved these changes Feb 5, 2024
View reviewed changes
ui/.prettierrc.cjs Show resolved Hide resolved
@cpvannier cpvannier merged commit fd6616c into develop Feb 5, 2024
5 checks passed
BertrandRenault pushed a commit that referenced this pull request Feb 5, 2024
@cpvannier @BertrandRenault
feat(back): Choose Pre-annotation or Model run in InferenceModel (#91)
a32e8da 
* feat(back): Add ann_type to choose between "Pre-annotation" and "Model run"

* fix(ci): Update Pylint local variables limit

* feat(front): Update "Ignore" pre-annotation button to "Reject"

As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb

* fix(back): Make ann_type optional

* fix(front): Update Prettier config for 3.2.5

See https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki

* fix(back): Merge ann_type with process_type

* fix(ci): Revert Pylint local variables limit
BertrandRenault pushed a commit that referenced this pull request Feb 5, 2024
@cpvannier @BertrandRenault
feat(back): Choose Pre-annotation or Model run in InferenceModel (#91)
bff80fd 
* feat(back): Add ann_type to choose between "Pre-annotation" and "Model run"

* fix(ci): Update Pylint local variables limit

* feat(front): Update "Ignore" pre-annotation button to "Reject"

As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb

* fix(back): Make ann_type optional

* fix(front): Update Prettier config for 3.2.5

See https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki

* fix(back): Merge ann_type with process_type

* fix(ci): Revert Pylint local variables limit
BertrandRenault added a commit that referenced this pull request Feb 6, 2024
@BertrandRenault @cpvannier
feat(front): remove inputs after validation/cancel (#94)
2b3ebcc 
* feat(front): remove inputs after validation/cancel

* feat(back): Choose Pre-annotation or Model run in InferenceModel (#91)

* feat(back): Add ann_type to choose between "Pre-annotation" and "Model run"

* fix(ci): Update Pylint local variables limit

* feat(front): Update "Ignore" pre-annotation button to "Reject"

As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb

* fix(back): Make ann_type optional

* fix(front): Update Prettier config for 3.2.5

See https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki

* fix(back): Merge ann_type with process_type

* fix(ci): Revert Pylint local variables limit

* chore(front): linting

* fix(front): equality test

---------

Co-authored-by: Corentin Vannier <56968251+cpvannier@users.noreply.github.com>
BertrandRenault added a commit that referenced this pull request Feb 7, 2024
@BertrandRenault @cpvannier
fix: S3 and URL wrongly handled (#93)
a69ee8e 
* fix(back): AWS_ENDPOINT required by lancedb

* fix(back): protection against incomplete embeddings table

* fix(front): manage correctly url image

* fix(back): typo

* fix(back): incorrect doc param

* chore(back): linting

* feat(back): Choose Pre-annotation or Model run in InferenceModel (#91)

* feat(back): Add ann_type to choose between "Pre-annotation" and "Model run"

* fix(ci): Update Pylint local variables limit

* feat(front): Update "Ignore" pre-annotation button to "Reject"

As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb

* fix(back): Make ann_type optional

* fix(front): Update Prettier config for 3.2.5

See https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki

* fix(back): Merge ann_type with process_type

* fix(ci): Revert Pylint local variables limit

---------

Co-authored-by: Corentin Vannier <56968251+cpvannier@users.noreply.github.com>
@cpvannier cpvannier mentioned this pull request Feb 15, 2024
Merged
cpvannier added a commit that referenced this pull request Feb 15, 2024
@cpvannier
feat(back): Choose Pre-annotation or Model run in InferenceModel (#91)
dc988db 
* feat(back): Add ann_type to choose between "Pre-annotation" and "Model run"

* fix(ci): Update Pylint local variables limit

* feat(front): Update "Ignore" pre-annotation button to "Reject"

As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb

* fix(back): Make ann_type optional

* fix(front): Update Prettier config for 3.2.5

See https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki

* fix(back): Merge ann_type with process_type

* fix(ci): Revert Pylint local variables limit
cpvannier added a commit that referenced this pull request Feb 15, 2024
@BertrandRenault @cpvannier
feat(front): remove inputs after validation/cancel (#94)
74b1c2a 
* feat(front): remove inputs after validation/cancel

* feat(back): Choose Pre-annotation or Model run in InferenceModel (#91)

* feat(back): Add ann_type to choose between "Pre-annotation" and "Model run"

* fix(ci): Update Pylint local variables limit

* feat(front): Update "Ignore" pre-annotation button to "Reject"

As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb

* fix(back): Make ann_type optional

* fix(front): Update Prettier config for 3.2.5

See https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki

* fix(back): Merge ann_type with process_type

* fix(ci): Revert Pylint local variables limit

* chore(front): linting

* fix(front): equality test

---------

Co-authored-by: Corentin Vannier <56968251+cpvannier@users.noreply.github.com>
cpvannier added a commit that referenced this pull request Feb 15, 2024
@BertrandRenault @cpvannier
fix: S3 and URL wrongly handled (#93)
9ff1096 
* fix(back): AWS_ENDPOINT required by lancedb

* fix(back): protection against incomplete embeddings table

* fix(front): manage correctly url image

* fix(back): typo

* fix(back): incorrect doc param

* chore(back): linting

* feat(back): Choose Pre-annotation or Model run in InferenceModel (#91)

* feat(back): Add ann_type to choose between "Pre-annotation" and "Model run"

* fix(ci): Update Pylint local variables limit

* feat(front): Update "Ignore" pre-annotation button to "Reject"

As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb

* fix(back): Make ann_type optional

* fix(front): Update Prettier config for 3.2.5

See https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki

* fix(back): Merge ann_type with process_type

* fix(ci): Revert Pylint local variables limit

---------

Co-authored-by: Corentin Vannier <56968251+cpvannier@users.noreply.github.com>
@cpvannier cpvannier deleted the feat/preann_in_notebook branch February 20, 2024 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timothee-LJN timothee-LJN timothee-LJN approved these changes

@BertrandRenault BertrandRenault BertrandRenault approved these changes

Assignees

@cpvannier cpvannier

Labels
enhancement New feature or request scope: back Related to Pixano backend
Projects
None yet
Milestone
0.5.0
Development

Successfully merging this pull request may close these issues.

Add option to save annotations as "Pre-annotation" or "Model Run"
3 participants
@cpvannier @timothee-LJN @BertrandRenault