andrewkdinh/fund-indicators
1
0
Fork 0
mirror of https://github.com/andrewkdinh/fund-indicators.git synced 2024-11-23 18:14:21 -08:00
Code Issues Releases Wiki Activity

Changed fetch to GET

Browse Source 
Fixed error-handling for retrieinv indicator data
This commit is contained in:
Andrew Dinh 2019-04-23 20:56:32 -07:00
parent fa0a7f158f
commit b576c74b75
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Functions.py
View File

@ -96,7 +96,7 @@ def getJoke():
'User-Agent': 'fund-indicators (https://github.com/andrewkdinh/fund-indicators)'} 'User-Agent': 'fund-indicators (https://github.com/andrewkdinh/fund-indicators)'}
url = 'https://icanhazdadjoke.com' url = 'https://icanhazdadjoke.com'
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url, f = requests.get(url,
headers=headers).json() headers=headers).json()
@ -226,7 +226,7 @@ def getWeather():
with requests_cache.disabled(): with requests_cache.disabled():
url = 'https://wttr.in?format=3' url = 'https://wttr.in?format=3'
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url) f = requests.get(url)
print('') print('')

51
main.py
View File

@ -1,11 +1,11 @@
''' '''
__ _ _ _ _ _ __ _ _ _ _ _
/ _| | | (_) | (_) | | / _| | | (_) | (_) | |
| |_ _ _ _ __ __| | ______ _ _ __ __| |_ ___ __ _| |_ ___ _ __ ___ | |_ _ _ _ __ __| | ______ _ _ __ __| |_ ___ __ _| |_ ___ _ __ ___
| _| | | | '_ \ / _` | |______| | | '_ \ / _` | |/ __/ _` | __/ _ \| '__/ __| | _| | | | '_ \ / _` | |______| | | '_ \ / _` | |/ __/ _` | __/ _ \| '__/ __|
| | | |_| | | | | (_| | | | | | | (_| | | (_| (_| | || (_) | | \__ \ | | | |_| | | | | (_| | | | | | | (_| | | (_| (_| | || (_) | | \__ \
|_| \__,_|_| |_|\__,_| |_|_| |_|\__,_|_|\___\__,_|\__\___/|_| |___/ |_| \__,_|_| |_|\__,_| |_|_| |_|\__,_|_|\___\__,_|\__\___/|_| |___/
Project homepage: https://github.com/andrewkdinh/fund-indicators Project homepage: https://github.com/andrewkdinh/fund-indicators
Author: Andrew Dinh <fund-indicators@andrewkdinh.com> Author: Andrew Dinh <fund-indicators@andrewkdinh.com>
@ -105,7 +105,7 @@ class Stock:
removeOutliers = True removeOutliers = True
sourceList = ['Yahoo', 'Alpha Vantage', 'IEX', 'Tiingo'] sourceList = ['Yahoo', 'Alpha Vantage', 'IEX', 'Tiingo']
plotIndicatorRegression = False plotIndicatorRegression = False
timePlotIndicatorRegression = 5 # seconds timePlotIndicatorRegression = 5 # seconds
config = 'N/A' config = 'N/A'
# BENCHMARK VALUES # BENCHMARK VALUES
@ -162,7 +162,7 @@ class Stock:
url = ''.join( url = ''.join(
('https://api.iextrading.com/1.0/stock/', self.name, '/chart/5y')) ('https://api.iextrading.com/1.0/stock/', self.name, '/chart/5y'))
# link = "https://api.iextrading.com/1.0/stock/spy/chart/5y" # link = "https://api.iextrading.com/1.0/stock/spy/chart/5y"
cprint("Fetch:" + url, 'white', attrs=['dark']) cprint("GET:" + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url) f = requests.get(url)
Functions.fromCache(f) Functions.fromCache(f)
@ -201,7 +201,7 @@ class Stock:
self.name, '&outputsize=full&apikey=', apiAV)) self.name, '&outputsize=full&apikey=', apiAV))
# https://www.alphavantage.co/query?function=TIME_SERIES_DAILY_ADJUSTED&symbol=MSFT&outputsize=full&apikey=demo # https://www.alphavantage.co/query?function=TIME_SERIES_DAILY_ADJUSTED&symbol=MSFT&outputsize=full&apikey=demo
cprint("Fetch:" + url, 'white', attrs=['dark']) cprint("GET:" + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url) f = requests.get(url)
Functions.fromCache(f) Functions.fromCache(f)
@ -238,7 +238,7 @@ class Stock:
'Authorization': token 'Authorization': token
} }
url = ''.join(('https://api.tiingo.com/tiingo/daily/', self.name)) url = ''.join(('https://api.tiingo.com/tiingo/daily/', self.name))
cprint("Fetch:" + url, 'white', attrs=['dark']) cprint("GET:" + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url, headers=headers) f = requests.get(url, headers=headers)
Functions.fromCache(f) Functions.fromCache(f)
@ -260,7 +260,7 @@ class Stock:
url2 = ''.join((url, '/prices?startDate=', url2 = ''.join((url, '/prices?startDate=',
firstDate, '&endDate=', lastDate)) firstDate, '&endDate=', lastDate))
# https://api.tiingo.com/tiingo/daily/<ticker>/prices?startDate=2012-1-1&endDate=2016-1-1 # https://api.tiingo.com/tiingo/daily/<ticker>/prices?startDate=2012-1-1&endDate=2016-1-1
cprint("\nFetch:" + url2 + '\n', 'white', attrs=['dark']) cprint("\nGET:" + url2 + '\n', 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
requestResponse2 = requests.get(url2, headers=headers) requestResponse2 = requests.get(url2, headers=headers)
Functions.fromCache(requestResponse2) Functions.fromCache(requestResponse2)
@ -287,7 +287,7 @@ class Stock:
def Yahoo(self): def Yahoo(self):
url = ''.join(('https://finance.yahoo.com/quote/', url = ''.join(('https://finance.yahoo.com/quote/',
self.name, '?p=', self.name)) self.name, '?p=', self.name))
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
t = requests.get(url) t = requests.get(url)
Functions.fromCache(t) Functions.fromCache(t)
@ -585,18 +585,20 @@ class Stock:
str(i) + ' seconds \r') str(i) + ' seconds \r')
plt.pause(1) plt.pause(1)
sys.stdout.flush() sys.stdout.flush()
sys.stdout.write(' \r') sys.stdout.write(
' \r')
sys.stdout.flush() sys.stdout.flush()
plt.close() plt.close()
except: except:
sys.stdout.write(' \r') sys.stdout.write(
' \r')
sys.stdout.flush() sys.stdout.flush()
def scrapeYahooFinance(self): def scrapeYahooFinance(self):
# Determine if ETF, Mutual fund, or stock # Determine if ETF, Mutual fund, or stock
url = ''.join(('https://finance.yahoo.com/quote/', url = ''.join(('https://finance.yahoo.com/quote/',
self.name, '?p=', self.name)) self.name, '?p=', self.name))
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
t = requests.get(url) t = requests.get(url)
Functions.fromCache(t) Functions.fromCache(t)
@ -608,7 +610,7 @@ class Stock:
stockType = '' stockType = ''
url2 = ''.join(('https://finance.yahoo.com/lookup?s=', self.name)) url2 = ''.join(('https://finance.yahoo.com/lookup?s=', self.name))
cprint('Fetch:' + url2, 'white', attrs=['dark']) cprint('GET:' + url2, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
x = requests.get(url2) x = requests.get(url2)
raw_html = x.text raw_html = x.text
@ -766,7 +768,7 @@ class Stock:
url = ''.join(('https://finance.yahoo.com/quote/', url = ''.join(('https://finance.yahoo.com/quote/',
self.name, '/profile?p=', self.name)) self.name, '/profile?p=', self.name))
# https://finance.yahoo.com/quote/SPY/profile?p=SPY # https://finance.yahoo.com/quote/SPY/profile?p=SPY
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
t = requests.get(url) t = requests.get(url)
Functions.fromCache(t) Functions.fromCache(t)
@ -980,7 +982,7 @@ def stocksInit():
url = 'https://www.kiplinger.com/tool/investing/T041-S001-top-performing-mutual-funds/index.php' url = 'https://www.kiplinger.com/tool/investing/T041-S001-top-performing-mutual-funds/index.php'
headers = { headers = {
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36'} 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36'}
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url, headers=headers) f = requests.get(url, headers=headers)
Functions.fromCache(f) Functions.fromCache(f)
@ -1007,7 +1009,7 @@ def stocksInit():
url = 'https://www.thestreet.com/topic/21421/top-rated-mutual-funds.html' url = 'https://www.thestreet.com/topic/21421/top-rated-mutual-funds.html'
headers = { headers = {
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36'} 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36'}
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url, headers=headers) f = requests.get(url, headers=headers)
Functions.fromCache(f) Functions.fromCache(f)
@ -1037,7 +1039,7 @@ def stocksInit():
url = 'http://money.com/money/4616747/best-mutual-funds-etfs-money-50/' url = 'http://money.com/money/4616747/best-mutual-funds-etfs-money-50/'
headers = { headers = {
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36'} 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36'}
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url, headers=headers) f = requests.get(url, headers=headers)
Functions.fromCache(f) Functions.fromCache(f)
@ -1070,7 +1072,7 @@ def stocksInit():
url = 'https://www.investors.com/etfs-and-funds/mutual-funds/best-mutual-funds-beating-sp-500-over-last-1-3-5-10-years/' url = 'https://www.investors.com/etfs-and-funds/mutual-funds/best-mutual-funds-beating-sp-500-over-last-1-3-5-10-years/'
headers = { headers = {
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36'} 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36'}
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url, headers=headers) f = requests.get(url, headers=headers)
Functions.fromCache(f) Functions.fromCache(f)
@ -1147,7 +1149,7 @@ def asyncData(benchmark, listOfStocks):
def sendAsync(url): def sendAsync(url):
time.sleep(random.randrange(0, 2)) time.sleep(random.randrange(0, 2))
cprint('Fetch:' + url, 'white', attrs=['dark']) cprint('GET:' + url, 'white', attrs=['dark'])
requests.get(url) requests.get(url)
return return
@ -1210,7 +1212,7 @@ def riskFreeRate():
('https://www.quandl.com/api/v3/datasets/USTREASURY/LONGTERMRATES.json?api_key=', apiQuandl)) ('https://www.quandl.com/api/v3/datasets/USTREASURY/LONGTERMRATES.json?api_key=', apiQuandl))
# https://www.quandl.com/api/v3/datasets/USTREASURY/LONGTERMRATES.json?api_key=KUh3U3hxke9tCimjhWEF # https://www.quandl.com/api/v3/datasets/USTREASURY/LONGTERMRATES.json?api_key=KUh3U3hxke9tCimjhWEF
cprint('\nFetch:' + url, 'white', attrs=['dark']) cprint('\nGET:' + url, 'white', attrs=['dark'])
with Halo(spinner='dots'): with Halo(spinner='dots'):
f = requests.get(url) f = requests.get(url)
Functions.fromCache(f) Functions.fromCache(f)
@ -1480,9 +1482,10 @@ def indicatorMain(listOfStocks):
listOfStocks[i]) listOfStocks[i])
except: except:
print('Error retrieving indicator data') print('Error retrieving indicator data')
print('\nWould you like to enter a ' + str(Stock.indicator) + ' value for ' + str(listOfStocks[i].name) + '?') print('\nWould you like to enter a ' + str(Stock.indicator.lower()
) + ' value for ' + str(listOfStocks[i].name) + '?')
r = Functions.trueOrFalse() r = Functions.trueOrFalse()
if r is True: if r is False:
listOfStocks[i].indicatorValue = 'Remove' listOfStocks[i].indicatorValue = 'Remove'
else: else:
listOfStocks[i].indicatorValue = 'N/A' listOfStocks[i].indicatorValue = 'N/A'
@ -1764,7 +1767,7 @@ def main():
runningProgram = continueProgram() runningProgram = continueProgram()
print('') print('')
print('Goodbye!') print('Goodbye!\n')
exit() exit()