kaqing 2.0.33__tar.gz → 2.0.35__tar.gz

{kaqing-2.0.33 → kaqing-2.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.33
+Version: 2.0.35
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.33 → kaqing-2.0.35}/adam/batch.py

@@ -8,6 +8,7 @@ from adam.commands.command_helpers import ClusterCommandHelper, ClusterOrPodComm
 from adam.commands.cqlsh import CqlCommandHelper, Cqlsh
 from adam.commands.deploy.deploy import Deploy, DeployCommandHelper
 from adam.commands.deploy.undeploy import Undeploy, UndeployCommandHelper
+from adam.commands.describe.describe import Describe, DescribeCommandHelper
 from adam.commands.issues import Issues
 from adam.commands.login import Login
 from adam.commands.logs import Logs
@@ -86,6 +87,19 @@ def deploy(kubeconfig: str, config: str, param: list[str], namespace: str, extra
     run_command(Deploy(), kubeconfig, config, param, None, namespace, None, extra_args)
 
 
+@cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=DescribeCommandHelper, help='Describe keyspace(s) or table(s).')
+@click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
+@click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
+@click.option('--param', '-v', multiple=True, metavar='<key>=<value>', help='parameter override')
+@click.option('--cluster', '-c', required=False, metavar='statefulset', help='Kubernetes statefulset name')
+@click.option('--namespace', '-n', required=False, metavar='namespace', help='Kubernetes namespace')
+@click.option('--pod', '-p', required=False, metavar='pod', help='Kubernetes pod name')
+@click.option('--all-nodes', '-a', is_flag=True, help='execute on all Cassandra nodes')
+@click.argument('extra_args', nargs=-1, metavar='<cluster|pod>', type=click.UNPROCESSED)
+def describe(kubeconfig: str, config: str, param: list[str], cluster: str, namespace: str, pod: str, all_nodes: bool, extra_args):
+    run_command(Describe(), kubeconfig, config, param, cluster, namespace, pod, ('--all-nodes',) + extra_args if all_nodes else extra_args)
+
+
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterOrPodCommandHelper, help="Print Qing's issues.")
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
 @click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/command.py

@@ -2,9 +2,11 @@ from abc import abstractmethod
 import copy
 import subprocess
 import sys
+from typing import Callable
 
-from adam.config import Config
+from adam.commands.command_helpers import ClusterCommandHelper
 from adam.repl_state import ReplState, RequiredState
+from adam.utils import lines_to_tabular, log, log2
 
 repl_cmds: list['Command'] = []
 
@@ -41,9 +43,8 @@ class Command:
     def validate_state(self, state: ReplState, pg_required: RequiredState = None, app_required: RequiredState = None):
         return state.validate(self.required(), pg_required=pg_required, app_required=app_required)
 
-    @abstractmethod
-    def help(self, state: ReplState) -> str:
-        pass
+    def help(self, _: ReplState) -> str:
+        return None
 
     def args(self, cmd: str):
         a = list(filter(None, cmd.split(' ')))
@@ -102,4 +103,30 @@ class Command:
         while s := cmd._successor:
             print(f'-> {s.command()}', end = '')
             cmd = s
-        print()
+        print()
+
+    def intermediate_run(self, cmd: str, state: ReplState, args: list[str], cmds: list['Command'], separator='\t'):
+        state, _ = self.apply_state(args, state)
+
+        if state.in_repl:
+            log(lines_to_tabular([c.help(state) for c in cmds], separator=separator))
+
+            return 'command-missing'
+        else:
+            # head with the Chain of Responsibility pattern
+            cmds = Command.chain(cmds)
+            if not cmds.run(cmd, state):
+                log2('* Command is missing.')
+                Command.display_help()
+
+        return state
+
+    def intermediate_help(super_help: str, cmd: str, cmd_list: list['Command'], separator='\t', show_cluster_help=False):
+        log(super_help)
+        log()
+        log('Sub-Commands:')
+
+        log(lines_to_tabular([c.help(ReplState()).replace(f'{cmd} ', '  ', 1) for c in cmd_list], separator=separator))
+        if show_cluster_help:
+            log()
+            ClusterCommandHelper.cluster_help()

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/cqlsh.py

@@ -56,11 +56,17 @@ class Cqlsh(Command):
         if state.sts or state.pod:
             ts = table_names(state)
             return {Cqlsh.COMMAND: None} | {
-                'delete': {'from': {t: {'where': None} for t in ts}},
+                'delete': {'from': {t: {'where': {'id': {'=': None}}} for t in ts}},
                 'insert': {'into': {t: {'values': None} for t in ts}},
-                'select': {'*': {'from': {t: {'limit': {'1': None}, 'where': None} for t in ts}}},
+                'select': {'*': {'from': {t: {
+                    'limit': {'1': None},
+                    'where': {'id': {'=': None}}
+                } for t in ts}}},
                 'update': {t: {'set': None} for t in ts},
-                'describe': {'keyspaces': None, 'table': {t: None for t in ts}, 'tables': None},
+                'describe': {
+                    'keyspaces': None,
+                    'table': {t: None for t in ts},
+                    'tables': None},
             }
 
         return {}

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/deploy/deploy.py

