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

adam/commands/{cli_commands.py → cli/cli_commands.py}

@@ -3,14 +3,19 @@ import re
 
 from adam.commands.reaper.utils_reaper import Reapers
 from adam.config import Config
+from adam.utils import log_timing
 from adam.utils_k8s.kube_context import KubeContext
 from adam.utils_k8s.secrets import Secrets
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState
 
 class CliCommands:
-    @functools.lru_cache()
     def values(state: ReplState, collapse = False):
+        with log_timing('CliCommands.values'):
+            return CliCommands._values(state, collapse)
+
+    @functools.lru_cache()
+    def _values(state: ReplState, collapse = False):
         # node-exec-?, nodetool-?, cql-?, reaper-exec, reaper-forward, reaper-ui, reaper-usernae, reaper-password
         d = {}
 

adam/commands/{clipboard_copy.py → cli/clipboard_copy.py}

@@ -3,9 +3,9 @@ import click
 import pyperclip
 
 from adam.commands import validate_args
+from adam.commands.cli.cli_commands import CliCommands
 from adam.commands.command import Command, InvalidArgumentsException
 from adam.commands.command_helpers import ClusterOrPodCommandHelper
-from adam.commands.cli_commands import CliCommands
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import tabulize, log, log2
 
@@ -62,7 +62,7 @@ class ClipboardCopy(Command):
                 return state
 
     def completion(self, state: ReplState):
-        return super().completion(state, lambda: {key: None for key in CliCommands.values(state).keys()})
+        return super().completion(state, lambda: {key: None for key in CliCommands.values(state).keys()}, auto_key='cli.cp-auto-complete')
 
     def help(self, _: ReplState):
         return f"{ClipboardCopy.COMMAND} <key>\t copy a value to clipboard for conveninence"

adam/commands/{show/show_commands.py → cli/show_cli_commands.py}

@@ -1,5 +1,5 @@
+from adam.commands.cli.cli_commands import CliCommands
 from adam.commands.command import Command
-from adam.commands.cli_commands import CliCommands
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import tabulize, log
 
@@ -22,7 +22,7 @@ class ShowKubectlCommands(Command):
         return RequiredState.CLUSTER_OR_POD
 
     def run(self, cmd: str, state: ReplState):
-        if not self.args(cmd):
+        if not (args := self.args(cmd)):
             return super().run(cmd, state)
 
         with self.validate(args, state) as (args, state):

adam/commands/command.py

@@ -5,8 +5,10 @@ import subprocess
 import sys
 from typing import Union
 
+from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import is_lambda, log2
+from adam.sql.lark_completer import LarkCompleter
+from adam.utils import log2
 
 repl_cmds: list['Command'] = []
 
@@ -29,10 +31,10 @@ class Command:
 
         return None
 
-    def completion(self, state: ReplState, leaf: dict[str, any] = None, pods: tuple[list[str], str] = None) -> dict[str, any]:
+    def completion(self, state: ReplState, leaf: dict[str, any] = None, pods: tuple[list[str], str] = None, auto: str = 'on', auto_key: str = None) -> dict[str, any]:
         # pods is a tuple of list of pod names and the current pod repl is on
         if not pods:
-            return self._completion(state, leaf)
+            return self._completion(state, leaf, auto=auto, auto_key=auto_key)
 
         c = {}
 
@@ -40,18 +42,27 @@ class Command:
         pod = pods[1]
 
         if pod:
-            c |= self._completion(state, leaf)
+            c |= self._completion(state, leaf, auto=auto, auto_key=auto_key)
 
-        c |= {f'@{p}': self._completion(state, leaf, to_validate=False) for p in pod_names if p != pod}
+        c |= {f'@{p}': self._completion(state.with_pod(p), leaf, to_validate=False, auto=auto, auto_key=auto_key) for p in pod_names if p != pod}
 
         return c
 
-    def _completion(self, state: ReplState, leaf: dict[str, any] = None, to_validate = True) -> dict[str, any]:
+    def _completion(self, state: ReplState, leaf: dict[str, any] = None, to_validate = True, auto: str = 'on', auto_key: str = None) -> dict[str, any]:
         if to_validate and not self.validate_state(state, show_err=False):
             return {}
 
