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

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()]

adam/repl_state.py

@@ -1,8 +1,11 @@
-import copy
+from copy import copy
 from enum import Enum
 import re
+from typing import Callable
 
-from adam.commands.postgres.postgres_session import PostgresSession
+from adam.commands.postgres.postgres_context import PostgresContext
+from adam.utils_k8s.app_clusters import AppClusters
+from adam.utils_k8s.app_pods import AppPods
 from adam.utils_k8s.cassandra_clusters import CassandraClusters
 from adam.utils_k8s.cassandra_nodes import CassandraNodes
 from adam.utils_k8s.kube_context import KubeContext
@@ -17,7 +20,13 @@ class BashSession:
     def pwd(self, state: 'ReplState'):
         command = f'cat /tmp/.qing-{self.session_id}'
 
-        if state.pod:
+        if state.device == ReplState.A and state.app_app:
+            if state.app_pod:
+                rs = [AppPods.exec(state.app_pod, state.namespace, command, show_out=False)]
+            else:
+                pods = AppPods.pod_names(state.namespace, state.app_env, state.app_pod)
+                rs = AppClusters.exec(pods, state.namespace, command, show_out=False)
+        elif state.pod:
             rs = [CassandraNodes.exec(state.pod, state.namespace, command, show_out=False)]
         elif state.sts:
             rs = CassandraClusters.exec(state.sts, state.namespace, command, action='bash', show_out=False)
@@ -44,17 +53,22 @@ class RequiredState(Enum):
     NAMESPACE = 'namespace'
     PG_DATABASE = 'pg_database'
     APP_APP = 'app_app'
+    EXPORT_DB = 'export_db'
 
 class ReplState:
     A = 'a'
     C = 'c'
     L = 'l'
     P = 'p'
+    X = 'x'
+
+    ANY = [A, C, L, P, X]
+    NON_L = [A, C, P, X]
 
     def __init__(self, device: str = None,
                  sts: str = None, pod: str = None, namespace: str = None, ns_sts: str = None,
                  pg_path: str = None,
-                 app_env: str = None, app_app: str = None,
+                 app_env: str = None, app_app: str = None, app_pod: str = None,
                  in_repl = False, bash_session: BashSession = None, remote_dir = None):
         self.namespace = KubeContext.in_cluster_namespace()
 
@@ -64,12 +78,15 @@ class ReplState:
         self.pg_path = pg_path
         self.app_env = app_env
         self.app_app = app_app
+        self.app_pod = app_pod
         if namespace:
             self.namespace = namespace
         self.in_repl = in_repl
         self.bash_session = bash_session
         self.remote_dir = remote_dir
-        # self.wait_log_flag = False
+        self.original_state: ReplState = None
+
+        self.export_session: str = None
 
         if ns_sts:
             nn = ns_sts.split('@')
@@ -84,13 +101,49 @@ class ReplState:
     def __hash__(self):
         return hash((self.sts, self.pod))
 
+    def __str__(self):
+        msg = ''
+        if self.device == ReplState.P:
+            msg = f'{ReplState.P}:'
+            pg: PostgresContext = PostgresContext.apply(self.namespace, self.pg_path) if self.pg_path else None
+            if pg and pg.db:
+                msg += pg.db
+            elif pg and pg.host:
+                msg += pg.host
+        elif self.device == ReplState.A:
+            msg = f'{ReplState.A}:'
+            if self.app_env:
+                msg += self.app_env
+            if self.app_app:
+                msg += f'/{self.app_app}'
+            if self.app_pod:
+                # azops88-c3-c3-k8sdeploy-appleader-001-79957cf5b6-9k4bw
+                group = re.match(r".*?-.*?-.*?-.*?-(.*?-.*?)-.*", self.app_pod)
+                msg += '/' + group[1]
+        elif self.device == ReplState.L:
+            msg = f'{ReplState.L}:'
+        elif self.device == ReplState.X:
+            msg = f'{ReplState.X}:'
+        else:
+            msg = f'{ReplState.C}:'
+            if self.pod:
+                # cs-d0767a536f-cs-d0767a536f-default-sts-0
+                group = re.match(r".*?-.*?-(.*)", self.pod)
+                msg += group[1]
+            elif self.sts:
+                # cs-d0767a536f-cs-d0767a536f-default-sts
+                group = re.match(r".*?-.*?-(.*)", self.sts)
+                msg += group[1]
+
+        return msg
+
     def apply_args(self, args: list[str], cmd: list[str] = None, resolve_pg = True, args_to_check = 6) -> tuple['ReplState', list[str]]:
         state = self
 
         new_args = []
         for index, arg in enumerate(args):
             if index < args_to_check:
-                state = copy.copy(state)
+                state = copy(state)
 
                 s, n = KubeContext.is_sts_name(arg)
                 if s:
@@ -128,9 +181,9 @@ class ReplState:
         new_args = []
         for index, arg in enumerate(args):
             if index < 6:
-                state = copy.copy(state)
+                state = copy(state)
 
-                groups = re.match(r'^([a|c|l|p]):(.*)$', arg)
+                groups = re.match(r'^([a|c|l|p|x]):(.*)$', arg)
                 if groups:
                     if groups[1] == 'p':
                         state.device = 'p'
@@ -149,6 +202,8 @@ class ReplState:
                                 state.namespace = ns
                     elif groups[1] == 'l':
                         state.device = 'l'
+                    elif groups[1] == 'x':
+                        state.device = 'x'
                     else:
                         state.device = 'a'
                         if path := groups[2]:
@@ -166,84 +221,209 @@ class ReplState:
 
         return (state, new_args)
 
-    def validate(self, required: RequiredState = None, pg_required: RequiredState = None, app_required: RequiredState = None):
-        if not pg_required and not app_required:
-            if required == RequiredState.CLUSTER:
-                if not self.namespace or not self.sts:
+    def validate(self, required: list[RequiredState] = [], show_err = True):
+        if not required:
+            return True
+
+        def default_err():
+            if self.in_repl:
+                log2(f'Not a valid command on {self.device}: drive.')
+            else:
+                log2('* on a wrong device.')
+                log2()
+                display_help()
+
+        if type(required) is not list:
+            valid, err = self._validate(required)
+            if valid:
+                return True
+
+            if show_err:
+                if err:
+                    err()
+                else:
+                    default_err()
+
+            return False
+
+        devices = [r for r in required if r in [ReplState.L, ReplState.A, ReplState.C, ReplState.P, ReplState.X]]
+        non_devices = [r for r in required if r not in [ReplState.L, ReplState.A, ReplState.C, ReplState.P, ReplState.X]]
+
+        first_error: Callable = None
+        for r in non_devices:
+            valid, err = self._validate(r)
+            if valid:
+                return True
+
+            if not first_error:
+                first_error = err
+
+        if devices:
+            valid, err = self._validate_device(devices)
+            if valid:
+                return True
+
+            if not first_error:
+                first_error = err
+
+        if show_err and first_error:
+            if first_error:
+                first_error()
+            else:
+                default_err()
+
+        return False
+
+    def _validate(self, required: RequiredState):
+        if required == RequiredState.CLUSTER:
+            if self.device != ReplState.C:
+                return (False, None)
+
+            if not self.namespace or not self.sts:
+                def error():
                     if self.in_repl:
                         log2('cd to a Cassandra cluster first.')
                     else:
                         log2('* Cassandra cluster is missing.')
                         log2()
                         display_help()
+                return (False, error)
+
+        elif required == RequiredState.POD:
+            if self.device != ReplState.C:
+                return (False, None)
 
-                    return False
-            elif required == RequiredState.POD:
-                if not self.namespace or not self.pod:
+            if not self.namespace or not self.pod:
+                def error():
                     if self.in_repl:
                         log2('cd to a pod first.')
                     else:
                         log2('* Pod is missing.')
                         log2()
                         display_help()
+                return (False, error)
 
-                    return False
-            elif required == RequiredState.CLUSTER_OR_POD:
-                if not self.namespace or not self.sts and not self.pod:
+        elif required == RequiredState.CLUSTER_OR_POD:
+            if self.device != ReplState.C:
+                return (False, None)
+
+            if not self.namespace or not self.sts and not self.pod:
+                def error():
                     if self.in_repl:
                         log2('cd to a Cassandra cluster first.')
                     else:
                         log2('* Cassandra cluster or pod is missing.')
                         log2()
                         display_help()
+                return (False, error)
+
+        elif required == RequiredState.NAMESPACE:
+            if self.device != ReplState.C:
+                return (False, None)
 
-                    return False
-            elif required == RequiredState.NAMESPACE:
-                if not self.namespace:
+            if not self.namespace:
+                def error():
                     if self.in_repl:
                         log2('Namespace is required.')
                     else:
                         log2('* namespace is missing.')
                         log2()
                         display_help()
+                return (False, error)
 
-                    return False
+        elif required == RequiredState.PG_DATABASE:
+            if self.device != ReplState.P:
+                return (False, None)
 
