Merge branch 'develop' into bump-editorjs

frappe/core/doctype/scheduled_job_type/scheduled_job_type.py

@@ -22,23 +22,16 @@ class ScheduledJobType(Document):
 			# force logging for all events other than continuous ones (ALL)
 			self.create_log = 1
 
-	def enqueue(self, force=False):
+	def enqueue(self, force=False) -> bool:
 		# enqueue event if last execution is done
 		if self.is_event_due() or force:
-			if frappe.flags.enqueued_jobs:
-				frappe.flags.enqueued_jobs.append(self.method)
-
-			if frappe.flags.execute_job:
-				self.execute()
-			else:
-				if not self.is_job_in_queue():
-					enqueue(
-						"frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job",
-						queue=self.get_queue_name(),
-						job_type=self.method,
-					)
-					return True
-
+			if not self.is_job_in_queue():
+				enqueue(
+					"frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job",
+					queue=self.get_queue_name(),
+					job_type=self.method,
+				)
+				return True
 		return False
 
 	def is_event_due(self, current_time=None):

frappe/public/scss/common/grid.scss

@@ -402,6 +402,10 @@
 	display: inline-flex;
 }
 
+.grid-custom-buttons:empty {
+	padding: 0;
+}
+
 .grid-footer, .grid-custom-buttons {
 	padding: var(--padding-sm) 0px;
 	background-color: var(--fg-color);

frappe/tests/test_scheduler.py

@@ -34,18 +34,19 @@ class TestScheduler(TestCase):
 		if not frappe.get_all("Scheduled Job Type", limit=1):
 			sync_jobs()
 
+	def tearDown(self):
+		purge_pending_jobs()
+
 	def test_enqueue_jobs(self):
 		frappe.db.sql("update `tabScheduled Job Type` set last_execution = '2010-01-01 00:00:00'")
 
-		frappe.flags.execute_job = True
-		enqueue_events(site=frappe.local.site)
-		frappe.flags.execute_job = False
+		enqueued_jobs = enqueue_events(site=frappe.local.site)
 
-		self.assertTrue("frappe.email.queue.set_expiry_for_email_queue", frappe.flags.enqueued_jobs)
-		self.assertTrue("frappe.utils.change_log.check_for_update", frappe.flags.enqueued_jobs)
-		self.assertTrue(
+		self.assertIn("frappe.email.queue.set_expiry_for_email_queue", enqueued_jobs)
+		self.assertIn("frappe.utils.change_log.check_for_update", enqueued_jobs)
+		self.assertIn(
 			"frappe.email.doctype.auto_email_report.auto_email_report.send_monthly",
-			frappe.flags.enqueued_jobs,
+			enqueued_jobs,
 		)
 
 	def test_queue_peeking(self):

frappe/utils/scheduler.py

@@ -11,6 +11,7 @@ Events:
 # imports - standard imports
 import os
 import time
+from typing import NoReturn
 
 # imports - module imports
 import frappe
@@ -30,7 +31,7 @@ def cprint(*args, **kwargs):
 		pass
 
 
-def start_scheduler():
+def start_scheduler() -> NoReturn:
 	"""Run enqueue_events_for_all_sites based on scheduler tick.
 	Specify scheduler_interval in seconds in common_site_config.json"""
 
@@ -41,7 +42,7 @@ def start_scheduler():
 		enqueue_events_for_all_sites()
 
 
-def enqueue_events_for_all_sites():
+def enqueue_events_for_all_sites() -> None:
 	"""Loop through sites and enqueue events that are not already queued"""
 
 	if os.path.exists(os.path.join(".", ".restarting")):
@@ -54,16 +55,13 @@ def enqueue_events_for_all_sites():
 	for site in sites:
 		try:
 			enqueue_events_for_site(site=site)
-		except Exception as e:
-			print(e.__class__, f"Failed to enqueue events for site: {site}")
+		except Exception:
+			frappe.logger("scheduler").debug(f"Failed to enqueue events for site: {site}", exc_info=True)
 
 
-def enqueue_events_for_site(site):
-	def log_and_raise():
-		error_message = "Exception in Enqueue Events for Site {}\n{}".format(
-			site, frappe.get_traceback()
-		)
-		frappe.logger("scheduler").error(error_message)
+def enqueue_events_for_site(site: str) -> None:
+	def log_exc():
+		frappe.logger("scheduler").error(f"Exception in Enqueue Events for Site {site}", exc_info=True)
 
 	try:
 		frappe.init(site=site)
@@ -74,29 +72,27 @@ def enqueue_events_for_site(site):
 		enqueue_events(site=site)
 
 		frappe.logger("scheduler").debug(f"Queued events for site {site}")
-	except frappe.db.OperationalError as e:
+	except Exception as e:
 		if frappe.db.is_access_denied(e):
 			frappe.logger("scheduler").debug(f"Access denied for site {site}")
-		else:
-			log_and_raise()
-	except Exception:
-		log_and_raise()
+		log_exc()
 
 	finally:
 		frappe.destroy()
 
 
-def enqueue_events(site):
+def enqueue_events(site: str) -> list[str] | None:
 	if schedule_jobs_based_on_activity():
-		frappe.flags.enqueued_jobs = []
-		queued_jobs = get_jobs(site=site, key="job_type").get(site) or []
-		for job_type in frappe.get_all("Scheduled Job Type", ("name", "method"), dict(stopped=0)):
-			if not job_type.method in queued_jobs:
-				# don't add it to queue if still pending
-				frappe.get_doc("Scheduled Job Type", job_type.name).enqueue()
+		enqueued_jobs = []
+		for job_type in frappe.get_all("Scheduled Job Type", ("name", "method"), {"stopped": 0}):
+			job_type = frappe.get_cached_doc("Scheduled Job Type", job_type.name)
+			if _enqueued := job_type.enqueue():
+				enqueued_jobs.append(job_type.method)
+
+		return enqueued_jobs
 
 
-def is_scheduler_inactive():
+def is_scheduler_inactive() -> bool:
 	if frappe.local.conf.maintenance_mode:
 		cprint(f"{frappe.local.site}: Maintenance mode is ON")
 		return True
@@ -111,7 +107,7 @@ def is_scheduler_inactive():
 	return False
 
 
-def is_scheduler_disabled():
+def is_scheduler_disabled() -> bool:
 	if frappe.conf.disable_scheduler:
 		cprint(f"{frappe.local.site}: frappe.conf.disable_scheduler is SET")
 		return True