-        if is_lambda(leaf):
-            leaf = leaf()
+        if callable(leaf):
+            if auto_key:
+                auto_key = f'auto-complete.{auto_key}'
+                auto = Config().get(auto_key, 'off')
+
+            if auto == 'on':
+                leaf = leaf()
+            elif auto in ['lazy', 'jit']:
+                leaf = LarkCompleter.from_lambda(auto_key, leaf, auto=auto)
+            else:
+                leaf = None
 
         d = leaf
         for t in reversed(self.command().split(' ')):
@@ -130,7 +141,7 @@ class Command:
             options = [options]
 
         if args and trailing:
-            while args[-1] in trailing:
+            while args and args[-1] in trailing:
                 found_trailing = True
                 args = args[:-1]
 
@@ -148,6 +159,8 @@ class Command:
         return new_args, found_trailing, found_sequence, found_options
 
     def extract_option_sequence(args, sequence):
+        new_args = args
+
         len_sub = len(sequence)
         len_main = len(args)
         for i in range(len_main - len_sub + 1):

adam/commands/commands_utils.py

@@ -8,7 +8,7 @@ from adam.utils_k8s.cassandra_nodes import CassandraNodes
 from adam.utils_k8s.pods import Pods
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState
-from adam.utils import SORT, duration, tabulize, log, log2
+from adam.utils import SORT, duration, kaqing_log_file, tabulize, log2
 
 def show_pods(pods: List[client.V1Pod], ns: str, show_namespace = True, show_host_id = True):
     if len(pods) == 0:
@@ -59,14 +59,22 @@ def show_rollout(sts: str, ns: str):
         else:
             log2(f'Cluster has completed rollout {d} ago.')
 
-def show_table(state: ReplState, pods: list[str], cols: str, header: str, show_out=False):
+def show_table(state: ReplState, pods: list[str], cols: str, header: str, show_out=False, backgrounded = False):
     columns = Columns.create_columns(cols)
 
     results = run_checks(cluster=state.sts, pod=state.pod, namespace=state.namespace, checks=collect_checks(columns), show_out=show_out)
 
-    def line(pod_name: str):
-        return
+    r = tabulize(pods, lambda p: ','.join([c.pod_value(results, p) for c in columns]), header=header, separator=',', sorted=SORT, to = 0 if backgrounded else 1)
+
+    if backgrounded:
+        r = write_to_kaqing_log_file(r)
+
+    IssuesUtils.show(results, state.in_repl)
+
+    return r
 
-    tabulize(pods, lambda p: ','.join([c.pod_value(results, p) for c in columns]), header=header, separator=',', sorted=SORT)
+def write_to_kaqing_log_file(r: str):
+    with kaqing_log_file() as f:
+        f.write(r)
 
-    IssuesUtils.show(results, state.in_repl)
+        return f.name

adam/commands/{show → config}/show_params.py

@@ -1,7 +1,7 @@
 from adam.commands.command import Command
 from adam.config import Config
 from adam.repl_state import ReplState
-from adam.utils import tabulize, log
+from adam.utils import tabulize
 
 class ShowParams(Command):
     COMMAND = 'show params'

adam/commands/{alter_tables.py → cql/alter_tables.py}

@@ -59,7 +59,7 @@ class AlterTables(Command):
                     return state
 
     def completion(self, _: ReplState) -> dict[str, any]:
-        # auto completion is taken care of by sql completer
+        # auto completion is taken care of by lark completer
         return {}
 
     def help(self, _: ReplState) -> str:

adam/commands/cql/completions_c.py

