Added internet connection test

StockData.py

@@ -27,17 +27,18 @@ Daily Requests = 20,000
 Symbol Requests = 500
 '''
 
-import requests, json
+import requests, json, socket
 import importlib.util, sys # To check whether a package is installed
 from datetime import datetime
 
 class Stock:
 
-  def __init__(self, newName = '', newfirstLastDates = [], newAbsFirstLastDates = [], newfinalDatesAndClose = [], newAllLists = []):
+  def __init__(self, newName = '', newFirstLastDates = [], newAbsFirstLastDates = [], newFinalDatesAndClose = [], newAllLists = []):
     self.name = newName                             # Name of stock
-    self.firstLastDates = newfirstLastDates         # Dates that at least 2 sources have (or should it be all?) - Maybe let user decide
+    self.firstLastDates = newFirstLastDates         # Dates that at least 2 sources have (or should it be all?) - Maybe let user decide
     self.absFirstLastDates = newAbsFirstLastDates   # Absolute first and last dates from all sources
-    self.finalDatesAndClose = newfinalDatesAndClose # All available dates
+    self.finalDatesAndClose = newFinalDatesAndClose # All available dates
+    self.allLists = newAllLists
     '''
     Format: 
     # List from each source containing: [firstDate, lastDate, allDates, values, timeFrame]
@@ -46,32 +47,16 @@ class Stock:
     values (close) = ['164.6307', 164.6307]
     timeFrame = [days, weeks, years]
     '''
-    self.allLists = newAllLists
+
-  '''
+  def set(self, newName, newFirstLastDates, newAbsFirstLastDates, newFinalDatesAndClose, newAllLists):
-  def set(self, newName, newfirstLastDates, newAbsFirstLastDates, newDates, newListIEX, newListAV, newListTiingo):
     self.name = newName                             # Name of stock
-    self.firstLastDates = newfirstLastDates         # Dates that at least 2 sources have (or should it be all?) - Maybe let user decide
+    self.firstLastDates = newFirstLastDates         # Dates that at least 2 sources have (or should it be all?) - Maybe let user decide
     self.absFirstLastDates = newAbsFirstLastDates   # Absolute first and last dates from all sources
-    self.dates = newDates                           # All available dates
+    self.finalDatesAndClose = newFinalDatesAndClose
+    self.allLists = newAllLists
 
-    # List from each source containing: ['firstDate', 'lastDate', allDates, values]
+  def setName(self, newName):
-    self.listIEX = newListIEX                     # Dates available from IEX
+    self.name = newName
-    self.listAV = newListAV                       # Dates available from AV
-    self.listTiingo = newListTiingo               # Dates available from Tiingo
-
-  def setFirstLastDates(newFirstLastDates):
-    self.firstLastDates = newFirstLastDates
-  def setAbsFirstLastDates(newAbsFirstLastDates):
-    self.absFirstLastDates = newAbsFirstLastDates
-  def setDates(newDates):
-    self.dates = newDates
-  def setListIEX(newListIEX):
-    self.listIEX = newListIEX
-  def setListAV(newListAV):
-    self.listAV = newListAV
-  def setListTiingo(newListTiingo):
-    self.listTiingo = newListTiingo
-  '''
 
   def getIEX(self):
     url = ''.join(('https://api.iextrading.com/1.0/stock/', self.name, '/chart/5y'))
@@ -79,6 +64,10 @@ class Stock:
     print("\nSending request to:", url)
     f = requests.get(url)
     json_data = f.text
+    #print(json_data)
+    if (json_data == 'Unknown symbol'):
+      print("IEX not available")
+      return 'Not available'
     loaded_json = json.loads(json_data)
     listIEX = []
 
@@ -145,6 +134,14 @@ class Stock:
     f = requests.get(url)
     json_data = f.text
     loaded_json = json.loads(json_data)
+    #print(loaded_json)
+
+    #print(type(loaded_json)) # Dictionary
+    #print(len(loaded_json))
+    if len(loaded_json) == 1:
+      print("Alpha Vantage not available")
+      return 'Not available'
+
     #print(loaded_json['Monthly Time Series'])
     monthlyTimeSeries = loaded_json['Monthly Time Series']
     #print(monthlyTimeSeries)
@@ -215,6 +212,10 @@ class Stock:
     requestResponse = requests.get(url, headers=headers)
     #print(requestResponse.json())
     loaded_json = requestResponse.json()
+    #print(len(loaded_json))
+    if len(loaded_json) == 1:
+      print("Tiingo not available")
+      return 'Not available'
     #print(loaded_json)
     '''
     list1 = list(loaded_json)
@@ -264,7 +265,7 @@ class Stock:
     # Used loop from finding dates
     listTiingo.append(values)
     #print(listTiingo[3])
