kaqing 2.0.145__py3-none-any.whl → 2.0.174__py3-none-any.whl

adam/commands/devices/device_cass.py

@@ -1,10 +1,11 @@
-from adam.commands.bash.bash import Bash
-from adam.commands.command import Command
+from adam.commands.bash.bash_completer import BashCompleter
+from adam.commands.command import Command, InvalidStateException
 from adam.commands.commands_utils import show_pods, show_rollout
+from adam.commands.cql.utils_cql import cassandra, cassandra_table_names
 from adam.commands.devices.device import Device
 from adam.config import Config
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
+from adam.utils import lines_to_tabular, log, log2, wait_log
 from adam.utils_k8s.cassandra_clusters import CassandraClusters
 from adam.utils_k8s.custom_resources import CustomResources
 from adam.utils_k8s.kube_context import KubeContext
@@ -41,7 +42,7 @@ class DeviceCass(Command, Device):
 
     def ls(self, cmd: str, state: ReplState):
         if state.pod:
-            return Bash().run('bash ' + cmd, state)
+            return self.bash(state, state, cmd.split(' '))
         elif state.sts and state.namespace:
             show_pods(StatefulSets.pods(state.sts, state.namespace), state.namespace, show_namespace=not KubeContext.in_cluster_namespace())
             show_rollout(state.sts, state.namespace)
@@ -57,6 +58,18 @@ class DeviceCass(Command, Device):
         else:
             return {cmd: {n: None for n in StatefulSets.list_sts_names()}}
 
+    def cat(self, cmd: str, state: ReplState):
+        if state.pod:
+            return self.bash(state, state, cmd.split(' '))
+
+        raise InvalidStateException()
+
+    def cat_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        if state.sts:
+            return {f'@{p}': {cmd: None} for p in StatefulSets.pod_names(state.sts, state.namespace)}
+
+        return default
+
     def show_statefulsets(self):
         ss = StatefulSets.list_sts_names()
         if len(ss) == 0:
@@ -101,7 +114,7 @@ class DeviceCass(Command, Device):
                     if dir in names:
                         state.pod = names[dir]
                     else:
-                        log2('Not a valid pod name or host id.')
+                        state.pod = dir
 
     def cd_completion(self, cmd: str, state: ReplState, default: dict = {}):
         if state.pod:
@@ -140,6 +153,33 @@ class DeviceCass(Command, Device):
                 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}...')
+                    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}...')
+                    wait_log(f'Moving to the only Cassandra cluster: {state.sts}@{state.namespace}...')
+
+    def show_tables(self, state: ReplState):
+        log(lines_to_tabular(cassandra_table_names(state), separator=','))
+
+    def show_table_preview(self, state: ReplState, table: str, rows: int):
+        with cassandra(state) as pods:
+            pods.cql(f'select * from {table} limit {rows}', show_out=True, use_single_quotes=True, on_any=True)
+
+    def bash_target_changed(self, s0: ReplState, s1: ReplState):
+        return s0.sts != s1.sts or s0.pod != s1.pod
+
+    def exec_no_dir(self, command: str, state: ReplState):
+        with cassandra(state) as pods:
+            return pods.exec(command, action='bash', show_out=True, shell='bash')
+
+    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState):
+        with cassandra(state) as pods:
+            return pods.exec(command, action='bash', show_out=not session_just_created, shell='bash')
+
+    def bash_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        completions = {cmd: BashCompleter(lambda: [])}
+
+        if state.sts and state.namespace:
+            completions |= {f'@{p}': {cmd: BashCompleter(lambda: [])} for p in StatefulSets.pod_names(state.sts, state.namespace)}
+
+        return completions
+

adam/commands/devices/device_export.py

@@ -1,9 +1,9 @@
 from adam.commands.command import Command
 from adam.commands.devices.device import Device
-from adam.commands.export.export_databases import ExportDatabases
+from adam.commands.export.export_databases import ExportDatabases, export_db
 from adam.config import Config
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
+from adam.utils import lines_to_tabular, log, log2, wait_log
 
 class DeviceExport(Command, Device):
     COMMAND = f'{ReplState.X}:'
@@ -36,16 +36,14 @@ class DeviceExport(Command, Device):
 
     def ls(self, cmd: str, state: ReplState):
         if state.export_session:
-            self.show_export_tables(state.export_session)
+            log(lines_to_tabular(ExportDatabases.table_names(state.export_session), 'NAME', separator=','))
         else:
-            self.show_export_databases()
+            ExportDatabases.show_databases()
 
-    def show_export_databases(self, importer: str = None):
-        lines = [f'{k}\t{v}' for k, v in ExportDatabases.database_names_with_keyspace_cnt(importer).items()]
-        log(lines_to_tabular(lines, 'NAME\tKEYSPACES', separator='\t'))
-
-    def show_export_tables(self, export_session: str):
-        log(lines_to_tabular(ExportDatabases.table_names(export_session), 'NAME', separator=','))
+    def show_table_preview(self, state: ReplState, table: str, rows: int):
+        if state.export_session:
+            with export_db(state) as dbs:
+                dbs.sql(f'select * from {table} limit {rows}')
 
     def cd(self, dir: str, state: ReplState):
         if dir in ['', '..']:
@@ -78,7 +76,7 @@ class DeviceExport(Command, Device):
     def enter(self, state: ReplState):
         if auto_enter := Config().get('repl.x.auto-enter', 'no'):
             if auto_enter == 'latest':
-                Config().wait_log(f'Moving to the latest export database...')
+                wait_log(f'Moving to the latest export database...')
                 if dbs := ExportDatabases.database_names():
                     state.export_session = sorted(dbs)[-1]
                 else:

adam/commands/devices/device_postgres.py

@@ -1,10 +1,11 @@
-from adam.commands.command import Command
+from adam.commands.bash.bash_completer import BashCompleter
+from adam.commands.command import Command, InvalidStateException
 from adam.commands.devices.device import Device
 from adam.commands.postgres.postgres_context import PostgresContext
-from adam.commands.postgres.postgres_utils import pg_database_names, pg_table_names
-from adam.config import Config
+from adam.commands.postgres.utils_postgres import pg_database_names, pg_table_names, postgres
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log
+from adam.utils import lines_to_tabular, log, log2, wait_log
+from adam.utils_k8s.pods import Pods
 
 class DevicePostgres(Command, Device):
     COMMAND = f'{ReplState.P}:'
@@ -45,6 +46,12 @@ class DevicePostgres(Command, Device):
         else:
             self.show_pg_hosts(state)
 
+    def cat(self, cmd: str, state: ReplState):
+        if state.pod:
+            return self.bash(state, state, cmd.split(' '))
+
+        raise InvalidStateException()
+
     def show_pg_hosts(self, state: ReplState):
         if state.namespace:
             def line(pg: PostgresContext):
@@ -105,5 +112,33 @@ class DevicePostgres(Command, Device):
 
         return False, None
 
-    def enter(self, state: ReplState):
-        Config().wait_log('Inspecting postgres database instances...')
+    def enter(self, _: ReplState):
+        wait_log('Inspecting postgres database instances...')
+
+    def show_tables(self, state: ReplState):
+        pg = PostgresContext.apply(state.namespace, state.pg_path)
+        lines = [db["name"] for db in pg.tables() if db["schema"] == PostgresContext.default_schema()]
+        log(lines_to_tabular(lines, separator=','))
+
+    def show_table_preview(self, state: ReplState, table: str, rows: int):
+        PostgresContext.apply(state.namespace, state.pg_path).run_sql(f'select * from {table} limit {rows}')
+
+    def bash(self, s0: ReplState, s1: ReplState, args: list[str]):
+        pod, container = PostgresContext.pod_and_container(s1.namespace)
+        log2(f'Running on {pod}(container:{container})...')
+
+        return super().bash(s0, s1, args)
+
+    def bash_target_changed(self, s0: ReplState, s1: ReplState):
+        return s0.pg_path != s1.pg_path
+
+    def exec_no_dir(self, command: str, state: ReplState):
+        with postgres(state) as pod:
+            return pod.exec(command, show_out=True)
+
+    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState):
+        with postgres(state) as pod:
+            return pod.exec(command, show_out=not session_just_created)
+
+    def bash_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        return {cmd: BashCompleter(lambda: [])}

adam/commands/exit.py

@@ -23,10 +23,7 @@ class Exit(Command):
         exit()
 
     def completion(self, state: ReplState):
-        if state.pod:
-            return {Exit.COMMAND: None}
-
-        return {}
+        return {Exit.COMMAND: None}
 
     def help(self, _: ReplState):
         return f'{Exit.COMMAND}\t exit kaqing <Ctrl-D>'

adam/commands/export/clean_up_all_export_sessions.py

@@ -0,0 +1,37 @@
+from adam.commands.command import Command
+from adam.commands.export.export_sessions import ExportSessions
+from adam.repl_state import ReplState, RequiredState
+
+class CleanUpAllExportSessions(Command):
+    COMMAND = 'clean up all export sessions'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(CleanUpAllExportSessions, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return CleanUpAllExportSessions.COMMAND
+
+    def required(self):
+        return RequiredState.CLUSTER_OR_POD
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        with self.validate(args, state) as (args, state):
+            if ExportSessions.clean_up_all_sessions(state.sts, state.pod, state.namespace):
+                ExportSessions.clear_export_session_cache()
+
+            return state
+
+    def completion(self, _: ReplState):
+        return {}
+
+    def help(self, _: ReplState):
+        return f'{CleanUpAllExportSessions.COMMAND}\t clean up all export sessions'

adam/commands/export/clean_up_export_sessions.py

@@ -1,9 +1,12 @@
+from adam.commands import validate_args
 from adam.commands.command import Command
+from adam.commands.export.export_sessions import ExportSessions
 from adam.commands.export.exporter import Exporter
 from adam.repl_state import ReplState, RequiredState
+from adam.utils import log, log2
 
 class CleanUpExportSessions(Command):
-    COMMAND = 'clean up all export sessions'
+    COMMAND = 'clean up export sessions'
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -24,17 +27,18 @@ class CleanUpExportSessions(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 validate_args(args, state, name='export session') as arg_str:
+                sessions = [arg.strip(' ') for arg in arg_str.split(',')]
+                csv_cnt, log_cnt = ExportSessions.clean_up_sessions(state.sts, state.pod, state.namespace, sessions)
+                log(f'Removed {csv_cnt} csv and {log_cnt} log files.')
 
-        if Exporter.clean_up_all_sessions(state.sts, state.pod, state.namespace):
-            Exporter.clear_export_session_cache()
+                ExportSessions.clear_export_session_cache()
 
-        return state
+                return state
 
     def completion(self, _: ReplState):
         return {}
 
     def help(self, _: ReplState):
-        return f'{CleanUpExportSessions.COMMAND}\t clean up all export sessions'
+        return f'{CleanUpExportSessions.COMMAND} <export-session-name>\t clean up export session'

adam/commands/export/drop_export_database.py

@@ -1,9 +1,7 @@
+from adam.commands import validate_args
 from adam.commands.command import Command
-from adam.commands.export.exporter import Exporter
+from adam.commands.export.export_databases import export_db
 from adam.repl_state import ReplState
-from adam.utils import log2
-from adam.utils_athena import Athena
-from adam.utils_sqlite import SQLite
 
 class DropExportDatabase(Command):
     COMMAND = 'drop export database'
@@ -27,29 +25,12 @@ class DropExportDatabase(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 validate_args(args, state, name='database name') as db:
+                with export_db(state) as dbs:
+                    dbs.drop(args[0])
 
-        if not len(args):
-            if state.in_repl:
-                log2('Database name is required.')
-                log2()
-            else:
-                log2('* Database name is missing.')
-                Command.display_help()
-
-            return 'command-missing'
-
-        Exporter.drop_databases(state.sts, state.pod, state.namespace, args[0])
-
-        SQLite.clear_cache()
-        Athena.clear_cache()
-
-        if state.export_session == args[0]:
-            state.export_session = None
-
-        return state
+                return state
 
     def completion(self, _: ReplState):
         return {}

adam/commands/export/drop_export_databases.py

@@ -1,8 +1,6 @@
 from adam.commands.command import Command
-from adam.commands.export.exporter import Exporter
+from adam.commands.export.export_databases import export_db
 from adam.repl_state import ReplState
-from adam.utils_athena import Athena
-from adam.utils_sqlite import SQLite
 
 class DropExportDatabases(Command):
     COMMAND = 'drop all export databases'
@@ -26,18 +24,11 @@ class DropExportDatabases(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
-
-        Exporter.drop_databases(state.sts, state.pod, state.namespace)
-
-        SQLite.clear_cache()
-        Athena.clear_cache()
+        with self.validate(args, state) as (args, state):
+            with export_db(state) as dbs:
+                dbs.drop_all()
 
-        state.export_session = None
-
-        return state
+            return state
 
     def completion(self, _: ReplState):
         return {}

adam/commands/export/export.py

@@ -1,8 +1,8 @@
+from adam.commands import extract_options
 from adam.commands.command import Command
-from adam.commands.cql.cql_utils import cassandra_keyspaces, cassandra_table_names
+from adam.commands.cql.utils_cql import cassandra_keyspaces, cassandra_table_names
 from adam.commands.export.export_databases import ExportDatabases
-from adam.commands.export.exporter import Exporter
-from adam.commands.export.utils_export import ExportSpec
+from adam.commands.export.exporter import export
 from adam.repl_state import ReplState, RequiredState
 from adam.sql.sql_completer import SqlCompleter, SqlVariant
 from adam.utils import log
@@ -30,40 +30,10 @@ class ExportTables(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
-
-        # --export-only for testing only
-        args, export_only = Command.extract_options(args, ['--export-only'])
-
-        if not state.pod:
-            state.push()
-            state.pod = StatefulSets.pod_names(state.sts, state.namespace)[0]
-
-        export_session = state.export_session
-        spec: ExportSpec = None
-        try:
-            statuses, spec = Exporter.export_tables(args, state, export_only=export_only)
-            if not statuses:
-                return state
-
-            Exporter.clear_export_session_cache()
-
-            if spec.importer == 'csv' or export_only:
-                ExportDatabases.disply_export_session(state.sts, state.pod, state.namespace, spec.session)
-            else:
-                log()
-                ExportDatabases.display_export_db(state.export_session)
-
-        finally:
-            state.pop()
-
-            # if exporting to csv, do not bind the new session id to repl state
-            if spec and spec.importer == 'csv':
-                state.export_session = export_session
-
-        return state
+        with self.validate(args, state) as (args, state):
+            with extract_options(args, '--export-only') as (args, export_only):
+                with export(state) as exporter:
+                    return exporter.export(args, export_only=export_only)
 
     def completion(self, state: ReplState):
         def sc():
@@ -74,7 +44,7 @@ class ExportTables(Command):
                 'export-dbs': lambda: ExportDatabases.database_names(),
             }, variant=SqlVariant.CQL)
 
-        if state.sts:
+        if super().completion(state):
             return {f'@{p}': {ExportTables.COMMAND: sc()} for p in StatefulSets.pod_names(state.sts, state.namespace)}
 
         return {}

adam/commands/export/export_databases.py

@@ -1,26 +1,36 @@
+from collections.abc import Callable
 import os
 import boto3
 
-from adam.commands.export.utils_export import ExportTableStatus
+from adam.commands.export.export_sessions import ExportSessions
+from adam.commands.export.importer import Importer
 from adam.config import Config
-from adam.utils import lines_to_tabular, log, log2, ing
+from adam.repl_session import ReplSession
+from adam.repl_state import ReplState
+from adam.utils import debug, lines_to_tabular, log, log2, ing, log_exc
 from adam.utils_athena import Athena
-from adam.utils_k8s.statefulsets import StatefulSets
 from adam.utils_sqlite import SQLite
 
 LIKE = 'e%_%'
 
 class ExportDatabases:
-    def run_query(query: str, database: str, show_query=False) -> int:
+    def run_query(query: str, database: str, show_query=False, output: Callable[[str], str] = None) -> int:
         cnt: int = 0
 
         if show_query:
             log2(query)
 
+        log_file = None
         if database.startswith('s'):
-            cnt += SQLite.run_query(query, database=database)
+            cnt0, log_file = SQLite.run_query(query, database=database, output=output)
+            cnt += cnt0
         else:
-            cnt += Athena.run_query(query, database=database)
+            cnt0, log_file = Athena.run_query(query, database=database, output=output)
+            cnt += cnt0
+
+        if Config().get('repl.history.push-cat-log-file', True):
+            if log_file and ReplSession().prompt_session:
+                ReplSession().prompt_session.history.append_string(f':sh cat {log_file}')
 
         return cnt
 
@@ -47,15 +57,13 @@ class ExportDatabases:
         dbs = SQLite.database_names(db)
         if dbs:
             with ing(f'Droping {len(dbs)} SQLite databases'):
-                try:
+                with log_exc():
                     for db in dbs:
                         file_path = f'{SQLite.local_db_dir()}/{db}'
                         try:
                             os.remove(file_path)
                         except OSError as e:
                             pass
-                except:
-                    pass
 
         return dbs
 
@@ -65,20 +73,17 @@ class ExportDatabases:
             with ing(f'Droping {len(dbs)} Athena databases'):
                 for db in dbs:
                     query = f'DROP DATABASE {db} CASCADE'
-                    if Config().is_debug():
-                        log2(query)
+                    debug(query)
                     Athena.query(query)
 
         with ing(f'Deleting s3 folder: export'):
-            try:
+            with log_exc():
                 if not db:
                     db = ''
 
                 s3 = boto3.resource('s3')
                 bucket = s3.Bucket(Config().get('export.bucket', 'c3.ops--qing'))
                 bucket.objects.filter(Prefix=f'export/{db}').delete()
-            except:
-                pass
 
         return dbs
 
@@ -86,7 +91,7 @@ class ExportDatabases:
         if not export_session:
             return
 
-        Athena.clear_cache()
+        ExportDatabases.clear_cache()
 
         keyspaces = {}
         for table in ExportDatabases.table_names(export_session):
@@ -98,17 +103,6 @@ class ExportDatabases:
 
         log(lines_to_tabular([f'{k},{v}' for k, v in keyspaces.items()], header='SCHEMA,# of TABLES', separator=','))
 
-    def disply_export_session(sts: str, pod: str, namespace: str, session: str):
-        if not pod:
-            pod = StatefulSets.pod_names(sts, namespace)[0]
-
-        if not pod:
-            return
-
-        tables, _ = ExportTableStatus.from_session(sts, pod, namespace, session)
-        log()
-        log(lines_to_tabular([f'{table.keyspace}\t{table.table}\t{table.target_table}\t{"export_completed_pending_import" if table.status == "pending_import" else table.status}' for table in tables], header='KEYSPACE\tTABLE\tTARGET_TABLE\tSTATUS', separator='\t'))
-
     def database_names():
         return ExportDatabases.copy_database_names() + ExportDatabases.export_database_names()
 
@@ -167,4 +161,69 @@ class ExportDatabases:
         if db.startswith('s'):
             return SQLite.database_names(prefix=f'{eprefix}_')
         else:
-            return Athena.database_names(like=f'{eprefix}_%')
+            return Athena.database_names(like=f'{eprefix}_%')
+
+    def drop_databases(sts: str, pod: str, namespace: str, database: str = None):
+        importer = None
+        if database:
+            importer = Importer.importer_from_session(database)
+
+        sessions_done = ExportSessions.export_session_names(sts, pod, namespace, importer=importer, export_state='done')
+        sessions = ExportDatabases.sessions_from_dbs(ExportDatabases.drop_export_dbs(database))
+        if sessions_done and sessions:
+            intersects = list(set(sessions_done) & set(sessions))
+            with ing(f'Cleaning up {len(intersects)} completed sessions'):
+                ExportSessions.clean_up_sessions(sts, pod, namespace, list(intersects))
+                ExportSessions.clear_export_session_cache()
+
+    def clear_cache(database: str = None):
+        if not database or database.startswith('s'):
+            SQLite.clear_cache()
+        if not database or database.startswith('e'):
+            Athena.clear_cache()
+
+    def show_databases(importer: str = None):
+        lines = [f'{k}\t{v}' for k, v in ExportDatabases.database_names_with_keyspace_cnt(importer).items()]
+        log(lines_to_tabular(lines, 'NAME\tKEYSPACES', separator='\t'))
+
+class ExportDatabaseService:
+    def __init__(self, handler: 'ExportDatabaseHandler'):
+        self.handler = handler
+
+    def sql(self, query: str, database: str = None):
+        if not database:
+            database = self.handler.state.export_session
+
+        ExportDatabases.run_query(query, database, show_query = True)
+
+    def drop(self, database: str):
+        state = self.handler.state
+
+        ExportDatabases.drop_databases(state.sts, state.pod, state.namespace, database)
+        ExportDatabases.clear_cache(database)
+        if state.export_session == database:
+            state.export_session = None
+
+    def drop_all(self):
+        state = self.handler.state
+
+        ExportDatabases.drop_databases(state.sts, state.pod, state.namespace)
+        ExportDatabases.clear_cache()
+
+        state.export_session = None
+
+    def show_databases(self, importer: str = None):
+        ExportDatabases.show_databases(importer)
+
+class ExportDatabaseHandler:
+    def __init__(self, state: ReplState = None):
+        self.state = state
+
+    def __enter__(self):
+        return ExportDatabaseService(self)
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return False
+
+def export_db(state: ReplState = None):
+    return ExportDatabaseHandler(state)