@@ -0,0 +1,29 @@
+from adam.commands.cql.utils_cql import cassandra_keyspaces, cassandra_table_names
+from adam.commands.export.export_sessions import ExportSessions
+from adam.commands.export.export_databases import ExportDatabases
+from adam.config import Config
+from adam.repl_state import ReplState
+from adam.sql.lark_completer import LarkCompleter
+from adam.utils import log_timing
+from adam.utils_k8s.statefulsets import StatefulSets
+
+def completions_c(state: ReplState) -> dict[str, any]:
+    ps = Config().get('cql.alter-tables.gc-grace-periods', '3600,86400,864000,7776000').split(',')
+
+    with log_timing('lark.completions'):
+        return LarkCompleter(
+            expandables = {
+                'tables': lambda x: cassandra_table_names(state),
+                'keyspaces': lambda x: cassandra_keyspaces(state.with_no_pod()),
+                'table-props': {
+                    'GC_GRACE_SECONDS': ps
+                },
+                'table-props-value': lambda x: {None: None, 'GC_GRACE_SECONDS': ps}[x],
+                'export-database-types': ['athena', 'sqlite', 'csv'],
+                'export-databases': lambda x: ExportDatabases.database_names(),
+                'export-sessions': lambda x: ExportSessions.export_session_names(state.sts, state.pod, state.namespace),
+                'export-sessions-incomplete': lambda x: ExportSessions.export_session_names(state.sts, state.pod, state.namespace, export_state='pending_import'),
+                'hosts': lambda x: [f'@{p}' for p in StatefulSets.pod_names(state.sts, state.namespace)],
+            },
+            variant=ReplState.C
+        ).completions_for_nesting()

adam/commands/cql/cqlsh.py

@@ -3,9 +3,8 @@ import click
 from adam.commands import extract_trailing_options
 from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterOrPodCommandHelper
-from adam.commands.cql.cql_completions import cql_completions
+from adam.commands.cql.completions_c import completions_c
 from adam.commands.cql.utils_cql import cassandra
-from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log
 
@@ -38,13 +37,10 @@ class Cqlsh(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.device != state.C:
-            # conflicts with psql completions
             return {}
 
         if state.sts or state.pod:
-            c = cql_completions(state)
-            return c | \
-                   {f'@{p}': c for p in StatefulSets.pod_names(state.sts, state.namespace)}
+            return completions_c(state)
 
         return {}
 

adam/commands/cql/utils_cql.py

@@ -7,11 +7,19 @@ from adam.commands.commands_utils import show_table
 from adam.utils_k8s.cassandra_clusters import CassandraClusters
 from adam.utils_k8s.cassandra_nodes import CassandraNodes
 from adam.utils_k8s.secrets import Secrets
-from adam.pod_exec_result import PodExecResult
+from adam.utils_k8s.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState
-from adam.utils import log2, log_timing, wait_log
+from adam.utils import ing, log2, log_timing, wait_log
 from adam.utils_k8s.statefulsets import StatefulSets
 
+def cd_dirs(state: ReplState) -> list[str]:
+    if state.pod:
+        return [".."]
+    elif state.sts:
+        return [".."] + StatefulSets.pod_names(state.sts, state.namespace)
+    else:
+        return StatefulSets.list_sts_names()
+
 @functools.lru_cache()
 def cassandra_keyspaces(state: ReplState, on_any=True):
     if state.pod:
@@ -47,7 +55,7 @@ def table_spec(state: ReplState, table: str, on_any=False) -> 'TableSpec':
 
     return parse_cql_desc_table(r.stdout if state.pod else r[0].stdout)
 
-def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, show_query = False, use_single_quotes = False, on_any = False, backgrounded=False, log_file=None) -> list[PodExecResult]:
+def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, show_query = False, use_single_quotes = False, on_any = False, backgrounded=False, log_file=None, history=True) -> list[PodExecResult]:
     if show_query:
         log2(cql)
 
@@ -61,7 +69,7 @@ def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, show_
 
     with log_timing(cql):
         with cassandra(state) as pods:
-            return pods.exec(command, action='cql', show_out=show_out, on_any=on_any, backgrounded=backgrounded, log_file=log_file)
+            return pods.exec(command, action='cql', show_out=show_out, on_any=on_any, backgrounded=backgrounded, log_file=log_file, history=history)
 
 def parse_cql_desc_tables(out: str):
     # Keyspace data_endpoint_auth
@@ -219,16 +227,16 @@ class CassandraPodService:
     def __init__(self, handler: 'CassandraExecHandler'):
         self.handler = handler
 
