kaqing 2.0.145__py3-none-any.whl → 2.0.174__py3-none-any.whl

adam/commands/medusa/medusa.py

@@ -1,13 +1,13 @@
 import click
 
 from adam.commands.command import Command
+from adam.commands.intermediate_command import IntermediateCommand
 from .medusa_backup import MedusaBackup
 from .medusa_restore import MedusaRestore
 from .medusa_show_backupjobs import MedusaShowBackupJobs
 from .medusa_show_restorejobs import MedusaShowRestoreJobs
-from adam.repl_state import ReplState, RequiredState
 
-class Medusa(Command):
+class Medusa(IntermediateCommand):
     COMMAND = 'medusa'
 
     # the singleton pattern
@@ -16,30 +16,12 @@ class Medusa(Command):
 
         return cls.instance
 
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
     def command(self):
         return Medusa.COMMAND
 
-    def required(self):
-        return RequiredState.CLUSTER
-
-    def run(self, cmd: str, state: ReplState):
-        if not(args := self.args(cmd)):
-            return super().run(cmd, state)
-
-        return super().intermediate_run(cmd, state, args, Medusa.cmd_list())
-
-    def cmd_list():
+    def cmd_list(self):
         return [MedusaBackup(), MedusaRestore(), MedusaShowBackupJobs(), MedusaShowRestoreJobs()]
 
-    def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
-
 class MedusaCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        Command.intermediate_help(super().get_help(ctx), Medusa.COMMAND, Medusa.cmd_list(), show_cluster_help=True)
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Medusa.COMMAND, Medusa().cmd_list(), show_cluster_help=True)

adam/commands/medusa/medusa_backup.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-import re
 
 from adam.commands.command import Command
 from adam.utils_k8s.statefulsets import StatefulSets
@@ -7,7 +6,6 @@ from adam.repl_state import ReplState, RequiredState
 from adam.utils_k8s.custom_resources import CustomResources
 from adam.utils import log2
 
-
 class MedusaBackup(Command):
     COMMAND = 'backup'
 
@@ -29,33 +27,30 @@ class MedusaBackup(Command):
     def run(self, cmd: str, state: ReplState):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        ns = state.namespace
-        sts = state.sts
-        now_dtformat = datetime.now().strftime("%Y-%m-%d.%H.%M.%S")
-        bkname = 'medusa-' + now_dtformat + 'full-backup-' + sts
-        if len(args) == 1:
-            bkname = str(args[0])
-        groups = re.match(r'^(.*?-.*?-).*', sts)
-        dc = StatefulSets.get_datacenter(state.sts, ns)
-        if not dc:
-            return state
 
-        try:
-            CustomResources.create_medusa_backupjob(bkname, dc, ns)
-        except Exception as e:
-            log2("Exception: MedusaBackup failed: %s\n" % e)
+        with self.validate(args, state) as (args, state):
+            ns = state.namespace
+            sts = state.sts
+            now_dtformat = datetime.now().strftime("%Y-%m-%d.%H.%M.%S")
+            bkname = 'medusa-' + now_dtformat + 'full-backup-' + sts
+            if len(args) == 1:
+                bkname = str(args[0])
+
+            dc = StatefulSets.get_datacenter(state.sts, ns)
+            if not dc:
+                return state
+
+            try:
+                CustomResources.create_medusa_backupjob(bkname, dc, ns)
+            except Exception as e:
+                log2("Exception: MedusaBackup failed: %s\n" % e)
+            finally:
+                CustomResources.clear_caches()
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{MedusaBackup.COMMAND}\t start a backup job'

adam/commands/medusa/medusa_restore.py

@@ -1,11 +1,14 @@
+from collections.abc import Callable
 from datetime import datetime
+from functools import partial
 
-from adam.commands.command import Command
+from adam.commands import validate_args
+from adam.commands.command import Command, InvalidArgumentsException
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 from adam.utils_k8s.custom_resources import CustomResources
 from adam.config import Config
-from adam.utils import lines_to_tabular, log2
+from adam.utils import lines_to_tabular, log2, log_exc
 
 class MedusaRestore(Command):
     COMMAND = 'restore'
@@ -28,47 +31,42 @@ class MedusaRestore(Command):
     def run(self, cmd: str, state: ReplState):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        ns = state.namespace
