Merge branch 'development'

api_caller.py

@@ -42,7 +42,7 @@ def readCSV(file_path, max_stocks):
                 symbols.append(symbol)
                 stock_info[symbol] = []
         else:
-            print('max stocks exceeded')
+            
             break
             
     f.close()
@@ -60,7 +60,7 @@ def readCryptoCSV(file_path, max_crypto):
     i = 0
     unique_bases = []
     for row in CSV:
-        print(row)
+    
         if i < max_crypto:
             
             i += 1
@@ -80,7 +80,7 @@ def readCryptoCSV(file_path, max_crypto):
                 names.append(name)
                 stock_info[name] = [symbol, base]
         else:
-            print(i, max_crypto, 'max crypto exceeded')
+
             break
             
     f.close()
@@ -122,7 +122,7 @@ def updateStockPricesFinhubb():
             CSV.write(symbol + ',' + str(current_prices[i]) + ',' +  str(opening_prices[i]) + '\n')
         CSV.close()
         
-        print('API called successfully')
+
             
     except Exception as e:
         
@@ -133,7 +133,7 @@ def updateStockPricesFinhubb():
         logf.write('. line: ' +  str(exc_tb.tb_lineno))
         logf.write('. type: ' +  str(exc_type))
         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-        print(e)
+
         
 
 def updateStockPrices():
@@ -143,35 +143,12 @@ def updateStockPrices():
     max_stocks = 200
     symbols, stock_info = readCSV('csv/tickers.csv', max_stocks)
     try:
-        '''
-        symbols_str = ','.join(symbols)
-        print(symbols)
-        print(symbols_str)
-        method = 'GET'
-        host = 'https://cloud.iexapis.com/stable'
-        lastEndpoint = '/tops/last'
-        querystring = '?symbols=' + symbols_str +'&token='+iexAPIkey
-        
-        last_request_url = host + lastEndpoint + querystring
-        
-        
-        print('\nBEGIN REQUEST++++++++++++++++++++++++++++++++++++')
-        print('Request URL = ' + last_request_url)
-        last_response = requests.get(last_request_url)
-        print('done')
-        if last_response.status_code == 200:
-            print('last success')
-        
-        
-        for stock in last_response.json():
-            current_prices.append(stock['price'])
-            
-        '''
+    
         
         current_prices = []
         opening_prices = []
         for symbol in symbols:
-            print(symbol)
+            
             method = 'GET'
             host = 'https://cloud.iexapis.com/stable'
           
@@ -179,20 +156,12 @@ def updateStockPrices():
             querystring = '?chartIEXOnly=true&token='+iexAPIkey
 
             intraday_request_url = host + intradayEndpoint + querystring
-            
-            print('\nBEGIN REQUEST++++++++++++++++++++++++++++++++++++')
-            print('Request URL = ' + intraday_request_url)
+           
             intraday_response = requests.get(intraday_request_url)
             
-            print('\nRESPONSE++++++++++++++++++++++++++++++++++++')
-            print('Response code: \n',intraday_response)
-           
-                
-            #print(intraday_response.text)
             
             for i in range(len(intraday_response.json())):
                 opn = intraday_response.json()[i]['open']
-                print(opn)
                 if opn is not None:
                     break
             for i in range(len(intraday_response.json())-1, 0, -1):
@@ -203,12 +172,6 @@ def updateStockPrices():
                     
             opening_prices.append(opn)
             current_prices.append(current)
-            print(opn, current)
-            '''
-            for time_point in intraday_response.json():
-                print(time_point['date'])
-                print(time_point['open'])
-            '''
         
         CSV = open('csv/tickers.csv', 'w+')
         CSV.write('name,current,opening\n')
@@ -237,13 +200,11 @@ def updateCrypto():
     coins, coin_info, unique_bases = readCryptoCSV('csv/crypto.csv', max_crypto)
     try:
         response = coingecko_client.get_price(ids=','.join(coins), vs_currencies = unique_bases, include_24hr_change=True)
-        print(response)
         CSV = open('csv/crypto.csv', 'w+')
         CSV.write('symbol,name,base,current,24hr change\n')
         
         for coin in coins:
             info = coin_info[coin]
-            print(info)
             
             CSV.write(info[0] + ',' + coin + ',' + info[1] + ',' +str(response[coin][info[1]]) + ',' +  str(response[coin]['usd_24h_change']) + '\n')
         CSV.close()
@@ -255,7 +216,6 @@ def updateCrypto():
         logf.write('. line: ' +  str(exc_tb.tb_lineno))
         logf.write('. type: ' +  str(exc_type))
         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-        print(e)
 
 
 def updateNews():
@@ -295,7 +255,7 @@ def updateNews():
         logf.write('. line: ' +  str(exc_tb.tb_lineno))
         logf.write('. type: ' +  str(exc_type))
         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-        print(e)