-    def exec(self, command: str, action='bash', show_out = True, on_any = False, throw_err = False, shell = '/bin/sh', backgrounded = False, log_file = None) -> Union[PodExecResult, list[PodExecResult]]:
+    def exec(self, command: str, action='bash', show_out = True, on_any = False, throw_err = False, shell = '/bin/sh', backgrounded = False, log_file = None, history=True) -> Union[PodExecResult, list[PodExecResult]]:
         state = self.handler.state
         pod = self.handler.pod
 
         if pod:
             return CassandraNodes.exec(pod, state.namespace, command,
-                                    show_out=show_out, throw_err=throw_err, shell=shell, backgrounded=backgrounded, log_file=log_file)
+                                    show_out=show_out, throw_err=throw_err, shell=shell, backgrounded=backgrounded, log_file=log_file, history=history)
         elif state.sts:
             return CassandraClusters.exec(state.sts, state.namespace, command, action=action,
-                                        show_out=show_out, on_any=on_any, shell=shell, backgrounded=backgrounded, log_file=log_file)
+                                        show_out=show_out, on_any=on_any, shell=shell, backgrounded=backgrounded, log_file=log_file, history=history)
 
         return []
 
@@ -259,16 +267,17 @@ class CassandraPodService:
 
         return run_cql(state, query, opts=opts, show_out=show_out, show_query=show_query, use_single_quotes=use_single_quotes, on_any=on_any, backgrounded=backgrounded, log_file=log_file)
 
-    def display_table(self, cols: str, header: str, show_out = True):
+    def display_table(self, cols: str, header: str, show_out = True, backgrounded = False, msg: str = None):
         state = self.handler.state
 
-        if state.pod:
-            show_table(state, [state.pod], cols, header, show_out=show_out)
-        elif state.sts:
-            pod_names = [pod.metadata.name for pod in StatefulSets.pods(state.sts, state.namespace)]
-            show_table(state, pod_names, cols, header, show_out=show_out)
+        with ing(msg=msg, condition=backgrounded and msg):
+            if state.pod:
+                return show_table(state, [state.pod], cols, header, show_out=show_out, backgrounded = backgrounded)
+            elif state.sts:
+                pod_names = [pod.metadata.name for pod in StatefulSets.pods(state.sts, state.namespace)]
+                return show_table(state, pod_names, cols, header, show_out=show_out, backgrounded = backgrounded)
 
-    def nodetool(self, args: str, status = False, show_out = True) -> Union[PodExecResult, list[PodExecResult]]:
+    def nodetool(self, args: str, status = False, show_out = True, backgrounded = False) -> Union[PodExecResult, list[PodExecResult]]:
         state = self.handler.state
         pod = self.handler.pod
 
@@ -276,9 +285,9 @@ class CassandraPodService:
         command = f"nodetool -u {user} -pw {pw} {args}"
 
         if pod:
-            return CassandraNodes.exec(pod, state.namespace, command, show_out=show_out)
+            return CassandraNodes.exec(pod, state.namespace, command, show_out=show_out, backgrounded=backgrounded)
         else:
-            return CassandraClusters.exec(state.sts, state.namespace, command, action='nodetool.status' if status else 'nodetool', show_out=show_out)
+            return CassandraClusters.exec(state.sts, state.namespace, command, action='nodetool.status' if status else 'nodetool', show_out=show_out, backgrounded=backgrounded)
 
 class CassandraExecHandler:
     def __init__(self, state: ReplState, pod: str = None):
@@ -294,4 +303,4 @@ class CassandraExecHandler:
         return False
 
 def cassandra(state: ReplState, pod: str=None):
-    return CassandraExecHandler(state, pod=pod)
+    return CassandraExecHandler(state, pod=pod)

adam/commands/debug/debug.py