-        dc = StatefulSets.get_datacenter(state.sts, ns)
-        if not dc:
-            return state
-
-        if len(args) == 1:
-            bkname = args[0]
-            job = CustomResources.medusa_get_backupjob(dc, ns, bkname)
-            if not job:
-                log2('\n* Backup job name is not valid.')
+
+        with self.validate(args, state) as (args, state):
+            ns = state.namespace
+            dc: str = StatefulSets.get_datacenter(state.sts, ns)
+            if not dc:
+                return state
+
+            def msg(missing: bool):
+                if missing:
+                    log2('\n* Missing Backup Name')
+                    log2('Usage: qing restore <backup> <sts@name_space>\n')
+                else:
+                    log2('\n* Backup job name is not valid.')
+
                 bklist = [f"{x['metadata']['name']}\t{x['metadata']['creationTimestamp']}\t{x['status'].get('finishTime', '')}" for x in CustomResources.medusa_show_backupjobs(dc, ns)]
                 log2(lines_to_tabular(bklist, 'NAME\tCREATED\tFINISHED', separator='\t'))
 
-                return state
+            with validate_args(args, state, msg=partial(msg, True)) as bkname:
+                if not (job := CustomResources.medusa_get_backupjob(dc, ns, bkname)):
+                    msg(False)
+                    raise InvalidArgumentsException()
+
+                if not input(f"Restoring from {bkname} created at {job['metadata']['creationTimestamp']}. Please enter Yes to continue: ").lower() in ['y', 'yes']:
+                    return state
+
+                with log_exc(lambda e: "Exception: MedusaRestore failed: %s\n" % e):
+                    now_dtformat = datetime.now().strftime("%Y-%m-%d.%H.%M.%S")
+                    rtname = 'medusa-' + now_dtformat + '-restore-from-' + bkname
+                    CustomResources.create_medusa_restorejob(rtname, bkname, dc, ns)
 
-            if not input(f"Restoring from {bkname} created at {job['metadata']['creationTimestamp']}. Please enter Yes to continue: ").lower() in ['y', 'yes']:
                 return state
-        else:
-            bklist = [f"{x['metadata']['name']}\t{x['metadata']['creationTimestamp']}\t{x['status'].get('finishTime', '')}" for x in CustomResources.medusa_show_backupjobs(dc, ns)]
-            log2('\n* Missing Backup Name')
-            log2('Usage: qing medusa restore <backup> <sts@name_space>\n')
-            log2(lines_to_tabular(bklist, 'NAME\tCREATED\tFINISHED', separator='\t'))
-            return state
-
-        now_dtformat = datetime.now().strftime("%Y-%m-%d.%H.%M.%S")
-        rtname = 'medusa-' + now_dtformat + '-restore-from-' + bkname
-        try:
-            CustomResources.create_medusa_restorejob(rtname, bkname, dc, ns)
-        except Exception as e:
-            log2("Exception: MedusaRestore failed: %s\n" % e)
-
-        return state
 
     def completion(self, state: ReplState):
-        if state.sts:
+        if sc := super().completion(state):
             ns = state.namespace
-            dc = StatefulSets.get_datacenter(state.sts, ns)
+            dc: str = StatefulSets.get_datacenter(state.sts, ns)
             if not dc:
                 return {}
 
@@ -77,7 +75,7 @@ class MedusaRestore(Command):
 
                 return super().completion(state, leaf)
             else:
-                return super().completion(state)
+                return sc
 
         return {}
 

adam/commands/medusa/medusa_show_backupjobs.py

@@ -2,7 +2,7 @@ from adam.commands.command import Command
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 from adam.utils_k8s.custom_resources import CustomResources
-from adam.utils import lines_to_tabular, log2
+from adam.utils import lines_to_tabular, log2, log_exc
 
 
 class MedusaShowBackupJobs(Command):
@@ -26,28 +26,24 @@ class MedusaShowBackupJobs(Command):
     def run(self, cmd: str, state: ReplState):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
 
-        ns = state.namespace
-        dc = StatefulSets.get_datacenter(state.sts, ns)
-        if not dc:
-            return state
+        with self.validate(args, state) as (args, state):
+            ns = state.namespace
+            dc = StatefulSets.get_datacenter(state.sts, ns)
+            if not dc:
+                return state
 
-        try:
-            bklist = [f"{x['metadata']['name']}\t{x['metadata']['creationTimestamp']}\t{x['status'].get('finishTime', '')}" for x in CustomResources.medusa_show_backupjobs(dc, ns)]
-            log2(lines_to_tabular(bklist, 'NAME\tCREATED\tFINISHED', separator='\t'))
-        except Exception as e:
-            log2("Exception: MedusaShowBackupJobs failed: %s\n" % e)
+            # try:
+            with log_exc(lambda e: "Exception: MedusaShowBackupJobs failed: %s\n" % e):
+                CustomResources.clear_caches()
 
