Skip to content

Commit

Permalink
Aws/trashai staging (#65)
Browse files Browse the repository at this point in the history
* 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 <jimewald@gmail.com>

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

* 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 <jimewald@gmail.com>

* 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 <jimewald@gmail.com>

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

* removed symlink

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

* 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 <jimewald@gmail.com>

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

* 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 <jimewald@gmail.com>

* 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 <jimewald@gmail.com>

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

* removed symlink

Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

* 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 <shollingsworth@barracuda.com>
Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

* 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 <feydanm@gmail.com>
Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>

* 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 <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>
Co-authored-by: Dan Fey <feydanm@gmail.com>
  • Loading branch information
4 people authored Aug 20, 2022
1 parent 61f2835 commit 385f935
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions frontend/src/components/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@
<a href="https://mooreplasticresearch.org/"
>The Moore Institute for Plastic Pollution Research</a
>
and Walter Yu from <a href="https://dot.ca.gov/">CALTRANS</a>. There
have also been
<a href="https://github.com/code4sac/trash-ai/graphs/contributors"
>many contributors</a
>
to the code base.
and Walter Yu from <a href="https://dot.ca.gov/">CALTRANS</a>.
<a href="https://github.com/shollingsworth" >
Steven Hollingsworth
</a> is the lead developer and contributor to the code base.
</p>
<p>
To get started, visit the Upload Tab or
Expand Down Expand Up @@ -68,6 +66,8 @@
>open a Github Issue</a
>
in our repository.
If you would like to provide more general feedback, please fill out
our <a href="https://forms.gle/CwZvegq1oCUYLRjM7">feedback form here </a>.
</p>
&nbsp;
</v-sheet>
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/views/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@
<a href="https://mooreplasticresearch.org/">
The Moore Institute for Plastic Pollution Research
</a>
and Walter Yu from <a href="https://dot.ca.gov/">CALTRANS</a>. There
have also been
<a href="https://github.com/code4sac/trash-ai/graphs/contributors">
many contributors
</a>
to the code base.
and Walter Yu from <a href="https://dot.ca.gov/">CALTRANS</a>.
<a href="https://github.com/shollingsworth" >
Steven Hollingsworth
</a> is the lead developer and contributor to the code base.
</p>
<p>
To get started, visit the Upload Tab or
Expand Down Expand Up @@ -68,6 +66,8 @@
open a Github Issue
</a>
in our repository.
If you would like to provide more general feedback, please fill out
our <a href="https://forms.gle/CwZvegq1oCUYLRjM7">feedback form here </a>.
</p>
</v-sheet>
</template>
Expand Down

0 comments on commit 385f935

Please sign in to comment.