kaqing 2.0.95__py3-none-any.whl → 2.0.97__py3-none-any.whl

adam/batch.py

@@ -107,7 +107,7 @@ def deploy(kubeconfig: str, config: str, param: list[str], namespace: str, extra
 @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)
+    run_command(Describe(), kubeconfig, config, param, cluster, namespace, pod, 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.")

adam/commands/cql/cql_utils.py

@@ -42,6 +42,9 @@ def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, use_s
     else:
         command = f'cqlsh -u {user} -p {pw} {" ".join(opts)} -e "{cql}"'
 
+    if not on_any:
+        command = f'{command} &'
+
     if state.pod:
         return CassandraNodes.exec(state.pod, state.namespace, command, show_out=show_out)
     else:

adam/commands/describe/describe.py

@@ -3,6 +3,7 @@ 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_schema import DescribeSchema
 from adam.commands.describe.describe_table import DescribeTable
 from adam.commands.describe.describe_tables import DescribeTables
 from adam.repl_state import ReplState, RequiredState
@@ -33,7 +34,7 @@ class Describe(Command):
         return super().intermediate_run(cmd, state, args, Describe.cmd_list())
 
     def cmd_list():
-        return [DescribeKeyspace(), DescribeKeyspaces(), DescribeTable(), DescribeTables()]
+        return [DescribeKeyspace(), DescribeKeyspaces(), DescribeSchema(), DescribeTable(), DescribeTables()]
 
     def completion(self, state: ReplState):
         if state.sts:

adam/commands/describe/describe_keyspace.py

@@ -30,7 +30,7 @@ class DescribeKeyspace(Command):
         if not self.validate_state(state):
             return state
 
-        args, all_nodes = Command.extract_options(args, '--all-nodes')
+        args, all_nodes = Command.extract_options(args, '&')
 
         if not args:
             if state.in_repl:
@@ -52,9 +52,9 @@ class DescribeKeyspace(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts:
-            return super().completion(state, {ks: {'--all-nodes': None} for ks in keyspaces(state, on_any=True)})
+            return super().completion(state, {ks: {'&': None} for ks in keyspaces(state, on_any=True)})
 
         return {}
 
     def help(self, _: ReplState) -> str:
-        return f'{DescribeKeyspace.COMMAND} <keyspace-name> [--all-nodes]\t describe Cassandra keyspace'
+        return f'{DescribeKeyspace.COMMAND} <keyspace-name> [&]\t describe Cassandra keyspace'

adam/commands/describe/describe_keyspaces.py

@@ -30,9 +30,8 @@ class DescribeKeyspaces(Command):
         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)
+        args, all_nodes = Command.extract_options(args, '&')
+        r: list[PodExecResult] = run_cql(state, f'{DescribeKeyspaces.COMMAND} {" ".join(args)}', show_out=True, on_any=not all_nodes)
         if not r:
             log2('No pod is available')
             return 'no-pod'
@@ -42,9 +41,9 @@ class DescribeKeyspaces(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts:
-            return super().completion(state, {'--all-nodes': None})
+            return super().completion(state, {'&': None})
 
         return {}
 
     def help(self, _: ReplState) -> str:
-        return f'{DescribeKeyspaces.COMMAND} [--all-nodes]\t describe Cassandra keyspaces'
+        return f'{DescribeKeyspaces.COMMAND} [&]\t describe Cassandra keyspaces'

adam/commands/describe/describe_schema.py

@@ -0,0 +1,49 @@
+from adam.commands.command import Command
+from adam.commands.cql.cql_utils import run_cql
+from adam.pod_exec_result import PodExecResult
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class DescribeSchema(Command):
+    COMMAND = 'describe schema'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DescribeSchema, 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 DescribeSchema.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, '&')
+        r: list[PodExecResult] = run_cql(state, f'{DescribeSchema.COMMAND} {" ".join(args)}', 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, {'&': None})
+
+        return {}
+
+    def help(self, _: ReplState) -> str:
+        return f'{DescribeSchema.COMMAND} [&]\t describe Cassandra tables'

adam/commands/describe/describe_table.py

@@ -52,9 +52,9 @@ class DescribeTable(Command):
 
     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 super().completion(state, {t: {'&': 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'
+        return f'{DescribeTable.COMMAND} <table-name> [&]\t describe Cassandra table'

adam/commands/describe/describe_tables.py

@@ -30,9 +30,8 @@ class DescribeTables(Command):
         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)
+        args, all_nodes = Command.extract_options(args, '&')
+        r: list[PodExecResult] = run_cql(state, f'{DescribeTables.COMMAND} {" ".join(args)}', show_out=True, on_any=not all_nodes)
         if not r:
             log2('No pod is available')
             return 'no-pod'
@@ -42,9 +41,9 @@ class DescribeTables(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts:
-            return super().completion(state, {'--all-nodes': None})
+            return super().completion(state, {'&': None})
 
         return {}
 
     def help(self, _: ReplState) -> str:
-        return f'{DescribeTables.COMMAND} [--all-nodes]\t describe Cassandra tables'
+        return f'{DescribeTables.COMMAND} [&]\t describe Cassandra tables'

adam/config.py

@@ -39,7 +39,7 @@ class Config:
         return get_deep_keys(self.params)
 
     def is_debug(self):
-        return os.getenv('QING_DEV').lower() == 'true' or Config().get('debug', False)
+        return os.getenv('QING_DEV', 'false').lower() == 'true' or Config().get('debug', False)
 
     def debug(self, s: None):
         if self.is_debug():

adam/version.py

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

{kaqing-2.0.95.dist-info → kaqing-2.0.97.dist-info}/METADATA

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

{kaqing-2.0.95.dist-info → kaqing-2.0.97.dist-info}/RECORD

@@ -1,10 +1,10 @@
 adam/__init__.py,sha256=oVw1FNd9HZPJ7wm6BNn5ybyNGJLjJ8kopMeBiwgMaOI,59
 adam/app_session.py,sha256=Klypm4JYHOlovaRCHAZ2P_Mj_nheMlcQgX403R0TJGk,6969
 adam/apps.py,sha256=okYibOEiCVoM5zsPUKaLJZlwlnvWSHKL7U2J1Yk3-Aw,6701
-adam/batch.py,sha256=zXLh_dlfJ1vsW3YUUlMW8NXi2SMg3db3xhZiHaldUKY,25251
+adam/batch.py,sha256=7VI7g6uiZN5WNDWcTGQPXiatFsH6Mg7qsU0tCi95Qz0,25241
 adam/cli.py,sha256=03pIZdomAu7IL-GSP6Eun_PKwwISShRAmfx6eVRPGC0,458
 adam/cli_group.py,sha256=W3zy1BghCtVcEXizq8fBH-93ZRVVwgAyGPzy0sHno1Y,593
-adam/config.py,sha256=kUgxjrRB3USmRgQVEp9ROOT23Qya2nRIKNbyiWBUCpw,2871
+adam/config.py,sha256=GRtfpGgGwfeYdVSPfk3LKCRXlOEJZ2vmXM3ADr7IhVk,2880
 adam/embedded_apps.py,sha256=lKPx63mKzJbNmwz0rgL4gF76M9fDGxraYTtNAIGnZ_s,419
 adam/embedded_params.py,sha256=mxwL1A9iBsRkKPjL8xkFZ67wwknm2EPI3PstrF6Rvt0,5012
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
@@ -16,7 +16,7 @@ adam/repl_state.py,sha256=VlQpV19Sg5vL8H3o8lQxZB5atyuTuN5iEQsd6xpSkQQ,8774
 adam/utils.py,sha256=sbsNZP3qGJtb6fXCa4dDXHry5ay9ev583cCZIQzy07s,7382
 adam/utils_athena.py,sha256=tU6Arg4g7eKV6ei9SLgakOJJqxKgSCsII-7a68OI7_g,3199
 adam/utils_net.py,sha256=65fhBnWMCkhGtyHqz95qcHaCo35q-WX1RBkkXG8dKpI,416
-adam/version.py,sha256=5OYTBHKNsShwLlWo_7fFfBNkuxAXor71CGSSjOq6GmI,139
+adam/version.py,sha256=EhlDYaIpc-OvyS0b47jHaJwdqhOR9YG-9skABPr5nUY,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
@@ -84,7 +84,7 @@ adam/commands/audit/audit_repair_tables.py,sha256=ciKmacngg1r14uR8Z_uzgNH_sk0QlC
 adam/commands/cql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/cql/cql_completions.py,sha256=dXe51NTWEJis76587IWSn9Av-cjC0J6KMaxlBKfF4wM,411
 adam/commands/cql/cql_table_completer.py,sha256=Tth6lmZ1eCEbJeAVZojTx594ttQeeVf-OjhhkSLyRnI,312
-adam/commands/cql/cql_utils.py,sha256=ywooEd5jQrqlhUxA0H6sPqNoGz384fSkrQhQPgLjdYg,4005
+adam/commands/cql/cql_utils.py,sha256=n1XBvgC0Bi0AwUdLZHzXi3n2VQivAXF-Ll7g2dyK_M4,4058
 adam/commands/cql/cqlsh.py,sha256=qEQufaDVi9FXkvruum6OHQDfLX01DVWVDnWsAjyCZYQ,2661
 adam/commands/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/deploy/code_start.py,sha256=-iH8HThTNM83IfBxT_LqTByuHVatV9d-Il4OYOfrwLI,1370
@@ -100,11 +100,12 @@ adam/commands/deploy/undeploy_frontend.py,sha256=gHekPn7l19JgVbhneKpQ7ModNoDFmzW
 adam/commands/deploy/undeploy_pg_agent.py,sha256=RYME8no1FT94WpVg-HXDGL1NmLlpE1I9R4htitjaxpo,1319
 adam/commands/deploy/undeploy_pod.py,sha256=I-pNfdcfBGLJ5YssTjSHoM4miygqoiGN233wUSIUG9Y,1905
 adam/commands/describe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/describe/describe.py,sha256=isRQ1z3lrFtaSkeWPndLGvaIbZivlBxI8D1X8ywNe1E,1510
-adam/commands/describe/describe_keyspace.py,sha256=ug2xqddB-2VST8PdlEIc_tLE-8dqe2GMQk30t68ymm0,1931
-adam/commands/describe/describe_keyspaces.py,sha256=P3AbUIxm-KiuM98DjK7I2MGjj8bjZwOm5qN1-Y4tHzA,1578
-adam/commands/describe/describe_table.py,sha256=k4cbVkHkpCuFD3grne58sDPFZFG7e21DWtxAg2b_uUw,1887
-adam/commands/describe/describe_tables.py,sha256=vIs4lKz4nHBJumOlR4wBhR1QxXTFqzXCq-DNOO04CVE,1557
+adam/commands/describe/describe.py,sha256=h300tQRWPNCil9KXM1mUdNHiNcXb3Gq1x92anpJHtKA,1594
+adam/commands/describe/describe_keyspace.py,sha256=clqDM5-mS_8R90vjz14Z7P7dr38JbKft3v-KN5WAs-w,1901
+adam/commands/describe/describe_keyspaces.py,sha256=3oYiHoCFoTrgFG0xfWgU60412n9C0jLY38d_w0mghnQ,1576
+adam/commands/describe/describe_schema.py,sha256=mOiFqWe_M1JwtL-qSvGsXjlQxgViX0AWZl9f4ho58zY,1555
+adam/commands/describe/describe_table.py,sha256=wMAsi0bZuehDzj5LtkQfLFyiAGTlyfM_aou4Nvg53TE,1867
+adam/commands/describe/describe_tables.py,sha256=rtZtPZ8bHI6XXfKW0TcEXqmdgeOiC73QUoY4ig4xsEw,1555
 adam/commands/medusa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/medusa/medusa.py,sha256=KNFjStvilIuOJt3wTtcWmKvdm8FdCnrDY2ltEWbratk,1402
 adam/commands/medusa/medusa_backup.py,sha256=Tns-nBbqTnry8zoCFtXCisco3ipcOgArQbN5rc7SRGY,1801
@@ -183,8 +184,8 @@ adam/utils_k8s/service_accounts.py,sha256=v2oQSqCrNvt2uRnKlNwR3fjtpUG7oF5nqgzEB7
 adam/utils_k8s/services.py,sha256=EOJJGACVbbRvu5T3rMKqIJqgYic1_MSJ17EA0TJ6UOk,3156
 adam/utils_k8s/statefulsets.py,sha256=5g7KxGRHgEewT8rnZneDTaJDylUf-dHH2edWJEoorr8,4667
 adam/utils_k8s/volumes.py,sha256=RIBmlOSWM3V3QVXLCFT0owVOyh4rGG1ETp521a-6ndo,1137
-kaqing-2.0.95.dist-info/METADATA,sha256=qOBSsJn8-Y2hlhMJtQKQXFQb-KqW9ZoxICJvIbzGt9k,132
-kaqing-2.0.95.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.95.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.95.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.95.dist-info/RECORD,,
+kaqing-2.0.97.dist-info/METADATA,sha256=qaqFv8l7YzIR5aq2U070P14QwEQwQlt7kImfDS-GV14,132
+kaqing-2.0.97.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.97.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.97.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.97.dist-info/RECORD,,