kaqing 2.0.214__py3-none-any.whl → 2.0.227__py3-none-any.whl

adam/commands/deploy/code_stop.py

@@ -36,5 +36,5 @@ class CodeStop(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return f'{CodeStop.COMMAND}\t stop code server'
+    def help(self, state: ReplState):
+        return super().help(state, 'stop code server')

adam/commands/deploy/deploy_frontend.py

@@ -45,5 +45,5 @@ class DeployFrontend(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{DeployFrontend.COMMAND}\t deploy Web frontend'
+    def help(self, state: ReplState):
+        return super().help(state, 'deploy Web frontend')

adam/commands/deploy/deploy_pg_agent.py

@@ -31,5 +31,5 @@ class DeployPgAgent(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{DeployPgAgent.COMMAND}\t deploy Postgres agent'
+    def help(self, state: ReplState):
+        return super().help(state, 'deploy Postgres agent')

adam/commands/deploy/deploy_pod.py

@@ -102,5 +102,5 @@ class DeployPod(Command):
     def completion(self, state: ReplState):
         return super().completion(state, {'--force': None})
 
-    def help(self, _: ReplState):
-        return f'{DeployPod.COMMAND} [--force]\t deploy Ops pod, --force to undeploy first'
+    def help(self, state: ReplState):
+        return super().help(state, 'deploy Ops pod --force to undeploy first', args='[--force]')

adam/commands/deploy/undeploy_frontend.py

@@ -34,5 +34,5 @@ class UndeployFrontend(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{UndeployFrontend.COMMAND}\t undeploy Web frontend'
+    def help(self, state: ReplState):
+        return super().help(state, 'undeploy Web frontend')

adam/commands/deploy/undeploy_pg_agent.py

@@ -35,5 +35,5 @@ class UndeployPgAgent(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{UndeployPgAgent.COMMAND}\t undeploy Postgres agent'
+    def help(self, state: ReplState):
+        return super().help(state, 'undeploy Postgres agent')

adam/commands/deploy/undeploy_pod.py

@@ -44,5 +44,5 @@ class UndeployPod(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{UndeployPod.COMMAND}\t undeploy Ops pod'
+    def help(self, state: ReplState):
+        return super().help(state, 'undeploy Ops pod')

adam/commands/devices/device.py

@@ -83,12 +83,12 @@ class Device:
     def show_table_preview(self, state: ReplState, table: str, rows: int):
         pass
 
-    def bash(self, s0: ReplState, s1: ReplState, args: list[str]):
+    def bash(self, s0: ReplState, s1: ReplState, args: list[str], text_color: str = None):
         if s1.in_repl:
             if self.bash_target_changed(s0, s1):
-                r = self._exec_with_dir(s1, args)
+                r = self._exec_with_dir(s1, args, text_color=text_color)
             else:
-                r = self._exec_with_dir(s0, args)
+                r = self._exec_with_dir(s0, args, text_color=text_color)
 
             if not r:
                 s1.exit_bash()
@@ -101,7 +101,7 @@ class Device:
 
             return s1
 
-    def _exec_with_dir(self, state: ReplState, args: list[str]) -> list[PodExecResult]:
+    def _exec_with_dir(self, state: ReplState, args: list[str], text_color: str = None) -> list[PodExecResult]:
         session_just_created = False
         if not args:
             session_just_created = True
@@ -118,18 +118,18 @@ class Device:
                 if pwd := state.bash_session.pwd(state):
                     args = ['cd', pwd, '&&'] + args
 
-        return self.exec_with_dir(' '.join(args), session_just_created, state)
+        return self.exec_with_dir(' '.join(args), session_just_created, state, text_color=text_color)
 
     @abstractmethod
     def bash_target_changed(self, s0: ReplState, s1: ReplState):
         pass
 
     @abstractmethod
-    def exec_no_dir(self, command: str, state: ReplState):
+    def exec_no_dir(self, command: str, state: ReplState, text_color: str = None):
         pass
 
     @abstractmethod
-    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState):
+    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState, text_color: str = None):
         pass
 
     def bash_completion(self, cmd: str, state: ReplState, default: dict = {}):

adam/commands/devices/device_app.py

@@ -35,8 +35,8 @@ class DeviceApp(Command, Device):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{DeviceApp.COMMAND}\t move to App Operations device'
+    def help(self, state: ReplState):
+        return super().help(state, 'move to App Operations device')
 
     def pod(self, state: ReplState) -> str:
         return state.app_pod
@@ -150,13 +150,13 @@ class DeviceApp(Command, Device):
     def bash_target_changed(self, s0: ReplState, s1: ReplState):
         return s0.app_env != s1.app_env or s0.app_app != s1.app_app or s0.app_pod != s1.app_pod
 
-    def exec_no_dir(self, command: str, state: ReplState):
+    def exec_no_dir(self, command: str, state: ReplState, text_color: str = None):
         with app(state) as pods:
-            return pods.exec(command)
+            return pods.exec(command, text_color=text_color)
 
-    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState):
+    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState, text_color: str = None):
         with app(state) as pods:
-            return pods.exec(command, not session_just_created)
+            return pods.exec(command, not session_just_created, text_color=text_color)
 
     def bash_completion(self, cmd: str, state: ReplState, default: dict = {}):
         return {cmd: BashCompleter(lambda: [])} | \

adam/commands/devices/device_auit_log.py

@@ -30,8 +30,8 @@ class DeviceAuditLog(Command, Device):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{DeviceAuditLog.COMMAND}\t move to Audit Log Operations device'
+    def help(self, state: ReplState):
+        return super().help(state, 'move to Audit Log Operations device')
 
     def ls(self, cmd: str, _: ReplState):
         tabulize(Athena.table_names(), header='NAME', separator=',')

adam/commands/devices/device_cass.py

@@ -43,8 +43,8 @@ class DeviceCass(Command, Device):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{DeviceCass.COMMAND}\t move to Cassandra Operations device'
+    def help(self, state: ReplState):
+        return super().help(state, 'move to Cassandra Operations device')
 
     def default_container(self, _: ReplState) -> str:
         return 'cassandra'
@@ -161,13 +161,13 @@ class DeviceCass(Command, Device):
     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):
+    def exec_no_dir(self, command: str, state: ReplState, text_color: str = None):
         with cassandra(state) as pods:
-            return pods.exec(command, action='bash', show_out=True, shell='bash')
+            return pods.exec(command, action='bash', show_out=True, shell='bash', text_color=text_color)
 
-    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState):
+    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState, text_color: str = None):
         with cassandra(state) as pods:
-            return pods.exec(command, action='bash', show_out=not session_just_created, shell='bash')
+            return pods.exec(command, action='bash', show_out=not session_just_created, shell='bash', text_color=text_color)
 
     def bash_completion(self, cmd: str, state: ReplState, default: dict = {}):
         completions = {cmd: BashCompleter(lambda: [])}

adam/commands/devices/device_export.py

@@ -31,8 +31,8 @@ class DeviceExport(Command, Device):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{DeviceExport.COMMAND}\t move to Export Database Operations device'
+    def help(self, state: ReplState):
+        return super().help(state, 'Export Database Operations device')
 
     def ls(self, cmd: str, state: ReplState):
         if state.export_session:

adam/commands/devices/device_postgres.py

@@ -32,8 +32,8 @@ class DevicePostgres(Command, Device):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{DevicePostgres.COMMAND}\t move to Postgres Operations device'
+    def help(self, state: ReplState):
+        return super().help(state, 'move to Postgres Operations device')
 
     def pod(self, state: ReplState) -> str:
         pod, _ = PostgresDatabases.pod_and_container(state.namespace)
@@ -148,13 +148,13 @@ class DevicePostgres(Command, Device):
     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):
+    def exec_no_dir(self, command: str, state: ReplState, text_color: str = None):
         with postgres(state) as pod:
-            return pod.exec(command, show_out=True)
+            return pod.exec(command, show_out=True, text_color=text_color)
 
-    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState):
+    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState, text_color: str = None):
         with postgres(state) as pod:
-            return pod.exec(command, show_out=not session_just_created)
+            return pod.exec(command, show_out=not session_just_created, text_color=text_color)
 
     def bash_completion(self, cmd: str, state: ReplState, default: dict = {}):
         return {cmd: BashCompleter(lambda: [])}

adam/commands/diag/check.py

@@ -49,8 +49,8 @@ class Check(Issues):
     def completion(self, _: ReplState):
         return {Check.COMMAND: {check.name(): {'-s': None} for check in all_checks()}}
 
-    def help(self, _: ReplState):
-        return f'{Check.COMMAND} <check-name> [-s]\t run a single check'
+    def help(self, state: ReplState):
+        return super().help(state, 'run a single check -s show processing details', args='<check-name> [-s]')
 
 class CheckCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):

adam/commands/diag/generate_report.py

@@ -48,5 +48,5 @@ class GenerateReport(Command):
     def completion(self, state: ReplState):
         return super().completion(state, {'-s': None})
 
-    def help(self, _: ReplState):
-        return f"{GenerateReport.COMMAND} [-s]\t generate report"
+    def help(self, state: ReplState):
+        return super().help(state, 'generate report  -s show processing details', args='[-s]')

adam/commands/diag/issues.py

@@ -39,5 +39,6 @@ class Issues(Command):
     def completion(self, state: ReplState):
         return super().completion(state, {'-s': None})
 
-    def help(self, _: ReplState):
-        return f'{Issues.COMMAND} [-s]\t find all issues'
+    def help(self, state: ReplState, desc: str = None, args: str = None):
+        args1 = args if args else '[-s]'
+        return super().help(state, 'find all issues  -s show processing details', args=args1)

adam/commands/exit.py

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

adam/commands/export/clean_up_all_export_sessions.py

@@ -33,5 +33,5 @@ class CleanUpAllExportSessions(Command):
     def completion(self, _: ReplState):
         return {}
 
-    def help(self, _: ReplState):
-        return f'{CleanUpAllExportSessions.COMMAND}\t clean up all export sessions'
+    def help(self, state: ReplState):
+        return super().help(state, 'clean up all export sessions')

adam/commands/export/clean_up_export_sessions.py

@@ -35,5 +35,5 @@ class CleanUpExportSessions(Command):
     def completion(self, _: ReplState):
         return {}
 
-    def help(self, _: ReplState):
-        return f'{CleanUpExportSessions.COMMAND} <export-session-name,...>\t clean up export sessions'
+    def help(self, state: ReplState):
+        return super().help(state, 'clean up export sessions', args='<export-session-name>,...')

adam/commands/export/download_export_session.py

@@ -1,6 +1,6 @@
 from adam.commands import validate_args
 from adam.commands.command import Command
-from adam.commands.export.export_sessions import ExportSessions, export_session
+from adam.commands.export.export_sessions import export_session
 from adam.repl_state import ReplState, RequiredState
 
 class DownloadExportSession(Command):
@@ -32,9 +32,8 @@ class DownloadExportSession(Command):
 
             return state
 
-    def completion(self, state: ReplState):
+    def completion(self, _: ReplState):
         return {}
-        # return super().completion(state, {session: None for session in ExportSessions.export_session_names(state.sts, state.pod, state.namespace, export_state='pending_import')})
 
-    def help(self, _: ReplState):
-        return f'{DownloadExportSession.COMMAND} <export-session-name>\t download csv files in export session'
+    def help(self, state: ReplState):
+        return super().help(state, 'download csv files in export session', args='<export-session-name>')

adam/commands/export/drop_export_database.py

@@ -35,5 +35,5 @@ class DropExportDatabase(Command):
     def completion(self, _: ReplState):
         return {}
 
-    def help(self, _: ReplState):
-        return f'{DropExportDatabase.COMMAND} <export-database-name>\t drop export database'
+    def help(self, state: ReplState):
+        return super().help(state, 'drop export database', args='<export-database-name>')

adam/commands/export/drop_export_databases.py

@@ -33,5 +33,5 @@ class DropExportDatabases(Command):
     def completion(self, _: ReplState):
         return {}
 
-    def help(self, _: ReplState):
-        return f'{DropExportDatabases.COMMAND}\t drop all export databases'
+    def help(self, state: ReplState):
+        return super().help(state, 'drop all export databases')

adam/commands/export/export.py

@@ -30,8 +30,8 @@ class ExportTables(Command):
                 with export(state) as exporter:
                     return exporter.export(args, export_only=export_only)
 
-    def completion(self, state: ReplState):
+    def completion(self, _: ReplState):
         return {}
 
-    def help(self, _: ReplState):
-        return f'{ExportTables.COMMAND} [* [in KEYSPACE]] | [TABLE] [as target-name] [with consistency <level>]\t export tables to Sqlite, Athena or CSV file'
+    def help(self, state: ReplState):
+        return super().help(state, 'export tables to Sqlite, Athena or CSV file', args='TABLE...')

adam/commands/export/export_databases.py

@@ -206,6 +206,9 @@ class ExportDatabaseService:
                 flag = 'w'
 
             with open(export_log, flag) as f:
+                if flag == 'at':
+                    f.write(query)
+                    f.write('\n')
                 f.write(out)
 
             return export_log

adam/commands/export/export_select.py

@@ -30,5 +30,5 @@ class ExportSelect(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return f'<sql-select-statements>\t run queries on export database'
+    def help(self, state: ReplState):
+        return super().help(state, 'run queries on export database', command='<sql-select-statements>')

adam/commands/export/export_sessions.py

@@ -3,10 +3,10 @@ import os
 import re
 
 from adam.commands.export.importer import Importer
-from adam.commands.export.utils_export import ExportTableStatus, csv_dir, export_log_dir, find_files, os_system_exec
+from adam.commands.export.utils_export import ExportTableStatus, csv_dir, fs_exec, table_log_dir
 from adam.config import Config
 from adam.repl_state import ReplState
-from adam.utils import log2, tabulize, log, parallelize
+from adam.utils import log2, log_to_pods, tabulize, log, parallelize
 from adam.utils_k8s.cassandra_nodes import CassandraNodes
 from adam.utils_k8s.pods import Pods
 from adam.utils_k8s.statefulsets import StatefulSets
@@ -36,13 +36,13 @@ class ExportSessions:
 
         prefix = Importer.prefix_from_importer(importer)
 
-        log_files: list[str] = find_files(pod, namespace, f'{export_log_dir()}/{prefix}*_*.log*')
+        log_files: list[str] = Pods.find_files(pod, 'cassandra', namespace, f'{table_log_dir(pod, namespace)}/{prefix}*_*.log*', remote=log_to_pods())
 
         if not log_files:
             return {}
 
         for log_file in log_files[:limit]:
-            m = re.match(f'{export_log_dir()}/([ces].*?)_.*\.log?(.*)', log_file)
+            m = re.match(f'{table_log_dir(pod, namespace)}/([ces].*?)_.*\.log?(.*)', log_file)
             if m:
                 s = m.group(1)
                 state = m.group(2) # '', '.pending_import', '.done'
@@ -66,8 +66,8 @@ class ExportSessions:
             pod = StatefulSets.pod_names(sts, namespace)[0]
 
         CassandraNodes.exec(pod, namespace, f'rm -rf {csv_dir()}/*', show_out=Config().is_debug(), shell='bash')
-        cmd = f'rm -rf {export_log_dir()}/*.log*'
-        os_system_exec(cmd, show_out=Config().is_debug())
+        cmd = f'rm -rf {table_log_dir(pod, namespace)}/*.log*'
+        fs_exec(pod, namespace, cmd, show_out=Config().is_debug())
 
         return True
 
@@ -103,10 +103,10 @@ class ExportSessions:
         csv_cnt = 0
         log_cnt = 0
 
-        log_files: list[str] = find_files(pod, namespace, f'{export_log_dir()}/{session}_*.log*')
+        log_files: list[str] = Pods.find_files(pod, 'cassandra', namespace, f'{table_log_dir(pod, namespace)}/{session}_*.log*', remote=log_to_pods())
 
         for log_file in log_files:
-            m = re.match(f'{export_log_dir()}/{session}_(.*?)\.(.*?)\.log.*', log_file)
+            m = re.match(f'{table_log_dir(pod, namespace)}/{session}_(.*?)\.(.*?)\.log.*', log_file)
             if m:
                 table = m.group(2)
 
@@ -114,7 +114,7 @@ class ExportSessions:
                 csv_cnt += 1
 
                 cmd = f'rm -rf {log_file}'
-                os_system_exec(cmd, show_out=not multi_tables)
+                fs_exec(pod, namespace, cmd, show_out=not multi_tables)
                 log_cnt += 1
 
         return csv_cnt, log_cnt
@@ -145,6 +145,7 @@ class ExportSessions:
             from_path: str = table.csv_file
 
             to_path = from_path.replace(csv_dir(), local_downloads_dir())
+            os.makedirs(os.path.dirname(to_path), exist_ok=True)
             Pods.download_file(pod, 'cassandra', namespace, from_path, to_path)
 
             log2(f'[{session}] Downloaded to {to_path}.')

adam/commands/export/export_use.py

@@ -42,8 +42,8 @@ class ExportUse(Command):
 
                 return state
 
-    def completion(self, state: ReplState):
+    def completion(self, _: ReplState):
         return {}
 
-    def help(self, _: ReplState):
-        return f'{ExportUse.COMMAND} <export-database-name>\t use export database'
+    def help(self, state: ReplState):
+        return super().help(state, 'use export database', args='<export-database-name>')

adam/commands/export/export_x_select.py

@@ -44,5 +44,5 @@ class ExportXSelect(Command):
         # add only xelect completions to c: drive from lark
         return {ExportXSelect.COMMAND: completions_x(state)[ExportXSelect.COMMAND]}
 
-    def help(self, _: ReplState):
-        return f'xelect...\t run queries on export database'
+    def help(self, state: ReplState):
+        return super().help(state, 'run queries on export database', command='xelect...')

adam/commands/export/exporter.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-import os
 import time
 import traceback
 
@@ -10,12 +9,13 @@ from adam.commands.export.export_sessions import ExportSessions
 from adam.commands.export.importer import Importer
 from adam.commands.export.importer_athena import AthenaImporter
 from adam.commands.export.importer_sqlite import SqliteImporter
-from adam.commands.export.utils_export import ExportSpec, ExportTableStatus, ExportTableSpec, ImportSpec, csv_dir, export_log_dir, find_files, os_system_exec, state_with_pod
+from adam.commands.export.utils_export import ExportSpec, ExportTableStatus, ExportTableSpec, ImportSpec, csv_dir, fs_exec, state_with_pod, table_log_dir
 from adam.config import Config
 from adam.repl_session import ReplSession
 from adam.repl_state import ReplState
-from adam.utils import debug, kaqing_log_file_name, log, offload, parallelize, log2, ing, log_exc
+from adam.utils import debug, kaqing_log_file_name, log, log_to_pods, offload, parallelize, log2, ing, log_exc
 from adam.utils_k8s.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.pods import Pods
 
 class Exporter:
     def export_tables(args: list[str], state: ReplState, export_only: bool = False, max_workers = 0) -> tuple[list[str], ExportSpec]:
@@ -192,7 +192,7 @@ class Exporter:
 
         table, target_table, columns = Exporter.resove_table_n_columns(spec, state, include_ks_in_target=False, importer=importer)
 
-        log_file = f'{export_log_dir()}/{session}_{spec.keyspace}.{target_table}.log'
+        log_file = f'{table_log_dir(state.pod, state.namespace)}/{session}_{spec.keyspace}.{target_table}.log'
         create_db = not state.export_session
 
         if export_state == 'init':
@@ -203,7 +203,7 @@ class Exporter:
                 if export_state == 'pending_export':
                     Exporter.export_to_csv(spec, state, session, table, target_table, columns, multi_tables=multi_tables, consistency=consistency, job_log=job_log)
 
-                log_files: list[str] = find_files(state.pod, state.namespace, f'{log_file}*')
+                log_files: list[str] = Pods.find_files(state.pod, 'cassandra', state.namespace, f'{log_file}*', remote=log_to_pods())
                 if not log_files:
                     return s
 
@@ -250,11 +250,11 @@ class Exporter:
             traceback.print_exc()
 
     def create_table_log(spec: ExportTableSpec, state: ReplState, session: str, table: str, target_table: str):
-        log_file = f'{export_log_dir()}/{session}_{spec.keyspace}.{target_table}.log'
-        dir = os.path.dirname(log_file)
+        dir = table_log_dir(state.pod, state.namespace)
+        log_file = f'{dir}/{session}_{spec.keyspace}.{target_table}.log'
 
         cmd = f'rm -f {log_file}* && mkdir -p {dir} && touch {log_file}'
-        os_system_exec(cmd, show_out=Config().is_debug())
+        fs_exec(state.pod, state.namespace, cmd, show_out=Config().is_debug())
 
         return table
 
@@ -271,7 +271,7 @@ class Exporter:
 
         CassandraNodes.exec(state.pod, state.namespace, f'mkdir -p {csv_dir()}/{db}', show_out=Config().is_debug(), shell='bash')
         csv_file = f'{csv_dir()}/{db}/{table}.csv'
-        table_log_file = f'{export_log_dir()}/{session}_{spec.keyspace}.{target_table}.log'
+        table_log_file = f'{table_log_dir(state.pod, state.namespace)}/{session}_{spec.keyspace}.{target_table}.log'
 
         suppress_ing_log = Config().is_debug() or multi_tables
         queries = []
@@ -287,11 +287,11 @@ class Exporter:
         return table_log_file
 
     def rename_to_pending_import(spec: ExportTableSpec, state: ReplState, session: str, target_table: str):
-        log_file = f'{export_log_dir()}/{session}_{spec.keyspace}.{target_table}.log'
+        log_file = f'{table_log_dir(state.pod, state.namespace)}/{session}_{spec.keyspace}.{target_table}.log'
         to = f'{log_file}.pending_import'
 
         cmd =f'mv {log_file} {to}'
-        os_system_exec(cmd, show_out=Config().is_debug())
+        fs_exec(state.pod, state.namespace, cmd, show_out=Config().is_debug())
 
         return to
 

adam/commands/export/import_files.py

@@ -33,12 +33,8 @@ class ImportCSVFiles(Command):
                     with export(state) as exporter:
                         return exporter.import_files(spec)
 
-    def completion(self, state: ReplState):
-        # warm up cache
-        # ExportSessions.export_session_names(state.sts, state.pod, state.namespace)
-        # ExportSessions.export_session_names(state.sts, state.pod, state.namespace, export_state='pending_import')
-
+    def completion(self, _: ReplState):
         return {}
 
-    def help(self, _: ReplState):
-        return f'{ImportCSVFiles.COMMAND} <file-names,...>\t import files in session to Athena or SQLite'
+    def help(self, state: ReplState):
+        return super().help(state, 'import files in session to SQLite(or Athena)', args='<file-names>,...')

adam/commands/export/import_session.py

@@ -36,5 +36,5 @@ class ImportSession(Command):
     def completion(self, state: ReplState):
         return {}
 
-    def help(self, _: ReplState):
-        return f'{ImportSession.COMMAND} <export-session-name>\t import files in session to Athena or SQLite'
+    def help(self, state: ReplState):
+        return super().help(state, 'import tables in session to SQLite(or Athena)', args='<export-session-name>')

adam/commands/export/importer.py

@@ -1,6 +1,6 @@
 from abc import abstractmethod
 
-from adam.commands.export.utils_export import csv_dir, export_log_dir, os_system_exec
+from adam.commands.export.utils_export import csv_dir, fs_exec, table_log_dir
 from adam.config import Config
 from adam.repl_state import ReplState
 from adam.utils import ing
@@ -22,15 +22,14 @@ class Importer:
         pass
 
     def move_to_done(self, state: ReplState, from_session: str, keyspace: str, target_table: str):
-        pod = state.pod
-        namespace = state.namespace
+        dir = table_log_dir(state.pod, state.namespace)
         to_session = state.export_session
-        log_file = f'{export_log_dir()}/{from_session}_{keyspace}.{target_table}.log.pending_import'
+        log_file = f'{dir}/{from_session}_{keyspace}.{target_table}.log.pending_import'
 
-        to = f'{export_log_dir()}/{to_session}_{keyspace}.{target_table}.log.done'
+        to = f'{dir}/{to_session}_{keyspace}.{target_table}.log.done'
 
         cmd = f'mv {log_file} {to}'
-        os_system_exec(cmd, show_out=Config().is_debug())
+        fs_exec(state.pod, state.namespace, cmd, show_out=Config().is_debug())
 
         return to, to_session
 
@@ -46,7 +45,7 @@ class Importer:
 
         with ing(f'[{from_session}] Cleaning up temporary files', suppress_log=multi_tables, job_log=job_log):
             cmd = f'rm -rf {self.csv_file(from_session, table, target_table)}'
-            os_system_exec(cmd, show_out=Config().is_debug())
+            fs_exec(state.pod, state.namespace, cmd, show_out=Config().is_debug())
 
     def db(self, session: str, keyspace: str):
         return f'{session}_{keyspace}'

adam/commands/export/show_column_counts.py

@@ -39,7 +39,6 @@ class ShowColumnCounts(Command):
 
     def completion(self, state: ReplState):
         return super().completion(state, lambda: {t: None for t in ExportDatabases.table_names(state.export_session)}, auto_key='x.tables')
-        # return {}
 
-    def help(self, _: ReplState):
-        return f'{ShowColumnCounts.COMMAND} <export-table-name>\t show column count per id'
+    def help(self, state: ReplState):
+        return super().help(state, 'show column count per id', args='<export-table-name>')

adam/commands/export/show_export_databases.py

@@ -31,9 +31,8 @@ class ShowExportDatabases(Command):
 
             return state
 
-    def completion(self, state: ReplState):
+    def completion(self, _: ReplState):
         return {}
-        # return DeviceExport().ls_completion(ShowExportDatabases.COMMAND, state, default = super().completion(state))
 
-    def help(self, _: ReplState):
-        return f'{ShowExportDatabases.COMMAND}\t list export databases'
+    def help(self, state: ReplState):
+        return super().help(state, 'list export databases')