Merge pull request #11 from fin-tic/dev

Version 1.1.0

csv/commodities_settings.json

@@ -0,0 +1 @@
+{"feature": "Stocks", "speed": "fast", "speed2": "fast", "animation": "down", "percent": true, "point": true, "logos": true, "chart": false, "title": true, "symbols": {"BRENTOIL": {"current": "123.053", "unit": "bbl", "24hr_change": "1.0150", "percent_change": "0.83"}, "WTIOIL": {"current": "121.588", "unit": "bbl", "24hr_change": "0.8902", "percent_change": "0.74"}, "XAU": {"current": "1821.205", "unit": "oz", "24hr_change": "4.0045", "percent_change": "0.22"}, "XAG": {"current": "21.1034", "unit": "oz", "24hr_change": "-0.0550", "percent_change": "-0.26"}, "XCU": {"current": "0.2633", "unit": "oz", "24hr_change": "-0.0006", "percent_change": "-0.22"}, "NG": {"current": "8.6595", "unit": "mmbtu", "24hr_change": "-0.0236", "percent_change": "-0.27"}, "WHEAT": {"current": "393.123", "unit": "ton", "24hr_change": "-1.2642", "percent_change": "-0.32"}, "COTTON": {"current": "1.4494", "unit": "lb", "24hr_change": "0.0004", "percent_change": "0.03"}, "RICE": {"current": "16.3849", "unit": "cwt", "24hr_change": "0.0093", "percent_change": "0.06"}, "SUGAR": {"current": "0.1866", "unit": "lb", "24hr_change": "-0.0007", "percent_change": "-0.40"}, "COCOA": {"current": "2374.074", "unit": "ton", "24hr_change": "2.5206", "percent_change": "0.11"}, "LUMBER": {"current": "527.842", "unit": "oz", "24hr_change": "0.2641", "percent_change": "0.05"}, "SOYBEAN": {"current": "17.1621", "unit": "bu", "24hr_change": "0.0270", "percent_change": "0.16"}}}

csv/last_updates.json

@@ -0,0 +1 @@
+{"stocks": {"time": "14/06/2022 06:42:06", "force": false}, "crypto": {"time": "14/06/2022 06:58:18", "force": false}, "news": {"time": "14/06/2022 05:29:08", "force": false}, "weather": {"time": "14/06/2022 05:29:08", "force": false}, "forex": {"time": "14/06/2022 05:29:14", "force": false}, "sports_l": {"time": "14/06/2022 04:42:37", "force": false}, "sports_p": {"time": "14/06/2022 06:27:34", "force": false}, "sports_u": {"time": "14/06/2022 06:28:34", "force": false}, "sports_t": {"time": "14/06/2022 06:26:23", "force": false}, "commodities": {"time": "14/06/2022 06:51:07", "force": false}}

csv/sports/MLB/team_info.csv

@@ -0,0 +1,31 @@
+Full Team Name,Team ID,3 Letter ID,Team Color,Logo File name
+Arizona Diamondbacks,135267,ARI,Red,diamondbacks.png
+Atlanta Braves,135268,ATL,Red,braves.png
+Baltimore Orioles,135251,BAL,Orange,orioles.png
+Boston Red Sox,135252,BOS,Red,redsox.png
+Chicago Cubs,135269,CHC,Blue,cubs.png
+Chicago White Sox,135253,CWS,Gray,whitesox.png
+Cincinnati Reds,135270,CIN,Red,reds.png
+Cleveland Guardians,135254,CLE,Red,indians.png
+Colorado Rockies,135271,COL,Purple,rockies.png
+Detroit Tigers,135255,DET,Blue,tigers.png
+Houston Astros,135256,HOU,Orange,astros.png
+Kansas City Royals,135257,KC,Gold,royals.png
+Los Angeles Angels,135258,LAA,Red,angels.png
+Los Angeles Dodgers,135272,LAD,Blue,dodgers.png
+Miami Marlins,135273,MIA,Light blue,marlins.png
+Milwaukee Brewers,135274,MIL,Gold,brewers.png
+Minnesota Twins,135259,MIN,Red,twins.png
+New York Mets,135275,NYM,Orange,mets.png
+New York Yankees,135260,NYY,Blue,yankees.png
+Oakland Athletics,135261,OAK,Green,athletics.png
+Philadelphia Phillies,135276,PHI,Red,phillies.png
+Pittsburgh Pirates,135277,PIT,Gold,pirates.png
+San Diego Padres,135278,SD,Gold,padres.png
+San Francisco Giants,135279,SF,Orange,giants.png
+Seattle Mariners,135262,SEA,Blue,mariners.png
+St. Louis Cardinals,135280,STL,Red,cardinals.png
+Tampa Bay Rays,135263,TB,Blue,rays.png
+Texas Rangers,135264,TEX,Red,rangers.png
+Toronto Blue Jays,135265,TOR,Blue,bluejays.png
+Washington Nationals,135281,WSH,Red,nationals.png