-        if pg_required == RequiredState.PG_DATABASE:
-            pg = PostgresSession(self.namespace, self.pg_path)
+            pg: PostgresContext = PostgresContext.apply(self.namespace, self.pg_path)
             if not pg.db:
+                def error():
+                    if self.in_repl:
+                        log2('cd to a database first.')
+                    else:
+                        log2('* database is missing.')
+                        log2()
+                        display_help()
+                return (False, error)
+
+        elif required == RequiredState.APP_APP:
+            if self.device != ReplState.A:
+                return (False, None)
+
+            if not self.app_app:
+                def error():
+                    if self.in_repl:
+                        log2('cd to an app first.')
+                    else:
+                        log2('* app is missing.')
+                        log2()
+                        display_help()
+                return (False, error)
+
+        elif required == RequiredState.EXPORT_DB:
+            if self.device != ReplState.X:
+                return (False, None)
+
+            if not self.export_session:
+                def error():
+                    if self.in_repl:
+                        log2('use an export database first.')
+                    else:
+                        log2('* export database is missing.')
+                        log2()
+                        display_help()
+                return (False, error)
+
+        elif required in [ReplState.L, ReplState.A, ReplState.C, ReplState.P, ReplState.X] and self.device != required:
+            def error():
                 if self.in_repl:
-                    log2('cd to a database first.')
+                    log2(f'Switch to {required}: first.')
                 else:
-                    log2('* database is missing.')
+                    log2('* on a wrong device.')
                     log2()
                     display_help()
+            return (False, error)
 
-                return False
-
-        if app_required == RequiredState.APP_APP and not self.app_app:
-            if self.in_repl:
-                log2('cd to an app first.')
-            else:
-                log2('* app is missing.')
-                log2()
-                display_help()
+        return (True, None)
 
-            return False
+    def _validate_device(self, devices: list[RequiredState]):
+        if self.device not in devices:
+            def error():
+                if self.in_repl:
+                    log2(f'Not a valid command on {self.device}: drive.')
+                else:
+                    log2('* on a wrong device.')
+                    log2()
+                    display_help()
+            return (False, error)
 
-        return True
+        return (True, None)
 
     def user_pass(self, secret_path = 'cql.secret'):
         return Secrets.get_user_pass(self.pod if self.pod else self.sts, self.namespace, secret_path=secret_path)
 
     def enter_bash(self, bash_session: BashSession):
+        self.push()
+
         self.bash_session = bash_session
-        if self.device != ReplState.C:
-            self.device = ReplState.C
-            log2(f'Moved to {ReplState.C}: automatically. Will move back to {ReplState.P}: when you exit the bash session.')
 
     def exit_bash(self):
-        if self.bash_session and self.bash_session.device:
-            self.device = self.bash_session.device
-
-        self.bash_session = None
+        self.pop()
+        self.bash_session = None
+
+    def push(self):
+        if not self.original_state:
+            self.original_state = copy(self)
+
+    def pop(self):
+        if o := self.original_state:
+            self.device = o.device
+            self.sts = o.sts
+            self.pod = o.pod
+            self.pg_path = o.pg_path
+            self.app_env = o.app_env
+            self.app_app = o.app_app
+            self.app_pod = o.app_pod
+            self.namespace = o.namespace
+
+            self.original_state = None

adam/sql/sql_completer.py

@@ -1,78 +1,102 @@
-from typing import Callable, Iterable
-from prompt_toolkit.completion import CompleteEvent, Completer, Completion
-from prompt_toolkit.document import Document
+from typing import Callable
+
 import sqlparse
-from sqlparse.sql import Statement
+from sqlparse.sql import Statement, Token
 
-from adam.sql.state_machine import StateMachine, StateTo
 from adam.sql.term_completer import TermCompleter
+from adam.utils_repl.automata_completer import AutomataCompleter
+from adam.sql.sql_state_machine import AthenaStateMachine, CqlStateMachine, SqlStateMachine
+from adam.utils_repl.state_machine import State
 
 __all__ = [
     "SqlCompleter",
 ]
 
-DML_COMPLETER = TermCompleter(['select', 'insert', 'delete', 'update'])
-
-def default_columns(tables: list[str]):
+def default_columns(x: list[str]):
     return 'id,x.,y.,z.'.split(',')
 
