kaqing 2.0.115__py3-none-any.whl → 2.0.172__py3-none-any.whl

adam/commands/show/show_processes.py

@@ -1,5 +1,7 @@
+from adam.commands import extract_options, extract_sequence
 from adam.commands.command import Command
 from adam.commands.commands_utils import show_table
+from adam.commands.cql.utils_cql import cassandra
 from adam.config import Config
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
@@ -26,28 +28,22 @@ class ShowProcesses(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            with extract_options(args, ['-s', '--show']) as (args, show_out):
+                with extract_sequence(args, ['with', 'recipe', '=', 'qing']) as (_, recipe_qing):
+                    cols = Config().get('processes.columns', 'pod,cpu-metrics,mem')
+                    header = Config().get('processes.header', 'POD_NAME,M_CPU(USAGE/LIMIT),MEM/LIMIT')
+                    if recipe_qing:
+                        cols = Config().get('processes-qing.columns', 'pod,cpu,mem')
+                        header = Config().get('processes-qing.header', 'POD_NAME,Q_CPU/TOTAL,MEM/LIMIT')
 
-        args, show_output = Command.extract_options(args, ['-s', '--show'])
+                with cassandra(state) as pods:
+                    pods.display_table(cols, header, show_out=show_out)
 
-        cols = Config().get('processes.columns', 'pod,cpu,mem')
-        header = Config().get('processes.header', 'POD_NAME,CPU,MEM/LIMIT')
-
-        if state.pod:
-            show_table(state, [state.pod], cols, header, show_output=show_output)
-        elif state.sts:
-            pod_names = [pod.metadata.name for pod in StatefulSets.pods(state.sts, state.namespace)]
-            show_table(state, pod_names, cols, header, show_output=show_output)
-
-        return state
+                return state
 
     def completion(self, state: ReplState):
-        if not state.sts:
-            return {}
-
-        return super().completion(state)
+        return super().completion(state, {'with': {'recipe': {'=': {'metrics': {'-s': None}, 'qing': {'-s': None}}}}, '-s': None})
 
     def help(self, _: ReplState):
-        return f'{ShowProcesses.COMMAND} [-s]\t show process overview  -s show commands on nodes'
+        return f'{ShowProcesses.COMMAND} [with recipe qing|metrics] [-s]\t show process overview  -s show commands on nodes'

adam/commands/show/show_storage.py

@@ -1,7 +1,7 @@
+from adam.commands import extract_options
 from adam.commands.command import Command
-from adam.commands.commands_utils import show_table
+from adam.commands.cql.utils_cql import cassandra
 from adam.config import Config
-from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 
 class ShowStorage(Command):
@@ -26,27 +26,17 @@ class ShowStorage(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            with extract_options(args, ['-s', '--show']) as (args, show_out):
+                cols = Config().get('storage.columns', 'pod,volume_root,volume_cassandra,snapshots,data,compactions')
+                header = Config().get('storage.header', 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS')
+                with cassandra(state) as pods:
+                    pods.display_table(cols, header, show_out=show_out)
 
-        args, show_output = Command.extract_options(args, ['-s', '--show'])
-
-        cols = Config().get('storage.columns', 'pod,volume_root,volume_cassandra,snapshots,data,compactions')
-        header = Config().get('storage.header', 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS')
-        if state.pod:
-            show_table(state, [state.pod], cols, header, show_output=show_output)
-        elif state.sts:
-            pod_names = [pod.metadata.name for pod in StatefulSets.pods(state.sts, state.namespace)]
-            show_table(state, pod_names, cols, header, show_output=show_output)
-
-        return state
+                return state
 
     def completion(self, state: ReplState):
-        if not state.sts:
-            return {}
-
-        return super().completion(state)
+        return super().completion(state, {'-s': None})
 
     def help(self, _: ReplState):
         return f'{ShowStorage.COMMAND} [-s]\t show storage overview  -s show commands on nodes'

adam/commands/watch.py

@@ -8,10 +8,10 @@ from adam.commands.commands_utils import show_pods, show_rollout
 from adam.config import Config
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import convert_seconds, log2
+from adam.utils import log2
 
 class Watch(Command):
-    COMMAND = 'watch'
+    COMMAND = 'watch cassandra pods'
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -26,37 +26,34 @@ class Watch(Command):
         return Watch.COMMAND
 
     def required(self):
-        return RequiredState.CLUSTER_OR_POD
+        return RequiredState.NAMESPACE
 
     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
-
-        pods = StatefulSets.pods(state.sts, state.namespace)
-        if not pods:
-            log2("No pods are found.")
-            return state
+        with self.validate(args, state) as (args, state):
+            pods = StatefulSets.pods(state.sts, state.namespace)
+            if not pods:
+                log2("No pods are found.")
+                return state
 
-        stop_event = threading.Event()
-        thread = threading.Thread(target=self.loop, args=(stop_event, state.sts, pods, state.namespace), daemon=True)
-        thread.start()
+            stop_event = threading.Event()
+            thread = threading.Thread(target=self.loop, args=(stop_event, state.sts, pods, state.namespace), daemon=True)
+            thread.start()
 
-        try:
-            log2(f"Press Ctrl+C to break.")
+            try:
+                log2(f"Press Ctrl+C to break.")
 
-            time.sleep(Config().get('watch.timeout', 3600 * 1))
-        except KeyboardInterrupt:
-            pass
+                time.sleep(Config().get('watch.timeout', 3600 * 1))
+            except KeyboardInterrupt:
+                pass
 
-        log2("Stopping watch...")
-        stop_event.set()
-        thread.join()
+            log2("Stopping watch...")
+            stop_event.set()
+            thread.join()
 
-        return state
+            return state
 
     def loop(self, stop_flag: threading.Event, sts: str, pods: List[client.V1Pod], ns: str):
         show_pods(pods, ns)
@@ -73,13 +70,13 @@ class Watch(Command):
                 cnt = Config().get('watch.interval', 10)
 
     def completion(self, state: ReplState):
-        if state.pod:
-            return {}
+        if sc := super().completion(state):
+            if state.sts:
+                return sc
 
-        if not state.sts:
-            return {Watch.COMMAND: {n: None for n in StatefulSets.list_sts_names()}}
+            return super().completion(state, {n: None for n in StatefulSets.list_sts_names()})
 
-        return {Watch.COMMAND: None}
+        return {}
 
     def help(self, _: ReplState):
-        return f'{Watch.COMMAND}\t watch pod changes'
+        return f'{Watch.COMMAND}\t watch Cassandra pod changes'

adam/config.py

@@ -3,13 +3,16 @@ from typing import TypeVar, cast
 import yaml
 
 from . import __version__
-from adam.utils import copy_config_file, get_deep_keys, log2
+from adam.utils import LogConfig, copy_config_file, get_deep_keys, log2
 
 T = TypeVar('T')
 
 class Config:
     EMBEDDED_PARAMS = {}
 
+    LogConfig.is_debug = lambda: Config().is_debug()
+    LogConfig.is_debug_timing = lambda: Config().get('debugs.timings', False)
+
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
         if not hasattr(cls, 'instance'): cls.instance = super(Config, cls).__new__(cls)
@@ -41,10 +44,6 @@ class Config:
     def is_debug(self):
         return os.getenv('QING_DEV', 'false').lower() == 'true' or Config().get('debug', False)
 
-    def debug(self, s: None):
-        if self.is_debug():
-            log2(f'DEBUG {s}')
-
     def get(self, key: str, default: T) -> T:
         # params['nodetool']['status']['max-nodes']
         d = self.params
@@ -85,12 +84,4 @@ class Config:
             log2(f'incorrect path: {key}')
             return None
 
-        return v if v else 'false'
-
-    def wait_log(self, msg: str):
-        if hasattr(self, 'wait_log_flag') and not self.wait_log_flag:
-            log2(msg)
-            self.wait_log_flag = True
-
-    def clear_wait_log_flag(self):
-        self.wait_log_flag = False
+        return v if v else 'false'

adam/embedded_params.py

@@ -1,2 +1,2 @@
 def config():
-    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'container-name': 'c3-server', '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', 'repair-partition-tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results', 'repair-cluster-tables': 'cluster'}}, '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}}, 'export': {'workers': 8, 'temp_dir': '/c3/cassandra/tmp', 'columns': '<keys>'}, '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}}
+    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'container-name': 'c3-server', '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', 'repair-partition-tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results', 'repair-cluster-tables': 'cluster'}}, '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}}, 'export': {'workers': 8, 'csv_dir': '/c3/cassandra/tmp', 'column_counts_query': 'select id, count(id) as columns from {table} group by id order by columns desc limit 10', 'default-importer': 'sqlite', 'sqlite': {'workers': 8, 'columns': '<row-key>', 'local-db-dir': '/tmp/qing-db'}, 'athena': {'workers': 8, 'columns': '<keys>', 'bucket': 'c3.ops--qing'}, 'csv': {'workers': 8, 'columns': '<row-key>'}, 'log-prefix': '/tmp/qing'}, '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'}, 'log-prefix': '/tmp/qing', '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-metrics,mem', 'header': 'POD_NAME,M_CPU(USAGE/LIMIT),MEM/LIMIT'}, 'processes-qing': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,Q_CPU/TOTAL,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': 'c', 'a': {'auto-enter': 'c3/c3/*'}, 'c': {'auto-enter': 'cluster'}, 'x': {'auto-enter': 'latest'}, 'history': {'push-cat-log-file': True, '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}}

adam/log.py

@@ -4,6 +4,8 @@ import os
 import sys
 import click
 
+from adam.utils import log_exc
+
 class Log:
     DEBUG = False
 
@@ -28,7 +30,7 @@ class Log:
             print(file=sys.stderr)
 
     def log_to_file(config: dict[any, any]):
-        try:
+        with log_exc():
             base = f"/tmp/logs"
             os.makedirs(base, exist_ok=True)
 
@@ -42,6 +44,4 @@ class Log:
                     except:
                         f.write(config)
                 else:
-                        f.write(config)
-        except:
-            pass
+                        f.write(config)

adam/pod_exec_result.py

@@ -1,5 +1,7 @@
 import yaml
 
+from adam.utils import log_exc
+
 class PodExecResult:
     # {
     #   'metadata': {},
@@ -27,10 +29,8 @@ class PodExecResult:
     def exit_code(self) -> int:
         code = 0
 
-        try:
+        with log_exc(False):
             code = self.error['details']['causes'][0]['message']
-        except:
-            pass
 
         return code
 

adam/repl.py

@@ -1,28 +1,22 @@
-from copy import copy
 import os
-import re
 import time
-import traceback
 from typing import cast
 import click
-import concurrent
 from prompt_toolkit.key_binding import KeyBindings
 
 from adam.cli_group import cli
-from adam.commands.command import Command
+from adam.commands.command import Command, InvalidState
 from adam.commands.command_helpers import ClusterCommandHelper
+from adam.commands.devices.devices import Devices
 from adam.commands.help import Help
-from adam.commands.postgres.postgres_context import PostgresContext
 from adam.config import Config
 from adam.utils_audits import Audits
-from adam.utils_k8s.app_pods import AppPods
 from adam.utils_k8s.kube_context import KubeContext
-from adam.utils_k8s.statefulsets import StatefulSets
 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, deep_sort_dict, lines_to_tabular, log2
+from adam.utils import clear_wait_log_flag, debug, debug_trace, deep_merge_dicts, deep_sort_dict, lines_to_tabular, log2, log_exc, log_timing
 from adam.apps import Apps
 from adam.utils_repl.repl_completer import ReplCompleter
 from . import __version__
@@ -44,46 +38,7 @@ def enter_repl(state: ReplState):
 
     Log.log2(f'kaqing {__version__}')
 
-    if state.device == ReplState.C:
-        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 auto_enter := Config().get('repl.a.auto-enter-app', 'c3/c3/*'):
-                if auto_enter != 'no':
-                    ea = auto_enter.split('/')
-                    state.app_env = ea[0]
-                    if len(ea) > 2:
-                        state.app_app = ea[1]
-                        state.app_pod = ea[2]
-                        if state.app_pod == '*':
-                            if (pods := AppPods.pod_names(state.namespace, ea[0], ea[1])):
-                                state.app_pod = pods[0]
-                                Config().wait_log(f'Moving to {state.app_env}/{state.app_app}/{state.app_pod}...')
-                            else:
-                                Config().wait_log(f'No pods found, moving to {state.app_env}/{state.app_app}...')
-                        else:
-                            Config().wait_log(f'Moving to {state.app_env}/{state.app_app}/{state.app_pod}...')
-                    elif len(ea) > 1:
-                        state.app_app = ea[1]
-                        Config().wait_log(f'Moving to {state.app_env}/{state.app_app}...')
-                    else:
-                        Config().wait_log(f'Moving to {state.app_env}...')
-    elif state.device == ReplState.P:
-        Config().wait_log('Inspecting postgres database instances...')
+    Devices.device(state).enter(state)
 
     kb = KeyBindings()
 
@@ -91,34 +46,32 @@ def enter_repl(state: ReplState):
     def _(event):
         event.app.current_buffer.text = ''
 
-    with concurrent.futures.ThreadPoolExecutor(max_workers=Config().get('audit.workers', 3)) as executor:
+    with Audits.offload() as exec:
         # warm up AWS lambda - this log line may timeout and get lost, which is fine
-        executor.submit(Audits.log, 'entering kaqing repl', state.namespace, 'z', 0.0)
+        exec.submit(Audits.log, 'entering kaqing repl', state.namespace, 'z', 0.0)
 
         s0 = time.time()
 
         # use sorted command list only for auto-completion
         sorted_cmds = sorted(cmd_list, key=lambda cmd: cmd.command())
         while True:
+            cmd: str = None
             result = None
             try:
                 completer = ReplCompleter.from_nested_dict({})
                 if not state.bash_session:
-                    completions = {}
-                    # app commands are available only on a: drive
-                    if state.device == ReplState.A and state.app_app:
-                        completions = Apps(path='apps.yaml').commands()
-
-                    for cmd in sorted_cmds:
-                        s1 = time.time()
-                        try:
-                            completions = deep_sort_dict(deep_merge_dicts(completions, cmd.completion(state)))
-                        finally:
-                            if Config().get('debugs.timings', False):
-                                log2(f'Timing auto-completion-calc {cmd.command()}: {time.time() - s1:.2f}')
-
-                    # print(json.dumps(completions, indent=4))
-                    completer = ReplCompleter.from_nested_dict(completions)
+                    with log_timing('completion-calcs'):
+                        completions = {}
+                        # app commands are available only on a: drive
+                        if state.device == ReplState.A and state.app_app:
+                            completions = log_timing('actions', lambda: Apps(path='apps.yaml').commands())
+
+                        for c in sorted_cmds:
+                            with log_exc(f'* {c.command()} command returned None completions.'):
+                                completions = log_timing(c.command(), lambda: deep_sort_dict(deep_merge_dicts(completions, c.completion(state))))
+
+                        # print(json.dumps(completions, indent=4))
+                        completer = ReplCompleter.from_nested_dict(completions)
 
                 cmd = session.prompt(prompt_msg(), completer=completer, key_bindings=kb)
                 s0 = time.time()
@@ -134,7 +87,12 @@ def enter_repl(state: ReplState):
                     if not (cmd.startswith('@') and len(arry := cmd.split(' ')) > 1):
                         return state, cmd
 
-                    if state.device == ReplState.A and state.app_app:
+                    if state.device == ReplState.A and state.app_app or state.device == ReplState.P:
+                        state.push()
+
+                        state.app_pod = arry[0].strip('@')
+                        cmd = ' '.join(arry[1:])
+                    elif state.device == ReplState.P:
                         state.push()
 
                         state.app_pod = arry[0].strip('@')
@@ -148,11 +106,15 @@ def enter_repl(state: ReplState):
                     return (state, cmd)
 
                 target, cmd = targetted(state, cmd)
-                if cmd and cmd.strip(' ') and not (result := cmds.run(cmd, target)):
-                    result = try_device_default_action(target, cmds, cmd_list, cmd)
+                try:
+                    if cmd and cmd.strip(' ') and not (result := cmds.run(cmd, target)):
+                        result = try_device_default_action(target, cmds, cmd_list, cmd)
+                except InvalidState:
+                    pass
 
-                if result and type(result) is ReplState and (s := cast(ReplState, result).export_session):
+                if result and type(result) is ReplState and (s := cast(ReplState, result).export_session) != state.export_session:
                     state.export_session = s
+
             except EOFError:  # Handle Ctrl+D (EOF) for graceful exit
                 break
             except Exception as e:
@@ -160,48 +122,23 @@ def enter_repl(state: ReplState):
                     raise e
                 else:
                     log2(e)
-                    Config().debug(traceback.format_exc())
+                    debug_trace()
             finally:
                 if not state.bash_session:
                     state.pop()
 
-                Config().clear_wait_log_flag()
-                if Config().get('debugs.timings', False) and 'cmd' in locals() and 's0' in locals():
-                    log2(f'Timing command {cmd}: {time.time() - s0:.2f}')
+                clear_wait_log_flag()
+                if cmd:
+                    log_timing(f'command {cmd}', s0=s0)
 
                 # offload audit logging
                 if cmd and (state.device != ReplState.L or Config().get('audit.log-audit-queries', False)):
-                    executor.submit(Audits.log, cmd, state.namespace, state.device, time.time() - s0, get_audit_extra(result))
+                    exec.submit(Audits.log, cmd, state.namespace, state.device, time.time() - s0, get_audit_extra(result))
 
 def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Command], cmd: str):