csv/sports/MLS/team_info.csv

@@ -0,0 +1,29 @@
+Full Team Name,Team ID,3 Letter ID,Team Color,Logo File name
+Atlanta United,135851,ATL,Gold,Atlanta.png
+Austin FC,140079,AUS,Green,Austin.png
+CF Montréal,134150,MTL,Gray,Montreal.png
+Charlotte FC,140078,CHA,Blue,Charlotte.png
+Chicago Fire,134154,CHI,Orange,Chicago.png
+Colorado Rapids,134794,COL,Red,Colorado.png
+Columbus Crew,134152,CBS,Yellow,Columbus.png
+DC United,134145,DC,Red,DC.png
+FC Cincinnati,136688,CIN,Orange,Cincinnati.png
+FC Dallas,134146,DAL,Blue,Dallas.png
+Houston Dynamo,134144,HOU,Orange,Houston.png
+Inter Miami,137699,MIA,Pink,Miami.png
+L.A. Galaxy,134153,LA,Yellow,LA-Galaxy.png
+Los Angeles FC,136050,LA,Gold,LAFC.png
+Minnesota United,135852,MIN,Light Blue,Minnesota.png
+Nashville SC,137700,NSH,Yellow,Nashville.png
+New England Rev.,134159,NE,Red,New-England.png
+New York City,134630,NYF,Light Blue,NYC.png
+New York Red Bulls,134156,NYR,Red,New-York.png
+Orlando City,135292,PHI,Purple,Orlando.png
+Philadelphia Union,134142,PHI,Gold,Philadelphia.png
+Portland Timbers,134155,POR,Green,Portland.png
+Real Salt Lake,134158,RSL,Gold,Salt-Lake.png
+San Jose Earthquakes,134157,SJ,Light Blue,San-Jose.png
+Seattle Sounders FC,134149,SEA,Green,Seattle.png
+Sporting Kansas City,134143,KC,Blue,Kansas-City.png
+Toronto FC,134148,TOR,Red,Toronto.png
+Vancouver Whitecaps,134147,VAN,Blue,Vancouver.png

csv/sports/NHL/team_info.csv