-class SqlCompleter(Completer):
-    def __init__(self, tables: Callable[[], list[str]], dml: str = None, columns: Callable[[list[str]], list[str]] = default_columns, debug = False):
-        super().__init__()
-        self.dml = dml
-        self.tables = tables
-        self.columns = columns
-        self.debug = debug
-        self.machine = StateMachine(debug=self.debug)
-
-    def get_completions(
-        self, document: Document, complete_event: CompleteEvent
-    ) -> Iterable[Completion]:
-        text = document.text_before_cursor.lstrip()
-        state = ''
-        if self.dml:
-            state = f'{self.dml}_'
-            text = f'{self.dml} {text}'
-
-        completer: Completer = None
+class SqlCompleter(AutomataCompleter[Token]):
+    def tokens(self, text: str) -> list[Token]:
+        tokens = []
+
         stmts = sqlparse.parse(text)
         if not stmts:
-            completer = DML_COMPLETER
+            tokens = []
         else:
             statement: Statement = stmts[0]
-            state: StateTo = self.machine.traverse_tokens(statement.tokens, StateTo(state))
-            if self.debug:
-                print('\n  =>', state.to_s if isinstance(state, StateTo) else '')
-
-            if not state or not state.to_s:
-                completer = DML_COMPLETER
-
-            if state and state.to_s in self.machine.suggestions:
-                terms = []
-
-                for word in self.machine.suggestions[state.to_s].strip(' ').split(','):
-                    if word == 'tables':
-                        terms.extend(self.tables())
-                    elif word == 'columns':
-                        terms.extend(self.columns([]))
-                    elif word == 'single':
-                        terms.append("'")
-                    elif word == 'comma':
-                        terms.append(",")
-                    else:
-                        terms.append(word)
-
-                if terms:
-                    completer = TermCompleter(terms)
-
-        if completer:
-            for c in completer.get_completions(document, complete_event):
-                yield c
-
-    def completions(table_names: Callable[[], list[str]], columns: Callable[[list[str]], list[str]] = default_columns):
+            tokens = statement.tokens
+
+        return tokens
+
+    def __init__(self,
+                 tables: Callable[[], list[str]],
+                 dml: str = None,
+                 columns: Callable[[list[str]], list[str]] = default_columns,
+                 partition_columns: Callable[[list[str]], list[str]] = lambda x: [],
+                 table_props: Callable[[], dict[str,list[str]]] = lambda: [],
+                 variant = 'sql',
+                 debug = False):
+        machine = SqlStateMachine(debug=debug)
+        if variant == 'cql':
+            machine = CqlStateMachine(debug=debug)
+        elif variant == 'athena':
+            machine = AthenaStateMachine(debug=debug)
+        super().__init__(machine, dml, debug)
+
+        self.tables = tables
+        self.columns = columns
+        self.partition_columns = partition_columns
+        self.table_props = table_props
+        self.variant = variant
+        self.debug = debug
+
+    def suggestions_completer(self, state: State, suggestions: str) -> list[str]:
+        if not suggestions:
+            return None
+
+        terms = []
+        for suggestion in suggestions.split(','):
+            terms.extend(self._terms(state, suggestion))
+
+        return TermCompleter(terms)
+
+    def _terms(self, state: State, word: str) -> list[str]:
+        terms = []
+
+        if word == 'tables':
+            terms.extend(self.tables())
+        elif word == '`tables`':
+            terms.append('tables')
+        elif word == 'columns':
+            if 'last_name' in state.context and (n := state.context['last_name']):
+                if 'last_namespace' in state.context and (ns := state.context['last_namespace']):
+                    n = f'{ns}.{n}'
+                terms.extend(self.columns([n]))
+            else:
+                terms.extend(self.columns([]))
+        elif word == 'partition-columns':
+            terms.extend(self.partition_columns([]))
+        elif word == 'table-props':
+            terms.extend(self.table_props().keys())
+        elif word == 'table-prop-values':
+            if 'last_name' in state.context and state.context['last_name']:
+                terms.extend(self.table_props()[state.context['last_name']])
+        elif word == 'single':
+            terms.append("'")
+        elif word == 'comma':
+            terms.append(",")
+        else:
+            terms.append(word)
+
+        return terms
+
+    def completions_for_nesting(self, dml: str = None):
+        if dml:
+            return {dml: SqlCompleter(self.tables, dml, columns=self.columns, partition_columns=self.partition_columns,
+                                table_props=self.table_props, variant=self.variant)}
+
         return {
-            'delete': SqlCompleter(table_names, 'delete', columns=columns),
-            'insert': SqlCompleter(table_names, 'insert', columns=columns),
-            'select': SqlCompleter(table_names, 'select', columns=columns),
-            'update': SqlCompleter(table_names, 'update', columns=columns),
+            word : SqlCompleter(self.tables, word, columns=self.columns, partition_columns=self.partition_columns,
+                                table_props=self.table_props, variant=self.variant)
+            for word in self.machine.suggestions[''].strip(' ').split(',')
         }