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

adam/repl.py

@@ -1,29 +1,30 @@
-import getpass
+from copy import copy
 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_helpers import ClusterCommandHelper
 from adam.commands.help import Help
-from adam.commands.postgres.postgres_session import PostgresSession
+from adam.commands.postgres.postgres_context import PostgresContext
 from adam.config import Config
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.statefulsets import StatefulSets
+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.apps import Apps
-from adam.utils_net import get_my_host
+from adam.utils_repl.repl_completer import ReplCompleter
 from . import __version__
 
 def enter_repl(state: ReplState):
@@ -37,63 +38,52 @@ 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}...')
+        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.auto-enter-app', 'c3/c3'):
-                if app != 'no':
-                    ea = app.split('/')
+            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) > 1:
+                    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...')
 
     kb = KeyBindings()
 
@@ -103,13 +93,16 @@ def enter_repl(state: ReplState):
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=Config().get('audit.workers', 3)) as executor:
         # warm up AWS lambda - this log line may timeout and get lost, which is fine
-        executor.submit(audit_log, 'entering kaqing repl', state)
+        executor.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:
+            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
@@ -125,7 +118,7 @@ def enter_repl(state: ReplState):
                                 log2(f'Timing auto-completion-calc {cmd.command()}: {time.time() - s1:.2f}')
 
                     # print(json.dumps(completions, indent=4))
-                    completer = NestedCompleter.from_nested_dict(completions)
+                    completer = ReplCompleter.from_nested_dict(completions)
 
                 cmd = session.prompt(prompt_msg(), completer=completer, key_bindings=kb)
                 s0 = time.time()
@@ -137,33 +130,29 @@ 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:
+                        state.push()
+
+                        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()
+
+                        state.pod = arry[0].strip('@')
+                        cmd = ' '.join(arry[1:])
+
+                    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)
+
+                if result and type(result) is ReplState and (s := cast(ReplState, result).export_session):
+                    state.export_session = s
             except EOFError:  # Handle Ctrl+D (EOF) for graceful exit
                 break
             except Exception as e:
@@ -173,31 +162,68 @@ def enter_repl(state: ReplState):
                     log2(e)
                     Config().debug(traceback.format_exc())
             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}')
 
                 # 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}")
+                    executor.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:
+        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'))
+
+    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')

adam/repl_commands.py

@@ -2,7 +2,8 @@ from adam.commands.alter_tables import AlterTables
 from adam.commands.app import App
 from adam.commands.app_ping import AppPing
 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.deploy.code_start import CodeStart
 from adam.commands.deploy.code_stop import CodeStop
 from adam.commands.deploy.deploy import Deploy
@@ -13,16 +14,21 @@ 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.export.export import ExportTables
+from adam.commands.export.export_rmdbs import RemoveExportDatabases
+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.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 import Bash
+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.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
@@ -55,10 +61,10 @@ 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(), Deploy(), Show(), Undeploy()]
         ic = [c.command() for c in intermediate_cmds]
         # 1. dedup commands
         deduped = []
@@ -75,22 +81,28 @@ 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(), 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(), 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()
 
-    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()]
 
-    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 [ExportUseX(), ExportSelectX()]
+
+    def tools() -> list[Command]:
+        return [Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(), DeployPod(), UndeployPod(), Kubectl(), Code()]
+
     def exit() -> list[Command]:
         return [Exit()]