@@ -1,33 +1,33 @@
-Full Team Name,Team ID,3 Letter ID,Team Color,Logo File name,,Season
+Full Team Name,Team ID,3 Letter ID,Team Color,Logo File name
-Arizona Coyotes,134847,ARI,Red,coyotes.png,,Off
+Arizona Coyotes,134847,ARI,Red,coyotes.png
-Anaheim Ducks,134846,ANA,Gold,ducks.png,,Pre
+Anaheim Ducks,134846,ANA,Gold,ducks.png
-Boston Bruins,134830,BOS,Yellow,bruins.png,,On
+Boston Bruins,134830,BOS,Yellow,bruins.png
-Colorado Avalanche,134855,COL,Red,avalanche.png,,Semi Finals
+Colorado Avalanche,134855,COL,Red,avalanche.png
-Chicago Blackhawks,134854,CHI,Orange,blackhawks.png,,Finals
+Chicago Blackhawks,134854,CHI,Orange,blackhawks.png
-Columbus Blue Jackets,134839,CBJ,Blue,blue-jackets.png,,
+Columbus Blue Jackets,134839,CBJ,Blue,blue-jackets.png
-St. Louis Blues,134859,STL,Blue,blues.png,,
+St. Louis Blues,134859,STL,Blue,blues.png
-Montreal Canadiens,134834,MTL,Red,canadiens.png,,
+Montreal Canadiens,134834,MTL,Red,canadiens.png
-Vancouver Canucks,134850,VAN,Blue,canucks.png,,
+Vancouver Canucks,134850,VAN,Blue,canucks.png
-Washington Capitals,134845,WSH,Blue,capitals.png,,
+Washington Capitals,134845,WSH,Blue,capitals.png
-New Jersey Devils,134840,NJD,Red,devils.png,,
+New Jersey Devils,134840,NJD,Red,devils.png
-Calgary Flames,134848,CGY,Orange,flames.png,,
+Calgary Flames,134848,CGY,Orange,flames.png
-Philadelphia Flyers,134843,PHI,White,flyers.png,,
+Philadelphia Flyers,134843,PHI,White,flyers.png
-Carolina Hurricanes,134838,CAR,Red,hurricanes.png,,
+Carolina Hurricanes,134838,CAR,Red,hurricanes.png
-New York Islanders,134841,NYI,Orange,islanders.png,,
+New York Islanders,134841,NYI,Orange,islanders.png
-Winnipeg Jets,134851,WPG,Blue,jets.png,,
+Winnipeg Jets,134851,WPG,Blue,jets.png
-Los Angeles Kings,134852,LAK,Gray,kings.png,,
+Los Angeles Kings,134852,LAK,Gray,kings.png
-Vegas Golden Knights,135913,VGK,Gold,knights.png,,
+Vegas Golden Knights,135913,VGK,Gold,knights.png
-Tampa Bay Lightning,134836,TBL,Blue,lightning.png,,
+Tampa Bay Lightning,134836,TBL,Blue,lightning.png
-Toronto Maple Leafs,134837,TOR,Blue,maple-leafs.png,,
+Toronto Maple Leafs,134837,TOR,Blue,maple-leafs.png
-Edmonton Oilers,134849,EDM,Orange,oilers.png,,
+Edmonton Oilers,134849,EDM,Orange,oilers.png
-Florida Panthers,134833,FLA,Red,panthers.png,,
+Florida Panthers,134833,FLA,Red,panthers.png
-Pittsburgh Penguins,134844,PIT,Yellow,penguins.png,,
+Pittsburgh Penguins,134844,PIT,Yellow,penguins.png
-Nashville Predators,134858,NSH,Yellow,predators.png,,
+Nashville Predators,134858,NSH,Yellow,predators.png
-New York Rangers,134842,NYR,Blue,rangers.png,,
+New York Rangers,134842,NYR,Blue,rangers.png
-Detroit Red Wings,134832,DET,Red,red-wings.png,,
+Detroit Red Wings,134832,DET,Red,red-wings.png
-Buffalo Sabres,134831,BUF,Yellow,sabres.png,,
+Buffalo Sabres,134831,BUF,Yellow,sabres.png
-Ottawa Senators,134835,OTT,Gold,senators.png,,
+Ottawa Senators,134835,OTT,Gold,senators.png
-San Jose Sharks,134853,SJS,Light blue,sharks.png,,
+San Jose Sharks,134853,SJS,Light blue,sharks.png
-Dallas Stars,134856,DAL,Green,stars.png,,
+Dallas Stars,134856,DAL,Green,stars.png
-Minnesota Wild,134857,MIN,Green,wild.png,,
+Minnesota Wild,134857,MIN,Green,wild.png
-Seattle Kraken,140082,SEA,Light blue,kraken.png,,
+Seattle Kraken,140082,SEA,Light blue,kraken.png

database_caller.py

@@ -94,7 +94,51 @@ def updateStocks(api_key, logf):
         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])))
         logf.close()
+
+def updateCommodities(api_key, logf):
+ 
+    try:
+              
+        f = open('csv/commodities_settings.json', 'r')
+        all_commodities_settings = json.load(f)
+        f.close()
         
