kaqing 2.0.172__py3-none-any.whl → 2.0.186__py3-none-any.whl

adam/commands/show/show_processes.py

@@ -1,9 +1,7 @@
-from adam.commands import extract_options, extract_sequence
+from adam.commands import extract_options, extract_sequence, extract_trailing_options
 from adam.commands.command import Command
-from adam.commands.commands_utils import show_table
 from adam.commands.cql.utils_cql import cassandra
 from adam.config import Config
-from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 
 class ShowProcesses(Command):
@@ -29,21 +27,24 @@ class ShowProcesses(Command):
             return super().run(cmd, state)
 
         with self.validate(args, state) as (args, state):
-            with extract_options(args, ['-s', '--show']) as (args, show_out):
-                with extract_sequence(args, ['with', 'recipe', '=', 'qing']) as (_, recipe_qing):
-                    cols = Config().get('processes.columns', 'pod,cpu-metrics,mem')
-                    header = Config().get('processes.header', 'POD_NAME,M_CPU(USAGE/LIMIT),MEM/LIMIT')
-                    if recipe_qing:
-                        cols = Config().get('processes-qing.columns', 'pod,cpu,mem')
-                        header = Config().get('processes-qing.header', 'POD_NAME,Q_CPU/TOTAL,MEM/LIMIT')
+            with extract_trailing_options(args, '&') as (args, backgrounded):
+                with extract_options(args, ['-s', '--show']) as (args, show_out):
+                    with extract_sequence(args, ['with', 'recipe', '=', 'qing']) as (_, recipe_qing):
+                        cols = Config().get('processes.columns', 'pod,cpu-metrics,mem')
+                        header = Config().get('processes.header', 'POD_NAME,M_CPU(USAGE/LIMIT),MEM/LIMIT')
+                        if recipe_qing:
+                            cols = Config().get('processes-qing.columns', 'pod,cpu,mem')
+                            header = Config().get('processes-qing.header', 'POD_NAME,Q_CPU/TOTAL,MEM/LIMIT')
 
-                with cassandra(state) as pods:
-                    pods.display_table(cols, header, show_out=show_out)
+                    with cassandra(state) as pods:
+                        pods.display_table(cols, header, show_out=show_out, backgrounded=backgrounded)
 
-                return state
+                    return state
 
     def completion(self, state: ReplState):
-        return super().completion(state, {'with': {'recipe': {'=': {'metrics': {'-s': None}, 'qing': {'-s': None}}}}, '-s': None})
+        recipes = ['metrics', 'qing']
+        return super().completion(state, {'with': {'recipe': {'=': {r: {'-s': {'&': None}, '&': None} for r in recipes}}}, '-s': {'&': None}, '&': None})
+        # return super().completion(state, {'with': {'recipe': {'=': {'metrics': {'-s': {'&': None}, '&': None}, 'qing': {'-s': {'&': None}}}}}, '-s': {'&': None}, '&': None})
 
     def help(self, _: ReplState):
         return f'{ShowProcesses.COMMAND} [with recipe qing|metrics] [-s]\t show process overview  -s show commands on nodes'

adam/commands/show/show_storage.py

@@ -1,4 +1,4 @@
-from adam.commands import extract_options
+from adam.commands import extract_options, extract_trailing_options
 from adam.commands.command import Command
 from adam.commands.cql.utils_cql import cassandra
 from adam.config import Config
@@ -27,16 +27,17 @@ class ShowStorage(Command):
             return super().run(cmd, state)
 
         with self.validate(args, state) as (args, state):