+
     
 def updateWeather():
     max_cities = 30
@@ -371,7 +331,6 @@ def updateWeather():
         logf.write('. line: ' +  str(exc_tb.tb_lineno))
         logf.write('. type: ' +  str(exc_type))
         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-        print(e)
             
             
 def updateForex():
@@ -410,7 +369,7 @@ def updateForex():
         logf.write('. line: ' +  str(exc_tb.tb_lineno))
         logf.write('. type: ' +  str(exc_type))
         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-        print(e)
+
     
 def updateLeagueTable(api_key, league_id):
     try:
@@ -427,8 +386,7 @@ def updateLeagueTable(api_key, league_id):
         for i in range(len(all_data['table'])):
             team = {}
             
-            if all_data['table'][i]['strTeam'] == "Calgary Flames":
-                print(all_data['table'][i]['dateUpdated'], all_data['table'][i]['intPoints'])
+           
                 
             team['name'] = all_data['table'][i]['strTeam']
             team['wins'] = all_data['table'][i]['intWin']
@@ -459,7 +417,7 @@ def updateLeagueTable(api_key, league_id):
         logf.write('. line: ' +  str(exc_tb.tb_lineno))
         logf.write('. type: ' +  str(exc_type))
         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-        print(e)
+
     
 def updateLeagueEvents(api_key, league_id, time):
     
@@ -516,7 +474,7 @@ def updateLeagueEvents(api_key, league_id, time):
         logf.write('. line: ' +  str(exc_tb.tb_lineno))
         logf.write('. type: ' +  str(exc_type))
         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-        print(e)
+      
 
 def updateSports():
     #read user settings to decide which sprots to update
@@ -533,7 +491,7 @@ def updateSports():
         updateLeagueEvents(api_key, i, 'future') 
     
     
-    print('sports updated')
+
     updateLeagueTable(api_key, prem_id)
 
     'https://www.thesportsdb.com/api/v1/json/{}/eventsnext.php?id=133602'.format(api_key)  # next five events by team ID (paid)  use this for upcoming team games
@@ -585,14 +543,7 @@ if __name__ == '__main__':
     logf = open("log.txt", "w")
     
     t = time.time()
-    '''
-    updateStockPrices()
-    print('finnhub:',time.time() -t)
-    t = time.time()
-    updateStockPricesIEX()
-    print('iex:', time.time() -t)
-    sys.exit()
-    '''
+    
     max_stocks = 200
     max_crypto = 100
     
@@ -714,6 +665,6 @@ if __name__ == '__main__':
         logf.write('. line: ' +  str(exc_tb.tb_lineno))
         logf.write('. type: ' +  str(exc_type))
         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-        print(e)
+        
             
      

csv/crypto.csv

@@ -1,4 +1,4 @@
 symbol,name,base,current,24hr change
-BTC,bitcoin,usd,32853,-5.123452021886864
-ETH,ethereum,gbp,1569.89,-8.265398243169946
-DOGE,dogecoin,usd,0.213477,-7.950182857591908
+BTC,bitcoin,usd,32909,-5.27349177462667
+ETH,ethereum,gbp,1567.8,-8.93621241035941
+DOGE,dogecoin,usd,0.211789,-8.771137919593707

csv/current_weather.json

@@ -1 +1 @@
-[{"main_weather": "Clear", "description": "clear sky", "temp": 29, "min_temp": 27.5, "max_temp": 29.88, "feels_like": 35.18, "humidity": 82, "clouds": 6, "wind_speed": 1.79, "wind_direction": 130, "visibility": 10000, "uv": 0, "rain_chance": 0}, {"main_weather": "Clouds", "description": "few clouds", "temp": 19.7, "min_temp": 12.56, "max_temp": 21.29, "feels_like": 19.68, "humidity": 75, "clouds": 20, "wind_speed": 4.12, "wind_direction": 220, "visibility": 10000, "uv": 1.21, "rain_chance": 0.82}]
+[{"main_weather": "Clear", "description": "clear sky", "temp": 28.37, "min_temp": 28.14, "max_temp": 30.06, "feels_like": 34.15, "humidity": 86, "clouds": 5, "wind_speed": 0.45, "wind_direction": 281, "visibility": 10000, "uv": 0, "rain_chance": 0}, {"main_weather": "Clouds", "description": "broken clouds", "temp": 19.26, "min_temp": 12.56, "max_temp": 21.12, "feels_like": 19.25, "humidity": 77, "clouds": 57, "wind_speed": 3.09, "wind_direction": 230, "visibility": 10000, "uv": 0.18, "rain_chance": 0.3}]

csv/daily_weather.json

