Merge branch 'master' into RDS-postgres

zwarshavsky · Feb 20, 2020 · a7cfe0c · a7cfe0c
2 parents 0623293 + 82a6444
commit a7cfe0c
Show file tree

Hide file tree

Showing 55 changed files with 93,871 additions and 57,911 deletions.
diff --git a/.gitignore b/.gitignore
@@ -93,8 +93,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
-spotipy/spotipy_test/
-Flask_AWS/SOUNDDRIP/sounddrip/
 
 # Spyder project settings
 .spyderproject
@@ -111,8 +109,25 @@ Flask_AWS/SOUNDDRIP/sounddrip/
 
 data_collection/env_vars.py
 data_collection/final_data/DF_v1.pkl
-Flask_AWS/SOUNDDRIP/flask_app.zip
 Flask_AWS/SOUNDDRIP/zip_for_aws_sample/flask_app.zip
-data_collection/song_list_v2_backup.db
+data_collection/song_list.db
+data_collection/song_list copy.db
+data_collection/for_backend/song_list4.sqlite3
 data_collection/final_data/DF_v2.pkl
+data_collection/song_list_v2 copy.db
 data_collection/song_list_v2.db
+data_collection/song_list_v2_backup.db
+data_collection/final_data/DF_v3.pkl
+model_notebooks/DF_v3.pkl
+data_collection/song_list_v3.db
+data_collection/final_data/DF_v4.pkl
+model_notebooks/DF_genres_hashed.pkl
+model_notebooks/DF_v4.pkl
+model_notebooks/data/X_array.pkl
+model_notebooks/data/song_list_v4_hashed.pkl
+model_notebooks/data/song_list_v5_hashed.pkl
+model_notebooks/data/DF_Genres_List_v1.pkl
+model_notebooks/song_list_v4_hashed.pkl
+model_notebooks/song_list_v4_hashed (1).pkl
+model_notebooks/DBSCAN_Model.pkl
+Flask_AWS/SOUNDDRIP/sounddrip/
diff --git a/Flask_AWS/SOUNDDRIP/application.py b/Flask_AWS/SOUNDDRIP/application.py
@@ -3,12 +3,14 @@
 from flask import (Flask, render_template, request,
                    make_response,
                    jsonify)
+from flask_cors import CORS
 
 from models.predict import predictfunc, get_id, get_features, instantiate_sp
 
 
 # Create Flask app. Should use "application" as variable name for AWS
 application = Flask(__name__)
+CORS(application)
 
 
 

diff --git a/Flask_AWS/SOUNDDRIP/requirements.txt b/Flask_AWS/SOUNDDRIP/requirements.txt
@@ -2,6 +2,7 @@ certifi==2019.11.28
 chardet==3.0.4
 click==6.7
 Flask==1.1.1
+Flask-Cors==3.0.8
 gunicorn==20.0.4
 heroku3==4.2.1
 idna==2.8

