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.

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

Manuscript #69

Merged
merged 57 commits into from
Nov 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
f79b68a
my workflow
wincowgerDEV Sep 1, 2022
dcdf30a
example templates for manuscript.
wincowgerDEV Sep 1, 2022
756f28c
manuscript info
wincowgerDEV Sep 1, 2022
d6b503b
update citations
wincowgerDEV Sep 5, 2022
6e3ff73
cleanup text
wincowgerDEV Sep 5, 2022
d249780
cite
wincowgerDEV Sep 5, 2022
e5a3fb2
update readme
wincowgerDEV Sep 5, 2022
f24c5f6
contribute
wincowgerDEV Sep 5, 2022
3122002
add website badge
wincowgerDEV Sep 5, 2022
968b751
update web link
wincowgerDEV Sep 5, 2022
bf04070
Update README.md
wincowgerDEV Sep 5, 2022
f053598
Update README.md
wincowgerDEV Sep 5, 2022
ef37cc0
add video link
wincowgerDEV Sep 5, 2022
4f46bd0
auto update
wincowgerDEV Sep 5, 2022
6050002
Merge branch 'manuscript' of https://github.com/code4sac/trash-ai int…
wincowgerDEV Sep 5, 2022
11f5eaa
utility files device specific
wincowgerDEV Sep 5, 2022
f97c3d7
move the pdf generator to workflows
wincowgerDEV Sep 5, 2022
99cde81
test error in paper.bib
wincowgerDEV Sep 5, 2022
b458d55
test citation style
wincowgerDEV Sep 5, 2022
1140afc
add citations
wincowgerDEV Sep 5, 2022
b8cbe58
add a few more citations
wincowgerDEV Sep 5, 2022
80dc434
try without space
wincowgerDEV Sep 5, 2022
acd67ec
add all
wincowgerDEV Sep 5, 2022
ce4de09
no spaces allowed in citation names
wincowgerDEV Sep 5, 2022
41dd5a1
add demo images
wincowgerDEV Sep 5, 2022
cbae5af
Update paper.md
wincowgerDEV Sep 5, 2022
d1075f3
give images some space
wincowgerDEV Sep 5, 2022
11b2c2e
image captions
wincowgerDEV Sep 5, 2022
4b2a454
add mention of wade
wincowgerDEV Sep 12, 2022
4ff318f
update authors and acknowledgements
wincowgerDEV Sep 15, 2022
c6b89e9
Updated with Dan's Recs
wincowgerDEV Sep 23, 2022
5090030
Mary Comments
wincowgerDEV Sep 28, 2022
3652a15
SteveO comments
wincowgerDEV Sep 28, 2022
39726ed
Walter's comments
wincowgerDEV Sep 28, 2022
f53d12e
Create config.yml
wincowgerDEV Sep 28, 2022
6e5361b
Create bug.yml
wincowgerDEV Sep 28, 2022
d50cb69
Create feature.yml
wincowgerDEV Sep 28, 2022
67fc98c
hyperlink
wincowgerDEV Sep 28, 2022
ac33012
Update bug.yml
wincowgerDEV Sep 28, 2022
35a35e1
Update feature.yml
wincowgerDEV Sep 28, 2022
4d30772
Added in Kristiina and Kris's comments
wincowgerDEV Oct 16, 2022
99f6145
added kristiina and kris comments
wincowgerDEV Oct 16, 2022
8c4f47d
Update README.md
wincowgerDEV Oct 26, 2022
3a33857
https://github.com/code4sac/trash-ai/pull/69#discussion_r1006489065
wincowgerDEV Oct 31, 2022
01e6bad
https://github.com/code4sac/trash-ai/pull/69#discussion_r1006514485
wincowgerDEV Oct 31, 2022
14eb61c
https://github.com/code4sac/trash-ai/pull/69#discussion_r1006517045
wincowgerDEV Oct 31, 2022
1654df8
https://github.com/code4sac/trash-ai/pull/69#discussion_r1006519572
wincowgerDEV Oct 31, 2022
0b4743e
https://github.com/code4sac/trash-ai/pull/69#discussion_r1006536610
wincowgerDEV Oct 31, 2022
21ad88f
https://github.com/code4sac/trash-ai/pull/69#discussion_r1007668618
wincowgerDEV Oct 31, 2022
83e1fd4
add kris's comments
wincowgerDEV Nov 18, 2022
29d2265
add WSL2 link
wincowgerDEV Nov 18, 2022
9633408
Update paper.md
wincowgerDEV Nov 18, 2022
327bf75
add acknowledgements
wincowgerDEV Nov 18, 2022
7a1a006
Merge branch 'production' into manuscript
wincowgerDEV Nov 24, 2022
640e465
https://github.com/code4sac/trash-ai/pull/69#discussion_r1033145379
wincowgerDEV Nov 28, 2022
3273b24
https://github.com/code4sac/trash-ai/pull/69#discussion_r1033146187
wincowgerDEV Nov 28, 2022
a582b32
https://github.com/code4sac/trash-ai/pull/69#discussion_r1024726101
wincowgerDEV Nov 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
name: Bug report
description: Report a problem you encountered
title: "[Bug]: "
labels: ["bug"]
body:
- type: markdown
attributes:
value: Thanks for taking the time to complete this bug report!
- type: checkboxes
id: terms
attributes:
label: Guidelines
description: By submitting this issue, you agree to follow our [Contributing Guidelines](https://www.contributor-covenant.org/version/2/1/code_of_conduct/).
options:
- label: I agree to follow this project's Contributing Guidelines.
required: true
- type: input
id: project
attributes:
label: Project Version
description: Which project versions are affected?
placeholder: "1.0, 2.2, 3.5.1"
validations:
required: false
- type: input
id: platform
attributes:
label: Platform and OS Version
description: Which platforms or operating systems are affected?
placeholder: "macOS 10.15.1, Ubuntu 20.04"
validations:
required: false
- type: input
id: existing-issues
attributes:
label: Existing Issues
description: Are there any similar existing issues?
placeholder: "#42"
validations:
required: false
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Clearly and concisely describe the bug.
placeholder: Tell us what happened.
validations:
required: true
- type: textarea
id: repro-steps
attributes:
label: Steps to reproduce
value: |
1.
2.
3.
...
validations:
required: true
- type: textarea
id: expected-behavior
attributes:
label: Expected behavior
description: What should have happened?
placeholder: What did you expect to happen?
validations:
required: true
- type: textarea
id: attachments
attributes:
label: Attachments
description: Please include code snippets, stack traces, or compiler errors.
placeholder: Paste code snippets, stack traces, and compiler errors here
validations:
required: false
- type: textarea
id: screenshots
attributes:
label: Screenshots or Videos
description: Add screenshots, gifs, or videos to help explain your problem.
placeholder: Upload screenshots, gifs, and videos here
validations:
required: false
- type: textarea
id: additional
attributes:
label: Additional Information
description: Add any other useful information about the problem here.
placeholder: Is there any additional helpful information you can share?
validations:
required: false
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: true
48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Feature request
description: Suggest an idea for this project
title: "[Feature]: "
labels: ["feature request", "enhancement", "feature"]
body:
- type: markdown
attributes:
value: Thanks for taking the time to complete this form!
- type: checkboxes
id: terms
attributes:
label: Guidelines
description: By submitting this issue, you agree to follow our [Contributing Guidelines](https://www.contributor-covenant.org/version/2/1/code_of_conduct/).
options:
- label: I agree to follow this project's Contributing Guidelines.
required: true
- type: textarea
id: description
attributes:
label: Description
description: Clearly and concisely describe what you would like to change, add, or implement.
placeholder: Tell us your idea.
validations:
required: true
- type: textarea
id: problem
attributes:
label: Problem
description: Is your feature request related to a problem?
placeholder: What problem will this solve?
validations:
required: true
- type: textarea
id: solution
attributes:
label: Proposed Solution
description: How should this be solved?
placeholder: How do you think this should be implemented?
validations:
required: true
- type: textarea
id: alternatives
attributes:
label: Alternatives Considered
description: Are there other possible approaches?
placeholder: Can you think of any other options?
validations:
required: true
23 changes: 23 additions & 0 deletions .github/workflows/draft-pdf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
on: [push]

jobs:
paper:
runs-on: ubuntu-latest
name: Paper Draft
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Build draft PDF
uses: openjournals/openjournals-draft-action@master
with:
journal: joss
# This should be the path to the paper within your repo.
paper-path: paper.md
- name: Upload
uses: actions/upload-artifact@v1
with:
name: paper
# This is the output path where Pandoc will write the compiled
# PDF. Note, this should be the same directory as the input
# paper.md
path: paper.pdf
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,18 @@ data
# other
.DS_Store

#Google drive
*.ini

# R Studio
*.Rproj

**/*.pyc
.python-version
**/*.zip
pyrightconfig.json
archive/
tmp/
.Rproj.user
delete.bat
.Rhistory
35 changes: 23 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,38 @@
## AI for Litter Detection (Web Application)
# Trash AI: Web application for serverless image classification of trash
[![Website](https://img.shields.io/badge/Web-TrashAI.org-blue)](https://www.trashai.org)


### Project Information

- Sponsor: Win Cowger, UC Riverside - Trash Data Projects
- Meeting Times: Wednesdays at 6:30pm (Weekly Brigade Meetings)
- Sponsor: Win Cowger, [Moore Institute for Plastic Pollution Research](https://mooreplasticresearch.org/)
- Meeting Times: Wednesdays at 6:30pm PT [Weekly Brigade Meetings](https://www.meetup.com/code4sac/)

### Project Summary

- Description: Develop web application where users can upload photos of street litter which will be labeled using computer vision to detect and categorize litter type.
- Benefit: Enhance abilities of researchers to quickly label photos and categorize types.
Trash AI is a web application where users can upload photos of litter, which will be labeled using computer vision to detect and categorize litter in the image by type. Early inspiration from [WADE AI](https://github.com/letsdoitworld/wade-ai) streamlined this development. Trash AI will enhance the abilities of researchers to quickly label trash in photos.

#### Demo
[![image](https://user-images.githubusercontent.com/26821843/188515526-33e1196b-6830-4187-8fe4-e68b2bd4019e.png)](https://youtu.be/HHrjUpQynUM)

## Deployment

You can simply go to www.trashai.org to start using the tool or deploy it yourself. Current self-deployment options are local deployment with docker to remote on Amazon Web Services (AWS).

### [Local Development](./docs/localdev.md)

Run the environment live with localstack, and docker
- Run the environment live with localstack and docker.

### [AWS Deployment](./docs/git-aws-account-setup.md)

### [AWS Deployments](./docs/git-aws-account-setup.md)
- Instructions on bringing up a new AWS deployment.

Instructions on bringing up a new deployment
#### [Continuous Integration and Continuous Delivery (CI/CD) - Github Actions](./docs/github-actions.md)

### [CI/CD - Github Actions](./docs/github-actions.md)
- Mostly CD at this point.

Mostly CD at this point.
#### [Github Actions AWS Deployment Role](./docs/github-actions-deployment-role.md)

### [Github Actions AWS Deployment Role](./docs/github-actions-deployment-role.md)
- Runs the complex stuff so you don't have to.

Runs the complex stuff so you don't have to
## Contribute
We welcome contributions of all kinds. To get started, open an [issue](https://github.com/code4sac/trash-ai/issues) or [pull request](https://github.com/code4sac/trash-ai/pulls). Here are some ideas on [How to Contribute](https://opensource.guide/how-to-contribute/). Please adhere to this project's [Code of Conduct](https://www.contributor-covenant.org/version/2/1/code_of_conduct/).
16 changes: 11 additions & 5 deletions docs/localdev.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

When doing local development, you can run this stack in the background and
edit files in the `/backend` and `/frontend` directories and the environment
with automatically update.
with automatic update.

The listening port for the web frontend defaults to `http://localhost:5150`,
The backend is exposed via `http://localhost:4000` by default.
Expand All @@ -13,17 +13,23 @@ These values can be adjusted by editing the localdev env file [.env](../localdev

## _*IMPORTANT*_

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`
It's suggested you work in branch `local` by creating your own local branch when developing
Pushing / merging PR's to any branches with a prefix of `aws/` will trigger deployment actions
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
=======


---
# Set up

## Operating System Requirements
- Linux
- MacOS
- MacOS (testing)
- Windows using [WSL2](https://learn.microsoft.com/en-us/windows/wsl/install)
- WSL Integration on Ubuntu must be enabled in Docker options -> Resources -> WSL Integration
- Repo must be inside Ubuntu (i.e. ~/code/trash-ai)
- Make local must be run from a WSL (Ubuntu) terminal
- Take note of docker-compose installation (installing through apt may not install the correct version)

## 1. Install Required Software
- docker desktop (or configure docker engine and docker-compose another way)
Expand Down
Loading