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

Aws/trashai staging #41

Merged
merged 24 commits into from
Apr 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
56614d6
Coco POC #8 #9 (#19) (#26)
Mar 12, 2022
3d6829f
removed symlink
Mar 12, 2022
5638685
Merge branch 'aws/trashai-staging' into testing_coco
Mar 12, 2022
40b16a3
Testing coco (#28)
Mar 12, 2022
aa3a62f
Changed upload behaviour
Mar 13, 2022
b3e2234
Merge branch 'aws/trashai-staging' of github.com:code4sac/trash-ai in…
Mar 13, 2022
e5b4f88
Merge branch 'production' into aws/trashai-staging
Mar 13, 2022
457a5c1
Merge branch 'testing_coco' into aws/trashai-staging
Mar 13, 2022
c48befd
Refactored upload dialog / drop area
Mar 13, 2022
5d8db28
Fixed issue with remove / key and array order
Mar 13, 2022
4ed2acb
Removed lab / test for deployed versions of environment
Mar 14, 2022
e206216
Forgot to update the metadata text
Mar 14, 2022
550014e
Yolov5-Taco web model #7 (#30)
Mar 19, 2022
39800da
Testing change to model loading in AWS
Mar 21, 2022
ba36038
Try 2 on loading model
Mar 22, 2022
4f3be20
Try 3 on loading model
Mar 22, 2022
92ae160
Reverting changes (has to do with basic auth url)
Mar 22, 2022
b610d17
Removed old react frontend directory
Mar 30, 2022
50b9714
Removed old react frontend directory (#34)
Mar 31, 2022
877793a
Merge branch 'aws/trashai-staging' of github.com:code4sac/trash-ai in…
Mar 31, 2022
401c426
Moving domain from codefordev to trashai.org
Mar 31, 2022
01e9e7a
Merge branch 'production' into aws/trashai-staging
Apr 6, 2022
2dfc14b
Fixes for #36, #35, #32 + download all feature, and backend refactor …
Apr 7, 2022
2c6d994
bugfix on s3 naming with file extension (#40)
Apr 7, 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
11 changes: 11 additions & 0 deletions .github/workflows/infra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ jobs:
- name: Git clone the repository
uses: actions/checkout@v1

- name: Setup python
uses: actions/setup-python@v3
with:
python-version: '3.8'
architecture: 'x64'

- name: setup boto3
run: |
pip3 install --upgrade pip
pip3 install boto3

- name: register variables
id: setregion
run: |
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/manual_run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
- all_stack
- backend_stack
- frontend_stack
- deploy_role_stack
- global_stack
- region_stack
- first_run_stack
Expand All @@ -36,6 +37,17 @@ jobs:
- name: Git clone the repository
uses: actions/checkout@v1

- name: Setup python
uses: actions/setup-python@v3
with:
python-version: '3.8'
architecture: 'x64'

- name: setup boto3
run: |
pip3 install --upgrade pip
pip3 install boto3

- name: register variables
id: setregion
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ data
**/*.zip
pyrightconfig.json
archive/
tmp/
3 changes: 3 additions & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
node_modules
.serverless
tmp/
layers/requirements/
.in
56 changes: 56 additions & 0 deletions backend/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
.DEFAULT_GOAL := help
help:
@echo "Available commands:"
@cat Makefile | grep '^\w' | cut -d ':' -f 1 | grep -v '^help$$'




STAGE := $(shell git rev-parse --abbrev-ref HEAD | sed 's/^aws\///')
REGION := us-west-1
export STAGE
export REGION

offline:
yarn run local

deploy:
serverless deploy \
-s "${STAGE}" \
-r "${REGION}"

destroy:
serverless remove \
-s "${STAGE}" \
-r "${REGION}"

print:
serverless print \
-s "${STAGE}" \
-r "${REGION}"

list:
serverless deploy list functions \
-s "${STAGE}" \
-r "${REGION}"

logs_web:
serverless logs \
--function webapp \
-t \
-s "${STAGE}" \
-r "${REGION}"
#
# logs_rate:
# serverless logs \
# --function ratehandler \
# -t \
# -s "${STAGE}" \
# -r "${REGION}"
#
# logs_cron:
# serverless logs \
# --function cronhandler \
# -t \
# -s "${STAGE}" \
# -r "${REGION}"
127 changes: 0 additions & 127 deletions backend/README.md

This file was deleted.

13 changes: 0 additions & 13 deletions backend/bin/serverless.sh

This file was deleted.

3 changes: 0 additions & 3 deletions backend/handler.js

This file was deleted.

Loading