kaqing 2.0.98__py3-none-any.whl → 2.0.203__py3-none-any.whl

adam/repl.py

@@ -1,31 +1,31 @@
-import getpass
 import os
-import re
 import time
-import traceback
+from typing import cast
 import click
-import concurrent
-from prompt_toolkit.completion import NestedCompleter
 from prompt_toolkit.key_binding import KeyBindings
-import requests
 
 from adam.cli_group import cli
-from adam.commands.command import Command
+from adam.commands.command import Command, InvalidArgumentsException, InvalidStateException
 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_session import PostgresSession
 from adam.config import Config
+from adam.utils_audits import Audits
 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 CommandLog, clear_wait_log_flag, debug_trace, deep_sort_dict, tabulize, log2, log_exc, log_timing
 from adam.apps import Apps
-from adam.utils_net import get_my_host
+from adam.utils_repl.repl_completer import ReplCompleter, merge_completions
 from . import __version__
 
+import nest_asyncio
+nest_asyncio.apply()
+
+import asyncio
+
 def enter_repl(state: ReplState):
     if os.getenv('QING_DROPPED', 'false') == 'true':
         log2('You have dropped to bash from another qing instance. Please enter "exit" to go back to qing.')
@@ -37,65 +37,13 @@ def enter_repl(state: ReplState):
     session = ReplSession().prompt_session
 
     def prompt_msg():
-        msg = ''
-        if state.device == ReplState.P:
-            msg = f'{ReplState.P}:'
-            pg = PostgresSession(state.namespace, state.pg_path) if state.pg_path else None
-            if pg and pg.db:
-                msg += pg.db
-            elif pg and pg.host:
-                msg += pg.host
-        elif state.device == ReplState.A:
-            msg = f'{ReplState.A}:'
-            if state.app_env:
-                msg += state.app_env
-            if state.app_app:
-                msg += f'/{state.app_app}'
-        elif state.device == ReplState.L:
-            msg = f'{ReplState.L}:'
-        else:
-            msg = f'{ReplState.C}:'
-            if state.pod:
-                # cs-d0767a536f-cs-d0767a536f-default-sts-0
-                group = re.match(r".*?-.*?-(.*)", state.pod)
-                msg += group[1]
-            elif state.sts:
-                # cs-d0767a536f-cs-d0767a536f-default-sts
-                group = re.match(r".*?-.*?-(.*)", state.sts)
-                msg += group[1]
+        msg = state.__str__()
 
         return f"{msg}$ " if state.bash_session else f"{msg}> "
 
     Log.log2(f'kaqing {__version__}')
 
-    if state.device == ReplState.C:
-        auto_enter = Config().get('repl.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}...')
-    elif state.device == ReplState.A:
-        if not state.app_env:
-            if app := Config().get('repl.auto-enter-app', 'c3/c3'):
-                if app != 'no':
-                    ea = app.split('/')
-                    state.app_env = ea[0]
-                    if 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.of(state).enter(state)
 
     kb = KeyBindings()
 
