kaqing 2.0.29__py3-none-any.whl → 2.0.31__py3-none-any.whl

adam/commands/alter_tables.py

@@ -1,12 +1,9 @@
-import click
-
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterOrPodCommandHelper
-from adam.commands.cql_utils import parse_cql_desc_tables, run_cql
+from adam.commands.cql_utils import tables as get_tables, run_cql
 from adam.config import Config
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log, log2
+from adam.utils import log2
 
 class AlterTables(Command):
     COMMAND = 'alter tables with'
@@ -47,16 +44,16 @@ class AlterTables(Command):
         args, include_reaper = Command.extract_options(args, '--include-reaper')
         arg_str = ' '.join(args)
 
-        r: list[PodExecResult] = run_cql(state, 'describe tables', show_out=False, on_any=True)
-        if not r:
-            log2('No pod is available')
-            return 'no-pod'
+        # r: list[PodExecResult] = run_cql(state, 'describe tables', show_out=False, on_any=True)
+        # if not r:
+        #     log2('No pod is available')
+        #     return 'no-pod'
 
         excludes = [e.strip(' \r\n') for e in Config().get(
             'cql.alter-tables.excludes',
             'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema').split(',')]
         batching = Config().get('cql.alter-tables.batching', True)
-        tables = parse_cql_desc_tables(r[0].stdout)
+        tables = get_tables(state, on_any=True)
         for k, v in tables.items():
             if k not in excludes or k == 'reaper_db' and include_reaper:
                 if batching:
@@ -92,20 +89,4 @@ class AlterTables(Command):
         return {}
 
     def help(self, _: ReplState) -> str:
-        return f'[{AlterTables.COMMAND}] <param = value> [--include-reaper] \t alter on all tables'
-
-class CqlCommandHelper(click.Command):
-    def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('  e.g. qing cql <cluster or pod> select host_id from system.local')
-        log()
-        log('Advanced Usages:')
-        log('  1. Use -- to specify what arguments are passed to the cqlsh.')
-        log('  2. Use "" to avoid expansion on shell variables.')
-        log('  3. Use ; to use multiple CQL statements')
-        log()
-        log('  e.g. qing cql <cluster or pod> -- "consistency quorum; select * from system.local" --request-timeout=3600')
-        log()
-
-        ClusterOrPodCommandHelper.cluter_or_pod_help()
+        return f'{AlterTables.COMMAND} <param = value> [--include-reaper] \t alter on all tables'

adam/commands/cql_utils.py

@@ -1,9 +1,39 @@
+import functools
 import re
 
+from adam.config import Config
 from adam.k8s_utils.cassandra_clusters import CassandraClusters
 from adam.k8s_utils.cassandra_nodes import CassandraNodes
 from adam.k8s_utils.secrets import Secrets
+from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState
+from adam.utils import log2
+
+@functools.lru_cache()
+def keyspaces(sts: str, namespace: str):
+    Config().wait_log("Inspecting Cassandra Keyspaces...")
+
+    user, pw = Secrets.get_user_pass(sts, namespace, secret_path='cql.secret')
+    command = f'cqlsh -u {user} -p {pw} -e "describe keyspaces"'
+
+    r: list[PodExecResult] = CassandraClusters.exec(sts, namespace, command, show_out=False, action='cql', on_any=True)
+    if not r:
+        log2('No pod is available')
+        return []
+
+    return parse_cql_desc_keyspaces(r[0].stdout)
+
+def table_names(state: ReplState):
+    return [f'{k}.{t}' for k, ts in tables(state, on_any=True).items() for t in ts]
+
+@functools.lru_cache()
+def tables(state: ReplState, on_any=False):
+    r: list[PodExecResult] = run_cql(state, 'describe tables', show_out=False, on_any=on_any)
+    if not r:
+        log2('No pod is available')
+        return []
+
+    return parse_cql_desc_tables(r[0].stdout)
 
 def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, use_single_quotes = False, on_any = False):
     user, pw = Secrets.get_user_pass(state.sts if state.sts else state.pod, state.namespace, secret_path='cql.secret')
@@ -50,4 +80,33 @@ def parse_cql_desc_tables(out: str):
                             tables_by_keyspace[keyspace] = []
                         tables_by_keyspace[keyspace].append(t)
 
-    return tables_by_keyspace
+    return tables_by_keyspace
+
+def parse_cql_desc_keyspaces(out: str) -> list[str]:
+    #
+    # Warning: Cannot create directory at `/home/cassandra/.cassandra`. Command history will not be saved. Please check what was the environment property CQL_HISTORY set to.
+    #
+    #
+    # Warning: Using a password on the command line interface can be insecure.
+    # Recommendation: use the credentials file to securely provide the password.
+    #
+    #
+    # azops88_db  system_auth         system_traces
+    # reaper_db   system_distributed  system_views
+    # system      system_schema       system_virtual_schema
+    #
+    kses = []
+    for line in out.split('\n'):
+        line = line.strip(' \r')
+        if not line:
+            continue
+        if line.startswith('Warning:'):
+            continue
+        if line.startswith('Recommendation:'):
+            continue
+
+        for ks in line.split(' '):
+            if s := ks.strip(' \r\t'):
+                kses.append(s)
+
+    return kses