-            with extract_options(args, ['-s', '--show']) as (args, show_out):
-                cols = Config().get('storage.columns', 'pod,volume_root,volume_cassandra,snapshots,data,compactions')
-                header = Config().get('storage.header', 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS')
-                with cassandra(state) as pods:
-                    pods.display_table(cols, header, show_out=show_out)
+            with extract_trailing_options(args, '&') as (args, backgrounded):
+                with extract_options(args, ['-s', '--show']) as (args, show_out):
+                    cols = Config().get('storage.columns', 'pod,volume_root,volume_cassandra,snapshots,data,compactions')
+                    header = Config().get('storage.header', 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS')
+                    with cassandra(state) as pods:
+                        pods.display_table(cols, header, show_out=show_out, backgrounded=backgrounded)
 
-                return state
+                    return state
 
     def completion(self, state: ReplState):
-        return super().completion(state, {'-s': None})
+        return super().completion(state, {'-s': {'&': None}, '&': None})
 
     def help(self, _: ReplState):
         return f'{ShowStorage.COMMAND} [-s]\t show storage overview  -s show commands on nodes'

adam/config.py

@@ -11,6 +11,7 @@ class Config:
     EMBEDDED_PARAMS = {}
 
     LogConfig.is_debug = lambda: Config().is_debug()
+    LogConfig.is_debug_complete = lambda: Config().get('debugs.complete', False)
     LogConfig.is_debug_timing = lambda: Config().get('debugs.timings', False)
 
     # the singleton pattern

adam/embedded_params.py

@@ -1,2 +1,2 @@
 def config():
-    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'container-name': 'c3-server', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'auto-repair': {'elapsed_hours': 12}, 'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'repair-partition-tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results', 'repair-cluster-tables': 'cluster'}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'export': {'workers': 8, 'csv_dir': '/c3/cassandra/tmp', 'column_counts_query': 'select id, count(id) as columns from {table} group by id order by columns desc limit 10', 'default-importer': 'sqlite', 'sqlite': {'workers': 8, 'columns': '<row-key>', 'local-db-dir': '/tmp/qing-db'}, 'athena': {'workers': 8, 'columns': '<keys>', 'bucket': 'c3.ops--qing'}, 'csv': {'workers': 8, 'columns': '<row-key>'}, 'log-prefix': '/tmp/qing'}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'log-prefix': '/tmp/qing', 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu-metrics,mem', 'header': 'POD_NAME,M_CPU(USAGE/LIMIT),MEM/LIMIT'}, 'processes-qing': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,Q_CPU/TOTAL,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'c', 'a': {'auto-enter': 'c3/c3/*'}, 'c': {'auto-enter': 'cluster'}, 'x': {'auto-enter': 'latest'}, 'history': {'push-cat-log-file': True, 'push-cat-remote-log-file': True}, 'background-process': {'auto-nohup': True}}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}
+    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'container-name': 'c3-server', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'auto-repair': {'elapsed_hours': 12}, 'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'repair-partition-tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results', 'repair-cluster-tables': 'cluster'}, 'queries': {'last10': "SELECT * FROM audit\nWHERE drive <> 'z' and ({date_condition})\nORDER BY ts DESC LIMIT {limit}", 'slow10': "SELECT * FROM audit\nWHERE drive <> 'z' and ({date_condition})\nORDER BY CAST(duration AS REAL) DESC LIMIT {limit}", 'top10': "SELECT min(c) AS cluster, line, COUNT(*) AS cnt, avg(CAST(duration AS REAL)) AS duration\nFROM audit WHERE drive <> 'z' and ({date_condition})\nGROUP BY line ORDER BY cnt DESC LIMIT {limit}"}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'download': {'workers': 8}, 'export': {'workers': 8, 'csv_dir': '/c3/cassandra/tmp', 'column_counts_query': 'select id, count(id) as columns from {table} group by id order by columns desc limit 10', 'default-importer': 'sqlite', 'sqlite': {'workers': 8, 'columns': '<row-key>', 'local-db-dir': '/tmp/qing-db'}, 'athena': {'workers': 8, 'columns': '<keys>', 'bucket': 'c3.ops--qing'}, 'csv': {'workers': 8, 'columns': '<row-key>'}, 'log-prefix': '/tmp/qing'}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'local-tmp-dir': '/tmp/qing-db', 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'log-prefix': '/tmp/qing', 'nodetool': {'workers': 96, 'commands_in_line': 40, 'status': {'workers': 32, 'samples': 3, 'commands_in_line': 40}}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu-metrics,mem', 'header': 'POD_NAME,M_CPU(USAGE/LIMIT),MEM/LIMIT'}, 'processes-qing': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,Q_CPU/TOTAL,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'c', 'a': {'auto-enter': 'c3/c3/*'}, 'c': {'auto-enter': 'cluster'}, 'x': {'auto-enter': 'latest'}, 'history': {'push-cat-log-file': True, 'push-cat-remote-log-file': True}, 'background-process': {'auto-nohup': True}}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'auto-complete': {'c': {'tables': 'lazy'}, 'x': {'tables': 'lazy'}, 'cli': {'cp': 'jit'}, 'export': {'databases': 'jit'}, 'medusa': {'backups': 'jit'}, 'reaper': {'schedules': 'lazy'}}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}

