From 385f935befbe37614918b8a2a36512e43e2288e3 Mon Sep 17 00:00:00 2001 From: Steven Hollingsworth Date: Sat, 20 Aug 2022 15:02:59 -0700 Subject: [PATCH] Aws/trashai staging (#65) * Coco POC #8 #9 (#19) (#26) * Fixed some package.json issues, updated some entries in .gitignore and .in (for those who would use it) * saving work * saving work... having issues with async reading file then loading it in coco * coco confirmed working * Added JSON metadata * Arg! this should work * Removed Pro port mapping from localstack docker-compose * Added multiple file upload and cleaned up presentation a bit Looks like there is a problem with uploading multiple files at once, the predictions don't always trigger * Minor updates to MacOS details (#24) Co-authored-by: Jim Co-authored-by: Jim Ewald Co-authored-by: Jim Co-authored-by: Jim Ewald Co-authored-by: Jim * removed symlink * Testing coco (#28) * Fixed some package.json issues, updated some entries in .gitignore and .in (for those who would use it) * saving work * saving work... having issues with async reading file then loading it in coco * coco confirmed working * Added JSON metadata * Arg! this should work * Removed Pro port mapping from localstack docker-compose * Added multiple file upload and cleaned up presentation a bit Looks like there is a problem with uploading multiple files at once, the predictions don't always trigger * Minor updates to MacOS details (#24) Co-authored-by: Jim * removed symlink to web_model * Coco POC #8 #9 (#19) (#26) * Fixed some package.json issues, updated some entries in .gitignore and .in (for those who would use it) * saving work * saving work... having issues with async reading file then loading it in coco * coco confirmed working * Added JSON metadata * Arg! this should work * Removed Pro port mapping from localstack docker-compose * Added multiple file upload and cleaned up presentation a bit Looks like there is a problem with uploading multiple files at once, the predictions don't always trigger * Minor updates to MacOS details (#24) Co-authored-by: Jim Co-authored-by: Jim Ewald Co-authored-by: Jim Co-authored-by: Jim Ewald Co-authored-by: Jim * removed symlink Co-authored-by: Jim Ewald Co-authored-by: Jim * Changed upload behaviour * Refactored upload dialog / drop area * added more model samples * removed dropzone package * Fixed issue with remove / key and array order * Removed lab / test for deployed versions of environment * Added about page * Forgot to update the metadata text * Yolov5-Taco web model #7 (#30) * Testing tf_web model export * removing pyright * Working version of taco dataset + initial build instructions * Created links to code4sac and the github project Added jupyter notebook files for new training as well as using existing training data * Adjusted new training jupyter notebook * Testing change to model loading in AWS * Try 2 on loading model * Try 3 on loading model * Reverting changes (has to do with basic auth url) * Removed old react frontend directory * Removed old react frontend directory (#34) * Moving domain from codefordev to trashai.org * Replaced Backend with python, fixed infa deploy logic # 35 * backend now tracks images by their sha256 value to avoid duplication * added new manual action to infra deploy logic # 35 * added log retention logic to backend deploy # 36 * added new fields to deploy_map "log_retention_days": 30, "dns_domain_map_root": true, * made github_actions script aware of domain, and "is_root_domain" deploy_map setting * Addresses # 32, added new features amongst them a download all button * added new packages to UI * "dexie" local storage w/ indexeddb browser store, localstore couldn't cut it * "file-saver": allows us to do a saveas with the zip file * "jszip": zip libarary to address # * indicators for backend upload success, and if the image has been seen before * now looks good in mobile as well as desktop * also using indexeddb introduced caching the file objects (for download later) and caching of the tf model * Added support for python packages * Adjusted permission to add/remove layers in the prefix namespace * fixed permissions issue for layers / backend deploy * Added hash and other metadata to the metadata display and hover over filename * Fixed metadata download and info button * Fixes for #36, #35, #32 + download all feature, and backend refactor w/ dedup (#38) * Replaced Backend with python, fixed infa deploy logic # 35 * backend now tracks images by their sha256 value to avoid duplication * added new manual action to infra deploy logic # 35 * added log retention logic to backend deploy # 36 * added new fields to deploy_map "log_retention_days": 30, "dns_domain_map_root": true, * made github_actions script aware of domain, and "is_root_domain" deploy_map setting * Addresses # 32, added new features amongst them a download all button * added new packages to UI * "dexie" local storage w/ indexeddb browser store, localstore couldn't cut it * "file-saver": allows us to do a saveas with the zip file * "jszip": zip libarary to address # * indicators for backend upload success, and if the image has been seen before * now looks good in mobile as well as desktop * also using indexeddb introduced caching the file objects (for download later) and caching of the tf model * Added support for python packages * Adjusted permission to add/remove layers in the prefix namespace * fixed permissions issue for layers / backend deploy * Added hash and other metadata to the metadata display and hover over filename * Fixed metadata download and info button * Fixing file ext name issue with s3 bucket upload on backend * bugfix on s3 naming with file extension (#40) * Added magnifying feature for larger images * filling out the about page (#45) * filling out the about page * adding article * better formatting * Made about page default #49 * Added "Samples" button to upload tab closes #50 * Making about updates specified in #48 (#51) * Making about updates specified in #48 * removing space * small about update * Demoing the CI/CD integration * Typescript refactor Version 1 * removed nuxt * removed more files * adjusted build commands * fixed height issue with uploads * re-implemented backend * adjusted frontend deploy stack * Added github secret for google maps api key * Added dockerfile for frontend * added jszip * Fixed android upload gps issue, fixed mobile status truncating issue * removed uneeded logo files * Typescript refactor (#58) * Replaced Backend with python, fixed infa deploy logic # 35 * backend now tracks images by their sha256 value to avoid duplication * added new manual action to infra deploy logic # 35 * added log retention logic to backend deploy # 36 * added new fields to deploy_map "log_retention_days": 30, "dns_domain_map_root": true, * made github_actions script aware of domain, and "is_root_domain" deploy_map setting * Addresses # 32, added new features amongst them a download all button * added new packages to UI * "dexie" local storage w/ indexeddb browser store, localstore couldn't cut it * "file-saver": allows us to do a saveas with the zip file * "jszip": zip libarary to address # * indicators for backend upload success, and if the image has been seen before * now looks good in mobile as well as desktop * also using indexeddb introduced caching the file objects (for download later) and caching of the tf model * Added support for python packages * Adjusted permission to add/remove layers in the prefix namespace * fixed permissions issue for layers / backend deploy * Added hash and other metadata to the metadata display and hover over filename * Fixed metadata download and info button * Fixing file ext name issue with s3 bucket upload on backend * Promote staging updates to prod (#52) * Coco POC #8 #9 (#19) (#26) * Fixed some package.json issues, updated some entries in .gitignore and .in (for those who would use it) * saving work * saving work... having issues with async reading file then loading it in coco * coco confirmed working * Added JSON metadata * Arg! this should work * Removed Pro port mapping from localstack docker-compose * Added multiple file upload and cleaned up presentation a bit Looks like there is a problem with uploading multiple files at once, the predictions don't always trigger * Minor updates to MacOS details (#24) Co-authored-by: Jim Co-authored-by: Jim Ewald Co-authored-by: Jim Co-authored-by: Jim Ewald Co-authored-by: Jim * removed symlink * Testing coco (#28) * Fixed some package.json issues, updated some entries in .gitignore and .in (for those who would use it) * saving work * saving work... having issues with async reading file then loading it in coco * coco confirmed working * Added JSON metadata * Arg! this should work * Removed Pro port mapping from localstack docker-compose * Added multiple file upload and cleaned up presentation a bit Looks like there is a problem with uploading multiple files at once, the predictions don't always trigger * Minor updates to MacOS details (#24) Co-authored-by: Jim * removed symlink to web_model * Coco POC #8 #9 (#19) (#26) * Fixed some package.json issues, updated some entries in .gitignore and .in (for those who would use it) * saving work * saving work... having issues with async reading file then loading it in coco * coco confirmed working * Added JSON metadata * Arg! this should work * Removed Pro port mapping from localstack docker-compose * Added multiple file upload and cleaned up presentation a bit Looks like there is a problem with uploading multiple files at once, the predictions don't always trigger * Minor updates to MacOS details (#24) Co-authored-by: Jim Co-authored-by: Jim Ewald Co-authored-by: Jim Co-authored-by: Jim Ewald Co-authored-by: Jim * removed symlink Co-authored-by: Jim Ewald Co-authored-by: Jim * Changed upload behaviour * Refactored upload dialog / drop area * added more model samples * removed dropzone package * Fixed issue with remove / key and array order * Removed lab / test for deployed versions of environment * Added about page * Forgot to update the metadata text * Yolov5-Taco web model #7 (#30) * Testing tf_web model export * removing pyright * Working version of taco dataset + initial build instructions * Created links to code4sac and the github project Added jupyter notebook files for new training as well as using existing training data * Adjusted new training jupyter notebook * Testing change to model loading in AWS * Try 2 on loading model * Try 3 on loading model * Reverting changes (has to do with basic auth url) * Removed old react frontend directory * Removed old react frontend directory (#34) * Moving domain from codefordev to trashai.org * Fixes for #36, #35, #32 + download all feature, and backend refactor w/ dedup (#38) * Replaced Backend with python, fixed infa deploy logic # 35 * backend now tracks images by their sha256 value to avoid duplication * added new manual action to infra deploy logic # 35 * added log retention logic to backend deploy # 36 * added new fields to deploy_map "log_retention_days": 30, "dns_domain_map_root": true, * made github_actions script aware of domain, and "is_root_domain" deploy_map setting * Addresses # 32, added new features amongst them a download all button * added new packages to UI * "dexie" local storage w/ indexeddb browser store, localstore couldn't cut it * "file-saver": allows us to do a saveas with the zip file * "jszip": zip libarary to address # * indicators for backend upload success, and if the image has been seen before * now looks good in mobile as well as desktop * also using indexeddb introduced caching the file objects (for download later) and caching of the tf model * Added support for python packages * Adjusted permission to add/remove layers in the prefix namespace * fixed permissions issue for layers / backend deploy * Added hash and other metadata to the metadata display and hover over filename * Fixed metadata download and info button * bugfix on s3 naming with file extension (#40) * Added magnifying feature for larger images * filling out the about page (#45) * filling out the about page * adding article * better formatting * Made about page default #49 * Added "Samples" button to upload tab closes #50 * Making about updates specified in #48 (#51) * Making about updates specified in #48 * removing space * small about update Co-authored-by: Steven Hollingsworth Co-authored-by: Jim Ewald Co-authored-by: Jim * Typescript refactor Version 1 * removed nuxt * removed more files * adjusted build commands * fixed height issue with uploads * re-implemented backend * adjusted frontend deploy stack * Added github secret for google maps api key * Added dockerfile for frontend * added jszip * Fixed android upload gps issue, fixed mobile status truncating issue * removed uneeded logo files Co-authored-by: Dan Fey Co-authored-by: Jim Ewald Co-authored-by: Jim * updated deploy scripts * testing config update * added vite * testing vite * testing vite * testing deploy * adjusted permissions to allow access to public bucket * still testing * arg! * Updating about page (#64) * Updating about page to show Steve as the lead dev and adding feedback form * making about pages consistent Co-authored-by: Jim Ewald Co-authored-by: Jim Co-authored-by: Dan Fey --- frontend/src/components/about.vue | 12 ++++++------ frontend/src/views/about.vue | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/about.vue b/frontend/src/components/about.vue index cd4d6db..b386cf2 100644 --- a/frontend/src/components/about.vue +++ b/frontend/src/components/about.vue @@ -14,12 +14,10 @@ The Moore Institute for Plastic Pollution Research - and Walter Yu from CALTRANS. There - have also been - many contributors - to the code base. + and Walter Yu from CALTRANS. + + Steven Hollingsworth + is the lead developer and contributor to the code base.

To get started, visit the Upload Tab or @@ -68,6 +66,8 @@ >open a Github Issue in our repository. + If you would like to provide more general feedback, please fill out + our feedback form here .

  diff --git a/frontend/src/views/about.vue b/frontend/src/views/about.vue index 4e1b46e..bb91d38 100644 --- a/frontend/src/views/about.vue +++ b/frontend/src/views/about.vue @@ -14,12 +14,10 @@ The Moore Institute for Plastic Pollution Research - and Walter Yu from CALTRANS. There - have also been - - many contributors - - to the code base. + and Walter Yu from CALTRANS. + + Steven Hollingsworth + is the lead developer and contributor to the code base.

To get started, visit the Upload Tab or @@ -68,6 +66,8 @@ open a Github Issue in our repository. + If you would like to provide more general feedback, please fill out + our feedback form here .