@@ -5,7 +5,6 @@ from adam.commands.deploy.deploy_pg_agent import DeployPgAgent
 from adam.commands.deploy.deploy_pod import DeployPod
 from .deploy_frontend import DeployFrontend
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
 
 class Deploy(Command):
     COMMAND = 'deploy'
@@ -27,18 +26,7 @@ class Deploy(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Deploy.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Deploy.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Deploy.cmd_list())
 
     def cmd_list():
         return [DeployFrontend(), DeployPod(), DeployPgAgent()]
@@ -49,13 +37,6 @@ class Deploy(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class DeployCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Deploy.COMMAND} ', '  ', 1) for c in Deploy.cmd_list()], separator='\t'))
+        Command.intermediate_help(super().get_help(ctx), Deploy.COMMAND, Deploy.cmd_list())

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/deploy/undeploy.py

@@ -5,7 +5,6 @@ from adam.commands.deploy.undeploy_frontend import UndeployFrontend
 from adam.commands.deploy.undeploy_pg_agent import UndeployPgAgent
 from adam.commands.deploy.undeploy_pod import UndeployPod
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
 
 class Undeploy(Command):
     COMMAND = 'undeploy'
@@ -27,18 +26,7 @@ class Undeploy(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Undeploy.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Undeploy.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Undeploy.cmd_list())
 
     def cmd_list():
         return [UndeployFrontend(), UndeployPod(), UndeployPgAgent()]
@@ -49,13 +37,6 @@ class Undeploy(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class UndeployCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Undeploy.COMMAND} ', '  ', 1) for c in Undeploy.cmd_list()], separator='\t'))
+        Command.intermediate_help(super().get_help(ctx), Undeploy.COMMAND, Undeploy.cmd_list())

kaqing-2.0.35/adam/commands/describe/describe.py

@@ -0,0 +1,46 @@
+import click
+
+from adam.commands.command import Command
+from adam.commands.describe.describe_keyspace import DescribeKeyspace
+from adam.commands.describe.describe_keyspaces import DescribeKeyspaces
+from adam.commands.describe.describe_table import DescribeTable
+from adam.commands.describe.describe_tables import DescribeTables
+from adam.repl_state import ReplState, RequiredState
+
+class Describe(Command):
+    COMMAND = 'describe'
+    reaper_login = None
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(Describe, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def required(self):
+        return RequiredState.CLUSTER
+
+    def command(self):
+        return Describe.COMMAND
+
+    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, Describe.cmd_list())
+
+    def cmd_list():
+        return [DescribeKeyspace(), DescribeKeyspaces(), DescribeTable(), DescribeTables()]
+
+    def completion(self, state: ReplState):
+        if state.sts:
+            return super().completion(state)
+
+        return {}
+
+class DescribeCommandHelper(click.Command):
+    def get_help(self, ctx: click.Context):
+        Command.intermediate_help(super().get_help(ctx), Describe.COMMAND, Describe.cmd_list(), show_cluster_help=True)

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/medusa/medusa.py

@@ -1,13 +1,11 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
 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
-from adam.utils import lines_to_tabular, log, log2
 
 class Medusa(Command):
     COMMAND = 'medusa'
@@ -31,20 +29,7 @@ class Medusa(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
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Medusa.cmd_list()], separator=':'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Medusa.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Medusa.cmd_list())
 
     def cmd_list():
         return [MedusaBackup(), MedusaRestore(), MedusaShowBackupJobs(), MedusaShowRestoreJobs()]
@@ -55,15 +40,6 @@ class Medusa(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class MedusaCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Medusa.COMMAND} ', '  ', 1) for c in Medusa.cmd_list()], separator=':'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.intermediate_help(super().get_help(ctx), Medusa.COMMAND, Medusa.cmd_list(), show_cluster_help=True)

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/medusa/medusa_show_backupjobs.py

@@ -49,4 +49,4 @@ class MedusaShowBackupJobs(Command):
         return {}
 
     def help(self, _: ReplState):
-        return f'{MedusaShowBackupJobs.COMMAND}\t show backups'
+        return f'{MedusaShowBackupJobs.COMMAND}\t show Medusa backups'

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/medusa/medusa_show_restorejobs.py

@@ -49,4 +49,4 @@ class MedusaShowRestoreJobs(Command):
         return {}
 
     def help(self, _: ReplState):