@@ -103,31 +51,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(audit_log, 'entering kaqing repl', state)
+        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 = NestedCompleter.from_nested_dict({})
+                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 = NestedCompleter.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(merge_completions(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()
@@ -139,33 +88,40 @@ 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)
+                def targetted(state: ReplState, cmd: str):
+                    if not (cmd.startswith('@') and len(arry := cmd.split(' ')) > 1):
+                        return state, cmd
+
+                    if state.device == ReplState.A and state.app_app or state.device == ReplState.P:
+                        state.push(pod_targetted=True)
+
+                        state.app_pod = arry[0].strip('@')
+                        cmd = ' '.join(arry[1:])
+                    elif state.device == ReplState.P:
+                        state.push(pod_targetted=True)
+
+                        state.app_pod = arry[0].strip('@')
+                        cmd = ' '.join(arry[1:])
                     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'))
+                        state.push(pod_targetted=True)
+
+                        state.pod = arry[0].strip('@')
+                        cmd = ' '.join(arry[1:])
+
+                    return (state, cmd)
+
+                target, cmd = targetted(state, 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 InvalidStateException:
+                    pass
+                except InvalidArgumentsException:
+                    pass
+
+                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:
@@ -173,33 +129,46 @@ def enter_repl(state: ReplState):
                     raise e
                 else:
                     log2(e)
-                    Config().debug(traceback.format_exc())
+                    debug_trace()
             finally:
-                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}')
+                if not state.bash_session:
+                    state.pop()
+
+                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(audit_log, cmd, state)
-
-def audit_log(cmd: str, state: ReplState):
-    payload = {
-        'cluster': state.namespace if state.namespace else 'NA',
-        'ts': time.time(),
-        'host': get_my_host(),
-        'user': getpass.getuser(),
-        'line': cmd.replace('"', '""').replace('\n', ' '),
-    }
-    audit_endpoint = Config().get("audit.endpoint", "https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/")
-    try:
-        response = requests.post(audit_endpoint, json=payload, timeout=Config().get("audit.timeout", 10))
-        if response.status_code in [200, 201]:
-            Config().debug(response.text)
-        else:
-            log2(f"Error: {response.status_code} {response.text}")
-    except requests.exceptions.Timeout as e:
-        log2(f"Timeout occurred: {e}")
+                    exec.submit(Audits.log, cmd, state.namespace, state.device, time.time() - s0, get_audit_extra(result))
+
+                CommandLog.close_log_file()
+
+def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Command], cmd: str):
+    action_taken, result = Devices.of(state).try_fallback_action(cmds, state, cmd)
+
+    if not action_taken:
+        log2(f'* Invalid command: {cmd}')
+        log2()
+        tabulize([c.help(state) for c in cmd_list if c.help(state)], separator='\t', to=2)
+
+    return result
+
+def get_audit_extra(result: any):
+    if not result:
+        return None
+
+    if type(result) is list:
+        extras = set()
+
+        for r in result:
+            if hasattr(r, '__audit_extra__') and (x := r.__audit_extra__()):
+                extras.add(x)
+
+        return ','.join(list(extras))
+
+    if hasattr(result, '__audit_extra__') and (x := result.__audit_extra__()):
+        return x
 
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterCommandHelper, help="Enter interactive shell.")
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
@@ -213,6 +182,9 @@ def repl(kubeconfig: str, config: str, param: list[str], cluster:str, namespace:
     if not KubeContext.init_params(config, param):
         return
 
-    state = ReplState(device=Config().get('repl.start-drive', 'a'), ns_sts=cluster, namespace=namespace, in_repl=True)
+    state = ReplState(ns_sts=cluster, namespace=namespace, in_repl=True)
     state, _ = state.apply_device_arg(extra_args)
+    if not state.device:
+        state.device=Config().get('repl.start-drive', 'a')
+
     enter_repl(state)

adam/repl_commands.py

@@ -1,8 +1,16 @@
 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.audit.audit_repair_tables import AuditRepairTables
+from adam.commands.cat import Cat
+from adam.commands.code import Code
+from adam.commands.debug.debug import Debug
+from adam.commands.debug.debug_timings import DebugTimings
+from adam.commands.download_cassandra_log import DownloadCassandraLog
+from adam.commands.download_file import DownloadFile
 from adam.commands.deploy.code_start import CodeStart
 from adam.commands.deploy.code_stop import CodeStop
 from adam.commands.deploy.deploy import Deploy
@@ -13,52 +21,73 @@ from adam.commands.deploy.undeploy import Undeploy
 from adam.commands.deploy.undeploy_frontend import UndeployFrontend
 from adam.commands.deploy.undeploy_pg_agent import UndeployPgAgent
 from adam.commands.deploy.undeploy_pod import UndeployPod
-from adam.commands.describe.describe import Describe
+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.download_export_session import DownloadExportSession
+from adam.commands.export.drop_export_database import DropExportDatabase
+from adam.commands.export.export import ExportTables
+from adam.commands.export.import_files import ImportCSVFiles
+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_x_select import ExportXSelect
+from adam.commands.export.export_use import ExportUse
+from adam.commands.export.export_select import ExportSelect
+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.find_files import FindLocalFiles
+from adam.commands.find_processes import FindProcesses
+from adam.commands.head import Head
+from adam.commands.kubectl import Kubectl
+from adam.commands.restart_cluster import RestartCluster
+from adam.commands.restart_node import RestartNode
 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 import Bash
+from adam.commands.clipboard_copy 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, 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
 from adam.commands.repair.repair import Repair
-from adam.commands.report import Report
-from adam.commands.restart import Restart
+from adam.commands.generate_report import GenerateReport
+from adam.commands.restart_nodes import RestartNodes
 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
+from adam.commands.show.show_cli_commands import ShowKubectlCommands
 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
 
 class ReplCommands:
     def repl_cmd_list() -> list[Command]:
-        cmds: list[Command] = ReplCommands.navigation() + ReplCommands.cassandra_check() + ReplCommands.cassandra_ops() + \
-            ReplCommands.tools() + ReplCommands.app() + ReplCommands.exit()
+        cmds: list[Command] = ReplCommands.navigation() + ReplCommands.cassandra_ops() + ReplCommands.postgres_ops() + \
+            ReplCommands.app_ops() + ReplCommands.audit_ops() + ReplCommands.export_ops() + ReplCommands.tools() + ReplCommands.exit()
 
-        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Describe(), Show(), Undeploy()]
+        intermediate_cmds: list[Command] = [App(), Audit(), Reaper(), Repair(), Debug(), Deploy(), Show(), Undeploy()]
         ic = [c.command() for c in intermediate_cmds]
         # 1. dedup commands
         deduped = []
