kaqing 2.0.100__tar.gz → 2.0.102__tar.gz

{kaqing-2.0.100 → kaqing-2.0.102}/PKG-INFO

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

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/audit/audit.py

@@ -62,8 +62,9 @@ class Audit(Command):
                 columns=lambda table: audit_column_names(),
                 partition_columns=lambda table: audit_column_names(partition_cols_only=True),
                 variant='athena'
-            ) | {
-                'desc': {table: None for table in audit_table_names()}}
+            )
+        # | {
+        #         'desc': {table: None for table in audit_table_names()}}
 
         return {}
 

kaqing-2.0.102/adam/commands/audit/audit_table_completer.py

@@ -0,0 +1,9 @@
+from adam.sql.term_completer import TermCompleter
+from adam.utils_athena import audit_table_names
+
+class AuditTableNameCompleter(TermCompleter):
+    def __init__(self, ignore_case: bool = True):
+        super().__init__(audit_table_names(), ignore_case=ignore_case)
+
+    def __repr__(self) -> str:
+        return "AuditTableCompleter()"

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/cql/cql_utils.py

@@ -27,28 +27,25 @@ 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):
+def tables(state: ReplState, on_any=False) -> dict[str, list[str]]:
     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 {}
 
     return parse_cql_desc_tables(r.stdout if state.pod else r[0].stdout)
 
-def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, use_single_quotes = False, on_any = False):
+def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, use_single_quotes = False, on_any = False, background=False):
     user, pw = Secrets.get_user_pass(state.sts if state.sts else state.pod, state.namespace, secret_path='cql.secret')
     if use_single_quotes:
         command = f"cqlsh -u {user} -p {pw} {' '.join(opts)} -e '{cql}'"
     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)
+        return CassandraNodes.exec(state.pod, state.namespace, command, show_out=show_out, background=background)
     else:
-        return CassandraClusters.exec(state.sts, state.namespace, command, show_out=show_out, action='cql', on_any=on_any)
+        return CassandraClusters.exec(state.sts, state.namespace, command, show_out=show_out, action='cql', on_any=on_any, background=background)
 
 def parse_cql_desc_tables(out: str):
     # Keyspace data_endpoint_auth

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/cql/cqlsh.py

@@ -33,11 +33,14 @@ class Cqlsh(Command):
         if not self.validate_state(state):
             return state
 
+        background = False
         opts = []
         cqls = []
-        for arg in args:
+        for index, arg in enumerate(args):
             if arg.startswith('--'):
                 opts.append(arg)
+            elif index == len(args) -1 and arg == '&':
+                background = True
             elif arg != '-e':
                 cqls.append(arg)
         if not cqls:
@@ -51,7 +54,7 @@ class Cqlsh(Command):
             return 'no-cql'
 
         cql = ' '.join(cqls)
-        return run_cql(state, cql, opts, show_out=True)
+        return run_cql(state, cql, opts, show_out=True, background=background)
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.device != state.C:

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/describe/describe.py

@@ -7,6 +7,8 @@ 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
+from adam.utils import log2
+from adam.utils_athena import run_audit_query
 
 class Describe(Command):
     COMMAND = 'describe'
