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

Release candidate 2.0 #677

Merged
merged 269 commits into from
Aug 4, 2022
Merged

Release candidate 2.0 #677

merged 269 commits into from
Aug 4, 2022

Conversation

hlydecker
Copy link
Contributor

@hlydecker hlydecker commented Apr 28, 2022 •
edited
Loading

The largest update to Weed-AI yet, transforming Weed-AI from an open database with limited user control into a more full featured data platform.

Features

  • CVAT Annotation Platform: Integrate the open source Computer Vision Annotation Tool (CVAT).
  • OCFL Dataset Versioning
  • OCFL Dataset Migration Functionality
  • Dataset Editing: Allow users to add new annotations, modify metadata, and modify agricultural contexts.
  • Dataset Deletion: Allow users to remove their datasets if they need to.
  • Update documentation
  • Add a tab introducing annotation functionality to the front end.

Changes

  • GBIF API for species names: Previously EPPO code lookups were used to identify species names; we changed to using GBIF's API instead after we identified some potential problems with EPPO.
  • Increased image upload size limits to support more camera models.
  • Increased dataset size limit.

Bug Fixes

  • Load EPPO singletons
  • Fix upload communication email logic
  • Add interval of checking status after submit
  • Improved resilience to downtimes and server restarts

ElevnLi and others added 30 commits January 19, 2022 21:08
@ElevnLi
add mystatic volume in dev and expose 8080 for cvat admin
9dd25ca
Initial version of cvat_copy api endpoint
76326ac
Added a temporary component to test the endpoint which copies images …
b51606b 
…from

CVAT
Fixed the data path
dd8cbef
@ElevnLi
init version of stub dataset upload
51f007e
Took out the manual cvat-copy component
37e3fc4
Took out the CVAT item from the uploader drop-down
47fa85b
@ElevnLi
merge with copy_cvat image and add trigger
4da3c68
copy_cvat puts images in {user}/{upload_id}/images
5ef2909
@ElevnLi
merge and fix conflict
c473d3a
@ElevnLi
add /cvat-static to traefik rule
d2d706c
Added material-ui autocomplete to frontend dependencies.
18fb511 
Updated docker-compose-dev.yml to use a local image of the cvat server to keep it in version sync with the frontend
Merge branch 'bugfix-send-email' into cvat-uploader
8586399 
Quick fix to make it possible to turn off email notifications in dev
Adding cvat as a submodule - removing cvat/ path
c4639a0
committing before deiniting - botched git submodules
0bc5ae9
Removed first attempt at submodule
893146d
@ElevnLi
revert uploader zip images
ea1a0d8
@ElevnLi
add spinner for loading copy cvat
700f014
@ElevnLi
Merge branch 'cvat-uploader' of github.com:Sydney-Informatics-Hub/Wee…
01bf331 
…d-ID-Interchange into cvat-uploader
CVAT as submodule
3d3d082
@ElevnLi
add cypress test for cvat uploader
4bf8e6a
@ElevnLi
Merge branch 'cvat-uploader-as-submodule' of github.com:Sydney-Inform…
66c25ea 
…atics-Hub/Weed-ID-Interchange into cvat-uploader-cypress
@ElevnLi
submodule changes
e9a4755
@ElevnLi
init cypress test for cvat creation and upload
9dcbc8a
@ElevnLi
add DJANGO_AUTH_DEFAULT_GROUPS in docker-compose
790061e
@ElevnLi
new version of cvat
ff0e5a2
@ElevnLi
fix a cvat loading issue
8d73031
@ElevnLi
add other tests back
2d0571e
Updated cvat submodule branch
95bb4d2
Added git submodule update to frontend.yml.
3175aee 
Changed prod docker-compose.yml to build our own.
Updated search/cvat commit to match the branch in .gitmodules
@geezacoleman
Copy link
Collaborator

This sounds very exciting! Nice work!

ElevnLi and others added 23 commits May 17, 2022 11:53
@ElevnLi
hack cypress test
3b8af4d
@ElevnLi
Merge branch 'release-candidate-2.0' of github.com:Sydney-Informatics…
92fc1db 
…-Hub/Weed-ID-Interchange into release-candidate-2.0
@ElevnLi
Add interval of checking status after submit (#644)
bbab692 
* add interval of checking status after submit

* resolve conflict
@jnothman @hlydecker @ElevnLi
Remove reliance on EPPO download by using GBIF API (#593)
b5f1621 
* Remove reliance on EPPO download

Fixes #590

Resolves #559

* Ensure no error in upload_status

* Try to debug failed 'Set Form'

* Move logging statement

* This might set correct env

* More logging

* longer wait after Set Form

* Fix flake8 issue from newer version

* rm logging

* Update search/django/weedid/views.py

* fix: remove eppo cache path var

* flake8

Co-authored-by: Henry Lydecker <henry.lydecker@gmail.com>
Co-authored-by: Elevn Li <zheng.li411@gmail.com>
@ElevnLi
Allow admin to remove dataset (upload and repository record, database…
fceae29 
… entity, zipfile and elasticsearch index) (#680)

* backend module changes

* add more constraint

* add task and admin command

* change default host value

* hack cypress test

* flake8
@jnothman @ElevnLi
Allow arbitrary subcategorisation of valid categories by dataset cont…
7e0cbb9 
…ributors (#636)

* Allow for more fields in category editor

* Add possibility of subcategory to category name

* Adapt tests for addition of mapping summary on accordion summary

* fix

* finally found this bug..

* fixe issues

* add subcat to test case

* fix test

* more fix on cypress test

* raise exception for category with the same name

* remove apply button

* frontend fix editing category

* finally found this bug

Co-authored-by: Elevn Li <zheng.li411@gmail.com>
@ElevnLi
update readme for build and start (#682)
8bcd682
@ElevnLi
add decorator
f9de8ac
@ElevnLi
remove HTTP_HOST
f762762
@ElevnLi
another try
19312bf
@ElevnLi
upsize single image size to 30MB
15a79b3
change back to HTTPS_HOST
af87595
call check_image_zip if there is an error
f5be9b5
@ElevnLi
fix the MPO format out of PIL
7ff1127
@ElevnLi
remove env variable for cvat from docker-compose
35410cf
@ElevnLi
remove apply button and use next as control for cvat tasks retrival
3d4db15
@ElevnLi
fix the inconsistency of missing image error for weedcoco and other u…
f2c36a5 
…ploads
@ElevnLi
increase size limit from backend
2f78908
@ElevnLi
modify cypress test
9816898
@ElevnLi
more fix on frontend
857a2bc
@ElevnLi
check status code instead of status code
56ee8a8
@ElevnLi
remove the next hack
e0791ed
@spikelynch
Merge pull request #686 from Weed-AI/last-fixes
5ed90b8 
Last fixes
@hlydecker hlydecker mentioned this pull request Jul 5, 2022
Closed
@hlydecker
config tus to restart when docker does (#689)
630ae64
@hlydecker
Instructions hotfix (#691)
b421e6c 
* Update README.md

* Add Django build

* Update README.md
@hlydecker
Add Annotation Tab (#690)
230853f 
* Create annotate.md

* Update annotate.md

* Update annotate.md
@hlydecker
Merge branch 'master' into release-candidate-2.0
4a10202
@hlydecker hlydecker merged commit 4632e1b into master Aug 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@hlydecker @jnothman @geezacoleman @ElevnLi @spikelynch