app/functions.py

@@ -1,7 +1,5 @@
 from bs4 import BeautifulSoup
 import MySQLdb
-from pebble import ProcessPool
-from concurrent.futures import TimeoutError
 import markovify
 import requests
 from Crypto.PublicKey import RSA
@@ -48,9 +46,7 @@ def generate_output(handle):
 		host = cfg['db_host'],
 		user=cfg['db_user'],
 		passwd=cfg['db_pass'],
-		db=cfg['db_name'],
-		use_unicode=True,
-		charset="utf8mb4"
+		db=cfg['db_name']
 	)
 	# print("Generating post for {}".format(handle))
 	dc = db.cursor(MySQLdb.cursors.DictCursor)
@@ -92,7 +88,7 @@ def generate_output(handle):
 	posts = "\n".join(list(sum(c.fetchall(), ())))
 	if len(posts) == 0:
 		print("{} - No posts to learn from.".format(handle))
-		return bot, None
+		return
 
 	if bot['fake_mentions'] == 'never':
 		# remove all mentions from the training data before the markov model sees it
@@ -103,8 +99,8 @@ def generate_output(handle):
 	post = None
 
 	# even with such a high tries value for markovify, it still sometimes returns none.
-	# so we implement our own tries function as well, and try five times.
-	while post is None and tries < 5:
+	# so we implement our own tries function as well, and try ten times.
+	while post is None and tries < 10:
 		post = model.make_short_sentence(bot['length'], tries = 1000)
 		tries += 1
 
@@ -142,10 +138,6 @@ def make_post(args):
 
 	bot, post = generate_output(handle)
 
-	# post will be None if there's no posts for the bot to learn from.
-	# in such a case, we should just exit without doing anything.
-	if post == None: return
-
 	client = Mastodon(
 		client_id = bot['client_id'],
 		client_secret = bot['client_secret'],
@@ -157,9 +149,7 @@ def make_post(args):
 		host = cfg['db_host'],
 		user=cfg['db_user'],
 		passwd=cfg['db_pass'],
-		db=cfg['db_name'],
-		use_unicode=True,
-		charset="utf8mb4"
+		db=cfg['db_name']
 	)
 	c = db.cursor()
 
@@ -183,7 +173,7 @@ def make_post(args):
 		# this needs to be dealt with properly later on, but for now, we'll just disable the bot
 		c.execute("UPDATE bots SET enabled = FALSE WHERE handle = %s", (handle,))
 	except:
-		print("Failed to submit post for {}".format(handle))
+		print("Failed to create post for {}".format(handle))
 
 	if id == None:
 		# this wasn't a reply, it was a regular post, so update the last post date
@@ -191,31 +181,12 @@ def make_post(args):
 		db.commit()
 	c.close()
 
-def do_in_pool(function, data, timeout=30, silent=False):
-	with ProcessPool(max_workers=cfg['service_threads']) as p:
-		index = 0
-		future = p.map(function, data)
-		iterator = future.result()
-
-		while True:
-			try:
-				result = next(iterator)
-			except StopIteration:
-				# all threads are done
-				break
-			except TimeoutError as error:
-				if not silent: print("Timed out on {}.".format(data[index]))
-			finally:
-				index += 1
-
 def get_key():
 	db = MySQLdb.connect(
 		host = cfg['db_host'],
 		user=cfg['db_user'],
 		passwd=cfg['db_pass'],
-		db=cfg['db_name'],
-		use_unicode=True,
-		charset="utf8mb4"
+		db=cfg['db_name']
 	)
 
 	dc = db.cursor(MySQLdb.cursors.DictCursor)
@@ -228,9 +199,9 @@ def get_key():
 
 		key['private'] = privkey.exportKey('PEM').decode('utf-8')
 		key['public'] = privkey.publickey().exportKey('PEM').decode('utf-8')
-
+		
 		dc.execute("INSERT INTO http_auth_key (private, public) VALUES (%s, %s)", (key['private'], key['public']))
-
+	
 	dc.close()
 	db.commit()
 
@@ -272,4 +243,4 @@ def signed_get(url, timeout = 10, additional_headers = {}, request_json = True):
 
 	r = requests.Request('GET', url, headers)
 	return r.headers
-	# return requests.get(url, timeout = timeout)
+	# return requests.get(url, timeout = timeout)

app/scrape.py

@@ -2,6 +2,7 @@
 
 import MySQLdb
 import requests
+from multiprocessing import Pool
 import json, re
 import functions
 
@@ -130,7 +131,7 @@ cursor.execute("SELECT `handle`, `outbox` FROM `fedi_accounts` ORDER BY RAND()")
 accounts = cursor.fetchall()
 cursor.close()
 db.close()
-
-functions.do_in_pool(scrape_posts, accounts, timeout=60)
+with Pool(cfg['service_threads']) as p:
+	p.map(scrape_posts, accounts)
 
 print("Done!")

app/service.py

@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
-import json
-
 import MySQLdb
 from mastodon import Mastodon
+from multiprocessing import Pool
 import requests
-
+import json
 import functions
 
 cfg = json.load(open('config.json'))
@@ -74,7 +73,8 @@ cursor.execute("SELECT handle FROM bots WHERE enabled = TRUE AND TIMESTAMPDIFF(M
 # cursor.execute("SELECT handle FROM bots WHERE enabled = TRUE")
 bots = cursor.fetchall()
 
-functions.do_in_pool(functions.make_post, bots, 15)
+with Pool(cfg['service_threads']) as p:
+	p.map(functions.make_post, bots)
 
 print("Updating cached icons")
 dc = db.cursor(MySQLdb.cursors.DictCursor)
@@ -86,6 +86,7 @@ ON bots.credentials_id = credentials.id
 WHERE TIMESTAMPDIFF(HOUR, icon_update_time, CURRENT_TIMESTAMP()) > 2""")
 bots = dc.fetchall()
 
-functions.do_in_pool(update_icon, bots)
+with Pool(cfg['service_threads']) as p:
+	p.map(update_icon, bots)
 
 db.commit()

requirements.txt

@@ -7,6 +7,5 @@ flask-mysqldb==0.2.0
 bcrypt == 3.1.7
 requests==2.23.0
 http-ece==1.1.0
-pycryptodome==3.9.7
+pycryptodome==3.9.7 
 cryptography==2.9.2
-pebble==4.5.3