@@ -31,15 +33,27 @@ class Describe(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
+        if state.device == ReplState.L:
+            state, args = self.apply_state(args, state)
+            if not args:
+                if state.in_repl:
+                    log2('Please enter table name')
+                else:
+                    log2('* table name is missing.')
+                    log2()
+                    Command.display_help()
+                return state
+
+            run_audit_query(f'describe {args[0]}')
+
+            return state
+
         return super().intermediate_run(cmd, state, args, Describe.cmd_list())
 
     def cmd_list():
         return [DescribeKeyspace(), DescribeKeyspaces(), DescribeSchema(), DescribeTable(), DescribeTables()]
 
-    def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
+    def completion(self, _: ReplState):
         return {}
 
 class DescribeCommandHelper(click.Command):

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/describe/describe_keyspace.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql.cql_utils import keyspaces, run_cql
+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
@@ -50,9 +50,7 @@ class DescribeKeyspace(Command):
         # do not continue to cql route
         return state
 
-    def completion(self, state: ReplState) -> dict[str, any]:
-        if state.sts:
-            return super().completion(state, {ks: {'&': None} for ks in keyspaces(state, on_any=True)})
+    def completion(self, _: ReplState) -> dict[str, any]:
 
         return {}
 

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/describe/describe_keyspaces.py

@@ -39,10 +39,7 @@ class DescribeKeyspaces(Command):
         # do not continue to cql route
         return state
 
-    def completion(self, state: ReplState) -> dict[str, any]:
-        if state.sts:
-            return super().completion(state, {'&': None})
-
+    def completion(self, _: ReplState) -> dict[str, any]:
         return {}
 
     def help(self, _: ReplState) -> str:

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/describe/describe_schema.py

@@ -39,10 +39,7 @@ class DescribeSchema(Command):
         # do not continue to cql route
         return state
 
-    def completion(self, state: ReplState) -> dict[str, any]:
-        if state.sts:
-            return super().completion(state, {'&': None})
-
+    def completion(self, _: ReplState) -> dict[str, any]:
         return {}
 
     def help(self, _: ReplState) -> str:

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/describe/describe_table.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql.cql_utils import run_cql, table_names
+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
@@ -50,11 +50,8 @@ class DescribeTable(Command):
         # do not continue to cql route
         return state
 
-    def completion(self, state: ReplState) -> dict[str, any]:
-        if state.sts:
-            return super().completion(state, {t: {'&': None} for t in table_names(state)})
-
+    def completion(self, _: ReplState) -> dict[str, any]:
         return {}
 
     def help(self, _: ReplState) -> str:
-        return f'{DescribeTable.COMMAND} <table-name> [&]\t describe Cassandra table'
+        return f'{DescribeTable.COMMAND} <table-name> [&]\t describe Cassandra or Athena table'

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/describe/describe_tables.py

@@ -39,10 +39,7 @@ class DescribeTables(Command):
         # do not continue to cql route
         return state
 
-    def completion(self, state: ReplState) -> dict[str, any]:
-        if state.sts:
-            return super().completion(state, {'&': None})
-
+    def completion(self, _: ReplState) -> dict[str, any]:
         return {}
 
     def help(self, _: ReplState) -> str:

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/ls.py

@@ -91,7 +91,7 @@ class Ls(Command):
     def show_statefulsets(self):
         ss = StatefulSets.list_sts_names()
         if len(ss) == 0:
-            log2('No cassandra statefulsets found.')
+            log2('No Cassandra clusters found.')
             return
 
         app_ids = CustomResources.get_app_ids()

{kaqing-2.0.100 → kaqing-2.0.102}/adam/commands/preview_table.py

@@ -1,5 +1,6 @@
 import functools
 
+from adam.commands.audit.audit_table_completer import AuditTableNameCompleter
 from adam.commands.command import Command
 from adam.commands.cql.cql_table_completer import CqlTableNameCompleter
 from adam.commands.cql.cql_utils import run_cql, table_names, tables
@@ -8,6 +9,7 @@ from adam.commands.postgres.psql_table_completer import PsqlTableNameCompleter
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import lines_to_tabular, log, log2
+from adam.utils_athena import audit_table_names, run_audit_query
 
 class PreviewTable(Command):
     COMMAND = 'preview'
@@ -35,7 +37,7 @@ class PreviewTable(Command):
         if state.device == ReplState.P:
             if not self.validate_state(state, RequiredState.PG_DATABASE):
                 return state
-        else:
+        elif state.device != ReplState.L:
             if not self.validate_state(state):
                 return state
 
@@ -45,8 +47,10 @@ class PreviewTable(Command):
                     pg = PostgresSession(state.namespace, state.pg_path)
                     lines = [db["name"] for db in pg.tables() if db["schema"] == PostgresSession.default_schema()]
                     log(lines_to_tabular(lines, separator=','))
+                elif state.device == ReplState.L:
+                    log(lines_to_tabular(audit_table_names(), separator=','))
                 else:
-                    run_cql(state, f'describe tables', show_out=True)
+                    run_cql(state, f'describe tables', show_out=True, on_any=True)
 
             if state.in_repl:
                 log2('Table is required.')
@@ -66,14 +70,18 @@ class PreviewTable(Command):
         rows = Config().get('preview.rows', 10)
         if state.device == ReplState.P:
             PostgresSession(state.namespace, state.pg_path).run_sql(f'select * from {table} limit {rows}')
+        elif state.device == ReplState.L:
+            run_audit_query(f'select * from {table} limit {rows}')
         else:
-            run_cql(state, f'select * from {table} limit {rows}', show_out=True, use_single_quotes=True)
+            run_cql(state, f'select * from {table} limit {rows}', show_out=True, use_single_quotes=True, on_any=True)
 
         return state
 
     def completion(self, state: ReplState):
         if state.device == ReplState.P:
             return {PreviewTable.COMMAND: PsqlTableNameCompleter(state.namespace, state.pg_path)}
+        elif state.device == ReplState.L:
+            return {PreviewTable.COMMAND: AuditTableNameCompleter()}
         elif state.sts:
             return {PreviewTable.COMMAND: CqlTableNameCompleter(table_names(state))}
 

{kaqing-2.0.100 → kaqing-2.0.102}/adam/embedded_params.py

@@ -1,2 +1,2 @@
 def config():
-    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'auto-repair': {'elapsed_hours': 12}, 'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results'}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'a': {'auto-enter-app': 'c3/c3'}, 'c': {'auto-enter-only-cluster': 'cluster'}, 'history': {'push-cat-remote-log-file': True}, 'background-process': {'auto-nohup': True}}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}
+    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'auto-repair': {'elapsed_hours': 12}, 'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results'}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'a': {'auto-enter': 'c3/c3'}, 'c': {'auto-enter': 'cluster'}, 'history': {'push-cat-remote-log-file': True}, 'background-process': {'auto-nohup': True}}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}