-    result = None
-
-    c_sql_tried = False
-    if state.device == ReplState.P:
-        pg: PostgresContext = PostgresContext.apply(state.namespace, state.pg_path)
-        if pg.db:
-            c_sql_tried = True
-            cmd = f'pg {cmd}'
-            result = cmds.run(cmd, state)
-    elif state.device == ReplState.A:
-        if state.app_app:
-            c_sql_tried = True
-            cmd = f'app {cmd}'
-            result = cmds.run(cmd, state)
-    elif state.device == ReplState.L:
-        c_sql_tried = True
-        cmd = f'audit {cmd}'
-        result = cmds.run(cmd, state)
-    elif state.device == ReplState.X:
-        c_sql_tried = True
-        cmd = f'&{cmd}'
-        result = cmds.run(cmd, state)
-    elif state.sts:
-        c_sql_tried = True
-        cmd = f'cql {cmd}'
-        result = cmds.run(cmd, state)
-
-    if not c_sql_tried:
+    action_taken, result = Devices.device(state).try_fallback_action(cmds, state, cmd)
+
+    if not action_taken:
         log2(f'* Invalid command: {cmd}')
         log2()
         lines = [c.help(state) for c in cmd_list if c.help(state)]

adam/repl_commands.py

@@ -1,6 +1,9 @@
 from adam.commands.alter_tables import AlterTables
