Merge branch 'v2.1.0' of https://github.com/ATawzer/Storm into v2.1.0

.cache

@@ -1 +1 @@
-{"access_token": "BQBkKxVUB0Jdq1CsVXQAs_YIKMuL5E3g5rRA0HDS5LUfLFr65M6TGwRbuFs_XNnYSaL_lNDCyAx3vaT6Zq4", "token_type": "Bearer", "expires_in": 3600, "expires_at": 1619799116}
+{"access_token": "BQB1Zxtasy3gJzX9GjnvyMQHsyo-uwhQPULmIPWX0HjICey6XKFMnRuu6YEq6iQxsRyoMHUieT-ZD2hd3tA", "token_type": "Bearer", "expires_in": 3600, "expires_at": 1619802657}

.cache-1241528689

@@ -1 +1 @@
-{"access_token": "BQALtI4LPVoeULK1ejkF-NXl1oi1chGN3E99kz1q05gOwvvUK2_DgeIzMR5Hu9YYAd34If-s8Cea0yvwRSEqH1USBCjYRrtwz0TjdeIFeajWpZWgBZnURzOEhCH9oGCGi7pFRGYZM8vSHpg9r4Qb-9wZF8kN5cMnhddS2_MXC3wN6U5p8hSyzbg3DzSmSFZpvO54bUOXKFeRXoI", "token_type": "Bearer", "expires_in": 3600, "refresh_token": "AQCkRsNDn6OT8xCrrtN9NHlFNBNGGO9WNygnCq-5vr_mM9FuG5ILStdkAPw3mYy3vec2GgoKC7PMn9WKLSA9G1qXBglacLx72YoUU4_Bt05CDFEj6hRIcEKBwp3e39ZViYE", "scope": "playlist-modify-private playlist-modify-public", "expires_at": 1619799315}
+{"access_token": "BQDDwmOADNHL28ksoPakx1obP6sk0NIFUoJb-o8KPT7B9W9sZs7d0yariOcUuKSYZyCh1KiKqWqxSOy34qfEpIanXiE1TxpCY91wOUOGX0J6iQm9Bhl7yfudEAVbdycwSqOq2vup2hKonzCF2HC47HAVhzbcxprVVoXXxuBMOvy-dtyZd4WiEMyinXtuDPgT6YDRJNrxf2nmNQGruXITk-E", "token_type": "Bearer", "expires_in": 3600, "scope": "playlist-modify-private playlist-modify-public", "expires_at": 1619804182, "refresh_token": "AQCkRsNDn6OT8xCrrtN9NHlFNBNGGO9WNygnCq-5vr_mM9FuG5ILStdkAPw3mYy3vec2GgoKC7PMn9WKLSA9G1qXBglacLx72YoUU4_Bt05CDFEj6hRIcEKBwp3e39ZViYE"}

Pipfile

@@ -16,6 +16,7 @@ pyodbc = "*"
 mysql-connector-python = "*"
 sqlalchemy = "*"
 pymysql = "*"
+cryptography = "*"
 
 [dev-packages]
 

src/analytics.py

@@ -139,6 +139,7 @@ def gen_v_run_history(self, storm_names=[]):
  run_df.loc[run["_id"], 'storm_name'] = storm
  run_df.loc[run['_id'], 'run_date'] = run['run_date']
  run_df.loc[run['_id'], 'start_date'] = run['start_date']
+ run_df.loc[run['_id'], 'storm_name'] = storm
 
  # Direct Aggregations
  agg_keys = ['playlists', 'input_tracks', 'input_artists', 'eligible_tracks', 

src/db.py

@@ -3,7 +3,7 @@
 import json
 from pymongo import MongoClient
 import pandas as pd
-import tqdm as tqdm
+from tqdm import tqdm
 import numpy as np
 import datetime as dt
 from timeit import default_timer as timer