Add python type annotations

Also use consistent quote symbols
Also use 'is None' instead of '== None'
Also use 'if list1' instead of 'if len(list1) > 0'

1 files changed, 52 insertions, 52 deletions

diff --git a/backend/tolData/dbpedia/genDescData.py b/backend/tolData/dbpedia/genDescData.py
index 8756a40..43ed815 100755
--- a/backend/tolData/dbpedia/genDescData.py
+++ b/backend/tolData/dbpedia/genDescData.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-import sys, re
+import re
 import bz2, sqlite3
 
 import argparse
@@ -9,120 +9,120 @@ Adds DBpedia labels/types/abstracts/etc data into a database
 """, formatter_class=argparse.RawDescriptionHelpFormatter)
 parser.parse_args()
 
-labelsFile = "labels_lang=en.ttl.bz2" # Had about 16e6 entries
-idsFile = "page_lang=en_ids.ttl.bz2"
-redirectsFile = "redirects_lang=en_transitive.ttl.bz2"
-disambigFile = "disambiguations_lang=en.ttl.bz2"
-typesFile = "instance-types_lang=en_specific.ttl.bz2"
-abstractsFile = "short-abstracts_lang=en.ttl.bz2"
-dbFile = "descData.db"
+labelsFile = 'labels_lang=en.ttl.bz2' # Had about 16e6 entries
+idsFile = 'page_lang=en_ids.ttl.bz2'
+redirectsFile = 'redirects_lang=en_transitive.ttl.bz2'
+disambigFile = 'disambiguations_lang=en.ttl.bz2'
+typesFile = 'instance-types_lang=en_specific.ttl.bz2'
+abstractsFile = 'short-abstracts_lang=en.ttl.bz2'
+dbFile = 'descData.db'
 # In testing, this script took a few hours to run, and generated about 10GB
 
-print("Creating database")
+print('Creating database')
 dbCon = sqlite3.connect(dbFile)
 dbCur = dbCon.cursor()
 
-print("Reading/storing label data")
-dbCur.execute("CREATE TABLE labels (iri TEXT PRIMARY KEY, label TEXT)")
-dbCur.execute("CREATE INDEX labels_idx ON labels(label)")
-dbCur.execute("CREATE INDEX labels_idx_nc ON labels(label COLLATE NOCASE)")
+print('Reading/storing label data')
+dbCur.execute('CREATE TABLE labels (iri TEXT PRIMARY KEY, label TEXT)')
+dbCur.execute('CREATE INDEX labels_idx ON labels(label)')
+dbCur.execute('CREATE INDEX labels_idx_nc ON labels(label COLLATE NOCASE)')
 labelLineRegex = re.compile(r'<([^>]+)> <[^>]+> "((?:[^"]|\\")+)"@en \.\n')
 lineNum = 0
 with bz2.open(labelsFile, mode='rt') as file:
 	for line in file:
 		lineNum += 1
 		if lineNum % 1e5 == 0:
-			print(f"At line {lineNum}")
+			print(f'At line {lineNum}')
 		#
 		match = labelLineRegex.fullmatch(line)
-		if match == None:
-			raise Exception(f"ERROR: Line {lineNum} has unexpected format")
-		dbCur.execute("INSERT INTO labels VALUES (?, ?)", (match.group(1), match.group(2)))
+		if match is None:
+			raise Exception(f'ERROR: Line {lineNum} has unexpected format')
+		dbCur.execute('INSERT INTO labels VALUES (?, ?)', (match.group(1), match.group(2)))
 
-print("Reading/storing wiki page ids")
-dbCur.execute("CREATE TABLE ids (iri TEXT PRIMARY KEY, id INT)")
-dbCur.execute("CREATE INDEX ids_idx ON ids(id)")
+print('Reading/storing wiki page ids')
+dbCur.execute('CREATE TABLE ids (iri TEXT PRIMARY KEY, id INT)')
+dbCur.execute('CREATE INDEX ids_idx ON ids(id)')
 idLineRegex = re.compile(r'<([^>]+)> <[^>]+> "(\d+)".*\n')
 lineNum = 0
 with bz2.open(idsFile, mode='rt') as file:
 	for line in file:
 		lineNum += 1
 		if lineNum % 1e5 == 0:
-			print(f"At line {lineNum}")
+			print(f'At line {lineNum}')
 		#
 		match = idLineRegex.fullmatch(line)
-		if match == None:
-			raise Exception(f"ERROR: Line {lineNum} has unexpected format")
+		if match is None:
+			raise Exception(f'ERROR: Line {lineNum} has unexpected format')
 		try:
-			dbCur.execute("INSERT INTO ids VALUES (?, ?)", (match.group(1), int(match.group(2))))
+			dbCur.execute('INSERT INTO ids VALUES (?, ?)', (match.group(1), int(match.group(2))))
 		except sqlite3.IntegrityError as e:
 			# Accounts for certain lines that have the same IRI
-			print(f"WARNING: Failed to add entry with IRI \"{match.group(1)}\": {e}")
+			print(f'WARNING: Failed to add entry with IRI "{match.group(1)}": {e}')
 
-print("Reading/storing redirection data")
-dbCur.execute("CREATE TABLE redirects (iri TEXT PRIMARY KEY, target TEXT)")
+print('Reading/storing redirection data')
+dbCur.execute('CREATE TABLE redirects (iri TEXT PRIMARY KEY, target TEXT)')
 redirLineRegex = re.compile(r'<([^>]+)> <[^>]+> <([^>]+)> \.\n')
 lineNum = 0
 with bz2.open(redirectsFile, mode='rt') as file:
 	for line in file:
 		lineNum += 1
 		if lineNum % 1e5 == 0:
-			print(f"At line {lineNum}")
+			print(f'At line {lineNum}')
 		#
 		match = redirLineRegex.fullmatch(line)
-		if match == None:
-			raise Exception(f"ERROR: Line {lineNum} has unexpected format")
-		dbCur.execute("INSERT INTO redirects VALUES (?, ?)", (match.group(1), match.group(2)))
+		if match is None:
+			raise Exception(f'ERROR: Line {lineNum} has unexpected format')
+		dbCur.execute('INSERT INTO redirects VALUES (?, ?)', (match.group(1), match.group(2)))
 
-print("Reading/storing diambiguation-page data")
-dbCur.execute("CREATE TABLE disambiguations (iri TEXT PRIMARY KEY)")
+print('Reading/storing diambiguation-page data')
+dbCur.execute('CREATE TABLE disambiguations (iri TEXT PRIMARY KEY)')
 disambigLineRegex = redirLineRegex
 lineNum = 0
 with bz2.open(disambigFile, mode='rt') as file:
 	for line in file:
 		lineNum += 1
 		if lineNum % 1e5 == 0:
-			print(f"At line {lineNum}")
+			print(f'At line {lineNum}')
 		#
 		match = disambigLineRegex.fullmatch(line)
-		if match == None:
-			raise Exception(f"ERROR: Line {lineNum} has unexpected format")
-		dbCur.execute("INSERT OR IGNORE INTO disambiguations VALUES (?)", (match.group(1),))
+		if match is None:
+			raise Exception(f'ERROR: Line {lineNum} has unexpected format')
+		dbCur.execute('INSERT OR IGNORE INTO disambiguations VALUES (?)', (match.group(1),))
 
-print("Reading/storing instance-type data")
-dbCur.execute("CREATE TABLE types (iri TEXT, type TEXT)")
-dbCur.execute("CREATE INDEX types_iri_idx ON types(iri)")
+print('Reading/storing instance-type data')
+dbCur.execute('CREATE TABLE types (iri TEXT, type TEXT)')
+dbCur.execute('CREATE INDEX types_iri_idx ON types(iri)')
 typeLineRegex = redirLineRegex
 lineNum = 0
 with bz2.open(typesFile, mode='rt') as file:
 	for line in file:
 		lineNum += 1
 		if lineNum % 1e5 == 0:
-			print(f"At line {lineNum}")
+			print(f'At line {lineNum}')
 		#
 		match = typeLineRegex.fullmatch(line)
-		if match == None:
-			raise Exception(f"ERROR: Line {lineNum} has unexpected format")
-		dbCur.execute("INSERT INTO types VALUES (?, ?)", (match.group(1), match.group(2)))
+		if match is None:
+			raise Exception(f'ERROR: Line {lineNum} has unexpected format')
+		dbCur.execute('INSERT INTO types VALUES (?, ?)', (match.group(1), match.group(2)))
 
-print("Reading/storing abstracts")
-dbCur.execute("CREATE TABLE abstracts (iri TEXT PRIMARY KEY, abstract TEXT)")
+print('Reading/storing abstracts')
+dbCur.execute('CREATE TABLE abstracts (iri TEXT PRIMARY KEY, abstract TEXT)')
 descLineRegex = labelLineRegex
 lineNum = 0
 with bz2.open(abstractsFile, mode='rt') as file:
 	for line in file:
 		lineNum += 1
 		if lineNum % 1e5 == 0:
-			print(f"At line {lineNum}")
+			print(f'At line {lineNum}')
 		#
-		if line[0] == "#":
+		if line[0] == '#':
 			continue
 		match = descLineRegex.fullmatch(line)
-		if match == None:
-			raise Exception(f"ERROR: Line {lineNum} has unexpected format")
-		dbCur.execute("INSERT INTO abstracts VALUES (?, ?)",
+		if match is None:
+			raise Exception(f'ERROR: Line {lineNum} has unexpected format')
+		dbCur.execute('INSERT INTO abstracts VALUES (?, ?)',
 			(match.group(1), match.group(2).replace(r'\"', '"')))
 
-print("Closing database")
+print('Closing database')
 dbCon.commit()
 dbCon.close()