@@ -1 +1 @@
-[[{"main_weather": "Clear", "description": "clear sky", "min_temp": 27.5, "max_temp": 29.88}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.19, "max_temp": 29.67}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.74, "max_temp": 29.76}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.93, "max_temp": 29.66}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.79, "max_temp": 29.39}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.85, "max_temp": 29.43}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.77, "max_temp": 29.71}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.58, "max_temp": 29.86}], [{"main_weather": "Rain", "description": "light rain", "min_temp": 12.56, "max_temp": 21.29}, {"main_weather": "Clouds", "description": "scattered clouds", "min_temp": 13.75, "max_temp": 22.24}, {"main_weather": "Rain", "description": "light rain", "min_temp": 13.6, "max_temp": 16.97}, {"main_weather": "Rain", "description": "light rain", "min_temp": 12.32, "max_temp": 20.09}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 14.42, "max_temp": 16.14}, {"main_weather": "Rain", "description": "light rain", "min_temp": 12.53, "max_temp": 21.98}, {"main_weather": "Rain", "description": "light rain", "min_temp": 14.85, "max_temp": 17.18}, {"main_weather": "Clouds", "description": "few clouds", "min_temp": 13.16, "max_temp": 20.6}]]
+[[{"main_weather": "Clear", "description": "clear sky", "min_temp": 28.14, "max_temp": 30.06}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 27.59, "max_temp": 29.94}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.95, "max_temp": 29.92}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.98, "max_temp": 30.06}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.99, "max_temp": 29.64}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.95, "max_temp": 29.61}, {"main_weather": "Clouds", "description": "scattered clouds", "min_temp": 27.89, "max_temp": 30}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.51, "max_temp": 30}], [{"main_weather": "Rain", "description": "light rain", "min_temp": 12.56, "max_temp": 21.12}, {"main_weather": "Clouds", "description": "broken clouds", "min_temp": 12.98, "max_temp": 21.57}, {"main_weather": "Rain", "description": "light rain", "min_temp": 13.06, "max_temp": 15.61}, {"main_weather": "Rain", "description": "light rain", "min_temp": 11.89, "max_temp": 19.79}, {"main_weather": "Rain", "description": "heavy intensity rain", "min_temp": 13.67, "max_temp": 16.51}, {"main_weather": "Rain", "description": "light rain", "min_temp": 13.47, "max_temp": 21.12}, {"main_weather": "Rain", "description": "light rain", "min_temp": 13.57, "max_temp": 22.15}, {"main_weather": "Rain", "description": "light rain", "min_temp": 14.44, "max_temp": 22.67}]]

csv/last_updates.json

@@ -1 +1 @@
-{"stocks": "08/07/2021 12:56:04", "crypto": "08/07/2021 12:56:08", "news": "08/07/2021 12:56:09", "weather": "08/07/2021 12:56:08", "forex": "08/07/2021 18:56:19", "sports": "08/07/2021 12:56:10"}
+{"stocks": "08/07/2021 15:27:24", "crypto": "08/07/2021 15:27:24", "news": "08/07/2021 15:27:24", "weather": "08/07/2021 15:27:24", "forex": "08/07/2021 21:27:24", "sports": "08/07/2021 15:27:24"}

csv/news.csv

@@ -1,21 +1,21 @@
 headline,source,date,time