{kaqing-2.0.100 → kaqing-2.0.102}/adam/repl.py

@@ -69,20 +69,21 @@ def enter_repl(state: ReplState):
     Log.log2(f'kaqing {__version__}')
 
     if state.device == ReplState.C:
-        auto_enter = Config().get('repl.c.auto-enter-only-cluster', 'cluster')
-        ss = StatefulSets.list_sts_name_and_ns()
-        if not ss:
-            raise Exception("no Cassandra clusters found")
-        elif not state.sts and len(ss) == 1 and auto_enter in ['cluster', 'first-pod']:
-            cluster = ss[0]
-            state.sts = cluster[0]
-            state.namespace = cluster[1]
-            if auto_enter == 'first-pod':
-                state.pod = f'{state.sts}-0'
-            if KubeContext().in_cluster_namespace:
-                Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}...')
-            else:
-                Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}@{state.namespace}...')
+        auto_enter = Config().get('repl.c.auto-enter', 'cluster')
+        if auto_enter and auto_enter in ['cluster', 'first-pod']:
+            ss = StatefulSets.list_sts_name_and_ns()
+            if not ss:
+                log2("No Cassandra clusters found.")
+            elif not state.sts and len(ss) == 1:
+                cluster = ss[0]
+                state.sts = cluster[0]
+                state.namespace = cluster[1]
+                if auto_enter == 'first-pod':
+                    state.pod = f'{state.sts}-0'
+                if KubeContext().in_cluster_namespace:
+                    Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}...')
+                else:
+                    Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}@{state.namespace}...')
     elif state.device == ReplState.A:
         if not state.app_env:
             if app := Config().get('repl.a.auto-enter-app', 'c3/c3'):
@@ -140,32 +141,34 @@ def enter_repl(state: ReplState):
                     cmd = f'bash {cmd}'
 
                 if cmd and cmd.strip(' ') and not cmds.run(cmd, state):