adam/commands/cqlsh.py

@@ -2,7 +2,7 @@ import click
 
 from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterOrPodCommandHelper
-from adam.commands.cql_utils import run_cql
+from adam.commands.cql_utils import run_cql, table_names, tables
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log, log2
 
@@ -54,11 +54,13 @@ class Cqlsh(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts or state.pod:
+            ts = table_names(state)
             return {Cqlsh.COMMAND: None} | {
-                'delete': {'from': None},
-                'insert': {'into': None},
-                'select': None,
-                'update': None,
+                'delete': {'from': {t: {'where': 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}}},
+                'update': {t: {'set': None} for t in ts},
+                'describe': {'keyspaces': None, 'table': {t: None for t in ts}, 'tables': None},
             }
 
         return {}

adam/commands/deploy/deploy_pod.py

@@ -3,6 +3,7 @@ import yaml
 
 from adam.commands.command import Command
 from adam.commands.deploy.deploy_utils import creating, deploy_frontend, gen_labels
+from adam.commands.deploy.undeploy_pod import UndeployPod
 from adam.config import Config
 from adam.k8s_utils.config_maps import ConfigMaps
 from adam.k8s_utils.deployment import Deployments
@@ -39,6 +40,10 @@ class DeployPod(Command):
         if not self.validate_state(state):
             return state
 
+        args, forced = Command.extract_options(args, '--force')
+        if forced:
+            UndeployPod().run(UndeployPod.COMMAND, state)
+
         if KubeContext.in_cluster():
             log2('This is doable only from outside of the Kubernetes cluster.')
             return state
@@ -103,7 +108,7 @@ class DeployPod(Command):
         return state
 
     def completion(self, state: ReplState):
-        return super().completion(state)
+        return super().completion(state, {'--force': None})
 
     def help(self, _: ReplState):
-        return f'{DeployPod.COMMAND}\t deploy Ops pod'
+        return f'{DeployPod.COMMAND} [--force]\t deploy Ops pod, --force to undeploy first'

adam/commands/describe/describe_keyspace.py

@@ -0,0 +1,60 @@
+from adam.commands.command import Command
+from adam.commands.cql_utils import keyspaces, run_cql
+from adam.pod_exec_result import PodExecResult
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class DescribeKeyspace(Command):
+    COMMAND = 'describe keyspace'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DescribeKeyspace, 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 DescribeKeyspace.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
+
+        args, all_nodes = Command.extract_options(args, '--all-nodes')
+
+        if not args:
+            if state.in_repl:
+                log2('Please enter keyspace name')
+            else:
+                log2('* keyspace name is missing.')
+                log2()
+                Command.display_help()
+
+            return 'missing-keyspace'
+
+        r: list[PodExecResult] = run_cql(state, f'describe keyspace {args[0]}', show_out=True, on_any=not all_nodes)
+        if not r:
+            log2('No pod is available')
+            return 'no-pod'
+
+        # do not continue to cql route
+        return state
+
+    def completion(self, state: ReplState) -> dict[str, any]:
+        if state.sts:
+            return super().completion(state, {ks: {'--all-nodes': None} for ks in keyspaces(state.sts, state.namespace)})
+
+        return {}
+
+    def help(self, _: ReplState) -> str:
+        return f'{DescribeKeyspace.COMMAND} <keyspace-name> [--all-nodes]\t describe Cassandra keyspace'

adam/commands/describe/describe_keyspaces.py

@@ -0,0 +1,50 @@
+from adam.commands.command import Command
+from adam.commands.cql_utils import keyspaces, run_cql
+from adam.pod_exec_result import PodExecResult
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class DescribeKeyspaces(Command):
+    COMMAND = 'describe keyspaces'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DescribeKeyspaces, 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 DescribeKeyspaces.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
+
+        _, all_nodes = Command.extract_options(args, '--all-nodes')
+
+        r: list[PodExecResult] = run_cql(state, f'describe keyspaces', show_out=True, on_any=not all_nodes)
+        if not r:
+            log2('No pod is available')
+            return 'no-pod'
+
+        # do not continue to cql route
+        return state
+
+    def completion(self, state: ReplState) -> dict[str, any]:
+        if state.sts:
+            return super().completion(state, {'--all-nodes': None})
+
+        return {}
+
+    def help(self, _: ReplState) -> str:
+        return f'{DescribeKeyspaces.COMMAND} [--all-nodes]\t describe Cassandra keyspaces'

adam/commands/describe/describe_table.py

@@ -0,0 +1,60 @@
+from adam.commands.command import Command
+from adam.commands.cql_utils import keyspaces, run_cql, table_names, tables
+from adam.pod_exec_result import PodExecResult
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class DescribeTable(Command):
+    COMMAND = 'describe table'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DescribeTable, 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 DescribeTable.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
+
+        args, all_nodes = Command.extract_options(args, '--all-nodes')
+
+        if not args:
+            if state.in_repl:
+                log2('Please enter table name')
+            else:
+                log2('* table name is missing.')
+                log2()
+                Command.display_help()
+
+            return 'missing-table'
+
+        r: list[PodExecResult] = run_cql(state, f'describe table {args[0]}', show_out=True, on_any=not all_nodes)
+        if not r:
+            log2('No pod is available')
+            return 'no-pod'
+
+        # do not continue to cql route
+        return state
+
+    def completion(self, state: ReplState) -> dict[str, any]:
+        if state.sts:
+            return super().completion(state, {t: {'--all-nodes': None} for t in table_names(state)})
+
+        return {}
+
+    def help(self, _: ReplState) -> str:
+        return f'{DescribeTable.COMMAND} <table-name> [--all-nodes]\t describe Cassandra table'

adam/commands/describe/describe_tables.py

@@ -0,0 +1,50 @@
+from adam.commands.command import Command
+from adam.commands.cql_utils import keyspaces, run_cql, table_names, tables
+from adam.pod_exec_result import PodExecResult
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class DescribeTables(Command):
+    COMMAND = 'describe tables'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DescribeTables, 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 DescribeTables.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
+
+        _, all_nodes = Command.extract_options(args, '--all-nodes')
+
+        r: list[PodExecResult] = run_cql(state, f'describe tables', show_out=True, on_any=not all_nodes)
+        if not r:
+            log2('No pod is available')
+            return 'no-pod'
+
+        # do not continue to cql route
+        return state
+
+    def completion(self, state: ReplState) -> dict[str, any]:
+        if state.sts:
+            return super().completion(state, {'--all-nodes': None})
+
+        return {}
+
+    def help(self, _: ReplState) -> str:
+        return f'{DescribeTables.COMMAND} [--all-nodes]\t describe Cassandra tables'

adam/commands/param_set.py

@@ -38,7 +38,7 @@ class SetParam(Command):
         return value
 
     def completion(self, _: ReplState):
-        return {SetParam.COMMAND: {key: ({'true': None, 'false': None} if key.startswith('debug') else None) for key in Config().keys()}}
+        return {SetParam.COMMAND: {key: ({'true': None, 'false': None} if Config().get(key, None) in [True, False] else None) for key in Config().keys()}}
 
     def help(self, _: ReplState):
         return f"{SetParam.COMMAND} <key> <value>\t sets a Kaqing parameter to a different value"

adam/commands/preview_table.py

@@ -1,7 +1,7 @@
 import functools
 
 from adam.commands.command import Command
-from adam.commands.cql_utils import parse_cql_desc_tables, run_cql
+from adam.commands.cql_utils import run_cql, tables
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.config import Config
 from adam.pod_exec_result import PodExecResult
@@ -74,10 +74,9 @@ class PreviewTable(Command):
         if state.device == ReplState.P:
             if tables := PreviewTable.pg_tables(state.namespace, state.pg_path):
                 return {PreviewTable.COMMAND: {db["name"]: None for db in tables if db["schema"] == PostgresSession.default_schema()}}
-        else:
-            if state.pod:
-                tables = PreviewTable.cql_tables(state)
-                return {PreviewTable.COMMAND: {f'{k}.{t}': None for k, ts in tables.items() for t in ts}}
+        elif state.sts:
+            tables = PreviewTable.cql_tables(state)
+            return {PreviewTable.COMMAND: {f'{k}.{t}': None for k, ts in tables.items() for t in ts}}
 
         return {}
 
@@ -86,8 +85,16 @@ class PreviewTable(Command):
 
     @functools.lru_cache()
     def cql_tables(state: ReplState):
-        r: PodExecResult =  run_cql(state, 'describe tables', show_out=False)
-        return parse_cql_desc_tables(r.stdout)
+        if state.pod:
+            return tables(state)
+
+        return tables(state, on_any=True)
+
+        # r: list[PodExecResult] = run_cql(state, 'describe tables', show_out=False, on_any=True)
+        # if not r:
+        #     return []
+
+        # return parse_cql_desc_tables(r[0].stdout)
 
     @functools.lru_cache()
     def pg_tables(ns: str, pg_path: str):

adam/commands/reaper/reaper_session.py

@@ -149,7 +149,7 @@ class ReaperSession:
             return ReaperSession.schedules_ids_by_cluster[state.sts]
 
         if reaper := ReaperSession.create(state):
-            state.wait_log("Inspecting Cassandra Reaper...")
+            Config().wait_log("Inspecting Cassandra Reaper...")
 
             schedules = reaper.schedule_ids(state, show_output = False)
             ReaperSession.schedules_ids_by_cluster[state.sts] = schedules

adam/config.py

@@ -17,6 +17,7 @@ class Config:
 
     def __init__(self, path: str = None, is_user_entry = False):
         if path:
+            self.wait_log_flag = False
             try:
                 with open(path) as f:
                     self.params = cast(dict[str, any], yaml.safe_load(f))
@@ -83,4 +84,12 @@ class Config:
             log2(f'incorrect path: {key}')
             return None
 
-        return v if v else 'false'
+        return v if v else 'false'
+
+    def wait_log(self, msg: str):
+        if not self.wait_log_flag:
+            log2(msg)
+            self.wait_log_flag = True
+
+    def clear_wait_log_flag(self):
+        self.wait_log_flag = False

adam/k8s_utils/cassandra_clusters.py

@@ -3,6 +3,7 @@ from concurrent.futures import ThreadPoolExecutor
 import sys
 from typing import TypeVar
 
+from adam.config import Config
 from adam.k8s_utils.cassandra_nodes import CassandraNodes
 from adam.pod_exec_result import PodExecResult
 from adam.utils import log2

adam/k8s_utils/pods.py

@@ -47,7 +47,7 @@ class Pods:
 
         if not max_workers:
             max_workers = Config().action_workers(action, 0)
-        if not on_any and  max_workers > 0:
+        if not on_any and max_workers > 0:
             # if parallel, node sampling is suppressed
             if KubeContext.show_parallelism():
                 log2(f'Executing on all nodes from statefulset in parallel...')
@@ -79,7 +79,8 @@ class Pods:
                 log2(f'Executing on {adj} nodes from statefulset...')
             for pod_name in pods:
                 try:
-                    result = body(None, pod_name, namespace, show_out)
+                    # disable stdout from the pod_exec, then show the output in a for loop
+                    result = body(None, pod_name, namespace, False)
                     if post:
                         result = post(result, show_out=show_out)
                     results.append(result)

adam/repl.py

@@ -18,7 +18,7 @@ from adam.log import Log
 from adam.repl_commands import ReplCommands
 from adam.repl_session import ReplSession
 from adam.repl_state import ReplState
-from adam.utils import deep_merge_dicts, lines_to_tabular, log2
+from adam.utils import deep_merge_dicts, deep_sort_dict, lines_to_tabular, log2
 from adam.apps import Apps
 from . import __version__
 
@@ -70,7 +70,7 @@ def enter_repl(state: ReplState):
             cluster = ss[0]
             state.sts = cluster[0]
             state.namespace = cluster[1]
-            state.wait_log(f'Moving to the only Cassandra cluster: {state.sts}@{state.namespace}...')
+            Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}@{state.namespace}...')
     elif state.device == ReplState.A:
         if app := Config().get('repl.auto-enter-app', 'c3/c3'):
             if app != 'no':