-        return state
+                bklist = [f"{x['metadata']['name']}\t{x['metadata']['creationTimestamp']}\t{x['status'].get('finishTime', '') if 'status' in x else 'unknown'}" for x in CustomResources.medusa_show_backupjobs(dc, ns)]
+                log2(lines_to_tabular(bklist, 'NAME\tCREATED\tFINISHED', separator='\t'))
 
-    def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
+            return state
 
-        return {}
+    def completion(self, state: ReplState):
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{MedusaShowBackupJobs.COMMAND}\t show Medusa backups'

adam/commands/medusa/medusa_show_restorejobs.py

@@ -2,7 +2,7 @@ from adam.commands.command import Command
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 from adam.utils_k8s.custom_resources import CustomResources
-from adam.utils import lines_to_tabular, log2
+from adam.utils import lines_to_tabular, log2, log_exc
 
 class MedusaShowRestoreJobs(Command):
     COMMAND = 'show restores'
@@ -25,28 +25,21 @@ class MedusaShowRestoreJobs(Command):
     def run(self, cmd: str, state: ReplState):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
 
-        ns = state.namespace
-        dc = StatefulSets.get_datacenter(state.sts, ns)
-        if not dc:
-            return state
+        with self.validate(args, state) as (args, state):
+            ns = state.namespace
+            dc = StatefulSets.get_datacenter(state.sts, ns)
+            if not dc:
+                return state
 
-        try:
-            rtlist = CustomResources.medusa_show_restorejobs(dc, ns)
-            log2(lines_to_tabular(rtlist, 'NAME\tCREATED\tFINISHED', separator='\t'))
-        except Exception as e:
-            log2("Exception: MedusaShowRestoreJobs failed: %s\n" % e)
+            with log_exc(lambda e: "Exception: MedusaShowRestoreJobs failed: %s\n" % e):
+                rtlist = CustomResources.medusa_show_restorejobs(dc, ns)
+                log2(lines_to_tabular(rtlist, 'NAME\tCREATED\tFINISHED', separator='\t'))
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{MedusaShowRestoreJobs.COMMAND}\t show Medusa restores'

adam/commands/nodetool.py

@@ -2,10 +2,9 @@ import click
 
 from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterOrPodCommandHelper
+from adam.commands.cql.utils_cql import cassandra
 from adam.commands.nodetool_commands import NODETOOL_COMMANDS
 from adam.config import Config
-from adam.utils_k8s.cassandra_clusters import CassandraClusters
-from adam.utils_k8s.cassandra_nodes import CassandraNodes
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log
 from adam.utils_k8s.statefulsets import StatefulSets