+        commodity_info = all_commodities_settings['symbols']
+        symbols = list(commodity_info.keys())        
+        
+        url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/commodities?symbols='
+        
+        for symbol in symbols:
+            url += symbol + ','
+            
+        url += '&apiKey=' + api_key
+        response = requests.get(url)
+        data = response.json()
+      
+
+        commodity_info = {}
+        if len(data) > 0:
+            for symbol in symbols:
+                for commodity in data: 
+                    if commodity['symbol'] == symbol:
+                        commodity_info[commodity['symbol']] = {'current': commodity['price'], 'unit': commodity['unit'], '24hr_change': commodity['price_over_24hr'], 'percent_change': commodity['percent_over_24hr']}
+                   
+            all_commodities_settings['symbols'] = commodity_info
+            f = open('csv/commodities_settings.json', 'w+')
+            json.dump(all_commodities_settings, f)
+            f.close()
+        
+    except Exception as e:
+        
+        logf = open('log.txt', "a")
+        exc_type, exc_obj, exc_tb = sys.exc_info()
+        fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
+        logf.write(str(e))
+        logf.write('. file: ' + fname)
+        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])))
+        logf.close()
 
 def updateCrypto(api_key, logf):
  
@@ -607,7 +651,7 @@ if __name__ == '__main__':
     
     
 
-    update_frequencies = {'stocks':2, 'crypto':5, 'forex':60, 'news':120, 'weather': 120, 'sports': 1440} #minutes
+    update_frequencies = {'stocks':2, 'crypto':5, 'forex':60, 'news':120, 'weather': 120, 'sports': 1440, 'commodities': 15} #minutes
 
     NY_zone = pytz.timezone('America/New_York')
     CET_zone = pytz.timezone('EST')
@@ -650,7 +694,18 @@ if __name__ == '__main__':
     t = time.time()
     update_processes = []
     
-    
+    try:
+        time.sleep(60)
+        f = open('csv/last_updates.json', 'r')
+        last_updates = json.load(f)
+        f.close()
+        last_updates['stocks']['force'] = True
+        #last_updates['weather']['force'] = True
+        f = open('csv/last_updates.json', 'w')
+        json.dump(last_updates, f)
+        f.close()    
+    except:
+        pass
     
     
     
@@ -667,7 +722,7 @@ if __name__ == '__main__':
                 "news": {"time": "06/03/2022 04:07:09", "force": True}, "weather": {"time": "06/03/2022 04:08:20", "force": True}, 
                 "forex": {"time": "06/03/2022 03:54:02", "force": True}, "sports_l": {"time": "06/03/2022 04:10:09", "force": True}, 
                 "sports_p": {"time": "06/03/2022 04:10:09", "force": True},
-                "sports_u": {"time": "06/03/2022 04:10:09", "force": True},"sports_t": {"time": "06/03/2022 04:10:09", "force": True}}
+                "sports_u": {"time": "06/03/2022 04:10:09", "force": True},"sports_t": {"time": "06/03/2022 04:10:09", "force": True}, "commodities": {"time": "06/03/2022 04:10:09", "force": True}}
 
             
            
@@ -717,7 +772,25 @@ if __name__ == '__main__':
                 update_process = Process(target = updateCrypto, args = (api_key,logf))
                 update_process.start()
                 update_processes.append(update_process)
-                    
+  
+            # commodities
+            commodities_time = datetime.strptime(last_updates['commodities']['time'], "%d/%m/%Y %H:%M:%S")
+           
+            
+            NY_time = datetime.now(NY_zone).replace(tzinfo=None)
+            diff = (NY_time - commodities_time).total_seconds()/60 #minutes
+           
+            
+            if last_updates['commodities']['force'] or diff >= update_frequencies['commodities']:# or msg == 'c':
+                commodities_time = NY_time.strftime("%d/%m/%Y %H:%M:%S")
+                #updateCrypto(api_key, logf)
+               
+                
+                last_updates['commodities']['time'] = commodities_time
+                last_updates['commodities']['force'] = False
+                update_process = Process(target = updateCommodities, args = (api_key,logf))
+                update_process.start()
+                update_processes.append(update_process)
                     
             # weather
             weather_time = datetime.strptime(last_updates['weather']['time'], "%d/%m/%Y %H:%M:%S")