@@ -78,9 +78,9 @@ def enter_repl(state: ReplState):
                 state.app_env = ea[0]
                 if len(ea) > 1:
                     state.app_app = ea[1]
-                    state.wait_log(f'Moving to {state.app_env}/{state.app_app}...')
+                    Config().wait_log(f'Moving to {state.app_env}/{state.app_app}...')
                 else:
-                    state.wait_log(f'Moving to {state.app_env}...')
+                    Config().wait_log(f'Moving to {state.app_env}...')
 
     kb = KeyBindings()
 
@@ -102,7 +102,7 @@ def enter_repl(state: ReplState):
                 for cmd in sorted_cmds:
                     s1 = time.time()
                     try:
-                        completions = deep_merge_dicts(completions, cmd.completion(state))
+                        completions = deep_sort_dict(deep_merge_dicts(completions, cmd.completion(state)))
                     finally:
                         if Config().get('debugs.timings', False):
                             Config().debug('Timing completion calc', cmd.command(), f'{time.time() - s1:.2f}')
@@ -151,7 +151,7 @@ def enter_repl(state: ReplState):
                 log2(e)
                 Config().debug(traceback.format_exc())
         finally:
-            state.clear_wait_log_flag()
+            Config().clear_wait_log_flag()
             if Config().get('debugs.timings', False) and 'cmd' in locals() and 's0' in locals():
                 print('Timing command', cmd, f'{time.time() - s0:.2f}')
 
