feat(agent): Add action to cancel or stop a job

frappe · Jan 20, 2025 · f30aff6 · f30aff6
1 parent 368c379
commit f30aff6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/press/agent.py b/press/agent.py
@@ -964,6 +964,9 @@ def update_monitor_rules(self, rules, routes):
 	def get_job_status(self, id):
 		return self.get(f"jobs/{id}")
 
+	def cancel_job(self, id):
+		return self.post(f"jobs/{id}/cancel")
+
 	def get_site_sid(self, site, user=None):
 		if user:
 			data = {"user": user}

diff --git a/press/press/doctype/agent_job/agent_job.js b/press/press/doctype/agent_job/agent_job.js
@@ -52,6 +52,7 @@ frappe.ui.form.on('Agent Job', {
 				__('Succeed and Process Job Updates'),
 				'succeed_and_process_job_updates',
 			],
+			[__('Cancel Job'), 'cancel_job', ['Pending', "Running"].includes(frm.doc.status)],
 		].forEach(([label, method, condition]) => {
 			frm.add_custom_button(
 				label,

diff --git a/press/press/doctype/agent_job/agent_job.py b/press/press/doctype/agent_job/agent_job.py
@@ -307,6 +307,11 @@ def fail_and_process_job_updates(self):
 	def process_job_updates(self):
 		process_job_updates(self.name)
 
+	@frappe.whitelist()
+	def cancel_job(self):
+		agent = Agent(self.server, server_type=self.server_type)
+		agent.cancel_job(self.job_id)
+
 	def on_trash(self):
 		steps = frappe.get_all("Agent Job Step", filters={"agent_job": self.name})
 		for step in steps: