kaqing 2.0.110__py3-none-any.whl → 2.0.184__py3-none-any.whl

adam/repl_state.py

@@ -1,10 +1,10 @@
-import copy
+from copy import copy
 from enum import Enum
 import re
-import traceback
 from typing import Callable
 
-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
@@ -19,25 +19,8 @@ class BashSession:
     def pwd(self, state: 'ReplState'):
         command = f'cat /tmp/.qing-{self.session_id}'
 
-        if 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)
-
-        dir = None
-        for r in rs:
-            if r.exit_code(): # if fails to read the session file, ignore
-                continue
-
-            dir0 = r.stdout.strip(' \r\n')
-            if dir:
-                if dir != dir0:
-                    log2('Inconsitent working dir found across multiple pods.')
-                    return None
-            else:
-                dir = dir0
-
-        return dir
+        with device(state) as pods:
+            return pods.exec(command, action='bash', show_out=False)
 
 class RequiredState(Enum):
     CLUSTER = 'cluster'
@@ -46,20 +29,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]
-    NON_L = [A, C, P]
+    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()
 
@@ -69,12 +54,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('@')
@@ -89,13 +77,51 @@ class ReplState:
     def __hash__(self):
         return hash((self.sts, self.pod))
 
+    def __str__(self):
+        msg = ''
+        if self.device == ReplState.P:
+            msg = f'{ReplState.P}:'
+            host, database = self.pg_host_n_database()
+            if database:
+                msg += database
+            elif host:
+                msg += 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}:'
+            if self.export_session:
+                msg += self.export_session
+        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:
@@ -133,9 +159,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'
@@ -154,6 +180,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]:
@@ -196,8 +224,8 @@ class ReplState:
 
             return False
 
-        devices = [r for r in required if r in [ReplState.L, ReplState.A, ReplState.C, ReplState.P]]
-        non_devices = [r for r in required if r not in [ReplState.L, ReplState.A, ReplState.C, ReplState.P]]
+        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:
@@ -285,8 +313,8 @@ class ReplState:
             if self.device != ReplState.P:
                 return (False, None)
 
-            pg: PostgresContext = PostgresContext.apply(self.namespace, self.pg_path)
-            if not pg.db:
+            _, database = self.pg_host_n_database()
+            if not database:
                 def error():
                     if self.in_repl:
                         log2('cd to a database first.')
@@ -310,7 +338,24 @@ class ReplState:
                         display_help()
                 return (False, error)
 
-        elif required in [ReplState.L, ReplState.A, ReplState.C, ReplState.P] and self.device != required:
+        elif required == RequiredState.EXPORT_DB:
+            if self.device not in [ReplState.C, ReplState.X]:
+                return (False, None)
+
+            if not self.export_session:
+                def error():
+                    if self.in_repl:
+                        if self.device == ReplState.C:
+                            log2("Select an export database first with 'use' command.")
+                        else:
+                            log2('cd to 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(f'Switch to {required}: first.')
@@ -339,13 +384,89 @@ class ReplState:
         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.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.export_session = o.export_session
+            self.namespace = o.namespace
+
+            self.original_state = None
+
+    def pg_host_n_database(self):
+        host = None
+        database = None
+
+        if self.pg_path:
+            host_n_db = self.pg_path.split('/')
+            host = host_n_db[0]
+            if len(host_n_db) > 1:
+                database = host_n_db[1]
+
+        return host, database
+
+class DevicePodService:
+    def __init__(self, handler: 'DeviceExecHandler'):
+        self.handler = handler
+
+    def exec(self, command: str, action='bash', show_out = True):
+        state = self.handler.state
+
+        rs = None
+        if state.device == ReplState.A and state.app_app:
+            if state.app_pod:
+                rs = [AppPods.exec(state.app_pod, state.namespace, command, show_out=show_out)]
+            else:
+                pods = AppPods.pod_names(state.namespace, state.app_env, state.app_app)
+                rs = AppClusters.exec(pods, state.namespace, command, show_out=show_out)
+        elif state.pod:
+            rs = [CassandraNodes.exec(state.pod, state.namespace, command, show_out=show_out)]
+        elif state.sts:
+            rs = CassandraClusters.exec(state.sts, state.namespace, command, action=action, show_out=show_out)
+        # assume that pg-agent or ops pod is single pod
+
+        dir = None
+        if rs:
+            for r in rs:
+                if r.exit_code(): # if fails to read the session file, ignore
+                    continue
+
+                dir0 = r.stdout.strip(' \r\n')
+                if dir:
+                    if dir != dir0:
+                        log2('Inconsitent working dir found across multiple pods.')
+                        return None
+                else:
+                    dir = dir0
+
+        return dir
+
+class DeviceExecHandler:
+    def __init__(self, state: ReplState):
+        self.state = state
+
+    def __enter__(self):
+        return DevicePodService(self)
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return False
 
-        self.bash_session = None
+def device(state: ReplState):
+    return DeviceExecHandler(state)

adam/sql/sql_completer.py

@@ -1,7 +1,8 @@
+from enum import Enum
 from typing import Callable
 
 import sqlparse
-from sqlparse.sql import Statement, Token
+from sqlparse.sql import Token
 
 from adam.sql.term_completer import TermCompleter
 from adam.utils_repl.automata_completer import AutomataCompleter
@@ -12,41 +13,42 @@ __all__ = [
     "SqlCompleter",
 ]
 
-def default_columns(_: list[str]):
+def default_columns(x: list[str]):
     return 'id,x.,y.,z.'.split(',')
 
+class SqlVariant(Enum):
+    SQL = 'sql'
+    CQL = 'cql'
+    ATHENA = 'athena'
+
 class SqlCompleter(AutomataCompleter[Token]):
     def tokens(self, text: str) -> list[Token]:
         tokens = []
 
         stmts = sqlparse.parse(text)
-        if not stmts:
-            tokens = []
-        else:
-            statement: Statement = stmts[0]
-            tokens = statement.tokens
+        if stmts:
+            for stmt in stmts:
+                tokens.extend(stmt.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',
+                 expandables: dict = {},
+                 variant: SqlVariant = SqlVariant.SQL,
                  debug = False):
         machine = SqlStateMachine(debug=debug)
-        if variant == 'cql':
+        if variant == SqlVariant.CQL:
             machine = CqlStateMachine(debug=debug)
-        elif variant == 'athena':
+        elif variant == SqlVariant.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
+        if 'columns' not in expandables:
+            expandables['columns'] = default_columns
+        self.expandables = expandables
         self.variant = variant
         self.debug = debug
 
@@ -63,31 +65,54 @@ class SqlCompleter(AutomataCompleter[Token]):
     def _terms(self, state: State, word: str) -> list[str]:
         terms = []
 
-        if word == 'tables':
+        if word.startswith('`') and word.endswith('`'):
+            terms.append(word.strip('`'))
+        elif word == 'tables':
             terms.extend(self.tables())
-        elif word == '`tables`':
-            terms.append('tables')
         elif word == 'columns':
-            terms.extend(self.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._call_expandable(word, [n]))
+            else:
+                terms.extend(self._call_expandable(word, []))
         elif word == 'partition-columns':
-            terms.extend(self.partition_columns([]))
+            terms.extend(self._call_expandable(word, []))
         elif word == 'table-props':
-            terms.extend(self.table_props().keys())
+            terms.extend(self._call_expandable(word).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']])
+                table_props = self._call_expandable('table-props')
+                terms.extend(table_props[state.context['last_name']])
         elif word == 'single':
             terms.append("'")
         elif word == 'comma':
             terms.append(",")
+        elif word in self.machine.expandable_names():
+            terms.extend(self._call_expandable(word))
         else:
             terms.append(word)
 
         return terms
 
-    def completions_for_nesting(self):
+    def _call_expandable(self, name: str, *args):
+        if name in self.expandables:
+            c = self.expandables[name]
+            if args:
+                return c(args)
+            else:
+                return c()
+
+        return []
+
+    def completions_for_nesting(self, dml: str = None):
+        if dml:
+            return {dml: SqlCompleter(self.tables, dml, expandables=self.expandables, variant=self.variant)}
+
         return {
-            word : SqlCompleter(self.tables, word, columns=self.columns, partition_columns=self.partition_columns,
-                                table_props=self.table_props, variant=self.variant)
+            word: SqlCompleter(self.tables, word, expandables=self.expandables, variant=self.variant)
             for word in self.machine.suggestions[''].strip(' ').split(',')
-        }
+        }
+
+    def __str__(self):
+        return f'{self.variant}, {self.first_term}'