-                    c_sql_tried = False
-                    if state.device == ReplState.P:
-                        pg = PostgresSession(state.namespace, state.pg_path)
-                        if pg.db:
-                            c_sql_tried = True
-                            cmd = f'pg {cmd}'
-                            cmds.run(cmd, state)
-                    elif state.device == ReplState.A:
-                        if state.app_app:
-                            c_sql_tried = True
-                            cmd = f'app {cmd}'
-                            cmds.run(cmd, state)
-                    elif state.device == ReplState.L:
-                        c_sql_tried = True
-                        cmd = f'audit {cmd}'
-                        cmds.run(cmd, state)
-                    elif state.sts:
-                        c_sql_tried = True
-                        cmd = f'cql {cmd}'
-                        cmds.run(cmd, state)
-
-                    if not c_sql_tried:
-                        log2(f'* Invalid command: {cmd}')
-                        log2()
-                        lines = [c.help(state) for c in cmd_list if c.help(state)]
-                        log2(lines_to_tabular(lines, separator='\t'))
+                    try_device_default_action(state, cmds, cmd_list, cmd)
+                    # not served by any command in the chain; try SQL query or C3 action
+                    # c_sql_tried = False
+                    # if state.device == ReplState.P:
+                    #     pg = PostgresSession(state.namespace, state.pg_path)
+                    #     if pg.db:
+                    #         c_sql_tried = True
+                    #         cmd = f'pg {cmd}'
+                    #         cmds.run(cmd, state)
+                    # elif state.device == ReplState.A:
+                    #     if state.app_app:
+                    #         c_sql_tried = True
+                    #         cmd = f'app {cmd}'
+                    #         cmds.run(cmd, state)
+                    # elif state.device == ReplState.L:
+                    #     c_sql_tried = True
+                    #     cmd = f'audit {cmd}'
+                    #     cmds.run(cmd, state)
+                    # elif state.sts:
+                    #     c_sql_tried = True
+                    #     cmd = f'cql {cmd}'
+                    #     cmds.run(cmd, state)
+
+                    # if not c_sql_tried:
+                    #     log2(f'* Invalid command: {cmd}')
+                    #     log2()
+                    #     lines = [c.help(state) for c in cmd_list if c.help(state)]
+                    #     log2(lines_to_tabular(lines, separator='\t'))
             except EOFError:  # Handle Ctrl+D (EOF) for graceful exit
                 break
             except Exception as e:
@@ -183,6 +186,34 @@ def enter_repl(state: ReplState):
                 if cmd and (state.device != ReplState.L or Config().get('audit.log-audit-queries', False)):
                     executor.submit(audit_log, cmd, state)
 
+def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Command], cmd: str):
+    c_sql_tried = False
+    if state.device == ReplState.P:
+        pg = PostgresSession(state.namespace, state.pg_path)
+        if pg.db:
+            c_sql_tried = True
+            cmd = f'pg {cmd}'
+            cmds.run(cmd, state)
+    elif state.device == ReplState.A:
+        if state.app_app:
+            c_sql_tried = True
+            cmd = f'app {cmd}'
+            cmds.run(cmd, state)
+    elif state.device == ReplState.L:
+        c_sql_tried = True
+        cmd = f'audit {cmd}'
+        cmds.run(cmd, state)
+    elif state.sts:
+        c_sql_tried = True
+        cmd = f'cql {cmd}'
+        cmds.run(cmd, state)
+
+    if not c_sql_tried:
+        log2(f'* Invalid command: {cmd}')
+        log2()
+        lines = [c.help(state) for c in cmd_list if c.help(state)]
+        log2(lines_to_tabular(lines, separator='\t'))
+
 def audit_log(cmd: str, state: ReplState):
     payload = {
         'cluster': state.namespace if state.namespace else 'NA',

{kaqing-2.0.100 → kaqing-2.0.102}/adam/repl_commands.py

@@ -58,7 +58,8 @@ 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(), Describe(), Show(), Undeploy()]
+        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,8 @@ class ReplCommands:
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
 
     def cassandra_check() -> list[Command]:
-        return Describe.cmd_list() + [ShowCassandraStatus(),
+        # return Describe.cmd_list() + [ShowCassandraStatus(),
+        return [ShowCassandraStatus(),
                 ShowCassandraVersion(), ShowRepairs(), ShowStorage(), ShowProcesses(), Check(), Issues(), NodeTool(), Report()]
 
     def cassandra_ops() -> list[Command]:

{kaqing-2.0.100 → kaqing-2.0.102}/adam/sql/sql_completer.py

@@ -11,7 +11,7 @@ __all__ = [
     "SqlCompleter",
 ]
 
-DML_COMPLETER = TermCompleter(['select', 'insert', 'delete', 'update', 'alter'])
+DML_COMPLETER = TermCompleter(['select', 'insert', 'delete', 'update', 'alter', 'describe'])
 
 def default_columns(tables: list[str]):
     return 'id,x.,y.,z.'.split(',')
@@ -98,4 +98,5 @@ class SqlCompleter(Completer):
             'select': SqlCompleter(table_names, 'select', columns=columns, partition_columns=partition_columns, table_props=table_props, variant=variant),
             'update': SqlCompleter(table_names, 'update', columns=columns, partition_columns=partition_columns, table_props=table_props, variant=variant),
             'alter': SqlCompleter(table_names, 'alter', columns=columns, partition_columns=partition_columns, table_props=table_props, variant=variant),
+            'describe': SqlCompleter(table_names, 'describe', columns=columns, partition_columns=partition_columns, table_props=table_props, variant=variant),
         }

{kaqing-2.0.100 → kaqing-2.0.102}/adam/sql/state_machine.py

@@ -321,7 +321,8 @@ class SqlSpec:
         'update', 'where', 'set',
         'delete',
         'audit',
-        'alter', 'table', 'tables', 'add', 'drop', 'with'
+        'alter', 'table', 'tables', 'add', 'drop', 'with',
+        'describe'
     ]
 
     def spec(self):
@@ -346,11 +347,32 @@ class CqlSpec(SqlSpec):
         'alter_table_with_               > name             > alter_table_with_p                      ^ table-props',
         'alter_table_with_p              > comparison       > alter_table_with_p_op                   ^ =',
         'alter_table_with_p_op           > name|single|num  > alter_table_with_p_op                   ^ table-prop-values',
+
+        '                                > describe         > describe',
+        'describe_                       > table            > desc_table                              ^ table,`tables`,keyspace,keyspaces,schema',
+        '-                               > tables           > desc_tables',
+        '-                               > keyspace         > desc_keyspace',
+        '-                               > keyspaces        > desc_keyspaces',
+        '-                               > schema           > desc_schema',
+        'desc_table_                     > name             > desc_table_t                            ^ tables',
+        'desc_table_t                    > name             > desc_table_t                            ^ tables',
+        'desc_table_t_                   > &                > desc_table_t_bg                         ^ &',
+        'desc_tables_                    > &                > desc_tables_bg                          ^ &',
+        'desc_keyspace_                  > name             > desc_keyspace_k',
+        'desc_keyspace_k_                > &                > desc_keyspace_k_bg                      ^ &',
+        'desc_schema_                    > &                > desc_schema_bg                          ^ &',
+    ]
+
+    KEYWORDS = SqlSpec.KEYWORDS + [
+        'schema', 'keyspace', 'keyspaces', 'tables'
     ]
 
     def spec(self):
         return CqlSpec.SPEC
 
+    def keywords(self):
+        return CqlSpec.KEYWORDS
+
 class AthenaSpec(SqlSpec):
     SPEC = SqlSpec.SPEC + [
         'alter_table_t_                  > add              > alter_table_add                         ^ add partition,drop partition',
@@ -362,6 +384,11 @@ class AthenaSpec(SqlSpec):
         'alter_partition_lp_a_op         > single           > alter_partition_lp_a_op_v               ^ single',
         'alter_partition_lp_a_op_v       > ,                > alter_partition_lp_sc                   ^ single',
         'alter_partition_lp_sc           > name|)           > alter_partition_lp_a                    ^ partition-columns',
+
+        '                                > describe         > describe',
+        'describe_                       > name             > desc_t                                  ^ tables',
+        'desc_t                          > name             > desc_t                                  ^ tables',
+        'desc_t_                         > name             > desc_t_',
     ]
 
     KEYWORDS = SqlSpec.KEYWORDS + [

{kaqing-2.0.100 → kaqing-2.0.102}/adam/utils_k8s/cassandra_clusters.py

@@ -14,12 +14,12 @@ T = TypeVar('T')
 # utility collection on cassandra clusters; methods are all static
 class CassandraClusters:
     def exec(statefulset: str, namespace: str, command: str, action: str = 'action',
-             max_workers=0, show_out=True, on_any = False, shell = '/bin/sh') -> list[PodExecResult]:
+             max_workers=0, show_out=True, on_any = False, shell = '/bin/sh', background = False) -> list[PodExecResult]:
         def body(executor: ThreadPoolExecutor, pod: str, namespace: str, show_out: bool):
             if executor:
-                return executor.submit(CassandraNodes.exec, pod, namespace, command, False, False, shell)
+                return executor.submit(CassandraNodes.exec, pod, namespace, command, False, False, shell, background)
 
-            return CassandraNodes.exec(pod, namespace, command, show_out=show_out)
+            return CassandraNodes.exec(pod, namespace, command, show_out=show_out, background=background)
 
         def post(result, show_out: bool):
             if KubeContext.show_out(show_out):
@@ -31,4 +31,4 @@ class CassandraClusters:
 
             return result
 
-        return StatefulSets.on_cluster(statefulset, namespace, body, post=post, action=action, max_workers=max_workers, show_out=show_out, on_any=on_any)
+        return StatefulSets.on_cluster(statefulset, namespace, body, post=post, action=action, max_workers=max_workers, show_out=show_out, on_any=on_any, background=background)

{kaqing-2.0.100 → kaqing-2.0.102}/adam/utils_k8s/cassandra_nodes.py

@@ -6,8 +6,8 @@ from adam.repl_session import ReplSession
 
 # utility collection on cassandra nodes; methods are all static
 class CassandraNodes:
-    def exec(pod_name: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh') -> PodExecResult:
-        r = Pods.exec(pod_name, "cassandra", namespace, command, show_out = show_out, throw_err = throw_err, shell = shell)
+    def exec(pod_name: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh', background = False) -> PodExecResult:
+        r = Pods.exec(pod_name, "cassandra", namespace, command, show_out = show_out, throw_err = throw_err, shell = shell, background = background)
 
         if r and Config().get('repl.history.push-cat-remote-log-file', True):
             if r.log_file:

{kaqing-2.0.100 → kaqing-2.0.102}/adam/utils_k8s/pods.py

@@ -43,7 +43,11 @@ class Pods:
                 namespace: str,
                 body: Callable[[ThreadPoolExecutor, str, str, bool], T],
                 post: Callable[[T], T] = None,
-                action: str = 'action', max_workers=0, show_out=True, on_any = False) -> list[T]:
+                action: str = 'action',
+                max_workers=0,
+                show_out=True,
+                on_any = False,
+                background = False) -> list[T]:
         show_out = KubeContext.show_out(show_out)
 
         if not max_workers:
@@ -94,7 +98,9 @@ class Pods:
 
             return results
 
-    def exec(pod_name: str, container: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh',
+    def exec(pod_name: str, container: str, namespace: str, command: str,
+             show_out = True, throw_err = False, shell = '/bin/sh',
+             background = False,
              interaction: Callable[[any, list[str]], any] = None):
         if _TEST_POD_EXEC_OUTS:
             return _TEST_POD_EXEC_OUTS
@@ -106,8 +112,8 @@ class Pods:
         log_file = None
         tty = True
         exec_command = [shell, '-c', command]
-        if command.endswith(' &'):
-            # should be false for starting a backgroud process
+        if background or command.endswith(' &'):
+            # should be false for starting a background process
             tty = False
 
             if Config().get('repl.background-process.auto-nohup', True):

{kaqing-2.0.100 → kaqing-2.0.102}/adam/utils_k8s/statefulsets.py

@@ -62,10 +62,10 @@ class StatefulSets:
                 namespace: str,
                 body: Callable[[ThreadPoolExecutor, str, str, bool], T],
                 post: Callable[[T], T] = None,
-                action: str = 'action', max_workers=0, show_out=True, on_any = False) -> list[T]:
+                action: str = 'action', max_workers=0, show_out=True, on_any = False, background = False) -> list[T]:
         pods = StatefulSets.pod_names(statefulset, namespace)
 
-        return Pods.on_pods(pods, namespace, body, post=post, action=action, max_workers=max_workers, show_out=show_out, on_any=on_any)
+        return Pods.on_pods(pods, namespace, body, post=post, action=action, max_workers=max_workers, show_out=show_out, on_any=on_any, background=background)
 
     @functools.lru_cache()
     def pod_names(ss: str, ns: str):

kaqing-2.0.102/adam/version.py

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