secator 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

secator/runners/command.py

@@ -1,20 +1,24 @@
+import copy
 import getpass
 import logging
 import os
 import re
 import shlex
+import signal
 import subprocess
 import sys
+import uuid
 
-from time import sleep
+from time import time
 
+import psutil
 from fp.fp import FreeProxy
 
-from secator.template import TemplateLoader
 from secator.definitions import OPT_NOT_SUPPORTED, OPT_PIPE_INPUT
 from secator.config import CONFIG
+from secator.output_types import Info, Error, Target, Stat
 from secator.runners import Runner
-from secator.serializers import JSONSerializer
+from secator.template import TemplateLoader
 from secator.utils import debug
 
 
@@ -53,18 +57,18 @@ class Command(Runner):
 	# Output encoding
 	encoding = 'utf-8'
 
-	# Environment variables
-	env = {}
-
 	# Flag to take the input
 	input_flag = None
 
 	# Input path (if a file is constructed)
 	input_path = None
 
-	# Input chunk size (default None)
+	# Input chunk size
 	input_chunk_size = CONFIG.runners.input_chunk_size
 
+	# Input required
+	input_required = True
+
 	# Flag to take a file as input
 	file_flag = None
 
@@ -80,7 +84,14 @@ class Command(Runner):
 
 	# Serializer
 	item_loader = None
-	item_loaders = [JSONSerializer(),]
+	item_loaders = []
+
+	# Hooks
+	hooks = [
+		'on_cmd',
+		'on_cmd_done',
+		'on_line'
+	]
 
 	# Ignore return code
 	ignore_return_code = False
@@ -88,9 +99,6 @@ class Command(Runner):
 	# Return code
 	return_code = -1
 
-	# Error
-	error = ''
-
 	# Output
 	output = ''
 
@@ -102,7 +110,8 @@ class Command(Runner):
 	# Profile
 	profile = 'cpu'
 
-	def __init__(self, input=None, **run_opts):
+	def __init__(self, inputs=[], **run_opts):
+
 		# Build runnerconfig on-the-fly
 		config = TemplateLoader(input={
 			'name': self.__class__.__name__,
@@ -110,26 +119,45 @@ class Command(Runner):
 			'description': run_opts.get('description', None)
 		})
 
-		# Run parent init
+		# Extract run opts
 		hooks = run_opts.pop('hooks', {})
+		caller = run_opts.get('caller', None)
 		results = run_opts.pop('results', [])
 		context = run_opts.pop('context', {})
+		self.skip_if_no_inputs = run_opts.pop('skip_if_no_inputs', False)
+
+		# Prepare validators
+		input_validators = []
+		if not self.skip_if_no_inputs:
+			input_validators.append(self._validate_input_nonempty)
+		if not caller:
+			input_validators.append(self._validate_chunked_input)
+		validators = {'validate_input': input_validators}
+
+		# Call super().__init__
 		super().__init__(
 			config=config,
-			targets=input,
+			inputs=inputs,
 			results=results,
 			run_opts=run_opts,
 			hooks=hooks,
+			validators=validators,
 			context=context)
 
+		# Inputs path
+		self.inputs_path = None
+
 		# Current working directory for cmd
 		self.cwd = self.run_opts.get('cwd', None)
 
-		# No capturing of stdout / stderr.
-		self.no_capture = self.run_opts.get('no_capture', False)
+		# Print cmd
+		self.print_cmd = self.run_opts.get('print_cmd', False)
+
+		# Stat update
+		self.last_updated_stat = None
 
-		# No processing of output lines.
-		self.no_process = self.run_opts.get('no_process', False)
+		# Process
+		self.process = None
 
 		# Proxy config (global)
 		self.proxy = self.run_opts.pop('proxy', False)
@@ -141,6 +169,9 @@ class Command(Runner):
 		# Build command
 		self._build_cmd()
 