-        return f'{MedusaShowRestoreJobs.COMMAND}\t show restores'
+        return f'{MedusaShowRestoreJobs.COMMAND}\t show Medusa restores'

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/postgres/postgres.py

@@ -1,12 +1,12 @@
+import functools
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview
 from .postgres_session import PostgresSession
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
+from adam.utils import log, log2
 
 class Postgres(Command):
     COMMAND = 'pg'
@@ -30,30 +30,22 @@ class Postgres(Command):
 
         state, args = self.apply_state(args, state)
 
-        if state.in_repl:
-            if not args:
+        if not args:
+            if state.in_repl:
                 log2('Please use SQL statement. e.g. pg \l')
-
-                return 'command-missing'
             else:
-                self.run_sql(state, args)
-        else:
-            if not args:
                 log2('* Command or SQL statements is missing.')
                 Command.display_help()
 
-                return 'command-missing'
-            else:
-                # head with the Chain of Responsibility pattern
-                cmds = Command.chain(Postgres.cmd_list())
-                if not cmds.run(cmd, state) :
-                    if not args:
-                        log2('* Command or SQL statements is missing.')
-                        Command.display_help()
+            return 'command-missing'
 
-                        return 'command-missing'
-                    else:
-                        self.run_sql(state, args)
+        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
 
@@ -73,16 +65,21 @@ class Postgres(Command):
 
     def completion(self, state: ReplState):
         leaf = {}
-        if PostgresSession(state.namespace, state.pg_path).db:
+        session = PostgresSession(state.namespace, state.pg_path)
+        if session.db:
+            ts = self.tables(state.namespace, state.pg_path)
             leaf = {
                 '\h': None,
                 '\d': None,
                 '\dt': None,
                 '\du': None,
-                'delete': {'from': None},
-                'insert': {'into': None},
-                'select': None,
-                'update': None,
+                'delete': {'from': {t: {'where': {'id': {'=': None}}} for t in ts}},
+                'insert': {'into': {t: {'values': None} for t in ts}},
+                'select': {'*': {'from': {t: {
+                    'limit': {'1': None},
+                    'where': {'id': {'=': None}}
+                } for t in ts}}},
+                'update': {t: {'set': None} for t in ts},
             }
         elif state.pg_path:
             leaf = {
@@ -95,18 +92,20 @@ class Postgres(Command):
         else:
             return {}
 
+    @functools.lru_cache()
+    def tables(self, ns: str, pg_path: str):
+        session = PostgresSession(ns, pg_path)
+        if session.db:
+            return [f'{t["schema"]}.{t["name"]}' for t in session.tables()]
+
+        return []
+
     def help(self, _: ReplState):
         return f'[{Postgres.COMMAND}] <sql-statements>\t run psql with queries'
 
 class PostgresCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Postgres.COMMAND} ', '  ', 1) for c in Postgres.cmd_list()], separator='\t'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.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')

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/postgres/postgres_session.py

@@ -25,7 +25,7 @@ class PostgresSession:
             if len(tks) > 1:
                 self.db = tks[1]
 
-    # work for databases()
+    # works only for databases()
     def __eq__(self, other: 'PostgresSession'):
         return self.host == other.host
 

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/reaper/reaper.py

@@ -1,7 +1,6 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
 from .reaper_forward import ReaperForward
 from .reaper_forward_stop import ReaperForwardStop
 from .reaper_restart import ReaperRestart
@@ -14,7 +13,6 @@ from .reaper_schedule_stop import ReaperScheduleStop
 from .reaper_schedules import ReaperSchedules
 from .reaper_status import ReaperStatus
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log, log2
 
 class Reaper(Command):
     COMMAND = 'reaper'
@@ -39,24 +37,12 @@ class Reaper(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
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Reaper.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Reaper.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Reaper.cmd_list())
 
     def cmd_list():
         return [ReaperSchedules(), ReaperScheduleStop(), ReaperScheduleActivate(), ReaperScheduleStart(),
-                ReaperForwardStop(), ReaperForward(), ReaperRunAbort(), ReaperRunsAbort(), ReaperRestart(), ReaperRuns(), ReaperStatus()]
+                ReaperForwardStop(), ReaperForward(), ReaperRunAbort(), ReaperRunsAbort(), ReaperRestart(),
+                ReaperRuns(), ReaperStatus()]
 
     def completion(self, state: ReplState):
         if state.sts:
@@ -64,15 +50,6 @@ class Reaper(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class ReaperCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Reaper.COMMAND} ', '  ', 1) for c in Reaper.cmd_list()], separator='\t'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.intermediate_help(super().get_help(ctx), Reaper.COMMAND, Reaper.cmd_list(), show_cluster_help=True)

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/repair/repair.py