@@ -0,0 +1,22 @@
+from adam.commands.command import Command
+from adam.commands.debug.debug_completes import DebugCompletes
+from adam.commands.debug.debug_timings import DebugTimings
+from adam.commands.intermediate_command import IntermediateCommand
+
+class Debug(IntermediateCommand):
+    COMMAND = 'debug'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(Debug, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return Debug.COMMAND
+
+    def cmd_list(self):
+        return [DebugTimings(), DebugCompletes()]

adam/commands/debug/debug_completes.py

@@ -0,0 +1,35 @@
+from adam.commands import validate_args
+from adam.commands.command import Command
+from adam.config import Config
+from adam.repl_state import ReplState
+
+class DebugCompletes(Command):
+    COMMAND = 'debug completes'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DebugCompletes, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return DebugCompletes.COMMAND
+
+    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):
+            with validate_args(args, state, name='on, off or file') as args:
+                Config().set('debugs.complete', args)
+
+                return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state, {f: None for f in ['on', 'off', 'file']})
+
+    def help(self, _: ReplState):
+        return f'{DebugCompletes.COMMAND} on|off|file\t turn auto complete debug on or off'

adam/commands/debug/debug_timings.py

@@ -0,0 +1,35 @@
+from adam.commands import validate_args
+from adam.commands.command import Command
+from adam.config import Config
+from adam.repl_state import ReplState
+
+class DebugTimings(Command):
+    COMMAND = 'debug timings'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DebugTimings, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return DebugTimings.COMMAND
+
+    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):
+            with validate_args(args, state, name='on, off or file') as args:
+                Config().set('debugs.timings', args)
+
+                return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state, {f: None for f in ['on', 'off', 'file']})
+
+    def help(self, _: ReplState):
+        return f'{DebugTimings.COMMAND} on|off|file\t turn timing debug on or off'

adam/commands/debug/show_offloaded_completes.py

@@ -0,0 +1,45 @@
+from adam.commands.command import Command
+from adam.repl_state import ReplState
+from adam.sql.async_executor import AsyncExecutor
+from adam.utils import tabulize
+
+class ShowOffloadedCompletes(Command):
+    COMMAND = 'show offloaded completes'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(ShowOffloadedCompletes, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return ShowOffloadedCompletes.COMMAND
+
+    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):
+            pending, processed, first, last = AsyncExecutor.entries_in_queue()
+            lines = []
+            for k, v in processed.items():
+                lines.append(f'{k}\t{v:2.2f}')
+            for k in pending:
+                lines.append(f'{k}\tpending')
+            lines += [
+                f'---------------------------',
+                f'duration\t{last-first:2.2f}'
+            ]
+
+            tabulize(lines, header='key\tduration(in sec)', separator='\t')
+
+            return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f'{ShowOffloadedCompletes.COMMAND}\t show offloaded completes'

adam/commands/devices/device.py

@@ -2,13 +2,23 @@ from abc import abstractmethod
 
 from adam.commands.command import Command
 from adam.config import Config
-from adam.pod_exec_result import PodExecResult
+from adam.utils_k8s.pod_exec_result import PodExecResult
 from adam.repl_state import BashSession, ReplState
 from adam.utils import log2
+from adam.utils_k8s.pods import Pods
 
 class Device:
-    def pods(self, state: ReplState) -> tuple[list[str], str]:
-        return self.pod_names(state), self.pod(state)
+    def pods(self, state: ReplState, me: str = None) -> tuple[list[str], str]:
+        return self.pod_names(state), me if me else self.pod(state)
+
+    def default_pod(self, state: ReplState) -> tuple[list[str], str]:
+        if me := self.pod(state):
+            return me
+
+        if pods := self.pod_names(state):
+            return pods[0]
+
+        return None
 
     def pod(self, state: ReplState) -> str:
         return None
@@ -32,6 +42,9 @@ class Device:
     def cd_completion(self, cmd: str, state: ReplState, default: dict = {}):
         return default
 
+    def direct_dirs(self, cmd: str, state: ReplState, default: dict = {}) -> list[str]:
+        return []
+
     @abstractmethod
     def pwd(self, state: ReplState):
         pass
@@ -120,4 +133,17 @@ class Device:
         pass
 
     def bash_completion(self, cmd: str, state: ReplState, default: dict = {}):