@@ -168,5 +168,5 @@ def repl(kubeconfig: str, config: str, param: list[str], cluster:str, namespace:
         return
 
     state = ReplState(device=Config().get('repl.start-drive', 'a'), ns_sts=cluster, namespace=namespace, in_repl=True)
-    state, _ = state.apply_args(extra_args)
+    state, _ = state.apply_device_arg(extra_args)
     enter_repl(state)

adam/repl_commands.py

@@ -11,6 +11,10 @@ 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_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.commands.shell import Shell
 from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.cp import ClipboardCopy
@@ -75,14 +79,15 @@ class ReplCommands:
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam()]
 
     def cassandra_check() -> list[Command]:
-        return [ShowCassandraStatus(), ShowCassandraVersion(), ShowRepairs(), ShowStorage(), ShowProcesses(), Check(), Issues(), NodeTool(), Report()]
+        return [DescribeKeyspace(), DescribeKeyspaces(), DescribeTable(), DescribeTables(), ShowCassandraStatus(),
+                ShowCassandraVersion(), ShowRepairs(), ShowStorage(), ShowProcesses(), Check(), Issues(), NodeTool(), Report()]
 
     def cassandra_ops() -> list[Command]:
-        # return Medusa.cmd_list() + [Restart(), RollOut(), Watch()] + Reaper.cmd_list() + Repair.cmd_list()
         return [AlterTables()] + Medusa.cmd_list() + [Restart(), RollOut(), Watch()] + Reaper.cmd_list() + Repair.cmd_list()
 
     def tools() -> list[Command]:
-        return [Cqlsh(), Postgres(), Bash(), Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(), DeployPod(), UndeployPod(), DeployPgAgent(), UndeployPgAgent()]
+        return [Cqlsh(), Postgres(), Bash(), Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(),
+                DeployPod(), UndeployPod(), DeployPgAgent(), UndeployPgAgent()]
 
     def app() -> list[Command]:
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), AppPing(), App()]

adam/repl_state.py

@@ -67,7 +67,7 @@ class ReplState:
         self.in_repl = in_repl
         self.bash_session = bash_session
         self.remote_dir = remote_dir
-        self.wait_log_flag = False
+        # self.wait_log_flag = False
 
         if ns_sts:
             nn = ns_sts.split('@')
@@ -120,6 +120,26 @@ class ReplState:
 
         return (state, new_args)
 
+    def apply_device_arg(self, args: list[str], cmd: list[str] = None) -> tuple['ReplState', list[str]]:
+        state = self
+
+        new_args = []
+        for index, arg in enumerate(args):
+            if index < 6:
+                state = copy.copy(state)
+
+                if arg in [f'{ReplState.A}:', f'{ReplState.C}:', f'{ReplState.P}:']:
+                    state.device = arg.strip(':')
+                else:
+                    new_args.append(arg)
+            else:
+                new_args.append(arg)
+
+        if cmd:
+            new_args = new_args[len(cmd):]
+
+        return (state, new_args)
+
     def validate(self, required: RequiredState = None, pg_required: RequiredState = None, app_required: RequiredState = None):
         if not pg_required and not app_required:
             if required == RequiredState.CLUSTER:
@@ -200,12 +220,4 @@ class ReplState:
         if self.bash_session and self.bash_session.device:
             self.device = self.bash_session.device
 
-        self.bash_session = None
-
-    def wait_log(self, msg: str):
-        if not self.wait_log_flag:
-            log2(msg)
-            self.wait_log_flag = True
-
-    def clear_wait_log_flag(self):
-        self.wait_log_flag = False
+        self.bash_session = None

adam/utils.py

@@ -125,6 +125,19 @@ def deep_merge_dicts(dict1, dict2):
             merged_dict[key] = value
     return merged_dict
 
