Skip to content

Feedback #1

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

Open
wants to merge 212 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
212 commits
Select commit Hold shift + click to select a range
35acb43
Setting up GitHub Classroom Feedback
github-classroom[bot] Nov 9, 2023
9d45d16
Update Fall 2023
bloombar Nov 13, 2023
d5d604f
coverage
bloombar Nov 13, 2023
64862c1
actions workflow
bloombar Nov 13, 2023
e09fb3c
pipfile and lint action
bloombar Nov 15, 2023
de22e24
mock web app. connected flask app to database
Lefie Nov 21, 2023
6a80dd4
web app proj folder
Lefie Nov 21, 2023
9c0f1b1
add requiermenets.txt
Lefie Nov 21, 2023
ddddb38
added basic setup for hand gesture
anaspacheco Nov 22, 2023
ad3808c
machine learning files
anaspacheco Nov 24, 2023
7a2d7a0
working on front end
SamuelShally Nov 24, 2023
2e67de2
snail
SamuelShally Nov 24, 2023
20082d9
snail 2
SamuelShally Nov 24, 2023
023e52c
big fix
SamuelShally Nov 24, 2023
a2090a0
LINTING
SamuelShally Nov 26, 2023
8f0d3f7
Delete database directory
SamuelShally Nov 26, 2023
b6582b2
Linting
SamuelShally Nov 26, 2023
22b7348
Delete web-app directory
SamuelShally Nov 26, 2023
7ff38d1
linting
anaspacheco Nov 26, 2023
fc8fb3a
still linting
SamuelShally Nov 26, 2023
384a4ee
linting
SamuelShally Nov 26, 2023
f4599e3
Merge pull request #2 from software-students-fall2023/samuel
anaspacheco Nov 26, 2023
f44b6df
merge
anaspacheco Nov 26, 2023
6f87fe7
changed python version
anaspacheco Nov 26, 2023
6b9e2a4
fixing linting
anaspacheco Nov 26, 2023
26d4d30
trying to fix linting again
anaspacheco Nov 26, 2023
c2c0fb8
Merge pull request #3 from software-students-fall2023/anasofia
SamuelShally Nov 26, 2023
b69f017
merging w sam
anaspacheco Nov 26, 2023
e080371
Merge pull request #4 from software-students-fall2023/anasofia
SamuelShally Nov 26, 2023
0d8e6cb
trying to fix linting again:
anaspacheco Nov 26, 2023
b2c139d
trying again
anaspacheco Nov 26, 2023
99d8cb8
retrying
anaspacheco Nov 26, 2023
dc863ba
trying
anaspacheco Nov 26, 2023
4b7351e
tryinggg
anaspacheco Nov 26, 2023
4cc0a79
installed packages
anaspacheco Nov 26, 2023
e0ac78e
tryingggg
anaspacheco Nov 26, 2023
4f4d741
trying again:
anaspacheco Nov 26, 2023
18a381e
formatting
anaspacheco Nov 26, 2023
9942fba
Merge pull request #5 from software-students-fall2023/anasofia
SamuelShally Nov 26, 2023
a480949
general update
SamuelShally Nov 26, 2023
380e080
Working on tests
SamuelShally Nov 27, 2023
fb7e2b2
working on tests
SamuelShally Nov 27, 2023
b799f70
general update
SamuelShally Nov 27, 2023
c4b4001
update
Lefie Nov 27, 2023
ff39d86
Basic route tests
SamuelShally Nov 27, 2023
b2b0820
linted and tested :)
SamuelShally Nov 27, 2023
c38ee20
Merge pull request #6 from software-students-fall2023/samuel
anaspacheco Nov 27, 2023
6e41848
Fixed some linting errors
SamuelShally Nov 27, 2023
51198bc
Merge pull request #7 from software-students-fall2023/samuel
anaspacheco Nov 27, 2023
fc7f964
Create Main.yaml
SamuelShally Nov 27, 2023
0ed3cb0
Update Main.yaml
SamuelShally Nov 27, 2023
797739c
update
Lefie Nov 27, 2023
54637ba
Update README.md
SamuelShally Nov 27, 2023
fe073ff
changes to formatting of ml client
anaspacheco Nov 27, 2023
83b51e4
fixing linting
anaspacheco Nov 27, 2023
189f785
black formatting error fixed
anaspacheco Nov 27, 2023
24ef4fc
Update Main.yaml
SamuelShally Nov 27, 2023
ad6d37a
Update Main.yaml
SamuelShally Nov 27, 2023
64690d7
Update Main.yaml
SamuelShally Nov 27, 2023
441e8aa
Update Main.yaml
SamuelShally Nov 27, 2023
c04be6a
fixing CI
anaspacheco Nov 27, 2023
d8dd0bb
checked error
anaspacheco Nov 27, 2023
de92b0a
Merge pull request #10 from software-students-fall2023/anasofia
SamuelShally Nov 27, 2023
eca41b4
Update Main.yaml
SamuelShally Nov 27, 2023
eae1e53
Update Main.yaml
SamuelShally Nov 27, 2023
f9c9629
Update Main.yaml
SamuelShally Nov 27, 2023
fe5a9ff
Update Main.yaml
SamuelShally Nov 27, 2023
884586c
lint code
Lefie Nov 27, 2023
cb987b6
Update Main.yaml
SamuelShally Nov 27, 2023
42067a5
LINT
Lefie Nov 27, 2023
865dfa5
update LINT
Lefie Nov 27, 2023
6ca07d3
Update Main.yaml
SamuelShally Nov 27, 2023
9faa0c9
Update Main.yaml
SamuelShally Nov 27, 2023
be4c651
merged with main
Lefie Nov 28, 2023
c048818
lint
Lefie Nov 28, 2023
45d81da
format
Lefie Nov 28, 2023
ded4bb6
format
Lefie Nov 28, 2023
d56b4cd
lint
Lefie Nov 28, 2023
5985ff0
format
Lefie Nov 28, 2023
fad6f50
update
Lefie Nov 28, 2023
d013d61
update
Lefie Nov 28, 2023
8050741
test again
Lefie Nov 28, 2023
2d5ff2d
test again
Lefie Nov 28, 2023
b222663
test
Lefie Nov 28, 2023
b7635b2
update
Lefie Nov 28, 2023
cb2be6e
update
Lefie Nov 28, 2023
9d0fe88
update
Lefie Nov 28, 2023
2672a63
check if github is working again
Lefie Nov 28, 2023
dc2d201
test
Lefie Nov 28, 2023
61ae308
update
Lefie Nov 28, 2023
f4e9717
test
Lefie Nov 28, 2023
22c44d2
udpate
Lefie Nov 28, 2023
ddcd1b9
update again
Lefie Nov 28, 2023
20ddbb4
test
Lefie Nov 28, 2023
cebcd5c
update
Lefie Nov 28, 2023
e4e1deb
update
Lefie Nov 28, 2023
c7560c1
test again
Lefie Nov 28, 2023
a311bc8
test:
Lefie Nov 28, 2023
a4c2ff6
check
Lefie Nov 28, 2023
b89f8ff
msg
Lefie Nov 28, 2023
a9784f9
msg
Lefie Nov 28, 2023
75e5d9c
update
Lefie Nov 28, 2023
66be48e
update
Lefie Nov 28, 2023
17112b9
update:
Lefie Nov 28, 2023
d121ec6
test:
Lefie Nov 28, 2023
248e339
update:
Lefie Nov 29, 2023
bd4dd5d
update:
Lefie Nov 29, 2023
40d17fa
update
Lefie Nov 29, 2023
9f9c878
check
Lefie Nov 29, 2023
9c3df91
update
Lefie Nov 29, 2023
4133c96
update
Lefie Nov 29, 2023
cffefc0
update
Lefie Nov 29, 2023
f465773
update
Lefie Nov 29, 2023
df45101
test
Lefie Nov 29, 2023
4b06f04
test
Lefie Nov 29, 2023
3985f8d
lint
Lefie Nov 29, 2023
8990eec
update
Lefie Nov 29, 2023
45a2427
lint
Lefie Nov 29, 2023
ea313e1
fixed uri
Lefie Nov 29, 2023
fc91ea0
work pls
Lefie Nov 29, 2023
005ca00
work pls
Lefie Nov 29, 2023
eba76da
update
Lefie Nov 29, 2023
f253414
udpate
Lefie Nov 29, 2023
c2e131d
Merge pull request #12 from software-students-fall2023/lemon3
anaspacheco Nov 29, 2023
0d08be1
fixed setup.py
anaspacheco Nov 30, 2023
b15e293
fixed bug
anaspacheco Nov 30, 2023
94aa993
fixed second bug
anaspacheco Nov 30, 2023
fd5dc7e
no tests
anaspacheco Nov 30, 2023
1015dfa
fixed formatting
anaspacheco Nov 30, 2023
5483f77
Merge pull request #26 from software-students-fall2023/anasofia
SamuelShally Nov 30, 2023
820d755
changes to test
anaspacheco Nov 30, 2023
162a972
merging
anaspacheco Nov 30, 2023
a597e9a
docker file
SamuelShally Nov 30, 2023
b799386
initial ml tests
anaspacheco Nov 30, 2023
709cf9b
fixing lint
anaspacheco Nov 30, 2023
b28a0e9
fixed bug
anaspacheco Nov 30, 2023
89d3676
fixed lint
anaspacheco Nov 30, 2023
9d94c63
added yml
anaspacheco Nov 30, 2023
0e047e0
added yml file for ml
anaspacheco Nov 30, 2023
6186eb3
Merge pull request #27 from software-students-fall2023/anasofia
SamuelShally Dec 2, 2023
20fa4e2
added test
anaspacheco Dec 3, 2023
72aee76
merging
anaspacheco Dec 3, 2023
78bea20
see code coverage
anaspacheco Dec 3, 2023
08751fd
testing again
anaspacheco Dec 3, 2023
704f5b6
testing agin
anaspacheco Dec 3, 2023
c015196
fixing pipfile
anaspacheco Dec 3, 2023
9d59c47
testing code coveragee
anaspacheco Dec 3, 2023
86f2c47
formatting w black
anaspacheco Dec 3, 2023
3908850
Merge pull request #28 from software-students-fall2023/anasofia
SamuelShally Dec 3, 2023
11544f6
merged w sam
anaspacheco Dec 3, 2023
01d8a91
ignore
anaspacheco Dec 3, 2023
cd6cff2
ignore database
anaspacheco Dec 3, 2023
db26e60
trying
anaspacheco Dec 3, 2023
d4dbfdd
fixed linting
anaspacheco Dec 3, 2023
09d70d8
updated docker compose
anaspacheco Dec 3, 2023
d50f322
Merge pull request #29 from software-students-fall2023/anasofia
SamuelShally Dec 3, 2023
ac2ed6c
fixed ml client
anaspacheco Dec 4, 2023
ad8d444
pushing changes
anaspacheco Dec 4, 2023
ad11a92
fixed test
anaspacheco Dec 4, 2023
aeff110
fixed tests
anaspacheco Dec 4, 2023
3a58db5
added docker compose
anaspacheco Dec 4, 2023
cd20ad6
changing
anaspacheco Dec 5, 2023
8d3d4ee
pushing changes
anaspacheco Dec 5, 2023
5383af9
changes to docker
anaspacheco Dec 5, 2023
45f5ae7
fixed
anaspacheco Dec 5, 2023
cd35218
test
anaspacheco Dec 5, 2023
43e05dd
test
anaspacheco Dec 5, 2023
9018a36
testing
anaspacheco Dec 5, 2023
cc178b4
trying
anaspacheco Dec 5, 2023
ab7f6e2
lint ml
Lefie Dec 5, 2023
4e263f0
CI
anaspacheco Dec 5, 2023
4b62b5e
merge
anaspacheco Dec 5, 2023
51284ce
doing this
anaspacheco Dec 5, 2023
c0af56b
testing
anaspacheco Dec 5, 2023
5f19a06
trying
anaspacheco Dec 5, 2023
dbc07ff
testinggg
anaspacheco Dec 5, 2023
8ad06c0
adding tests
anaspacheco Dec 5, 2023
38cfc9b
testing
anaspacheco Dec 5, 2023
7ec098f
doing this
anaspacheco Dec 5, 2023
6d499b7
added test
anaspacheco Dec 5, 2023
0184074
testst
anaspacheco Dec 5, 2023
0e69e6e
testingss
anaspacheco Dec 5, 2023
9ab039a
tests
anaspacheco Dec 5, 2023
fe78f97
testing
anaspacheco Dec 5, 2023
e9c386e
testing
anaspacheco Dec 5, 2023
daa3150
testing
anaspacheco Dec 5, 2023
e70c649
gin
anaspacheco Dec 5, 2023
de02dea
linting
anaspacheco Dec 5, 2023
aff0168
linting
anaspacheco Dec 5, 2023
8938856
merging
anaspacheco Dec 5, 2023
c1d2342
Merge pull request #30 from software-students-fall2023/anasofia
SamuelShally Dec 5, 2023
7039757
testing tests
anaspacheco Dec 5, 2023
d694cb5
Thank You
SamuelShally Dec 5, 2023
dbe3a0a
Merge pull request #31 from software-students-fall2023/newBranchThree
SamuelShally Dec 5, 2023
408a2d1
Merge branch 'main' of https://github.com/software-students-fall2023/…
anaspacheco Dec 5, 2023
23546e8
seeing this
anaspacheco Dec 5, 2023
d8e8448
Is Samo mu
SamuelShally Dec 5, 2023
4e68b46
help
SamuelShally Dec 5, 2023
d5cdd0d
format
SamuelShally Dec 5, 2023
3224567
Update README.md
anaspacheco Dec 5, 2023
5c7b6a7
merging
anaspacheco Dec 5, 2023
7892ca4
formatting
anaspacheco Dec 5, 2023
3ade0f7
updating
anaspacheco Dec 5, 2023
b478fc6
Merge pull request #32 from software-students-fall2023/newBranchThree
Lefie Dec 5, 2023
186c9fc
merge
anaspacheco Dec 5, 2023
81fa041
test formt
anaspacheco Dec 5, 2023
8b26f21
Merge pull request #33 from software-students-fall2023/anasofia
Lefie Dec 5, 2023
fdf34d3
Update README.md
anaspacheco Dec 5, 2023
2078222
Update README.md
SamuelShally Dec 5, 2023
84e53aa
Update Main.yaml
SamuelShally Dec 5, 2023
bb3bfd6
Update ml_tests.yml
SamuelShally Dec 5, 2023
a5b0dac
Update README.md
SamuelShally Dec 5, 2023
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
2 changes: 2 additions & 0 deletions .github/read.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The files in this directory contain configuration settings for continuous integration using GitHub Actions (https://docs.github.com/en/actions).
Do not modify the given files, although you are welcome to add additional files as needed.
33 changes: 33 additions & 0 deletions .github/workflows/Main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Webb App CI
on: [push]
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 5
strategy:
matrix:
python-version: ["3.7", "3.9", "3.11"]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install --user pipenv
pipenv --python ${{ matrix.python-version }}
pipenv install pytest
pipenv install pytest-cov --dev
pipenv install
- name: Turn on 'editable' mode
run: |
pipenv install -e .
- name: Test with pytest
run: |
cd $GITHUB_WORKSPACE/web_app
pipenv run python -m pytest
pipenv run python -m pytest --cov=. --cov-report xml --cov-fail-under=80


58 changes: 58 additions & 0 deletions .github/workflows/event-logger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: log github events
on:
push:
branches: [main, master]
pull_request:
types: [opened, closed]
branches: [main, master]
jobs:
log:
runs-on: ubuntu-latest
env:
COMMIT_LOG_API: ${{ secrets.COMMIT_LOG_API }}
COMMITS: ${{ toJSON(github.event.commits) }}
REPOSITORY_URL: ${{ github.repositoryUrl }}
EVENT_TYPE: ${{ github.event_name }}
EVENT_ACTION: ${{ github.event.action }}
EVENT_USERNAME: ${{ github.actor }}
EVENT_EMAIL: "${{ github.event.pull_request.sender.email }}"
PR_MERGED: ${{ github.event.pull_request.merged }}
PR_CREATED_AT: ${{ github.event.pull_request.created_at}}
PR_CLOSED_AT: ${{ github.event.pull_request.closed_at}}
PR_MERGE_USER: ${{ github.event.pull_request.merged_by.login}}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # this is important so git fetches all history.. the actions/checkout by default fetches all history as one commit which throws off stats
- uses: actions/setup-python@v3
with:
python-version: "^3.9"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install --user pipenv
pipenv install pytz
pipenv install python-dateutil
pipenv install build
pipenv install requests
pipenv install gitcommitlogger
- name: Log pull request opened
if: github.event_name == 'pull_request' && github.event.action == 'opened'
run: |
pipenv run gitcommitlogger -r $(echo $REPOSITORY_URL) -t pull_request_opened -d $(echo $PR_CREATED_AT) -un $(echo $EVENT_USERNAME) -o commit_stats.csv -u $(echo $COMMIT_LOG_API) -v
- name: Log pull request closed and merged
if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
run: |
echo $COMMITS > commits.json
cat commits.json # debugging
pipenv run gitcommitlogger -r $(echo $REPOSITORY_URL) -t pull_request_merged -d $(echo $PR_CLOSED_AT) -un $(echo $PR_MERGE_USER) -i commits.json -o commit_stats.csv -u $(echo $COMMIT_LOG_API) -v
- name: Log pull request closed without merge
if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == false
run: |
pipenv run gitcommitlogger -r $(echo $REPOSITORY_URL) -t pull_request_closed -d $(echo $PR_CLOSED_AT) -un $(echo $EVENT_USERNAME) -o commit_stats.csv -u $(echo $COMMIT_LOG_API) -v
- name: Log push
if: github.event_name == 'push'
run: |
echo $COMMITS > commits.json
cat commits.json # debugging
pipenv run gitcommitlogger -r $(echo $REPOSITORY_URL) -t $(echo $EVENT_TYPE) -i commits.json -o commit_stats.csv -u $(echo $COMMIT_LOG_API) -v
27 changes: 27 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: check lint and format
on: [push, pull_request]

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.10"
- name: Install dependencies
if: ${{ hashFiles('**/*.py') != '' }}
run: |
python -m pip install --upgrade pip
python -m pip install pipenv
pipenv sync --dev --python $(which python)
pipenv shell --fancy --python $(which python)
- name: Lint with pylint
if: ${{ hashFiles('**/*.py') != '' }}
run: |
pipenv run pylint **/*.py
- name: Format with black
if: ${{ hashFiles('**/*.py') != '' }}
run: |
pipenv run black --diff --check .
31 changes: 31 additions & 0 deletions .github/workflows/ml_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: ML CI
on: [push]
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 5
strategy:
matrix:
python-version: ["3.7", "3.9", "3.11"]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install --user pipenv
pipenv --python ${{ matrix.python-version }}
pipenv install pytest
pipenv install pytest-cov --dev
pipenv install
- name: Turn on 'editable' mode
run: |
pipenv install -e .
- name: Test with pytest
run: |
cd $GITHUB_WORKSPACE/machine_learning_client
pipenv run python -m pytest
pipenv run python -m pytest --cov=. --cov-report xml --cov-fail-under=80
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# mac junk
.DS_Store

#DB folder
/database/

# visual studio code junk
.vscode/
.vscode/settings.json
Expand Down
28 changes: 28 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
pylint = "*"
black = "*"
tomli = "*"
typing-extensions = "*"
dill = "*"
numpy = "*"
mediapipe = "0.9.0.1"
flask-cors = "*"
tensorflow = "*"
flask = "*"
certifi = "*"
pymongo = "*"
python-dotenv = "*"
pytest = "*"
pytest-mongo = "*"
pip = "*"
install = "*"

[dev-packages]

[requires]
python_version = "3.10"
Loading