-from adam.commands.app import App
-from adam.commands.app_ping import AppPing
+from adam.commands.app.app import App
+from adam.commands.app.app_ping import AppPing
+from adam.commands.app.show_app_actions import ShowAppActions
+from adam.commands.app.show_app_id import ShowAppId
+from adam.commands.app.show_app_queues import ShowAppQueues
 from adam.commands.audit.audit import Audit
 from adam.commands.cat import Cat
 from adam.commands.code import Code
@@ -14,28 +17,39 @@ 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.devices.device_app import DeviceApp
+from adam.commands.devices.device_auit_log import DeviceAuditLog
+from adam.commands.devices.device_cass import DeviceCass
+from adam.commands.devices.device_export import DeviceExport
+from adam.commands.devices.device_postgres import DevicePostgres
+from adam.commands.export.drop_export_database import DropExportDatabase
 from adam.commands.export.export import ExportTables
-from adam.commands.export.export_rmdbs import RemoveExportDatabases
+from adam.commands.export.import_session import ImportSession
+from adam.commands.export.clean_up_export_sessions import CleanUpExportSessions
+from adam.commands.export.clean_up_all_export_sessions import CleanUpAllExportSessions
+from adam.commands.export.drop_export_databases import DropExportDatabases
 from adam.commands.export.export_select import ExportSelect
 from adam.commands.export.export_use import ExportUse
-from adam.commands.export.export_on_x import ExportSelectX, ExportUseX
+from adam.commands.export.export_select_x import ExportSelectX
+from adam.commands.export.show_column_counts import ShowColumnCounts
+from adam.commands.export.show_export_databases import ShowExportDatabases
+from adam.commands.export.show_export_session import ShowExportSession
+from adam.commands.export.show_export_sessions import ShowExportSessions
 from adam.commands.kubectl import Kubectl
 from adam.commands.shell import Shell
-from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.cp import ClipboardCopy
 from adam.commands.bash.bash import Bash
 from adam.commands.cd import Cd
 from adam.commands.check import Check
 from adam.commands.command import Command
 from adam.commands.cql.cqlsh import Cqlsh
-from adam.commands.devices import DeviceApp, DeviceAuditLog, DeviceCass, DeviceExport, DevicePostgres
 from adam.commands.exit import Exit
 from adam.commands.medusa.medusa import Medusa
 from adam.commands.param_get import GetParam
 from adam.commands.issues import Issues
 from adam.commands.ls import Ls
 from adam.commands.nodetool import NodeTool
-from adam.commands.postgres.postgres import Postgres
+from adam.commands.postgres.postgres import Postgres, PostgresPg
 from adam.commands.preview_table import PreviewTable
 from adam.commands.pwd import Pwd
 from adam.commands.reaper.reaper import Reaper
@@ -45,8 +59,6 @@ from adam.commands.restart import Restart
 from adam.commands.rollout import RollOut
 from adam.commands.param_set import SetParam
 from adam.commands.show.show import Show
-from adam.commands.show.show_app_actions import ShowAppActions
-from adam.commands.show.show_app_id import ShowAppId
 from adam.commands.show.show_cassandra_status import ShowCassandraStatus
 from adam.commands.show.show_cassandra_version import ShowCassandraVersion
 from adam.commands.show.show_commands import ShowKubectlCommands
@@ -54,7 +66,7 @@ from adam.commands.show.show_host import ShowHost
 from adam.commands.show.show_login import ShowLogin
 from adam.commands.show.show_params import ShowParams
 from adam.commands.show.show_processes import ShowProcesses
-from adam.commands.show.show_repairs import ShowRepairs
+from adam.commands.show.show_cassandra_repairs import ShowCassandraRepairs
 from adam.commands.show.show_storage import ShowStorage
 from adam.commands.show.show_adam import ShowAdam
 from adam.commands.watch import Watch
@@ -85,21 +97,25 @@ class ReplCommands:
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
 
     def cassandra_ops() -> list[Command]:
-        return [Cqlsh(), ShowCassandraStatus(), ShowCassandraVersion(), ShowRepairs(), ShowStorage(), ShowProcesses(), Check(), Issues(), NodeTool(), Report()] + \
-               [AlterTables(), Bash(), ExportTables(), ExportSelect(), ExportUse(), RemoveExportDatabases()] + \
-                Medusa.cmd_list() + [Restart(), RollOut(), Watch()] + Reaper.cmd_list() + Repair.cmd_list()
+        return [Cqlsh(), ShowCassandraStatus(), ShowCassandraVersion(), ShowCassandraRepairs(), ShowStorage(), ShowProcesses(),
+                Check(), Issues(), NodeTool(), Report(), AlterTables(), Bash(),
+                ExportTables(), ExportSelect(), ExportUse(),  ShowExportDatabases(), ShowColumnCounts(),
+                DropExportDatabase(), DropExportDatabases(),
+                ShowExportSessions(), ShowExportSession(),
+                CleanUpExportSessions(), CleanUpAllExportSessions(), ImportSession()] + \
+                Medusa().cmd_list() + [Restart(), RollOut(), Watch()] + Reaper().cmd_list() + Repair().cmd_list()
 
     def postgres_ops() -> list[Command]:
-        return [Postgres(), DeployPgAgent(), UndeployPgAgent()]
+        return [Postgres(), DeployPgAgent(), UndeployPgAgent(), PostgresPg()]
 
     def app_ops() -> list[Command]:
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), AppPing(), App()]
 
     def audit_ops() -> list[Command]:
-        return [Audit()] + Audit.cmd_list()
+        return [Audit()] + Audit().cmd_list()
 
     def export_ops() -> list[Command]:
-        return [ExportUseX(), ExportSelectX()]
+        return [ExportSelectX(), DropExportDatabase(), DropExportDatabases(), ShowColumnCounts()]
 
     def tools() -> list[Command]:
         return [Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(), DeployPod(), UndeployPod(), Kubectl(), Code()]