+def deep_sort_dict(d):
+    """
+    Recursively sorts a dictionary by its keys, and any nested lists by their elements.
+    """
+    if not isinstance(d, (dict, list)):
+        return d
+
+    if isinstance(d, dict):
+        return {k: deep_sort_dict(d[k]) for k in sorted(d)}
+
+    if isinstance(d, list):
+        return sorted([deep_sort_dict(item) for item in d])
+
 def get_deep_keys(d, current_path=""):
     """
     Recursively collects all combined keys (paths) from a deep dictionary.

adam/version.py

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

{kaqing-2.0.29.dist-info → kaqing-2.0.31.dist-info}/METADATA

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

{kaqing-2.0.29.dist-info → kaqing-2.0.31.dist-info}/RECORD

@@ -4,17 +4,17 @@ adam/apps.py,sha256=UTpUJBAMRFvR8kJZwileGC0UmPvsOjJ_AgvWoGmnIFI,6701
 adam/batch.py,sha256=o82yYDgyoJw1t87QyAfn9jGqIcWX23ehRI21U4JUTv8,23221
 adam/cli.py,sha256=03pIZdomAu7IL-GSP6Eun_PKwwISShRAmfx6eVRPGC0,458
 adam/cli_group.py,sha256=W3zy1BghCtVcEXizq8fBH-93ZRVVwgAyGPzy0sHno1Y,593
-adam/config.py,sha256=rnMcBBPXOJCO-MrjleGpW5_-G0OAyxtzvqhZAwffhqI,2543
+adam/config.py,sha256=5v8tf98SPnb9Mmn9EzxV1_EbjVrHo1ElkvyHpFMfbzk,2783
 adam/embedded_apps.py,sha256=lKPx63mKzJbNmwz0rgL4gF76M9fDGxraYTtNAIGnZ_s,419
 adam/embedded_params.py,sha256=_9tBKpkSzBfzm-s3tUgZs8DcSVBnPA1iumG0ZRCbZIs,4586
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
 adam/pod_exec_result.py,sha256=nq0xnCNOpUGBSijGF0H-YNrwBc9vUQs4DkvLMIFS5LQ,951
-adam/repl.py,sha256=NrDirez4s47Xvg8Z9es2Z1g03FLqW8nAUGvkIQvHI_s,7227
-adam/repl_commands.py,sha256=a6LQV4sZ0UrHVu-MveCeX301IZdzEs_iIc9qYwOhnFc,4437
+adam/repl.py,sha256=Yx7paOgzj-KCX8q46nsr9LQJAmoz-Gvnzo7dH9rwh_0,7277
+adam/repl_commands.py,sha256=Qg5b83NOoVigHB9b5wThhpUUTb-Gxy1b4IkBXQqQJa4,4708
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
-adam/repl_state.py,sha256=QarrUAwYWOz3YTemtaf2opbHLa5a3LEsyuonNwhvOhk,7131
-adam/utils.py,sha256=-O47UmVG8S5N2LHAOE-UTMBHJOS_mXufU8ncupeNCHc,7043
-adam/version.py,sha256=r-X2C2YOAw45hgb2eiLzHKHYQ-UPNUTMxpQBntYB3J8,139
+adam/repl_state.py,sha256=591d7gV6uQSFtm7IWdlIYAHjfAzs9bdvIkwlIAeKddE,7540
+adam/utils.py,sha256=2DoWsrcaioFFH0-RjT30qelVRPUJqCGTfz_ucfE7F8g,7406
+adam/version.py,sha256=WSZ2ZAbg3ooZRCiU80NkMKydx70-Lk81JfbRHesWvc8,139
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -47,7 +47,7 @@ adam/columns/pod_name.py,sha256=IYw0ZKA7Fb9LaGXENqzZTiTgL98tahwFRtfy0KkKh2Q,280
 adam/columns/volume_cassandra.py,sha256=9KRNOzjNYganI9avN6zaA5_-7yxD4rV-KNxro9CSUg4,753
 adam/columns/volume_root.py,sha256=29ujLoCAf9LO75u62LxEaPD58s6ihV-tcK17OeLSOM0,556
 adam/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/alter_tables.py,sha256=DoWfep8YJ6GLrd3ERh29M_5tKBoh4Vy0gU_PDVJB6-Q,4332
+adam/commands/alter_tables.py,sha256=Y5cWg0Ow93rIDusbHgxQcC7sSB64LmULTlDxPLybiVM,3578
 adam/commands/app.py,sha256=7alV8wK801t67_rUe6EmhtHJTl-6K7fGCm6Uz1dDgpM,1963
 adam/commands/app_ping.py,sha256=Xk7cfefphXM2w-UvpnhNUTZ3BU38f0deehUb2FEyLCI,1337
 adam/commands/bash.py,sha256=1O9cCl9JHQdttqNAgdB44rO0NjCqHzHv4psAEQMJcjw,2714
@@ -58,8 +58,8 @@ adam/commands/command.py,sha256=lULNtaRJ-S9hTBpJY2rjWwZaQi_S4zGqZrsd89M_wik,2879
 adam/commands/command_helpers.py,sha256=leOJJK1UXczNTJHN9TGMCbIpUpmpreULvQ-TvnsYS7w,1134
 adam/commands/commands_utils.py,sha256=ShUcxtDSd9B3NM0GDj3NBvKdmjCGY8qXgeUJpzNF63E,3122
 adam/commands/cp.py,sha256=dyQViRDPNqsKRkxPb7WyEVIBNw7YB6IfYa2q3VtfzyA,3107
-adam/commands/cql_utils.py,sha256=KPMZtfRJf9WP_NEgosADt6zCLSBn9hGODbMJF4MMy3c,2012
-adam/commands/cqlsh.py,sha256=gyRZLTcO2d_DMsc64b3HLh5xwMx4Qhe8298_NwXf2XQ,2635
+adam/commands/cql_utils.py,sha256=v2qQqDecYOJaurimJta2eUCYiHyIL4jtLSC_vg7931c,4001
+adam/commands/cqlsh.py,sha256=4dcemAdCQvpUAkLTpkOEhrbRHimovxSAG8eJ0i4RQM8,2939
 adam/commands/devices.py,sha256=_f8j6aQzTL8_pFlWYawRuG2Ju1zPjYSPcRIlLnZng10,2397
 adam/commands/exit.py,sha256=5MWUAmzYBlsrp0CoiTDB13SUkX9Ya18UlGeOIPia6TA,798
 adam/commands/help.py,sha256=Ey3R1X8w_CMhdADI0t8dSQ28euhDHheJm7NermiGni4,1645
@@ -70,8 +70,8 @@ adam/commands/ls.py,sha256=-AT0UnjvotSpFguaUoRAnJ8XXfshwh0ElHa_Ofl5l9w,5671
 adam/commands/nodetool.py,sha256=HV9yDzMhRjS4lw6UfV7Hc1pcmeSx5a1jU6cAEKSZ1Bg,2334
 adam/commands/nodetool_commands.py,sha256=5IgWC3rmeDD1cgwqQjiiWzi-wJpJ3n_8pAzz_9phXuk,2635
 adam/commands/param_get.py,sha256=kPAAppK2T0tEFRnSIVFLDPIIGHhgLA7drJhn8TRyvvE,1305
-adam/commands/param_set.py,sha256=yk0sS7Hz0aqzkgrj4yvbqxDt7NidPZdzcpEhAonIB5Q,1254
-adam/commands/preview_table.py,sha256=NbnQRjCQ7SJHzQqtB8RgJn8yydTVknaSF-qklLXDQ58,3383
+adam/commands/param_set.py,sha256=QDIuqfU80aWCB16OK49yf7XRaRTWwiLkwMsJuVikq9I,1271
+adam/commands/preview_table.py,sha256=ROEYHwCOhTxkSNqEyYZ9ASSevNmkN_mHEeH8LXa4gw8,3513
 adam/commands/pwd.py,sha256=VlgFjxFl66I7Df1YI6cuiEeY6Q13lEavMKfrzHLESKo,2340
 adam/commands/report.py,sha256=Ky45LIzSlB_X4V12JZWjU3SA2u4_FKRencRTq7psOWU,1944
 adam/commands/restart.py,sha256=Hik1t5rjH2ATZv4tzwrGB3e44b3dNuATgY327_Nb8Bs,2044
@@ -85,12 +85,17 @@ adam/commands/deploy/code_utils.py,sha256=5Gp4U8HzKpPkbkHDU7whlvGOK-wWaAbCIIGzVo
 adam/commands/deploy/deploy.py,sha256=Yy333-bEyTkB0-U5Qb4SXh_QGVUFngrPy99ROPWzn1Q,1874
 adam/commands/deploy/deploy_frontend.py,sha256=S3SvJD4JZQ9kDOOP_mrTnZFDl54AHhio5xxNgIUBZVk,1704
 adam/commands/deploy/deploy_pg_agent.py,sha256=VlOplID4MBABzuXeueyjKOTZjlQlQWLwvLSxpii4FHU,1203
-adam/commands/deploy/deploy_pod.py,sha256=6MgR1YLssOU4IjXPiqIM7btAKrceeumEeAg-HjzZLWM,4407
+adam/commands/deploy/deploy_pod.py,sha256=YamltqBcxDpM3Bqhq-pFHxzZDxmEXGmkP5HXlJjRs8o,4663
 adam/commands/deploy/deploy_utils.py,sha256=daJhX2kCg5aGt4ZLQdz5AbR-AS7q2y-bZNVxHzP708c,1524
 adam/commands/deploy/undeploy.py,sha256=HDPFSYTOAmSc11OmgKBxq64S4lqyEC8zL1q69CVDlLQ,1930
 adam/commands/deploy/undeploy_frontend.py,sha256=gHekPn7l19JgVbhneKpQ7ModNoDFmzWRMyQv9v4FBxo,1261
 adam/commands/deploy/undeploy_pg_agent.py,sha256=RYME8no1FT94WpVg-HXDGL1NmLlpE1I9R4htitjaxpo,1319
 adam/commands/deploy/undeploy_pod.py,sha256=hTcL8cAh7xYPcSm9sgiVFCxPh3SskefBfTmla310oUA,1905
+adam/commands/describe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+adam/commands/describe/describe_keyspace.py,sha256=9HN6_bJSmfgNl16rYsWkCD7Q3gHhb3lcpUD_Vjosm70,1935
+adam/commands/describe/describe_keyspaces.py,sha256=uXiVgpJlJz-8Q_rB2u3LWQixdECw6VWinfN70a5c3WQ,1585
+adam/commands/describe/describe_table.py,sha256=8jBiTqvZy0xzZdVTSzW6co6Ku-_seLqkdmrA3QXFgSQ,1902
+adam/commands/describe/describe_tables.py,sha256=RbbDhbyNjB1NyHP5LREAMPpXlgd1zmPlFQIp6jUVCdI,1585
 adam/commands/medusa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/medusa/medusa.py,sha256=Y_yyOZRb6u45wfTVBRp3kuklyYDTSlaAJQdAiymP_8M,2185
 adam/commands/medusa/medusa_backup.py,sha256=j4DTVWFT-4rzs4gG_pBvjE-JuPsVCJIsnyQjIzJ4EbA,1801
@@ -114,7 +119,7 @@ adam/commands/reaper/reaper_schedule_activate.py,sha256=HbwaSeKaDoR2qgiWgglwM5gm
 adam/commands/reaper/reaper_schedule_start.py,sha256=oDwH99QVyeKgu-jk5-pB7BzUH_rablCbtumNHXjBnpU,1940
 adam/commands/reaper/reaper_schedule_stop.py,sha256=_Ld5BRX5pqfIis5i1KG8yif0q5u9RTaFBmmQwkZuOMY,1929
 adam/commands/reaper/reaper_schedules.py,sha256=-b7eKl0wJT7zMru8qKcLqG5JF0-LfeTcNmlxut9t93E,1263
-adam/commands/reaper/reaper_session.py,sha256=gHk1OjcU8xH3Cjjgt_BLnfYPOjS_JSAw6-tggBE_zEY,6647
+adam/commands/reaper/reaper_session.py,sha256=Y-NYEpADhE1XJoaXQKBa8lObtoz4ny8_XB7byV-2RZ0,6650
 adam/commands/reaper/reaper_status.py,sha256=g3Uep1AVYOThAaZoFjn4bWTKHElZnCleJyYYHP9HayY,1967
 adam/commands/repair/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/repair/repair.py,sha256=5jdKVpP03GYNPuqeGlidOcFLTwl9gIzVDbxgXtUjAjw,2100
@@ -137,7 +142,7 @@ adam/commands/show/show_processes.py,sha256=jAesWDD_l0T6ql6LawnGpev-Glz21tFkegtC
 adam/commands/show/show_repairs.py,sha256=qpbyeRyLPyBWmn_4yxFu8KIjfd58HGry5pvqNyMwn5I,1477
 adam/commands/show/show_storage.py,sha256=LUTkH_qnc1d9s4jKsps8jhB4rkUuN7ifMlHSwFqd8_c,1837
 adam/k8s_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/k8s_utils/cassandra_clusters.py,sha256=lx_jSuxSZEIUvlmDMzPw0d7j2AeiBClLsudNMlK7RaM,1399
+adam/k8s_utils/cassandra_clusters.py,sha256=CBn2GgN2N9voY04gSnZxgXttDxexgvEnSE_cXnHD4fs,1430
 adam/k8s_utils/cassandra_nodes.py,sha256=Fr0PxjaVxkIhNMxzpNDD4bNeJ4xSE66pVHMbpBd8mzU,1119
 adam/k8s_utils/config_maps.py,sha256=vc9A-2D1-1mindCMFL1wuysDOXb0RCl4BdjC6B6usXI,1194
 adam/k8s_utils/custom_resources.py,sha256=cIeaZRQET2DelTGU2f5QsMckh7TddPpWZDFeNK3txeQ,7647
@@ -145,7 +150,7 @@ adam/k8s_utils/deployment.py,sha256=3oZPfPgQfqtAQaxEFL4daUfRSieRAhysmuaWMzUYgXk,
 adam/k8s_utils/ingresses.py,sha256=ul3Z6fDGc_Cxcn-ExP0vXhZatoShCUZFtpwtCY4Qx7o,3460
 adam/k8s_utils/jobs.py,sha256=gJpBpjcZ_FlkWJJIlavbHC_bqdmvv-GMVo8UZVh0sOQ,2610
 adam/k8s_utils/kube_context.py,sha256=xJF_72vUJu-X9MpIYzOIfnj7KEWU7a_sLBR-H3994Y0,3311
-adam/k8s_utils/pods.py,sha256=waj02Av78DWFVUIvVhru1fZNm2uZtgG5nhKspsURhzo,10453
+adam/k8s_utils/pods.py,sha256=ljn5tB-j8bdof6X_YWS9Hf5cjAzwmYw61I9_0bwIjCc,10540
 adam/k8s_utils/secrets.py,sha256=pYaVKXTpx3-QgFtBjznWFq0N6ZcBdxnx21FRe5nBCCo,2305
 adam/k8s_utils/service_accounts.py,sha256=v2oQSqCrNvt2uRnKlNwR3fjtpUG7oF5nqgzEB7NnT-U,6349
 adam/k8s_utils/services.py,sha256=EOJJGACVbbRvu5T3rMKqIJqgYic1_MSJ17EA0TJ6UOk,3156
@@ -161,8 +166,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-2.0.29.dist-info/METADATA,sha256=Yp7Y43u2KckeSl0vlpCSi4siYH8ItF-Mmd8iVRjFpJU,132
-kaqing-2.0.29.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.29.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.29.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.29.dist-info/RECORD,,
+kaqing-2.0.31.dist-info/METADATA,sha256=SSGMR2e1t9fREOsVU6kFYil93ig3Ei0l2hhV9hlQ8z8,132
+kaqing-2.0.31.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.31.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.31.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.31.dist-info/RECORD,,