@@ -75,22 +104,33 @@ class ReplCommands:
         return deduped
 
     def navigation() -> list[Command]:
-        return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), Cd(), Pwd(), ClipboardCopy(),
+        return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), DeviceExport(),
+                Cd(), Cat(), Head(), DownloadFile(), FindLocalFiles(), FindProcesses(), Pwd(), ClipboardCopy(),
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
 
-    def cassandra_check() -> list[Command]:
-        return Describe.cmd_list() + [ShowCassandraStatus(),
-                ShowCassandraVersion(), ShowRepairs(), ShowStorage(), ShowProcesses(), Check(), Issues(), NodeTool(), Report()]
-
     def cassandra_ops() -> list[Command]:
-        return [AlterTables()] + Medusa.cmd_list() + [Restart(), RollOut(), Watch()] + Reaper.cmd_list() + Repair.cmd_list()
+        return [Cqlsh(), DownloadCassandraLog(), ShowCassandraStatus(), ShowCassandraVersion(), ShowCassandraRepairs(), ShowStorage(), ShowProcesses(),
+                Check(), Issues(), NodeTool(), GenerateReport(), AlterTables(), Bash(),
+                ExportTables(), ExportXSelect(), ExportUse(),  ShowExportDatabases(), ShowColumnCounts(),
+                DropExportDatabase(), DropExportDatabases(),
+                ShowExportSessions(), ShowExportSession(), DownloadExportSession(),
+                CleanUpExportSessions(), CleanUpAllExportSessions(), ImportSession(), ImportCSVFiles()] + \
+                Medusa().cmd_list() + [RestartNodes(), RestartNode(), RestartCluster(), RollOut(), Watch()] + Reaper().cmd_list() + Repair().cmd_list() + Debug().cmd_list()
 
-    def tools() -> list[Command]:
-        return [Cqlsh(), Postgres(), Bash(), Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(),
-                DeployPod(), UndeployPod(), DeployPgAgent(), UndeployPgAgent(), AuditRepairTables(), Audit()]
+    def postgres_ops() -> list[Command]:
+        return [Postgres(), DeployPgAgent(), UndeployPgAgent(), PostgresPg()]
 
-    def app() -> list[Command]:
+    def app_ops() -> list[Command]:
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), AppPing(), App()]
 
+    def audit_ops() -> list[Command]:
+        return [Audit()] + Audit().cmd_list()
+
+    def export_ops() -> list[Command]:
+        return [ExportSelect(), DropExportDatabase(), DropExportDatabases(), ShowColumnCounts()]
+
+    def tools() -> list[Command]:
+        return [Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(), DeployPod(), UndeployPod(), Kubectl(), Code()]
+
     def exit() -> list[Command]:
         return [Exit()]

adam/repl_session.py

@@ -1,6 +1,9 @@
 from prompt_toolkit import PromptSession
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 
+from adam.config import Config
+from adam.utils import ConfigHolder
+
 class ReplSession:
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -10,4 +13,9 @@ class ReplSession:
 
     def __init__(self):
         if not hasattr(self, 'prompt_session'):
-            self.prompt_session = PromptSession(auto_suggest=AutoSuggestFromHistory())
+            self.prompt_session = PromptSession(auto_suggest=AutoSuggestFromHistory())
+            ConfigHolder().append_command_history = self.append_history
+
+    def append_history(self, entry: str):
+        if entry and  self.prompt_session and Config().get('repl.history.push-cat-remote-log-file', True):
+            self.prompt_session.history.append_string(entry)