-    print(len(listAV[3]), "close values")
+    print(len(listTiingo[3]), "close values")
 
     print("Finding time frame given [days, weeks, years]")
     timeFrame = []
@@ -313,6 +314,7 @@ class Stock:
           firstMonth = month
           firstDay = day
     #print(firstDate)
+    if len(listOfFirstDates) > 1:
       for i in range(0, len(listOfLastDates),1):
         date = listOfLastDates[i]
         if i == 0:
@@ -384,7 +386,7 @@ class Stock:
       day = day + 1
       if day == 32 and month == 12: # Next year
         day = 1
-        month = 2
+        month = 1
         year = year + 1
       elif day == 32:              # Next month
         month = month + 1
@@ -423,6 +425,16 @@ class Stock:
     finalDatesAndClose.append(finalClose)
     return finalDatesAndClose
 
+  def is_connected():
+    try:
+        # connect to the host -- tells us if the host is actually
+        # reachable
+        socket.create_connection(("www.andrewkdinh.com", 80))
+        return True
+    except OSError:
+        pass
+    return False
+
   def main(self):
 
     packages = ['requests']
@@ -432,7 +444,11 @@ class Stock:
       if spec is None:
         print(package_name +" is not installed\nPlease type in 'pip install -r requirements.txt' to install all required packages")
 
-    # Makes list with ['firstDate', 'lastDate', [allDates], values]
+    # Test internet connection
+    internetConnection = Stock.is_connected()
+    if internetConnection == False:
+      print("\nNo internet connection!")
+      return
 
     listOfFirstLastDates = []
 
@@ -441,6 +457,7 @@ class Stock:
     print("\nIEX")
     listIEX = Stock.getIEX(self)
     #print(listIEX)
+    if listIEX != 'Not available':
       listOfFirstLastDates.append((listIEX[0], listIEX[1]))
       self.allLists.append(listIEX)
     
@@ -448,6 +465,7 @@ class Stock:
     print("\nAlpha Vantage (AV)")
     listAV = Stock.getAV(self)
     #print(listAV)
+    if listAV != 'Not available':
       listOfFirstLastDates.append((listAV[0], listAV[1]))
       self.allLists.append(listAV)
 
@@ -456,12 +474,16 @@ class Stock:
     print("\nTiingo")
     listTiingo = Stock.getTiingo(self)
     #print(listTiingo)
+    if listTiingo != 'Not available':
       listOfFirstLastDates.append((listTiingo[0], listTiingo[1]))
       self.allLists.append(listTiingo)
     '''
     
     #print(self.allLists)
     #print(listOfFirstLastDates)
+    print("\n")
+    print(len(self.allLists), "available sources for", self.name)
+    if (len(self.allLists) > 0):
       self.absFirstLastDates = Stock.getFirstLastDate(self, listOfFirstLastDates)
       print("\nThe absolute first date with close values is:", self.absFirstLastDates[0])
       print("The absolute last date with close values is:", self.absFirstLastDates[1])
@@ -472,9 +494,11 @@ class Stock:
       #print("All close values:\n", self.finalDatesAndClose[1])
       finalDates = self.finalDatesAndClose[0]
       finalClose = self.finalDatesAndClose[1]
-    print(len(finalDates), "dates:", finalDates[len(finalDates)-1], "...", finalDates[0])
+      print(len(finalDates), "unique dates:", finalDates[len(finalDates)-1], "...", finalDates[0])
       print(len(finalClose), "close values:", finalClose[len(finalClose)-1], "...", finalClose[0])
       #print("Uncomment above line in code to see output")
+    else:
+      print("No sources have data for", self.name)
 
 def main(): # For testing purposes
   stockName = 'IWV'
@@ -482,12 +506,5 @@ def main(): # For testing purposes
   print("Finding available dates and close values for", stock1.name)
   Stock.main(stock1)
 
-def imported(): # When this file has been imported
-  # Add stuff here
-  return
-
 if __name__ == "__main__":
   main()
-
-else:
-  imported()

main.py

@@ -17,9 +17,23 @@ FIRST TESTING WITH EXPENSE RATIO
 
 from StockData import Stock
 
-#listOfStocks = [spy, ]
+listOfStocks = []
+numberOfStocks = int(input("How many stocks or mutual funds would you like to analyze? "))
+for i in range(0, numberOfStocks, 1):
+	print("Stock", i+1, ": ", end='')
+	stockName = str(input())
+	listOfStocks.append(i)
+	listOfStocks[i] = Stock()
+	listOfStocks[i].setName(stockName)
+	print(listOfStocks[i].name)
 
+for i in range(0, numberOfStocks, 1):
+	print("\n")
+	print(listOfStocks[i].name)
+	Stock.main(listOfStocks[i])
+'''
 stockName = 'IWV'
 stock1 = Stock(stockName)
 print("Finding available dates and close values for", stock1.name)
 Stock.main(stock1)
+'''