adam/repl.py

@@ -5,7 +5,7 @@ import click
 from prompt_toolkit.key_binding import KeyBindings
 
 from adam.cli_group import cli
-from adam.commands.command import Command, InvalidState
+from adam.commands.command import Command, InvalidArgumentsException, InvalidStateException
 from adam.commands.command_helpers import ClusterCommandHelper
 from adam.commands.devices.devices import Devices
 from adam.commands.help import Help
@@ -16,11 +16,16 @@ from adam.log import Log
 from adam.repl_commands import ReplCommands
 from adam.repl_session import ReplSession
 from adam.repl_state import ReplState
-from adam.utils import clear_wait_log_flag, debug, debug_trace, deep_merge_dicts, deep_sort_dict, lines_to_tabular, log2, log_exc, log_timing
+from adam.utils import clear_wait_log_flag, debug_trace, deep_sort_dict, tabulize, log2, log_exc, log_timing
 from adam.apps import Apps
-from adam.utils_repl.repl_completer import ReplCompleter
+from adam.utils_repl.repl_completer import ReplCompleter, merge_completions
 from . import __version__
 
+import nest_asyncio
+nest_asyncio.apply()
+
+import asyncio
+
 def enter_repl(state: ReplState):
     if os.getenv('QING_DROPPED', 'false') == 'true':
         log2('You have dropped to bash from another qing instance. Please enter "exit" to go back to qing.')
@@ -68,7 +73,7 @@ def enter_repl(state: ReplState):
 
                         for c in sorted_cmds:
                             with log_exc(f'* {c.command()} command returned None completions.'):
-                                completions = log_timing(c.command(), lambda: deep_sort_dict(deep_merge_dicts(completions, c.completion(state))))
+                                completions = log_timing(c.command(), lambda: deep_sort_dict(merge_completions(completions, c.completion(state))))
 
                         # print(json.dumps(completions, indent=4))
                         completer = ReplCompleter.from_nested_dict(completions)
@@ -88,17 +93,17 @@ def enter_repl(state: ReplState):
                         return state, cmd
 
                     if state.device == ReplState.A and state.app_app or state.device == ReplState.P:
-                        state.push()
+                        state.push(pod_targetted=True)
 
                         state.app_pod = arry[0].strip('@')
                         cmd = ' '.join(arry[1:])
                     elif state.device == ReplState.P:
-                        state.push()
+                        state.push(pod_targetted=True)
 
                         state.app_pod = arry[0].strip('@')
                         cmd = ' '.join(arry[1:])
                     elif state.sts:
-                        state.push()
+                        state.push(pod_targetted=True)
 
                         state.pod = arry[0].strip('@')
                         cmd = ' '.join(arry[1:])
@@ -109,7 +114,9 @@ def enter_repl(state: ReplState):
                 try:
                     if cmd and cmd.strip(' ') and not (result := cmds.run(cmd, target)):
                         result = try_device_default_action(target, cmds, cmd_list, cmd)
-                except InvalidState:
+                except InvalidStateException:
+                    pass
+                except InvalidArgumentsException:
                     pass
 
                 if result and type(result) is ReplState and (s := cast(ReplState, result).export_session) != state.export_session:
@@ -141,8 +148,7 @@ def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Co
     if not action_taken:
         log2(f'* Invalid command: {cmd}')
         log2()
-        lines = [c.help(state) for c in cmd_list if c.help(state)]
-        log2(lines_to_tabular(lines, separator='\t'))
+        tabulize([c.help(state) for c in cmd_list if c.help(state)], separator='\t', to=2)
 
     return result
 
@@ -174,6 +180,9 @@ def repl(kubeconfig: str, config: str, param: list[str], cluster:str, namespace:
     if not KubeContext.init_params(config, param):
         return
 
-    state = ReplState(device=Config().get('repl.start-drive', 'a'), ns_sts=cluster, namespace=namespace, in_repl=True)
+    state = ReplState(ns_sts=cluster, namespace=namespace, in_repl=True)
     state, _ = state.apply_device_arg(extra_args)
+    if not state.device:
+        state.device=Config().get('repl.start-drive', 'a')
+
     enter_repl(state)

adam/repl_commands.py

@@ -7,6 +7,7 @@ from adam.commands.app.show_app_queues import ShowAppQueues
 from adam.commands.audit.audit import Audit
 from adam.commands.cat import Cat
 from adam.commands.code import Code
+from adam.commands.download_file import DownloadFile
 from adam.commands.deploy.code_start import CodeStart
 from adam.commands.deploy.code_stop import CodeStop
 from adam.commands.deploy.deploy import Deploy
@@ -22,22 +23,27 @@ from adam.commands.devices.device_auit_log import DeviceAuditLog
 from adam.commands.devices.device_cass import DeviceCass
 from adam.commands.devices.device_export import DeviceExport
 from adam.commands.devices.device_postgres import DevicePostgres
+from adam.commands.export.download_export_session import DownloadExportSession
 from adam.commands.export.drop_export_database import DropExportDatabase
 from adam.commands.export.export import ExportTables
+from adam.commands.export.import_files import ImportCSVFiles
 from adam.commands.export.import_session import ImportSession
 from adam.commands.export.clean_up_export_sessions import CleanUpExportSessions
 from adam.commands.export.clean_up_all_export_sessions import CleanUpAllExportSessions
 from adam.commands.export.drop_export_databases import DropExportDatabases
-from adam.commands.export.export_select import ExportSelect
+from adam.commands.export.export_x_select import ExportXSelect
 from adam.commands.export.export_use import ExportUse
-from adam.commands.export.export_select_x import ExportSelectX
+from adam.commands.export.export_select import ExportSelect
 from adam.commands.export.show_column_counts import ShowColumnCounts
 from adam.commands.export.show_export_databases import ShowExportDatabases
 from adam.commands.export.show_export_session import ShowExportSession
 from adam.commands.export.show_export_sessions import ShowExportSessions
+from adam.commands.find_files import FindLocalFiles
+from adam.commands.find_processes import FindProcesses
+from adam.commands.head import Head
 from adam.commands.kubectl import Kubectl
 from adam.commands.shell import Shell
-from adam.commands.cp import ClipboardCopy
+from adam.commands.clipboard_copy import ClipboardCopy
 from adam.commands.bash.bash import Bash
 from adam.commands.cd import Cd
 from adam.commands.check import Check
@@ -61,7 +67,7 @@ from adam.commands.param_set import SetParam
 from adam.commands.show.show import Show
 from adam.commands.show.show_cassandra_status import ShowCassandraStatus
 from adam.commands.show.show_cassandra_version import ShowCassandraVersion
-from adam.commands.show.show_commands import ShowKubectlCommands
+from adam.commands.show.show_cli_commands import ShowKubectlCommands
 from adam.commands.show.show_host import ShowHost
 from adam.commands.show.show_login import ShowLogin
 from adam.commands.show.show_params import ShowParams
@@ -93,16 +99,17 @@ class ReplCommands:
         return deduped
 
     def navigation() -> list[Command]:
-        return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), DeviceExport(), Cd(), Cat(), Pwd(), ClipboardCopy(),
+        return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), DeviceExport(),
+                Cd(), Cat(), Head(), DownloadFile(), FindLocalFiles(), FindProcesses(), Pwd(), ClipboardCopy(),
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
 
     def cassandra_ops() -> list[Command]:
         return [Cqlsh(), ShowCassandraStatus(), ShowCassandraVersion(), ShowCassandraRepairs(), ShowStorage(), ShowProcesses(),
                 Check(), Issues(), NodeTool(), Report(), AlterTables(), Bash(),
-                ExportTables(), ExportSelect(), ExportUse(),  ShowExportDatabases(), ShowColumnCounts(),
+                ExportTables(), ExportXSelect(), ExportUse(),  ShowExportDatabases(), ShowColumnCounts(),
                 DropExportDatabase(), DropExportDatabases(),
-                ShowExportSessions(), ShowExportSession(),
-                CleanUpExportSessions(), CleanUpAllExportSessions(), ImportSession()] + \
+                ShowExportSessions(), ShowExportSession(), DownloadExportSession(),
+                CleanUpExportSessions(), CleanUpAllExportSessions(), ImportSession(), ImportCSVFiles()] + \
                 Medusa().cmd_list() + [Restart(), RollOut(), Watch()] + Reaper().cmd_list() + Repair().cmd_list()
 
     def postgres_ops() -> list[Command]:
@@ -115,7 +122,7 @@ class ReplCommands:
         return [Audit()] + Audit().cmd_list()
 
     def export_ops() -> list[Command]:
-        return [ExportSelectX(), DropExportDatabase(), DropExportDatabases(), ShowColumnCounts()]
+        return [ExportSelect(), DropExportDatabase(), DropExportDatabases(), ShowColumnCounts()]
 
     def tools() -> list[Command]:
         return [Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(), DeployPod(), UndeployPod(), Kubectl(), Code()]

adam/repl_session.py

@@ -1,6 +1,8 @@
 from prompt_toolkit import PromptSession
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 
+from adam.config import Config
+
 class ReplSession:
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -10,4 +12,9 @@ class ReplSession:
 
     def __init__(self):
         if not hasattr(self, 'prompt_session'):
-            self.prompt_session = PromptSession(auto_suggest=AutoSuggestFromHistory())
+            self.prompt_session = PromptSession(auto_suggest=AutoSuggestFromHistory())
+
+    def append_history(self, entry: str):
+        if entry and Config().get('repl.history.push-cat-remote-log-file', True):
+            if self.prompt_session:
+                self.prompt_session.history.append_string(entry)

adam/repl_state.py

@@ -3,7 +3,6 @@ from enum import Enum
 import re
 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
@@ -62,6 +61,7 @@ class ReplState:
         self.bash_session = bash_session
         self.remote_dir = remote_dir
         self.original_state: ReplState = None
+        self.pod_targetted = False
 
         self.export_session: str = None
 
@@ -82,11 +82,11 @@ class ReplState:
         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
+            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:
@@ -314,8 +314,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.')
@@ -346,7 +346,10 @@ class ReplState:
             if not self.export_session:
                 def error():
                     if self.in_repl:
-                        log2("Select an export database first with 'use' command.")
+                        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()
@@ -390,9 +393,10 @@ class ReplState:
         self.pop()
         self.bash_session = None
 
-    def push(self):
+    def push(self, pod_targetted=False):
         if not self.original_state:
             self.original_state = copy(self)
+            self.pod_targetted = pod_targetted
 
     def pop(self):
         if o := self.original_state:
@@ -407,6 +411,25 @@ class ReplState:
             self.namespace = o.namespace
 
             self.original_state = None
+            self.pod_targetted = False
+
+    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
+
+    def with_no_pod(self):
+        state1 = copy(self)
+        state1.pod = None
+
+        return state1
 
 class DevicePodService:
     def __init__(self, handler: 'DeviceExecHandler'):