@@ -1,13 +1,11 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
 from .repair_run import RepairRun
 from .repair_scan import RepairScan
 from .repair_stop import RepairStop
 from .repair_log import RepairLog
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log, log2
 
 class Repair(Command):
     COMMAND = 'repair'
@@ -31,20 +29,7 @@ class Repair(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
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Repair.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Repair.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Repair.cmd_list())
 
     def cmd_list():
         return [RepairRun(), RepairScan(), RepairStop(), RepairLog()]
@@ -54,15 +39,6 @@ class Repair(Command):
             return super().completion(state)
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class RepairCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Repair.COMMAND} ', '  ', 1) for c in Repair.cmd_list()], separator='\t'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.intermediate_help(super().get_help(ctx), Repair.COMMAND, Repair.cmd_list(), show_cluster_help=True)

{kaqing-2.0.33 → kaqing-2.0.35}/adam/commands/show/show.py

@@ -1,7 +1,8 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
+from adam.commands.medusa.medusa_show_backupjobs import MedusaShowBackupJobs
+from adam.commands.medusa.medusa_show_restorejobs import MedusaShowRestoreJobs
 from adam.commands.show.show_app_actions import ShowAppActions
 from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.show.show_login import ShowLogin
@@ -15,7 +16,6 @@ from .show_repairs import ShowRepairs
 from .show_storage import ShowStorage
 from .show_adam import ShowAdam
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
 
 class Show(Command):
     COMMAND = 'show'
@@ -36,35 +36,16 @@ class Show(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Show.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Show.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Show.cmd_list())
 
     def cmd_list():
-        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowLogin(), ShowKubectlCommands(), ShowParams(), ShowProcesses(), ShowRepairs(),
-                ShowStorage(), ShowAdam(), ShowCassandraStatus(), ShowCassandraVersion()]
+        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowLogin(), ShowKubectlCommands(),
+                ShowParams(), ShowProcesses(), ShowRepairs(), ShowStorage(), ShowAdam(),
+                ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs()]
 
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f"{Show.COMMAND}\t show kubectl commands"
-
 class ShowCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Catogories:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Show.COMMAND} ', '  ', 1) for c in Show.cmd_list()], separator=':'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.intermediate_help(super().get_help(ctx), Show.COMMAND, Show.cmd_list(), show_cluster_help=True)

{kaqing-2.0.33 → kaqing-2.0.35}/adam/repl_commands.py

@@ -11,6 +11,7 @@ from adam.commands.deploy.undeploy import Undeploy
 from adam.commands.deploy.undeploy_frontend import UndeployFrontend
 from adam.commands.deploy.undeploy_pg_agent import UndeployPgAgent
 from adam.commands.deploy.undeploy_pod import UndeployPod
+from adam.commands.describe.describe import Describe
 from adam.commands.describe.describe_keyspace import DescribeKeyspace
 from adam.commands.describe.describe_keyspaces import DescribeKeyspaces
 from adam.commands.describe.describe_table import DescribeTable
@@ -58,7 +59,7 @@ class ReplCommands:
         cmds: list[Command] = ReplCommands.navigation() + ReplCommands.cassandra_check() + ReplCommands.cassandra_ops() + \
             ReplCommands.tools() + ReplCommands.app() + ReplCommands.exit()
 
-        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Show(), Undeploy()]
+        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Describe(), Show(), Undeploy()]
         ic = [c.command() for c in intermediate_cmds]
         # 1. dedup commands
         deduped = []
@@ -79,7 +80,7 @@ class ReplCommands:
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam()]
 
     def cassandra_check() -> list[Command]:
-        return [DescribeKeyspace(), DescribeKeyspaces(), DescribeTable(), DescribeTables(), ShowCassandraStatus(),
+        return Describe.cmd_list() + [ShowCassandraStatus(),
                 ShowCassandraVersion(), ShowRepairs(), ShowStorage(), ShowProcesses(), Check(), Issues(), NodeTool(), Report()]
 
     def cassandra_ops() -> list[Command]:

kaqing-2.0.35/adam/version.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__version__ = "2.0.35"  #: the working version
+__release__ = "1.0.0"  #: the release version

{kaqing-2.0.33 → kaqing-2.0.35}/kaqing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.33
+Version: 2.0.35
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.33 → kaqing-2.0.35}/kaqing.egg-info/SOURCES.txt

@@ -94,6 +94,7 @@ adam/commands/deploy/undeploy_frontend.py
 adam/commands/deploy/undeploy_pg_agent.py
 adam/commands/deploy/undeploy_pod.py
 adam/commands/describe/__init__.py
+adam/commands/describe/describe.py
 adam/commands/describe/describe_keyspace.py
 adam/commands/describe/describe_keyspaces.py
 adam/commands/describe/describe_table.py