diff --git a/Flask_API/Pipfile → _archive_Flask_API_Heroku/Pipfile b/Flask_API/Pipfile → _archive_Flask_API_Heroku/Pipfile
diff --git a/Flask_API/Pipfile.lock → _archive_Flask_API_Heroku/Pipfile.lock b/Flask_API/Pipfile.lock → _archive_Flask_API_Heroku/Pipfile.lock
diff --git a/Flask_API/Procfile → _archive_Flask_API_Heroku/Procfile b/Flask_API/Procfile → _archive_Flask_API_Heroku/Procfile
diff --git a/Flask_API/SOUNDDRIP/__init__.py → ...ve_Flask_API_Heroku/SOUNDDRIP/__init__.py b/Flask_API/SOUNDDRIP/__init__.py → ...ve_Flask_API_Heroku/SOUNDDRIP/__init__.py
diff --git a/Flask_API/SOUNDDRIP/app.py → _archive_Flask_API_Heroku/SOUNDDRIP/app.py b/Flask_API/SOUNDDRIP/app.py → _archive_Flask_API_Heroku/SOUNDDRIP/app.py
diff --git a/...k_API/SOUNDDRIP/data/song_id_list2.joblib → ...eroku/SOUNDDRIP/data/song_id_list2.joblib b/...k_API/SOUNDDRIP/data/song_id_list2.joblib → ...eroku/SOUNDDRIP/data/song_id_list2.joblib
diff --git a/Flask_API/SOUNDDRIP/data/song_id_list2.pkl → ...I_Heroku/SOUNDDRIP/data/song_id_list2.pkl b/Flask_API/SOUNDDRIP/data/song_id_list2.pkl → ...I_Heroku/SOUNDDRIP/data/song_id_list2.pkl
diff --git a/Flask_API/SOUNDDRIP/misc/robots.txt → ...lask_API_Heroku/SOUNDDRIP/misc/robots.txt b/Flask_API/SOUNDDRIP/misc/robots.txt → ...lask_API_Heroku/SOUNDDRIP/misc/robots.txt
diff --git a/Flask_API/SOUNDDRIP/models/model2.joblib → ...API_Heroku/SOUNDDRIP/models/model2.joblib b/Flask_API/SOUNDDRIP/models/model2.joblib → ...API_Heroku/SOUNDDRIP/models/model2.joblib
diff --git a/Flask_API/SOUNDDRIP/models/original_model.py → ...Heroku/SOUNDDRIP/models/original_model.py b/Flask_API/SOUNDDRIP/models/original_model.py → ...Heroku/SOUNDDRIP/models/original_model.py
diff --git a/Flask_API/SOUNDDRIP/models/predict.py → ...sk_API_Heroku/SOUNDDRIP/models/predict.py b/Flask_API/SOUNDDRIP/models/predict.py → ...sk_API_Heroku/SOUNDDRIP/models/predict.py
diff --git a/Flask_API/SOUNDDRIP/models/scalar2.joblib → ...PI_Heroku/SOUNDDRIP/models/scalar2.joblib b/Flask_API/SOUNDDRIP/models/scalar2.joblib → ...PI_Heroku/SOUNDDRIP/models/scalar2.joblib
diff --git a/Flask_API/SOUNDDRIP/test.py → _archive_Flask_API_Heroku/SOUNDDRIP/test.py b/Flask_API/SOUNDDRIP/test.py → _archive_Flask_API_Heroku/SOUNDDRIP/test.py
diff --git a/Flask_API/requirements.txt → _archive_Flask_API_Heroku/requirements.txt b/Flask_API/requirements.txt → _archive_Flask_API_Heroku/requirements.txt
diff --git a/Flask_API/runtime.txt → _archive_Flask_API_Heroku/runtime.txt b/Flask_API/runtime.txt → _archive_Flask_API_Heroku/runtime.txt
diff --git a/data_collection/.cache-basslaughter b/data_collection/.cache-basslaughter
@@ -1 +1 @@
-{"access_token": "BQCFw6c8mbhbrRhloc1eKRUzc7FqF2tFROc0SF7je07DiVIB4uosYNqxh8KsBs8-ypBnibBchF-1DyFn-dtee8NHYugxHVQcc8GBS4qGcsuXkUSb9WEr2gSRFJEfqDegUYOGJJsF_t6QIHX8Iio_HdsRlClW0L6-LOJdYvr4otMB5H5m6QopDKYGaeBMb07sq0zvoN_G-A", "token_type": "Bearer", "expires_in": 3600, "scope": "user-library-read", "expires_at": 1580873201, "refresh_token": "AQCUOvAnslnlnGaRpTpdCjjh7Ol3wqR2MU2o4Sb7Fe7epSe8R424g1X4AVXs2Q00oGaZ8hA_qVPS9a6dUJsDYBAZHTfnTD3qX_tS4ZP7YhB-4blOSiHn_OuDMJyNVxQ5Qj4"}
+{"access_token": "BQBpAiCkX8OjtTDoJW26RwdMF8Ww3saqGoF9J5Fkaqli9s1ZVJ54jgB_JZH3bAyBQ8vM8Pa0fxSjuR2vhPR43NSD8BMQ3pLGkJ0UVOQiIbiiQYYAVVUld-SQOgYxsjiKD0bN3hDKgLWU1EfdcVvK5dZKzt0Ku9gb0jSeVxl53cn7xHXKAcvkPLrjlQzrIA-bVqNiR1kaRg", "token_type": "Bearer", "expires_in": 3600, "scope": "user-library-read", "expires_at": 1580945037, "refresh_token": "AQCUOvAnslnlnGaRpTpdCjjh7Ol3wqR2MU2o4Sb7Fe7epSe8R424g1X4AVXs2Q00oGaZ8hA_qVPS9a6dUJsDYBAZHTfnTD3qX_tS4ZP7YhB-4blOSiHn_OuDMJyNVxQ5Qj4"}
diff --git a/data_collection/Adding Genre.ipynb b/data_collection/Adding Genre.ipynb
diff --git a/data_collection/Pipfile b/data_collection/Pipfile
@@ -9,6 +9,7 @@ verify_ssl = true
 pandas = "*"
 ipykernel = "*"
 spotipy = "*"
+sqlalchemy = "*"
 
 [requires]
 python_version = "3.7"
diff --git a/data_collection/Pipfile.lock b/data_collection/Pipfile.lock
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"access_token": "BQCFw6c8mbhbrRhloc1eKRUzc7FqF2tFROc0SF7je07DiVIB4uosYNqxh8KsBs8-ypBnibBchF-1DyFn-dtee8NHYugxHVQcc8GBS4qGcsuXkUSb9WEr2gSRFJEfqDegUYOGJJsF_t6QIHX8Iio_HdsRlClW0L6-LOJdYvr4otMB5H5m6QopDKYGaeBMb07sq0zvoN_G-A", "token_type": "Bearer", "expires_in": 3600, "scope": "user-library-read", "expires_at": 1580873201, "refresh_token": "AQCUOvAnslnlnGaRpTpdCjjh7Ol3wqR2MU2o4Sb7Fe7epSe8R424g1X4AVXs2Q00oGaZ8hA_qVPS9a6dUJsDYBAZHTfnTD3qX_tS4ZP7YhB-4blOSiHn_OuDMJyNVxQ5Qj4"}
		{"access_token": "BQBpAiCkX8OjtTDoJW26RwdMF8Ww3saqGoF9J5Fkaqli9s1ZVJ54jgB_JZH3bAyBQ8vM8Pa0fxSjuR2vhPR43NSD8BMQ3pLGkJ0UVOQiIbiiQYYAVVUld-SQOgYxsjiKD0bN3hDKgLWU1EfdcVvK5dZKzt0Ku9gb0jSeVxl53cn7xHXKAcvkPLrjlQzrIA-bVqNiR1kaRg", "token_type": "Bearer", "expires_in": 3600, "scope": "user-library-read", "expires_at": 1580945037, "refresh_token": "AQCUOvAnslnlnGaRpTpdCjjh7Ol3wqR2MU2o4Sb7Fe7epSe8R424g1X4AVXs2Q00oGaZ8hA_qVPS9a6dUJsDYBAZHTfnTD3qX_tS4ZP7YhB-4blOSiHn_OuDMJyNVxQ5Qj4"}