-Why I'm Confident Nnamdi Kanu Will Soon Be Released—IPOB Leader's Lawyer - SaharaReporters.com,Saharareporters.com,2021-07-08,14:35:35Z
-Tokyo Olympics will be held without spectators^ under a state of emergency - Stuff.co.nz,Stuff.co.nz,2021-07-08,14:34:00Z
-Venus^ Mars and crescent moon to align in 'planetary conjunction' during 12-13 July - Firstpost,Firstpost,2021-07-08,14:27:07Z
-Death toll in Surfside building collapse rises to 60 after search efforts turn from rescue to recovery - CNN ,CNN,2021-07-08,14:25:00Z
-DOF to WB: Recall 'outdated report' on PHL education | Bernadette D. Nicolas and Cai Ordinario - Business Mirror,Businessmirror.com.ph,2021-07-08,14:24:42Z
-‘Huge leap’ for NASA’s Mars helicopter ushers new mission support role - The Verge,The Verge,2021-07-08,14:23:02Z
-Human body size shaped by climate^ evolutionary study shows - The Guardian,The Guardian,2021-07-08,14:23:00Z
-Spectators banned from Tokyo Olympic Games - CBC.ca,CBC News,2021-07-08,14:21:56Z
-Study Analyzes the Impact of Atmospheric Acidity on Ocean Ecology - AZoCleantech,AZoCleantech,2021-07-08,14:16:00Z
-Stellantis makes 30 billion euro wager on electric vehicle market - Reuters,Reuters,2021-07-08,14:10:00Z
-Over half of Ontario adults fully vaccinated against COVID-19; province to receive 5 million more doses in July - CP24 Toronto's Breaking News,CP24 Toronto's Breaking News,2021-07-08,14:06:03Z
-Transfer news: Fabrizio Romano confirms Arsenal signing is "really imminent" - GIVEMESPORT,GIVEMESPORT,2021-07-08,14:00:00Z
-Japan: Olympics to take place without spectators as state of emergency declared - The Irish Times,The Irish Times,2021-07-08,13:56:57Z
-Ram Teases Electric 1500 Pickup Truck Coming In 2024 - InsideEVs ,InsideEVs ,2021-07-08,13:49:00Z
-First meeting of PM Modi's new Cabinet focusses on agriculture^ health sectors - Times of India,The Times of India,2021-07-08,13:45:00Z
-Animal lovers up in arms after abuse of two-month-old puppy - The Star Online,The Star Online,2021-07-08,13:45:00Z
-South Africa's MeerKAT discovers treasure trove of galaxies - TechCentral,TechCentral,2021-07-08,13:43:28Z
-Delta variant growth likely to ‘outmatch’ vaccine supply in coming weeks – Reid - The Irish Times,The Irish Times,2021-07-08,13:43:02Z
-Singapore's largest E-sports Experience Centre opens at Kallang Wave Mall - The Straits Times,The Straits Times,2021-07-08,13:42:55Z
-Naya Rivera: A look back at the events leading to the star's tragic death - Fox News,Fox News,2021-07-08,13:41:33Z
+Scientists reveal how cauliflowers develop their unique shape - The Irish News,The Irish News,2021-07-08,18:32:22Z
+A peek inside a flying bat's brain uncovers clues to mammalian navigation - EurekAlert,EurekAlert,2021-07-08,18:24:36Z
+Winnipeg man charged with murder in stabbing of 3-year-old daughter - CBC.ca,CBC News,2021-07-08,18:04:39Z
+For The First Time^ Scientists Have Connected a Superconductor to a Semiconductor - ScienceAlert,ScienceAlert,2021-07-08,18:03:07Z
+86 more COVID-19 cases^ 3 new deaths reported in Manitoba Thursday - CBC.ca,CBC News,2021-07-08,18:01:31Z
+It’s Cold in the Ocean but It’s Hotter Inside Every Sea Otter - The New York Times,New York Times,2021-07-08,18:00:11Z
+A peek inside a flying bat's brain uncovers clues to mammalian navigation - Phys.org,Phys.Org,2021-07-08,18:00:08Z
+COVID-19 live updates: Quebec will implement a 'vaccination passport' by Sept. 1^ Dubé says - Montreal Gazette,Montreal Gazette,2021-07-08,18:00:00Z
+What a 51^000-year-old carved bone tells us about Neanderthals - CNET,CNET,2021-07-08,17:57:00Z
+Diego Simeone: Atletico Madrid coach signs new three-year deal to remain in charge as head coach - Sky Sports,Sky Sports,2021-07-08,17:55:31Z
+Growth worries hit markets as US jobless claims rise; ECB sets 2% inflation target – as it happened - The Guardian,The Guardian,2021-07-08,17:47:52Z
+Microsoft patches remaining versions of Windows against PrintNightmare flaw - TechRepublic,TechRepublic,2021-07-08,17:46:00Z
+Varun Dhawan Gives A Glimpse Of His Ripped Physique In New Pics. Anil Kapoor Comments - NDTV Movies,NDTV News,2021-07-08,17:39:10Z
+Quebec to use vaccine passports to limit access to non-essential services if COVID-19 worsens - CTV Montreal,Ctvnews.ca,2021-07-08,17:35:02Z
+Cloud Computing Will Bring Big Changes to First-Person Shooters in 'Just a Couple Years^' DICE GM Says - IGN - IGN,IGN,2021-07-08,17:34:27Z
+Purdue Pharma exit plan gains steam with OK from more states - Associated Press,Associated Press,2021-07-08,17:33:30Z
+Repurposed communications satellites could help save humanity from an asteroid impact - Space.com,Space.com,2021-07-08,17:33:18Z
+Haiti faces mounting questions after assassination of president - CBC.ca,CBC News,2021-07-08,17:32:54Z
+​Fitbit co-founder: 'we lead and others follow' – here's where it's heading next - Wareable,Wareable,2021-07-08,17:31:45Z
+Man charged following truck being driven onto Manitoba Legislature steps - CTV News,Ctvnews.ca,2021-07-08,17:31:35Z

csv/settings.csv

@@ -1,2 +1,2 @@
 speed,brightness
-m,9
+f,9

csv/tickers.csv

@@ -1,4 +1,4 @@
 name,current,opening
-MSFT,277.64,276.9
-NFLX,532.1,531.17
-GOOG,2593.71,2564.005
+MSFT,277.49,276.9
+NFLX,532.47,531.17
+GOOG,2585.06,2564.005