+		# Run on_cmd hook
+		self.run_hooks('on_cmd')
+
 		# Build item loaders
 		instance_func = getattr(self, 'item_loader', None)
 		item_loaders = self.item_loaders.copy()
@@ -148,40 +179,6 @@ class Command(Runner):
 			item_loaders.append(instance_func)
 		self.item_loaders = item_loaders
 
-		# Print built cmd
-		if self.print_cmd and not self.has_children:
-			if self.sync and self.description:
-				self._print(f'\n:wrench: {self.description} ...', color='bold gold3', rich=True)
-			self._print(self.cmd.replace('[', '\\['), color='bold cyan', rich=True)
-
-		# Print built input
-		if self.print_input_file and self.input_path:
-			input_str = '\n '.join(self.input).strip()
-			debug(f'[dim magenta]File input:[/]\n [italic medium_turquoise]{input_str}[/]')
-
-		# Print run options
-		if self.print_run_opts:
-			input_str = '\n '.join([
-				f'[dim blue]{k}[/] -> [dim green]{v}[/]' for k, v in self.run_opts.items() if v is not None]).strip()
-			debug(f'[dim magenta]Run opts:[/]\n {input_str}')
-
-		# Print format options
-		if self.print_fmt_opts:
-			input_str = '\n '.join([
-				f'[dim blue]{k}[/] -> [dim green]{v}[/]' for k, v in self.opts_to_print.items() if v is not None]).strip()
-			debug(f'[dim magenta]Print opts:[/]\n {input_str}')
-
-		# Print hooks
-		if self.print_hooks:
-			input_str = ''
-			for hook_name, hook_funcs in self.hooks.items():
-				hook_funcs_str = ', '.join([f'[dim green]{h.__module__}.{h.__qualname__}[/]' for h in hook_funcs])
-				if hook_funcs:
-					input_str += f'[dim blue]{hook_name}[/] -> {hook_funcs_str}\n '
-			input_str = input_str.strip()
-			if input_str:
-				debug(f'[dim magenta]Hooks:[/]\n {input_str}')
-
 	def toDict(self):
 		res = super().toDict()
 		res.update({
@@ -196,6 +193,7 @@ class Command(Runner):
 		# TODO: Move this to TaskBase
 		from secator.celery import run_command
 		results = kwargs.get('results', [])
+		kwargs['sync'] = False
 		name = cls.__name__
 		return run_command.apply_async(args=[results, name] + list(args), kwargs={'opts': kwargs}, queue=cls.profile)
 
@@ -206,7 +204,7 @@ class Command(Runner):
 		return run_command.s(cls.__name__, *args, opts=kwargs).set(queue=cls.profile)
 
 	@classmethod
-	def si(cls, results, *args, **kwargs):
+	def si(cls, *args, results=[], **kwargs):
 		# TODO: Move this to TaskBase
 		from secator.celery import run_command
 		return run_command.si(results, cls.__name__, *args, opts=kwargs).set(queue=cls.profile)
@@ -226,12 +224,14 @@ class Command(Runner):
 					d[k] = v.__name__
 			return d
 
-		opts = {k: convert(v) for k, v in cls.opts.items()}
+		cls_opts = copy.deepcopy(cls.opts)
+		opts = {k: convert(v) for k, v in cls_opts.items()}
 		for k, v in opts.items():
 			v['meta'] = cls.__name__
 			v['supported'] = True
 
-		meta_opts = {k: convert(v) for k, v in cls.meta_opts.items() if cls.opt_key_map.get(k) is not OPT_NOT_SUPPORTED}
+		cls_meta_opts = copy.deepcopy(cls.meta_opts)
+		meta_opts = {k: convert(v) for k, v in cls_meta_opts.items() if cls.opt_key_map.get(k) is not OPT_NOT_SUPPORTED}
 		for k, v in meta_opts.items():
 			v['meta'] = 'meta'
 			if cls.opt_key_map.get(k) is OPT_NOT_SUPPORTED:
@@ -247,7 +247,7 @@ class Command(Runner):
 	#---------------#
 
 	@classmethod
-	def execute(cls, cmd, name=None, cls_attributes={}, **kwargs):
+	def execute(cls, cmd, name=None, cls_attributes={}, run=True, **kwargs):
 		"""Execute an ad-hoc command.
 
 		Can be used without defining an inherited class to run a command, while still enjoying all the good stuff in
@@ -264,15 +264,13 @@ class Command(Runner):
 			secator.runners.Command: instance of the Command.
 		"""
 		name = name or cmd.split(' ')[0]
-		kwargs['no_process'] = kwargs.get('no_process', True)
 		kwargs['print_cmd'] = not kwargs.get('quiet', False)
-		kwargs['print_item'] = not kwargs.get('quiet', False)
-		kwargs['print_line'] = not kwargs.get('quiet', False)
-		delay_run = kwargs.pop('delay_run', False)
-		cmd_instance = type(name, (Command,), {'cmd': cmd})(**kwargs)
+		kwargs['print_line'] = True
+		kwargs['no_process'] = kwargs.get('no_process', True)
+		cmd_instance = type(name, (Command,), {'cmd': cmd, 'input_required': False})(**kwargs)
 		for k, v in cls_attributes.items():
 			setattr(cmd_instance, k, v)
-		if not delay_run:
+		if run:
 			cmd_instance.run()
 		return cmd_instance
 
@@ -328,124 +326,228 @@ class Command(Runner):
 
 		Yields:
 			str: Command stdout / stderr.
-			dict: Parsed JSONLine object.
+			dict: Serialized object.
 		"""
-		# Set status to 'RUNNING'
-		self.status = 'RUNNING'
+		try:
 
-		# Callback before running command
-		self.run_hooks('on_start')
+			# Abort if it has children tasks
+			if self.has_children:
+				return
 
-		# Check for sudo requirements and prepare the password if needed
-		sudo_password = self._prompt_sudo(self.cmd)
+			# Print task description
+			self.print_description()
 
-		# Prepare cmds
-		command = self.cmd if self.shell else shlex.split(self.cmd)
+			# Abort if no inputs
+			if len(self.inputs) == 0 and self.skip_if_no_inputs:
+				yield Info(message=f'{self.unique_name} skipped (no inputs)', _source=self.unique_name, _uuid=str(uuid.uuid4()))
+				return
 
-		# Output and results
-		self.return_code = 0
-		self.killed = False
+			# Yield targets
+			for input in self.inputs:
+				yield Target(name=input, _source=self.unique_name, _uuid=str(uuid.uuid4()))
+
+			# Check for sudo requirements and prepare the password if needed
+			sudo_password, error = self._prompt_sudo(self.cmd)
+			if error:
+				yield Error(
+					message=error,
+					_source=self.unique_name,
+					_uuid=str(uuid.uuid4())
+				)
+				return
 
-		# Run the command using subprocess
-		try:
+			# Prepare cmds
+			command = self.cmd if self.shell else shlex.split(self.cmd)
+
+			# Output and results
+			self.return_code = 0
+			self.killed = False
+
+			# Run the command using subprocess
 			env = os.environ
-			env.update(self.env)
 			self.process = subprocess.Popen(
 				command,
 				stdin=subprocess.PIPE if sudo_password else None,
-				stdout=sys.stdout if self.no_capture else subprocess.PIPE,
-				stderr=sys.stderr if self.no_capture else subprocess.STDOUT,
+				stdout=subprocess.PIPE,
+				stderr=subprocess.STDOUT,
 				universal_newlines=True,
 				shell=self.shell,
 				env=env,
 				cwd=self.cwd)
+			self.print_command()
 
 			# If sudo password is provided, send it to stdin
 			if sudo_password:
 				self.process.stdin.write(f"{sudo_password}\n")
 				self.process.stdin.flush()
 
-		except FileNotFoundError as e:
-			if self.config.name in str(e):
-				error = 'Executable not found.'
-				if self.install_cmd:
-					error += f' Install it with `secator install tools {self.config.name}`.'
-			else:
-				error = str(e)
-			celery_id = self.context.get('celery_id', '')
-			if celery_id:
-				error += f' [{celery_id}]'
-			self.errors.append(error)
-			self.return_code = 1
-			return
-
-		try:
-			# No capture mode, wait for command to finish and return
-			if self.no_capture:
-				self._wait_for_end()
-				return
-
 			# Process the output in real-time
 			for line in iter(lambda: self.process.stdout.readline(), b''):
-				sleep(0)  # for async to give up control
+				# sleep(0)  # for async to give up control
 				if not line:
 					break
+				yield from self.process_line(line)
 
-				# Strip line endings
-				line = line.rstrip()
-				if self.no_process:
-					yield line
-					continue
+			# Run hooks after cmd has completed successfully
+			result = self.run_hooks('on_cmd_done')
+			if result:
+				yield from result
+
+		except FileNotFoundError as e:
+			yield from self.handle_file_not_found(e)
+
+		except BaseException as e:
+			self.debug(f'{self.unique_name}: {type(e).__name__}.', sub='error')
+			self.stop_process()
+			yield Error.from_exception(e, _source=self.unique_name, _uuid=str(uuid.uuid4()))
+
+		finally:
+			yield from self._wait_for_end()
+
+	def process_line(self, line):
+		"""Process a single line of output emitted on stdout / stderr and yield results."""
+
+		# Strip line endings
+		line = line.rstrip()
+
+		# Some commands output ANSI text, so we need to remove those ANSI chars
+		if self.encoding == 'ansi':
+			ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+			line = ansi_escape.sub('', line)
+			line = line.replace('\\x0d\\x0a', '\n')
+
+		# Run on_line hooks
+		line = self.run_hooks('on_line', line)
+		if line is None:
+			return
 
-				# Some commands output ANSI text, so we need to remove those ANSI chars
-				if self.encoding == 'ansi':
-					# ansi_regex = r'\x1b\[([0-9,A-Z]{1,2}(;[0-9]{1,2})?(;[0-9]{3})?)?[K]?'
-					# line = re.sub(ansi_regex, '', line.strip())
-					ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
-					line = ansi_escape.sub('', line)
-					line = line.replace('\\x0d\\x0a', '\n')
+		# Run item_loader to try parsing as dict
+		item_count = 0
+		for item in self.run_item_loaders(line):
+			yield item
+			item_count += 1
 
-				# Run on_line hooks
-				line = self.run_hooks('on_line', line)
+		# Yield line if no items were yielded
+		if item_count == 0:
+			yield line
 
-				# Run item_loader to try parsing as dict
-				items = None
-				if self.output_json:
-					items = self.run_item_loaders(line)
+		# Skip rest of iteration (no process mode)
+		if self.no_process:
+			return
 
-				# Yield line if no items parsed
-				if not items:
-					yield line
+		# Yield command stats (CPU, memory, conns ...)
+		# TODO: enable stats support with timer
+		if self.last_updated_stat and (time() - self.last_updated_stat) < CONFIG.runners.stat_update_frequency:
+			return
 
-				# Turn results into list if not already a list
-				elif not isinstance(items, list):
-					items = [items]
+		yield from self.stats()
+		self.last_updated_stat = time()
+
+	def print_description(self):
+		"""Print description"""
+		if self.sync and not self.has_children:
+			if self.caller and self.description:
+				self._print(f'\n[bold gold3]:wrench: {self.description} [dim cyan]({self.config.name})[/][/] ...', rich=True)
+			elif self.print_cmd:
+				self._print('')
+
+	def print_command(self):
+		"""Print command."""
+		if self.print_cmd:
+			cmd_str = self.cmd.replace('[', '\\[')
+			if self.sync and self.chunk and self.chunk_count:
+				cmd_str += f' [dim gray11]({self.chunk}/{self.chunk_count})[/]'
+			self._print(cmd_str, color='bold cyan', rich=True)
+		self.debug('Command', obj={'cmd': self.cmd}, sub='init')
+
+	def handle_file_not_found(self, exc):
+		"""Handle case where binary is not found.
 
-				# Yield items
-				if items:
-					yield from items
+		Args:
+			exc (FileNotFoundError): the exception.
 
-		except KeyboardInterrupt:
-			self.process.kill()
-			self.killed = True
+		Yields:
+			secator.output_types.Error: the error.
+		"""
+		self.return_code = 127
+		if self.config.name in str(exc):
+			message = 'Executable not found.'
+			if self.install_cmd:
+				message += f' Install it with `secator install tools {self.config.name}`.'
+			error = Error(message=message)
+		else:
+			error = Error.from_exception(exc)
+		error._source = self.unique_name
+		error._uuid = str(uuid.uuid4())
+		yield error
+
+	def stop_process(self):
+		"""Sends SIGINT to running process, if any."""
+		if not self.process:
+			return
+		self.debug(f'Sending SIGINT to process {self.process.pid}.', sub='error')
+		self.process.send_signal(signal.SIGINT)
+
+	def stats(self):
+		"""Gather stats about the current running process, if any."""
+		if not self.process or not self.process.pid:
+			return
+		proc = psutil.Process(self.process.pid)
+		stats = Command.get_process_info(proc, children=True)
+		for info in stats:
+			name = info['name']
+			pid = info['pid']
+			cpu_percent = info['cpu_percent']
+			mem_percent = info['memory_percent']
+			net_conns = info.get('net_connections') or []
+			extra_data = {k: v for k, v in info.items() if k not in ['cpu_percent', 'memory_percent', 'net_connections']}
+			yield Stat(
+				name=name,
+				pid=pid,
+				cpu=cpu_percent,
+				memory=mem_percent,
+				net_conns=len(net_conns),
+				extra_data=extra_data
+			)
 
-		# Retrieve the return code and output
-		self._wait_for_end()
+	@staticmethod
+	def get_process_info(process, children=False):
+		"""Get process information from psutil.
+
+		Args:
+			process (subprocess.Process): Process.
+			children (bool): Whether to gather stats about children processes too.
+		"""
+		try:
+			data = {
+				k: v._asdict() if hasattr(v, '_asdict') else v
+				for k, v in process.as_dict().items()
+				if k not in ['memory_maps', 'open_files', 'environ']
+			}
+			yield data
+		except (psutil.Error, FileNotFoundError):
+			return
+		if children:
+			for subproc in process.children(recursive=True):
+				yield from Command.get_process_info(subproc, children=False)
 
 	def run_item_loaders(self, line):
-		"""Run item loaders on a string."""
-		items = []
+		"""Run item loaders against an output line.
+
+		Args:
+			line (str): Output line.
+		"""
+		if self.no_process:
+			return
 		for item_loader in self.item_loaders:
-			result = None
 			if (callable(item_loader)):
-				result = item_loader(self, line)
+				yield from item_loader(self, line)
 			elif item_loader:
-				result = item_loader.run(line)
-			if isinstance(result, dict):
-				result = [result]
-			if result:
-				items.extend(result)
-		return items
+				name = item_loader.__class__.__name__.replace('Serializer', '').lower()
+				default_callback = lambda self, x: [(yield x)]  # noqa: E731
+				callback = getattr(self, f'on_{name}_loaded', None) or default_callback
+				for item in item_loader.run(line):
+					yield from callback(self, item)
 
 	def _prompt_sudo(self, command):
 		"""
@@ -455,22 +557,25 @@ class Command(Runner):
 			command (str): The initial command to be executed.
 
 		Returns:
-			str or None: The sudo password if required; otherwise, None.
+			tuple: (sudo password, error).
 		"""
 		sudo_password = None
 
 		# Check if sudo is required by the command
 		if not re.search(r'\bsudo\b', command):
-			return None
+			return None, []
 
 		# Check if sudo can be executed without a password
-		if subprocess.run(['sudo', '-n', 'true'], capture_output=True).returncode == 0:
-			return None
+		try:
+			if subprocess.run(['sudo', '-n', 'true'], capture_output=False).returncode == 0:
+				return None, None
+		except ValueError:
+			self._print('[bold orange3]Could not run sudo check test.[/][bold green]Passing.[/]')
 
 		# Check if we have a tty
 		if not os.isatty(sys.stdin.fileno()):
-			self._print("No TTY detected. Sudo password prompt requires a TTY to proceed.", color='bold red')
-			sys.exit(1)
+			error = "No TTY detected. Sudo password prompt requires a TTY to proceed."
+			return -1, error
 
 		# If not, prompt the user for a password
 		self._print('[bold red]Please enter sudo password to continue.[/]')
@@ -484,31 +589,43 @@ class Command(Runner):
 				capture_output=True
 			)
 			if result.returncode == 0:
-				return sudo_password  # Password is correct
+				return sudo_password, None  # Password is correct
 			self._print("Sorry, try again.")
-		self._print("Sudo password verification failed after 3 attempts.")
-		return None
+		error = "Sudo password verification failed after 3 attempts."
+		return -1, error
 
 	def _wait_for_end(self):
 		"""Wait for process to finish and process output and return code."""
+		if not self.process:
+			return
+		for line in self.process.stdout.readlines():
+			yield from self.process_line(line)
 		self.process.wait()
 		self.return_code = self.process.returncode
+		self.process.stdout.close()
+		self.return_code = 0 if self.ignore_return_code else self.return_code
+		self.output = self.output.strip()
+		self.killed = self.return_code == -2 or self.killed
+		self.debug(f'Command {self.cmd} finished with return code {self.return_code}', sub='command')
 
-		if self.no_capture:
-			self.output = ''
-		else:
-			self.output = self.output.strip()
-			self.process.stdout.close()
-
-		if self.ignore_return_code:
-			self.return_code = 0
-
-		if self.return_code == -2 or self.killed:
+		if self.killed:
 			error = 'Process was killed manually (CTRL+C / CTRL+X)'
-			self.errors.append(error)
+			yield Error(
+				message=error,
+				_source=self.unique_name,
+				_uuid=str(uuid.uuid4())
+			)
+
 		elif self.return_code != 0:
 			error = f'Command failed with return code {self.return_code}.'
-			self.errors.append(error)
+			last_lines = self.output.split('\n')
+			last_lines = last_lines[max(0, len(last_lines) - 2):]
+			yield Error(
+				message=error,
+				traceback='\n'.join(last_lines),
+				_source=self.unique_name,
+				_uuid=str(uuid.uuid4())
+			)
 
 	@staticmethod
 	def _process_opts(
@@ -518,15 +635,19 @@ class Command(Runner):
 			opt_value_map={},
 			opt_prefix='-',
 			command_name=None):
-		"""Process a dict of options using a config, option key map / value map
-		and option character like '-' or '--'.
+		"""Process a dict of options using a config, option key map / value map and option character like '-' or '--'.
 
 		Args:
 			opts (dict): Command options as input on the CLI.
 			opts_conf (dict): Options config (Click options definition).
+			opt_key_map (dict[str, str | Callable]): A dict to map option key with their actual values.
+			opt_value_map (dict, str | Callable): A dict to map option values with their actual values.
+			opt_prefix (str, default: '-'): Option prefix.
+			command_name (str | None, default: None): Command name.
 		"""
 		opts_str = ''
 		for opt_name, opt_conf in opts_conf.items():
+			debug('before get_opt_value', obj={'name': opt_name, 'conf': opt_conf}, obj_after=False, sub='command.options', verbose=True)  # noqa: E501
 
 			# Get opt value
 			default_val = opt_conf.get('default')
@@ -537,25 +658,30 @@ class Command(Runner):
 				opt_prefix=command_name,
 				default=default_val)
 
+			debug('after get_opt_value', obj={'name': opt_name, 'value': opt_val, 'conf': opt_conf}, obj_after=False, sub='command.options', verbose=True)  # noqa: E501
+
 			# Skip option if value is falsy
 			if opt_val in [None, False, []]:
-				# logger.debug(f'Option {opt_name} was passed but is falsy. Skipping.')
+				debug('skipped (falsy)', obj={'name': opt_name, 'value': opt_val}, obj_after=False, sub='command.options', verbose=True)  # noqa: E501
 				continue
 
 			# Convert opt value to expected command opt value
 			mapped_opt_val = opt_value_map.get(opt_name)
-			if callable(mapped_opt_val):
-				opt_val = mapped_opt_val(opt_val)
-			elif mapped_opt_val:
-				opt_val = mapped_opt_val
+			if mapped_opt_val:
+				if callable(mapped_opt_val):
+					opt_val = mapped_opt_val(opt_val)
+				else:
+					opt_val = mapped_opt_val
 
 			# Convert opt name to expected command opt name
 			mapped_opt_name = opt_key_map.get(opt_name)
-			if mapped_opt_name == OPT_NOT_SUPPORTED:
-				# logger.debug(f'Option {opt_name} was passed but is unsupported. Skipping.')
-				continue
-			elif mapped_opt_name is not None:
-				opt_name = mapped_opt_name
+			if mapped_opt_name is not None:
+				if mapped_opt_name == OPT_NOT_SUPPORTED:
+					debug('skipped (unsupported)', obj={'name': opt_name, 'value': opt_val}, sub='command.options', verbose=True)  # noqa: E501
+					continue
+				else:
+					opt_name = mapped_opt_name
+			debug('mapped key / value', obj={'name': opt_name, 'value': opt_val}, obj_after=False, sub='command.options', verbose=True)  # noqa: E501
 
 			# Avoid shell injections and detect opt prefix
 			opt_name = str(opt_name).split(' ')[0]  # avoid cmd injection
@@ -570,31 +696,66 @@ class Command(Runner):
 			# Append opt name + opt value to option string.
 			# Note: does not append opt value if value is True (flag)
 			opts_str += f' {opt_name}'
+			shlex_quote = opt_conf.get('shlex', True)
 			if opt_val is not True:
-				opt_val = shlex.quote(str(opt_val))
+				if shlex_quote:
+					opt_val = shlex.quote(str(opt_val))
 				opts_str += f' {opt_val}'
+			debug('final', obj={'name': opt_name, 'value': opt_val}, sub='command.options', obj_after=False, verbose=True)
 
 		return opts_str.strip()
 
+	@staticmethod
+	def _validate_chunked_input(self, inputs):
+		"""Command does not suport multiple inputs in non-worker mode. Consider using .delay() instead."""
+		if len(inputs) > 1 and self.sync and self.file_flag is None:
+			return False
+		return True
+
+	@staticmethod
+	def _validate_input_nonempty(self, inputs):
+		"""Input is empty."""
+		if not self.input_required:
+			return True
+		if not inputs or len(inputs) == 0:
+			return False
+		return True
+
+	# @staticmethod
+	# def _validate_input_types_valid(self, input):
+	# 	pass
+
+	@staticmethod
+	def _get_opt_default(opt_name, opts_conf):
+		for k, v in opts_conf.items():
+			if k == opt_name:
+				return v.get('default', None)
+		return None
+
 	@staticmethod
 	def _get_opt_value(opts, opt_name, opts_conf={}, opt_prefix='', default=None):
-		aliases = [
-			opts.get(f'{opt_prefix}_{opt_name}'),
-			opts.get(f'{opt_prefix}.{opt_name}'),
-			opts.get(opt_name),
+		default = default or Command._get_opt_default(opt_name, opts_conf)
+		opt_names = [
+			f'{opt_prefix}.{opt_name}',
+			f'{opt_prefix}_{opt_name}',
+			opt_name,
 		]
-		alias = [conf.get('short') for _, conf in opts_conf.items() if conf.get('short') in opts]
+		opt_values = [opts.get(o) for o in opt_names]
+		alias = [conf.get('short') for _, conf in opts_conf.items() if conf.get('short') in opts and _ == opt_name]
 		if alias:
-			aliases.append(opts.get(alias[0]))
-		if OPT_NOT_SUPPORTED in aliases:
+			opt_values.append(opts.get(alias[0]))
+		if OPT_NOT_SUPPORTED in opt_values:
+			debug('skipped (unsupported)', obj={'name': opt_name}, obj_after=False, sub='command.options', verbose=True)
 			return None
-		return next((v for v in aliases if v is not None), default)
+		value = next((v for v in opt_values if v is not None), default)
+		debug('got opt value', obj={'name': opt_name, 'value': value, 'aliases': opt_names, 'values': opt_values}, obj_after=False, sub='command.options', verbose=True)  # noqa: E501
+		return value
 
 	def _build_cmd(self):
 		"""Build command string."""
 
 		# Add JSON flag to cmd
-		if self.output_json and self.json_flag:
+		if self.json_flag:
 			self.cmd += f' {self.json_flag}'
 
 		# Add options to cmd
@@ -624,47 +785,39 @@ class Command(Runner):
 		string or a list to the cmd.
 		"""
 		cmd = self.cmd
-		input = self.input
+		inputs = self.inputs
 
-		# If input is None, return the previous command
-		if not input:
+		# If inputs is empty, return the previous command
+		if not inputs:
 			return
 
-		# If input is a list but has one element, use the standard string input
-		if isinstance(input, list) and len(input) == 1:
-			input = input[0]
+		# If inputs has a single element but the tool does not support an input flag, use echo-piped_input input.
+		# If the tool's input flag is set to None, assume it is a positional argument at the end of the command.
+		# Otherwise use the input flag to pass the input.
+		if len(inputs) == 1:
+			input = shlex.quote(inputs[0])
+			if self.input_flag == OPT_PIPE_INPUT:
+				cmd = f'echo {input} | {cmd}'
+			elif not self.input_flag:
+				cmd += f' {input}'
+			else:
+				cmd += f' {self.input_flag} {input}'
 
-		# If input is a list and the tool has input_flag set to OPT_PIPE_INPUT, use cat-piped input.
+		# If inputs has multiple elements and the tool has input_flag set to OPT_PIPE_INPUT, use cat-piped_input input.
 		# Otherwise pass the file path to the tool.
-		if isinstance(input, list):
+		else:
 			fpath = f'{self.reports_folder}/.inputs/{self.unique_name}.txt'
 
 			# Write the input to a file
 			with open(fpath, 'w') as f:
-				f.write('\n'.join(input))
+				f.write('\n'.join(inputs))
 
 			if self.file_flag == OPT_PIPE_INPUT:
 				cmd = f'cat {fpath} | {cmd}'
 			elif self.file_flag:
 				cmd += f' {self.file_flag} {fpath}'
-			else:
-				self._print(f'{self.__class__.__name__} does not support multiple inputs.', color='bold red')
-				self.input_valid = False
-
-			self.input_path = fpath
 
-		# If input is a string but the tool does not support an input flag, use echo-piped input.
-		# If the tool's input flag is set to None, assume it is a positional argument at the end of the command.
-		# Otherwise use the input flag to pass the input.
-		else:
-			input = shlex.quote(input)
-			if self.input_flag == OPT_PIPE_INPUT:
-				cmd = f'echo {input} | {cmd}'
-			elif not self.input_flag:
-				cmd += f' {input}'
-			else:
-				cmd += f' {self.input_flag} {input}'
+			self.inputs_path = fpath
 
 		self.cmd = cmd
 		self.shell = ' | ' in self.cmd
-		self.input = input