-        return default
+        return default
+
+    def files(self, state: ReplState):
+        r: PodExecResult = Pods.exec(self.default_pod(state), self.default_container(state), state.namespace, f'find -maxdepth 1 -type f', show_out=Config().is_debug(), shell='bash')
+
+        log_files = []
+        for line in r.stdout.split('\n'):
+            line = line.strip(' \r')
+            if line:
+                if line.startswith('./'):
+                    line = line[2:]
+                log_files.append(line)
+
+        return log_files

adam/commands/devices/device_app.py

@@ -116,7 +116,7 @@ class DeviceApp(Command, Device):
         if state.app_app:
             words.append(f'app/{state.app_app}')
 
-        return '\t'.join([f'{ReplState.X}:>'] + (words if words else ['/']))
+        return '\t'.join([f'{ReplState.A}:>'] + (words if words else ['/']))
 
     def try_fallback_action(self, chain: Command, state: ReplState, cmd: str):
         if state.app_app:

adam/commands/devices/device_export.py

@@ -3,7 +3,7 @@ from adam.commands.devices.device import Device
 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 tabulize, log, log2, wait_log
+from adam.utils import tabulize, log2, wait_log
 
 class DeviceExport(Command, Device):
     COMMAND = f'{ReplState.X}:'
@@ -66,7 +66,10 @@ class DeviceExport(Command, Device):
         return '\t'.join([f'{ReplState.X}:>'] + (words if words else ['/']))
 
     def try_fallback_action(self, chain: Command, state: ReplState, cmd: str):
-        result = chain.run(f'.{cmd}', state)
+        if cmd.startswith('select '):
+            cmd = f'xelect {cmd[7:]}'
+
+        result = chain.run(cmd, state)
         if type(result) is ReplState:
             if state.export_session and not result.export_session:
                 state.export_session = None

adam/commands/devices/device_postgres.py

@@ -47,6 +47,10 @@ class DevicePostgres(Command, Device):
         return container
 
     def ls(self, cmd: str, state: ReplState):
+        if state.pod_targetted:
+            self.bash(state, state, ['ls'])
+            return
+
         with pg_path(state) as (host, database):
             if database:
                 tabulize(pg_table_names(state), header='NAME', separator=',')
@@ -94,13 +98,16 @@ class DevicePostgres(Command, Device):
                 state.pg_path = host
 
     def cd_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        return {cmd: {d: None for d in self.direct_dirs(cmd, state, default=default)}}
+
+    def direct_dirs(self, cmd: str, state: ReplState, default: dict = {}) -> list[str]:
         with pg_path(state) as (host, database):
             if database:
-                return {cmd: {'..': None}}
+                return ['..']
             elif host:
-                return {cmd: {'..': None} | {p: None for p in pg_database_names(state)}}
+                return ['..'] + [p for p in pg_database_names(state)]
             else:
-                return {cmd: {p: None for p in PostgresDatabases.host_names(state.namespace)}}
+                return [p for p in PostgresDatabases.host_names(state.namespace)]
 
     def pwd(self, state: ReplState):
         words = []
@@ -115,6 +122,9 @@ class DevicePostgres(Command, Device):
 
     def try_fallback_action(self, chain: Command, state: ReplState, cmd: str):
         with pg_path(state) as (_, database):
+            if not database:
+                database = PostgresDatabases.default_db()
+
             if database:
                 return True, chain.run(f'pg {cmd}', state)
 

adam/commands/devices/devices.py

@@ -7,7 +7,7 @@ from adam.commands.devices.device_postgres import DevicePostgres
 from adam.repl_state import ReplState
 
 class Devices:
-    def device(state: ReplState) -> Device:
+    def of(state: ReplState) -> Device:
         if state.device == ReplState.A:
             return DeviceApp()
         elif state.device == ReplState.C:

adam/commands/{check.py → diag/check.py}

@@ -5,7 +5,7 @@ from adam.checks.check_utils import all_checks, checks_from_csv, run_checks
 from adam.commands import extract_options, validate_args
 from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterOrPodCommandHelper
-from adam.commands.issues import Issues
+from adam.commands.diag.issues import Issues
 from adam.repl_state import ReplState
 from adam.utils import tabulize, log
 from adam.utils_issues import IssuesUtils