@@ -32,22 +31,14 @@ class NodeTool(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        user, pw = state.user_pass()
-        command = f"nodetool -u {user} -pw {pw} {' '.join(args)}"
+        with self.validate(args, state) as (args, state):
+            with cassandra(state) as pods:
+                pods.nodetool(' '.join(args))
 
-        if state.pod:
-            return CassandraNodes.exec(state.pod, state.namespace, command, show_out=True)
-        elif state.sts:
-            return CassandraClusters.exec(state.sts, state.namespace, command, action='nodetool', show_out=True)
-
-        return state
+            return state
 
     def completion(self, state: ReplState):
-        if state.pod or state.sts:
+        if super().completion(state):
             d = {c: {'&': None} for c in NODETOOL_COMMANDS}
             return {NodeTool.COMMAND: {'help': None} | d} | \
                    {f'@{p}': {NodeTool.COMMAND: d} for p in StatefulSets.pod_names(state.sts, state.namespace)}

adam/commands/param_get.py

@@ -1,3 +1,4 @@
+from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.config import Config
 from adam.repl_state import ReplState
@@ -22,21 +23,18 @@ class GetParam(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
+        with self.validate(args, state) as (args, state):
+            def msg():
+                lines = [f'{key}\t{Config().get(key, None)}' for key in Config().keys()]
+                log(lines_to_tabular(lines, separator='\t'))
 
-        if len(args) < 1:
-            lines = [f'{key}\t{Config().get(key, None)}' for key in Config().keys()]
-            log(lines_to_tabular(lines, separator='\t'))
+            with validate_args(args, state, msg=msg) as key:
+                if v := Config().get(key, None):
+                    log(v)
+                else:
+                    log2(f'{key} is not set.')
 
-            return state
-
-        key = args[0]
-        if v := Config().get(key, None):
-            log(v)
-        else:
-            log2(f'{key} is not set.')
-
-        return v if v else state
+                return v if v else state
 
     def completion(self, _: ReplState):
         return {GetParam.COMMAND: {key: None for key in Config().keys()}}

adam/commands/param_set.py

@@ -1,3 +1,4 @@
+from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.config import Config
 from adam.repl_state import ReplState
@@ -22,20 +23,15 @@ class SetParam(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
+        with self.validate(args, state) as (args, state):
+            with validate_args(args, state, count_at_least=2, msg=lambda: log2('set <key> <value>')):
+                key = args[0]
+                value = args[1]
+                Config().set(key, value)
 
-        if len(args) < 2:
-            log2('set <key> <value>')
+                log(Config().get(key, None))
 
-            return 'invalid args'
-
-        key = args[0]
-        value = args[1]
-        Config().set(key, value)
-
-        log(Config().get(key, None))
-
-        return value
+                return value
 
     def completion(self, _: ReplState):
         return {SetParam.COMMAND: {key: ({'true': None, 'false': None} if Config().get(key, None) in [True, False] else None) for key in Config().keys()}}

adam/commands/postgres/postgres.py

@@ -1,17 +1,18 @@
 import click
 
+from adam.commands import extract_trailing_options, validate_args
 from adam.commands.command import Command
+from adam.commands.intermediate_command import IntermediateCommand
 from adam.commands.postgres.psql_completions import psql_completions
-from adam.commands.postgres.postgres_utils import pg_table_names
+from adam.commands.postgres.utils_postgres import pg_table_names, postgres
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview
 from .postgres_context import PostgresContext
 from adam.repl_state import ReplState
 from adam.utils import log, log2
 
-class Postgres(Command):
+class Postgres(IntermediateCommand):
     COMMAND = 'pg'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -29,46 +30,29 @@ class Postgres(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
+        with self.validate(args, state) as (args, state):
+            with extract_trailing_options(args, '&') as (args, backgrounded):
+                with validate_args(args, state, name='SQL statement') as sql:
+                    if not state.pg_path:
+                        if state.in_repl:
+                            log2('Enter "use <pg-name>" first.')
+                        else:
+                            log2('* pg-name is missing.')
 
-        if not args:
-            if state.in_repl:
-                log2('Please use SQL statement. e.g. pg \l')
-            else:
-                log2('* Command or SQL statements is missing.')
-                Command.display_help()
+                        return state
 
-            return 'command-missing'
+                    if state.in_repl:
+                        with postgres(state) as pod:
+                            pod.sql(args, background=backgrounded)
+                    elif not self.run_subcommand(cmd, state):
+                        with postgres(state) as pod:
+                            pod.sql(args, background=backgrounded)
 
-        if state.in_repl:
-            self.run_sql(state, args)
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Postgres.cmd_list())
-            if not cmds.run(cmd, state) :
-                self.run_sql(state, args)
-
-        return state
+                    return state
 
-    def cmd_list():
+    def cmd_list(self):
         return [PostgresLs(), PostgresPreview(), PostgresPg()]
 
-    def run_sql(self, state: ReplState, args: list[str]):
-        if not state.pg_path:
-            if state.in_repl:
-                log2('Enter "use <pg-name>" first.')
-            else:
-                log2('* pg-name is missing.')
-
-            return state
-
-        background = False
-        if args and args[-1] == '&':
-            args = args[:-1]
-            background = True
-
-        PostgresContext.apply(state.namespace, state.pg_path).run_sql(' '.join(args), background=background)
-
     def completion(self, state: ReplState):
         if state.device != state.P:
             # conflicts with cql completions
@@ -95,7 +79,7 @@ class Postgres(Command):
 
 class PostgresCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        Command.intermediate_help(super().get_help(ctx), Postgres.COMMAND, Postgres.cmd_list(), show_cluster_help=True)
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Postgres.COMMAND, Postgres().cmd_list(), show_cluster_help=True)
         log('PG-Name:  Kubernetes secret for Postgres credentials')
         log('          e.g. stgawsscpsr-c3-c3-k8spg-cs-001')
         log('Database: Postgres database name within a host')

adam/commands/postgres/postgres_context.py

@@ -8,7 +8,7 @@ from adam.repl_session import ReplSession
 from adam.utils_k8s.kube_context import KubeContext
 from adam.utils_k8s.pods import Pods
 from adam.utils_k8s.secrets import Secrets
-from adam.utils import log2
+from adam.utils import log2, log_exc
 
 class PostgresContext:
     def apply(namespace: str, path: str, arg: str = None) -> 'PostgresContext':
@@ -149,36 +149,62 @@ class PostgresContext:
 
             return r
         else:
-            ns = self.namespace
-            pod_name = Config().get('pg.agent.name', 'ops-pg-agent')
-
-            if Config().get('pg.agent.just-in-time', False):
-                if not PostgresContext.deploy_pg_agent(pod_name, ns):
-                    return
+            pod_name, container_name = PostgresContext.pod_and_container(self.namespace)
+            if not pod_name:
+                return
 
-            real_pod_name = pod_name
-            try:
-                # try with dedicated pg agent pod name configured
-                Pods.get(ns, pod_name)
-            except:
-                try:
-                    # try with the ops pod
-                    pod_name = Config().get('pod.name', 'ops')
-                    real_pod_name = Pods.get_with_selector(ns, label_selector = Config().get('pod.label-selector', 'run=ops')).metadata.name
-                except:
-                    log2(f"Could not locate {pod_name} pod.")
-                    return None
+            # ns = self.namespace
+            # pod_name = Config().get('pg.agent.name', 'ops-pg-agent')
+
+            # if Config().get('pg.agent.just-in-time', False):
+            #     if not PostgresContext.deploy_pg_agent(pod_name, ns):
+            #         return
+
+            # real_pod_name = pod_name
+            # try:
+            #     # try with dedicated pg agent pod name configured
+            #     Pods.get(ns, pod_name)
+            # except:
+            #     try:
+            #         # try with the ops pod
+            #         pod_name = Config().get('pod.name', 'ops')
+            #         real_pod_name = Pods.get_with_selector(ns, label_selector = Config().get('pod.label-selector', 'run=ops')).metadata.name
+            #     except:
+            #         log2(f"Could not locate {pod_name} pod.")
+            #         return None
 
             cmd = f'psql -h {self.endpoint()} -p {self.port()} -U {self.username()} {db} --pset pager=off -c "{sql}"'
             env_prefix = f'PGPASSWORD="{self.password()}"'
 
-            r = Pods.exec(real_pod_name, pod_name, ns, cmd, show_out=show_out, background=background, env_prefix=env_prefix)
+            r = Pods.exec(pod_name, container_name, self.namespace, cmd, show_out=show_out, background=background, env_prefix=env_prefix)
             if r and Config().get('repl.history.push-cat-remote-log-file', True):
                 if r.log_file and ReplSession().prompt_session:
                     ReplSession().prompt_session.history.append_string(f'@{r.pod} cat {r.log_file}')
 
             return r
 
+    def pod_and_container(ns: str):
+        container_name = Config().get('pg.agent.name', 'ops-pg-agent')
+
+        if Config().get('pg.agent.just-in-time', False):
+            if not PostgresContext.deploy_pg_agent(container_name, ns):
+                return None
+
+        pod_name = container_name
+        try:
+            # try with dedicated pg agent pod name configured
+            Pods.get(ns, container_name)
+        except:
+            try:
+                # try with the ops pod
+                container_name = Config().get('pod.name', 'ops')
+                pod_name = Pods.get_with_selector(ns, label_selector = Config().get('pod.label-selector', 'run=ops')).metadata.name
+            except:
+                log2(f"Could not locate {container_name} pod.")
+                return None
+
+        return pod_name, container_name
+
     def deploy_pg_agent(pod_name: str, ns: str) -> str:
         image = Config().get('pg.agent.image', 'seanahnsf/kaqing')
         timeout = Config().get('pg.agent.timeout', 3600)
@@ -187,11 +213,9 @@ class PostgresContext:
         except Exception as e:
             if e.status == 409:
                 if Pods.completed(ns, pod_name):
-                    try:
+                    with log_exc(lambda e2: "Exception when calling BatchV1Api->create_pod: %s\n" % e2):
                         Pods.delete(pod_name, ns)
                         Pods.create(ns, pod_name, image, ['sleep', f'{timeout}'], env={'NAMESPACE': ns}, sa_name='c3')
-                    except Exception as e2:
-                        log2("Exception when calling BatchV1Api->create_pod: %s\n" % e2)
 
                         return
             else:

adam/commands/postgres/postgres_ls.py

@@ -4,7 +4,6 @@ from adam.repl_state import ReplState, RequiredState
 
 class PostgresLs(Command):
     COMMAND = 'pg ls'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -25,15 +24,12 @@ class PostgresLs(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        state.device = ReplState.P
+        with self.validate(args, state) as (args, state):
+            state.device = ReplState.P
 
-        Ls().run('ls', state)
+            Ls().run('ls', state)
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
         if state.sts: