Skip to content

Commit

Permalink
mutliple security fixes, disabled classification, improved label pres…
Browse files Browse the repository at this point in the history
…entation (#103)

* 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

* adding google analytics script (#67)

* removing kaggle depedency on running model notebook (#82)

* Updated UI to prepare to allow classifications (#63)

* Changes below

* adjusted dialog for lower parts of the image
* updated for mobile
* Added display div, added scores, adjusted the way labels are applied.
* Classification widgets

* merging staging

* updating Upload tab link in about page

* Removed duplicate about.vue page, removed duplicate function from utils.ts

Co-authored-by: Dan Fey <feydanm@gmail.com>

* added missing rxjs package

* bugfix on deploy script (testing)

* Add files to run notebook on MacBook M1 machine (#81)

* deleted about.Vue (#90)

* Local Deployment (#86)

* Testing fixes in issue 85

* changed platform in dockerfile

* add wsl2 instructions

* add windows docker install instructions

* Update localdev.md

* reorganization

* Update localdev.md

* Update localdev.md

* cleanup

* Update localdev.md

* Update localdev.md

* fix error that was preventing initial install.

Co-authored-by: Steven Hollingsworth <shollingsworth@barracuda.com>

* updated openid thumbprint for github (#87)

* Manuscript (#69)

* my workflow

* example templates for manuscript.

* manuscript info

* update citations

* cleanup text

* cite

* update readme

* contribute

* add website badge

* update web link

* Update README.md

* Update README.md

* add video link

* auto update

* utility files device specific

* move the pdf generator to workflows

* test error in paper.bib

* test citation style

* add citations

* add a few more citations

* try without space

* add all

* no spaces allowed in citation names

* add demo images

* Update paper.md

* give images some space

* image captions

* add mention of wade

* update authors and acknowledgements

* Updated with Dan's Recs

* Mary Comments

#69 (comment)

* SteveO comments

#69 (review)

* Walter's comments

#69 (review)

* Create config.yml

* Create bug.yml

* Create feature.yml

* hyperlink

* Update bug.yml

* Update feature.yml

* Added in Kristiina and Kris's comments

* Update README.md

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* add kris's comments

* add WSL2 link

* Update paper.md

* add acknowledgements

* #69 (comment)

* #69 (comment)

* #69 (comment)

* demo backend interaction (#88)

* deleted about.Vue

Co-authored-by: Win Cowger, PhD <wincowger@gmail.com>
Co-authored-by: Steven Hollingsworth <shollingsworth@barracuda.com>

* changed docker-compose to docker compose

* Bump moment-timezone from 0.5.34 to 0.5.40 in /backend

Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.34 to 0.5.40.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](moment/moment-timezone@0.5.34...0.5.40)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump simple-git from 3.5.0 to 3.16.0 in /backend (#95)

* Local Deployment (#86)

* Testing fixes in issue 85

* changed platform in dockerfile

* add wsl2 instructions

* add windows docker install instructions

* Update localdev.md

* reorganization

* Update localdev.md

* Update localdev.md

* cleanup

* Update localdev.md

* Update localdev.md

* fix error that was preventing initial install.

Co-authored-by: Steven Hollingsworth <shollingsworth@barracuda.com>

* updated openid thumbprint for github (#87)

* Manuscript (#69)

* my workflow

* example templates for manuscript.

* manuscript info

* update citations

* cleanup text

* cite

* update readme

* contribute

* add website badge

* update web link

* Update README.md

* Update README.md

* add video link

* auto update

* utility files device specific

* move the pdf generator to workflows

* test error in paper.bib

* test citation style

* add citations

* add a few more citations

* try without space

* add all

* no spaces allowed in citation names

* add demo images

* Update paper.md

* give images some space

* image captions

* add mention of wade

* update authors and acknowledgements

* Updated with Dan's Recs

* Mary Comments

#69 (comment)

* SteveO comments

#69 (review)

* Walter's comments

#69 (review)

* Create config.yml

* Create bug.yml

* Create feature.yml

* hyperlink

* Update bug.yml

* Update feature.yml

* Added in Kristiina and Kris's comments

* Update README.md

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* add kris's comments

* add WSL2 link

* Update paper.md

* add acknowledgements

* #69 (comment)

* #69 (comment)

* #69 (comment)

* demo backend interaction (#88)

* Bump simple-git from 3.5.0 to 3.16.0 in /backend

Bumps [simple-git](https://github.com/steveukx/git-js/tree/HEAD/simple-git) from 3.5.0 to 3.16.0.
- [Release notes](https://github.com/steveukx/git-js/releases)
- [Changelog](https://github.com/steveukx/git-js/blob/main/simple-git/CHANGELOG.md)
- [Commits](https://github.com/steveukx/git-js/commits/simple-git@3.16.0/simple-git)

---
updated-dependencies:
- dependency-name: simple-git
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Win Cowger, PhD <wincowger@gmail.com>
Co-authored-by: Steven Hollingsworth <shollingsworth@barracuda.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump http-cache-semantics from 4.1.0 to 4.1.1 in /infra

Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/commits)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump cookiejar from 2.1.3 to 2.1.4 in /infra

Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/bmeck/node-cookiejar/releases)
- [Commits](https://github.com/bmeck/node-cookiejar/commits)

---
updated-dependencies:
- dependency-name: cookiejar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump json5 from 2.2.1 to 2.2.3 in /infra

Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v2.2.1...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump luxon from 1.28.0 to 1.28.1 in /infra

Bumps [luxon](https://github.com/moment/luxon) from 1.28.0 to 1.28.1.
- [Release notes](https://github.com/moment/luxon/releases)
- [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md)
- [Commits](moment/luxon@1.28.0...1.28.1)

---
updated-dependencies:
- dependency-name: luxon
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Local Deployment (#86)

* Testing fixes in issue 85

* changed platform in dockerfile

* add wsl2 instructions

* add windows docker install instructions

* Update localdev.md

* reorganization

* Update localdev.md

* Update localdev.md

* cleanup

* Update localdev.md

* Update localdev.md

* fix error that was preventing initial install.

Co-authored-by: Steven Hollingsworth <shollingsworth@barracuda.com>

* Manuscript (#69)

* my workflow

* example templates for manuscript.

* manuscript info

* update citations

* cleanup text

* cite

* update readme

* contribute

* add website badge

* update web link

* Update README.md

* Update README.md

* add video link

* auto update

* utility files device specific

* move the pdf generator to workflows

* test error in paper.bib

* test citation style

* add citations

* add a few more citations

* try without space

* add all

* no spaces allowed in citation names

* add demo images

* Update paper.md

* give images some space

* image captions

* add mention of wade

* update authors and acknowledgements

* Updated with Dan's Recs

* Mary Comments

#69 (comment)

* SteveO comments

#69 (review)

* Walter's comments

#69 (review)

* Create config.yml

* Create bug.yml

* Create feature.yml

* hyperlink

* Update bug.yml

* Update feature.yml

* Added in Kristiina and Kris's comments

* Update README.md

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* add kris's comments

* add WSL2 link

* Update paper.md

* add acknowledgements

* #69 (comment)

* #69 (comment)

* #69 (comment)

* Bump moment-timezone from 0.5.34 to 0.5.40 in /backend

Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.34 to 0.5.40.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](moment/moment-timezone@0.5.34...0.5.40)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump luxon from 1.28.0 to 1.28.1 in /backend (#94)

Bumps [luxon](https://github.com/moment/luxon) from 1.28.0 to 1.28.1.
- [Release notes](https://github.com/moment/luxon/releases)
- [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md)
- [Commits](moment/luxon@1.28.0...1.28.1)

---
updated-dependencies:
- dependency-name: luxon
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump cookiejar from 2.1.3 to 2.1.4 in /infra

Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/bmeck/node-cookiejar/releases)
- [Commits](https://github.com/bmeck/node-cookiejar/commits)

---
updated-dependencies:
- dependency-name: cookiejar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump http-cache-semantics from 4.1.0 to 4.1.1 in /infra

Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/commits)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump json5 from 2.2.1 to 2.2.3 in /infra

Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v2.2.1...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump luxon from 1.28.0 to 1.28.1 in /infra

Bumps [luxon](https://github.com/moment/luxon) from 1.28.0 to 1.28.1.
- [Release notes](https://github.com/moment/luxon/releases)
- [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md)
- [Commits](moment/luxon@1.28.0...1.28.1)

---
updated-dependencies:
- dependency-name: luxon
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* disabled draw actions per issue 89 (#102)

* reset yarn.lock

* Cosmetic adjustments to image view screen

* Removed uneeded files, added troubleshooting section

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jim Ewald <jim.ewald@gmail.com>
Co-authored-by: Jim <jimewald@gmail.com>
Co-authored-by: Dan Fey <feydanm@gmail.com>
Co-authored-by: Gina Durante <46698605+gdurante2019@users.noreply.github.com>
Co-authored-by: Leonidas Gkimisis <97710680+Greek4Tech@users.noreply.github.com>
Co-authored-by: Win Cowger, PhD <wincowger@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
8 people committed Mar 2, 2023
1 parent b345466 commit ed2c0e8
Show file tree
Hide file tree
Showing 73 changed files with 4,280 additions and 934 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ tmp/
.Rproj.user
delete.bat
.Rhistory
model/build/Mask*
model/build/taco*
5 changes: 5 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/trash-ai.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source $HOME/.config/nvm/nvm.sh
nvm use 16.14.0
nvm use 16
export B=$(dirname $0)
export O=$B/frontend.orig
export S=$B/frontend/src
Expand Down
22 changes: 11 additions & 11 deletions backend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ dayjs@^1.11.0:
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.0.tgz#009bf7ef2e2ea2d5db2e6583d2d39a4b5061e805"
integrity sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==

debug@4, debug@^4.1.1, debug@^4.3.3:
debug@4, debug@^4.1.1, debug@^4.3.3, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
Expand Down Expand Up @@ -2665,16 +2665,16 @@ mkdirp@^1.0.3:
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==

moment-timezone@^0.5.31:
version "0.5.34"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c"
integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==
version "0.5.40"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz#c148f5149fd91dd3e29bf481abc8830ecba16b89"
integrity sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg==
dependencies:
moment ">= 2.9.0"

"moment@>= 2.9.0":
version "2.29.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
version "2.29.4"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==

ms@2.1.2:
version "2.1.2"
Expand Down Expand Up @@ -3569,13 +3569,13 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==

simple-git@^3.4.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.5.0.tgz#3c3538f4d7a1b3c8f3904412b12740bdcad9c8b1"
integrity sha512-fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA==
version "3.16.0"
resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.16.0.tgz#421773e24680f5716999cc4a1d60127b4b6a9dec"
integrity sha512-zuWYsOLEhbJRWVxpjdiXl6eyAyGo/KzVW+KFhhw9MqEEJttcq+32jTWSGyxTdf9e/YCohxRE+9xpWFj9FdiJNw==
dependencies:
"@kwsites/file-exists" "^1.1.1"
"@kwsites/promise-deferred" "^1.1.1"
debug "^4.3.3"
debug "^4.3.4"

slash@^3.0.0:
version "3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions bin/github_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def amplify_deploy(self):
raise SystemExit(f"Unknown branch: {self.branch}")
response = amplifycli.start_deployment(
appId=appid,
branchName=self.stage,
branchName=self.branch.replace("aws/", ""),
sourceUrl=f"s3://{self.public_bucket}/deploy.zip",
)

Expand Down Expand Up @@ -351,7 +351,7 @@ def frontend_stack(self):
),
Cmd(
"frontend_stack",
working_dir=self.BASE.joinpath("frontend"),
working_dir=FRONTEND,
cmd="yarn vite build",
callback=self.amplify_deploy,
),
Expand Down
15 changes: 12 additions & 3 deletions docs/localdev.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ Pushing / merging PR's to any branches with a prefix of `aws/` will trigger depl
For full functionality you will want to get a Google Maps API key and name it VITE_GOOGLE_MAPS_API_KEY, but it is not required
=======

Pushing / merging PR's to any branches with a prefix of `aws/` will
trigger deployment actions, when developing locally, create a new branch
and submit a pull request to `aws/trashai-staging`

---
# Set up
Expand Down Expand Up @@ -70,8 +73,14 @@ make local
```shell
cd localdev
# need to make sure the containers are down before starting
docker-compose down
docker-compose up --remove-orphans --build
docker compose down
docker compose up --remove-orphans --build
# down stack
docker-compose down
docker compose down
```

# Troubleshooting

| Error | Solution |
| ---------- |:------------:|
| `docker: 'compose' is not a docker command.` | Upgrade to the latest docker desktop or update your docker-ce install to the latest version. |
1 change: 1 addition & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ pnpm-debug.log*
*.njsproj
*.sln
*.sw?
.log
18 changes: 18 additions & 0 deletions frontend/notes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
https://github.com/tensorflow/models/blob/master/research/object_detection/g3doc/tf1_detection_zoo.md
https://indiantechwarrior.com/tutorial-on-tensorflow-image-segmentation/
https://tfhub.dev/tensorflow/collections/lite/task-library/image-segmenter/1
https://www.tensorflow.org/lite/inference_with_metadata/task_library/image_segmenter
https://www.tensorflow.org/lite/examples/segmentation/overview
https://github.com/tensorflow/datasets
https://github.com/tensorflow/tfjs-models
https://datasetsearch.research.google.com/
https://research.google/tools/datasets/
https://www.tensorflow.org/resources/models-datasets
https://github.com/aegorfk/TensorFlow.js-for-any-model/blob/master/src/custom-model/index.js
https://cloud.google.com/vision/automl/docs/tensorflow-js-tutorial#node.js


https://keras.io/examples/keras_recipes/creating_tfrecords/
https://www.kaggle.com/code/ryanholbrook/tfrecords-basics/notebook
https://medium.com/ai%C2%B3-theory-practice-business/image-dataset-with-tfrecord-files-7188b565bfc
https://towardsdatascience.com/create-tfrecords-dataset-and-use-it-to-train-an-ml-model-da26fe9f0c2c
6 changes: 4 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
"crypto-js": "^4.1.1",
"dexie": "^3.2.2",
"file-saver": "^2.0.5",
"fuse.js": "^6.6.2",
"jszip": "^3.10.0",
"loglevel": "^1.8.0",
"p-queue": "^7.2.0",
"pinia": "^2.0.16",
"p-queue": "^7.3.0",
"pinia": "^2.0.17",
"pinia-plugin-persistedstate": "^1.6.3",
"roboto-fontface": "^0.10.0",
"rxjs": "^7.5.7",
"ts-exif-parser": "^0.2.2",
"vite-plugin-pages": "^0.25.0",
"vite-plugin-vuetify": "^1.0.0-alpha.13",
Expand Down
28 changes: 18 additions & 10 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@dragover.prevent
>
<Snack ref="snack" />
<HighlightImage />
<v-layout>
<v-app-bar
color="primary"
Expand Down Expand Up @@ -163,8 +164,11 @@
import Snack from '@/components/snack.vue'
import { defineComponent, ref } from 'vue'
import IconCode4Sac from '@/components/icon/code4sac.vue'
import HighlightImage from '@/components/model/highlight_image.vue'
import { useTheme } from 'vuetify'
import * as m from '@/lib'
import { useAppStore, useImageStore, useCache } from '@/lib/store'
import { log } from '@/lib/logging'
import { TensorFlow } from '@/lib'
interface Data {
drawer: boolean
Expand All @@ -174,41 +178,45 @@ export default defineComponent({
name: 'App',
components: {
IconCode4Sac,
HighlightImage,
Snack,
},
setup() {
const imgstore = m.useImageStore()
const appstore = m.useAppStore()
const imgstore = useImageStore()
const appstore = useAppStore()
const cache = useCache()
const theme = useTheme()
const snackbar = ref<typeof Snack>()
return {
cache,
snackbar,
imgstore,
appstore,
theme,
}
},
created() {
m.TensorFlow.getInstance()
},
mounted() {
async mounted() {
// handle back button stuff
window.onpopstate = () => {
// @ts-ignore
this.preloader = false
}
this.theme.global.name.value = this.appstore.theme
this.imgstore.doinit()
m.log.debug('veutify', this.$vuetify)
m.log.debug('mounted', this)
m.log.debug(navigator.storage.estimate())
log.debug('veutify', this.$vuetify)
log.debug('mounted', this)
log.debug(navigator.storage.estimate())
// this.$root!.$snack = this.snackbar!.value
},
data(): Data {
return {
drawer: false,
}
},
async created() {
await TensorFlow.getInstance().load()
},
computed: {
is_mobile(): boolean {
return this.$vuetify.display.mobile
Expand Down
77 changes: 0 additions & 77 deletions frontend/src/components/about.vue

This file was deleted.

31 changes: 31 additions & 0 deletions frontend/src/components/classify_instructions.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<template>
<div class="d-flex">
<div class="mx-5 section-border">
<v-icon class="mr-3"> mdi-image-edit </v-icon>
<span> <b>Edit</b> </span>
<b> Double click </b>
on a classification label
</div>
<div class="mx-5 section-border">
<v-icon class="mr-3"> mdi-new-box </v-icon>
<span> <b>New</b> </span>
Hold the <b>middle mouse button</b> to draw a new classification
</div>
<slot />
</div>
</template>

<script lang="ts">
import { defineComponent } from 'vue'
export default defineComponent({
name: 'Instructions',
})
</script>
<style>
.section-border {
border: 2px solid black;
padding: 10px;
margin: 5px;
}
</style>
Loading

0 comments on commit ed2c0e8

Please sign in to comment.