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

adam/commands/alter_tables.py

@@ -92,20 +92,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,24 @@
+import functools
 import re
 
 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):
+    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 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 +65,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

@@ -59,6 +59,7 @@ class Cqlsh(Command):
                 'insert': {'into': None},
                 'select': None,
                 'update': None,
+                'describe': {'keyspaces': 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_keyspace.py

@@ -0,0 +1,63 @@
+import click
+
+from adam.commands.command import Command
+from adam.commands.command_helpers import ClusterOrPodCommandHelper
+from adam.commands.cql_utils import keyspaces, parse_cql_desc_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
+
+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
+
+        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=True)
+        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:
+            state.wait_log("Inspecting Cassandra Keyspaces...")
+            return super().completion(state, {ks: None for ks in keyspaces(state.sts, state.namespace)})
+
+        return {}
+
+    def help(self, _: ReplState) -> str:
+        return f'{DescribeKeyspace.COMMAND} <keyspace-name>\t describe Cassandra keyspace'

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/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__
 
@@ -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}')

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_keyspace import DescribeKeyspace
 from adam.commands.shell import Shell
 from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.cp import ClipboardCopy
@@ -75,7 +76,7 @@ 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(), 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()

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.30"  #: the working version
 __release__ = "1.0.0"  #: the release version

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

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

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

@@ -9,12 +9,12 @@ 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=3MmQBHI0I05TayRJY66h6XybmNz-cHAR_RbCB_ZThR0,7259
+adam/repl_commands.py,sha256=FZj57MRw-DQk-rJjVieN9Cqmq6j8GA7bkwQMTjTr75g,4518
 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/utils.py,sha256=2DoWsrcaioFFH0-RjT30qelVRPUJqCGTfz_ucfE7F8g,7406
+adam/version.py,sha256=mXqrSPTU-W-eJr88DNwAKCqexgkZP8CHrGml1Q_lyNs,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=9roVR8Ba0UWgNLS6Z1eeEFC23726-tU5oqRvNbdFYYY,3662
 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,9 @@ 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=QAZ104eGdFmuim3vW04gEbiU3xDXXUVIlNYDHFX9_Rw,3513
+adam/commands/cqlsh.py,sha256=7G1HmfvpYaSZVHYTY7zS3ZI0jjW-a00fND8FKZ4lTNA,2684
+adam/commands/describe_keyspace.py,sha256=FmVywSL8N2NwfSLZwpEawaC_KD6kkUDWLuElissI8t4,2028
 adam/commands/devices.py,sha256=_f8j6aQzTL8_pFlWYawRuG2Ju1zPjYSPcRIlLnZng10,2397
 adam/commands/exit.py,sha256=5MWUAmzYBlsrp0CoiTDB13SUkX9Ya18UlGeOIPia6TA,798
 adam/commands/help.py,sha256=Ey3R1X8w_CMhdADI0t8dSQ28euhDHheJm7NermiGni4,1645
@@ -70,7 +71,7 @@ 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/param_set.py,sha256=QDIuqfU80aWCB16OK49yf7XRaRTWwiLkwMsJuVikq9I,1271
 adam/commands/preview_table.py,sha256=NbnQRjCQ7SJHzQqtB8RgJn8yydTVknaSF-qklLXDQ58,3383
 adam/commands/pwd.py,sha256=VlgFjxFl66I7Df1YI6cuiEeY6Q13lEavMKfrzHLESKo,2340
 adam/commands/report.py,sha256=Ky45LIzSlB_X4V12JZWjU3SA2u4_FKRencRTq7psOWU,1944
@@ -85,7 +86,7 @@ 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
@@ -161,8 +162,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.30.dist-info/METADATA,sha256=pgrZuwOMEBEQzmy-9TyioV4GmY7-4nQYJp5FQa3QmYQ,132
+kaqing-2.0.30.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.30.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.30.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.30.dist-info/RECORD,,