kaqing 2.0.171__py3-none-any.whl → 2.0.203__py3-none-any.whl

adam/commands/show/show.py

@@ -1,17 +1,17 @@
 import click
 
+from adam.commands.app.show_app_actions import ShowAppActions
+from adam.commands.app.show_app_id import ShowAppId
+from adam.commands.app.show_app_queues import ShowAppQueues
 from adam.commands.intermediate_command import IntermediateCommand
 from adam.commands.medusa.medusa_show_backupjobs import MedusaShowBackupJobs
 from adam.commands.medusa.medusa_show_restorejobs import MedusaShowRestoreJobs
-from adam.commands.show.show_app_actions import ShowAppActions
-from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.show.show_host import ShowHost
 from adam.commands.show.show_login import ShowLogin
 from .show_params import ShowParams
-from .show_app_id import ShowAppId
 from .show_cassandra_status import ShowCassandraStatus
 from .show_cassandra_version import ShowCassandraVersion
-from .show_commands import ShowKubectlCommands
+from .show_cli_commands import ShowKubectlCommands
 from .show_processes import ShowProcesses
 from .show_cassandra_repairs import ShowCassandraRepairs
 from .show_storage import ShowStorage

adam/commands/show/show_adam.py

@@ -1,7 +1,7 @@
 import sys
 import os
 
-from adam.utils import lines_to_tabular, log2
+from adam.utils import tabulize, log2
 
 current_dir = os.path.dirname(os.path.abspath(__file__))
 
@@ -34,10 +34,10 @@ class ShowAdam(Command):
 
         package = os.path.dirname(os.path.abspath(__file__))
         package = package.split('/adam/')[0] + '/adam'
-        log2(lines_to_tabular([
+        tabulize([
             f'version\t{__version__}',
             f'source\t{package}'
-        ], separator='\t'))
+        ], separator='\t', to=2)
 
         return state
 

adam/commands/show/show_cassandra_repairs.py

@@ -1,3 +1,4 @@
+from adam.commands import extract_trailing_options
 from adam.commands.command import Command
 from adam.commands.cql.utils_cql import cassandra
 from adam.repl_state import ReplState, RequiredState
@@ -25,14 +26,12 @@ class ShowCassandraRepairs(Command):
             return super().run(cmd, state)
 
         with self.validate(args, state) as (args, state):
-            with cassandra(state) as pods:
-                return pods.nodetool('repair_admin list')
+            with extract_trailing_options(args, '&') as (args, backgrounded):
+                with cassandra(state) as pods:
+                    return pods.nodetool('repair_admin list', backgrounded=backgrounded)
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state, {'&': None})
 
     def help(self, _: ReplState):
         return f'{ShowCassandraRepairs.COMMAND}\t show Cassandra repairs'

adam/commands/show/show_cassandra_status.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 import sys
 
 from adam.checks.check_result import CheckResult
@@ -5,14 +6,15 @@ from adam.checks.check_utils import run_checks
 from adam.checks.compactionstats import CompactionStats
 from adam.checks.gossip import Gossip
 from adam.columns.columns import Columns
-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
+from adam.repl_session import ReplSession
 from adam.utils_issues import IssuesUtils
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log, log2
+from adam.utils import SORT, tabulize, log2, log_exc
 from adam.checks.status import parse_nodetool_status
 
 class ShowCassandraStatus(Command):
@@ -38,32 +40,31 @@ class ShowCassandraStatus(Command):
             return super().run(cmd, state)
 
         with self.validate(args, state) as (args, state):
-            with extract_options(args, ['-s', '--show']) as (args, show_out):
-                if state.namespace and state.pod:
-                    self.show_single_pod(state, show_out=show_out)
-                elif state.namespace and state.sts:
-                    self.merge(state, Config().get('nodetool.samples', sys.maxsize), show_output=show_out)
+            with extract_trailing_options(args, '&') as (args, backgrounded):
+                with extract_options(args, ['-s', '--show']) as (args, show_out):
+                    if state.namespace and state.pod:
+                        self.show_single_pod(state, show_out=show_out, backgrounded=backgrounded)
+                    elif state.namespace and state.sts:
+                        self.merge(state, Config().get('nodetool.samples', sys.maxsize), show_output=show_out, backgrounded=backgrounded)
 
-                return state
+                    return state
 
-    def show_single_pod(self, state: ReplState, show_out = False):
-        try:
+    def show_single_pod(self, state: ReplState, show_out = False, backgrounded = False):
+        with log_exc(True):
             with cassandra(state) as pods:
                 result = pods.nodetool('status', show_out=False)
                 status = parse_nodetool_status(result.stdout)
                 check_results = run_checks(cluster=state.sts, namespace=state.namespace, checks=[CompactionStats(), Gossip()], show_out=show_out)
-                self.show_table(status, check_results)
-        except Exception as e:
-            log2(e)
+                self.show_table(status, check_results, backgrounded=backgrounded)
 
-    def merge(self, state: ReplState, samples: int, show_output=False):
+    def merge(self, state: ReplState, samples: int, show_output=False, backgrounded = False):
         statuses: list[list[dict]] = []
 
         pod_names = StatefulSets.pod_names(state.sts, state.namespace)
         for pod_name in pod_names:
             pod_name = pod_name.split('(')[0]
 
-            try:
+            with log_exc(True):
                 with cassandra(state, pod=pod_name) as pods:
                     result = pods.nodetool('status', show_out=False)
                     status = parse_nodetool_status(result.stdout)
@@ -71,13 +72,11 @@ class ShowCassandraStatus(Command):
                         statuses.append(status)
                     if samples <= len(statuses) and len(pod_names) != len(statuses):
                         break
-            except Exception as e:
-                log2(e)
 
         combined_status = self.merge_status(statuses)
         log2(f'Showing merged status from {len(statuses)}/{len(pod_names)} nodes...')
         check_results = run_checks(cluster=state.sts, namespace=state.namespace, checks=[CompactionStats(), Gossip()], show_out=show_output)
-        self.show_table(combined_status, check_results)
+        self.show_table(combined_status, check_results, backgrounded=backgrounded)
 
         return combined_status
 
@@ -98,27 +97,28 @@ class ShowCassandraStatus(Command):
 
         return combined
 
-    def show_table(self, status: list[dict[str, any]], check_results: list[CheckResult]):
+    def show_table(self, status: list[dict[str, any]], check_results: list[CheckResult], backgrounded=False):
         cols = Config().get('status.columns', 'status,address,load,tokens,owns,host_id,gossip,compactions')
         header = Config().get('status.header', '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS')
         columns = Columns.create_columns(cols)
 
-        def line(status: dict):
-            cells = [c.host_value(check_results, status) for c in columns]
-            return ','.join(cells)
+        r = tabulize(status, lambda s: ','.join([c.host_value(check_results, s) for c in columns]), header=header, separator=',', sorted=SORT, to = 0 if backgrounded else 1)
 
-        lines = [line(d) for d in status]
-        lines.sort()
+        if backgrounded:
+            log_prefix = Config().get('log-prefix', '/tmp/qing')
+            log_file = f'{log_prefix}-{datetime.now().strftime("%d%H%M%S")}.log'
 
-        log(lines_to_tabular(lines, header, separator=','))
+            with open(log_file, 'w') as f:
+                f.write(r)
+
+            ReplSession().append_history(f':sh cat {log_file}')
+
+            r = log_file
 
         IssuesUtils.show(check_results)
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state, {'-s': None})
-
-        return {}
+        return super().completion(state, {'-s': {'&': None}, '&': None})
 
     def help(self, _: ReplState):
         return f'{ShowCassandraStatus.COMMAND} [-s]\t show merged nodetool status  -s show commands on nodes'

adam/commands/show/show_cassandra_version.py

@@ -29,10 +29,7 @@ class ShowCassandraVersion(Command):
                 return pods.cql('show version', show_out=True, on_any=True)
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ShowCassandraVersion.COMMAND}\t show Cassandra version'

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

@@ -1,7 +1,7 @@
 from adam.commands.command import Command
 from adam.commands.cli_commands import CliCommands
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log
+from adam.utils import tabulize, log
 
 class ShowKubectlCommands(Command):
     COMMAND = 'show cli-commands'
@@ -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):
@@ -45,14 +45,11 @@ class ShowKubectlCommands(Command):
 
             cmds += [f'{k},{v0}' for k, v0 in v.items() if k.startswith('pg-')]
 
-            log(lines_to_tabular(cmds, separator=','))
+            tabulize(cmds, separator=',')
 
             return cmds
 
     def completion(self, state: ReplState):
-        if not state.sts:
-            return {}
-
         return super().completion(state)
 
     def help(self, _: ReplState):

adam/commands/show/show_login.py

@@ -1,13 +1,11 @@
 import time
-import traceback
 
 from adam.apps import Apps
-from adam.config import Config
 from adam.sso.idp import Idp
 from adam.sso.idp_login import IdpLogin
 from adam.commands.command import Command
 from adam.repl_state import ReplState
-from adam.utils import duration, lines_to_tabular, log, log2
+from adam.utils import duration, tabulize, log, log2, log_exc
 
 class ShowLogin(Command):
     COMMAND = 'show login'
@@ -33,7 +31,7 @@ class ShowLogin(Command):
 
         with self.validate(args, state) as (args, state):
             login: IdpLogin = None
-            try:
+            with log_exc(True):
                 if not(host := Apps.app_host('c3', 'c3', state.namespace)):
                     log2('Cannot locate ingress for app.')
                     return state
@@ -47,11 +45,7 @@ class ShowLogin(Command):
                         f'IDP expires in\t{duration(time.time(), it.exp)}',
                         f'IDP Groups\t{",".join(it.groups)}'
                     ]
-                    log(lines_to_tabular(lines, separator='\t'))
-            except Exception as e:
-                log2(e)
-                if Config().is_debug():
-                    log2(traceback.format_exc())
+                    tabulize(lines, separator='\t')
 
             return state
 

adam/commands/show/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 lines_to_tabular, log
+from adam.utils import tabulize
 
 class ShowParams(Command):
     COMMAND = 'show params'
@@ -22,10 +22,7 @@ class ShowParams(Command):
         if not self.args(cmd):
             return super().run(cmd, state)
 
-        lines = [f'{key}\t{Config().get(key, None)}' for key in Config().keys()]
-        log(lines_to_tabular(lines, separator='\t'))
-
-        return lines
+        return tabulize(Config().keys(), lambda k: f'{k}\t{Config().get(k, None)}', separator='\t')
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/show/show_processes.py

@@ -1,9 +1,7 @@
-from adam.commands import extract_options
+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,23 +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):
-                cols = Config().get('processes.columns', 'pod,cpu-metrics,mem')
-                header = Config().get('processes.header', 'POD_NAME,M_CPU(USAGE/LIMIT),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')
 
-                qing_args = ['qing', 'recipe', 'with']
-                args, _, recipe_qing = Command.extract_options(args, options=qing_args)
-                if set(recipe_qing) == set(qing_args):
-                    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, backgrounded=backgrounded)
 
-                with cassandra(state) as pods:
-                    pods.show_table(cols, header, show_out=show_out)
-
-                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.show_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

@@ -3,16 +3,13 @@ from typing import TypeVar, cast
 import yaml
 
 from . import __version__
-from adam.utils import LogConfig, copy_config_file, get_deep_keys, log2
+from adam.utils import ConfigHolder, ConfigReadable, copy_config_file, get_deep_keys, log2
 
 T = TypeVar('T')
 
-class Config:
+class Config(ConfigReadable):
     EMBEDDED_PARAMS = {}
 
-    LogConfig.is_debug = lambda: Config().is_debug()
-    LogConfig.is_debug_timing = lambda: Config().get('debugs.timings', False)
-
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
         if not hasattr(cls, 'instance'): cls.instance = super(Config, cls).__new__(cls)
@@ -28,6 +25,8 @@ class Config:
             except:
                 with open(copy_config_file(f'params.yaml.{__version__}', 'adam.embedded_params', show_out=not is_user_entry)) as f:
                     self.params = cast(dict[str, any], yaml.safe_load(f))
+
+            ConfigHolder().config = self
         elif not hasattr(self, 'params'):
             with open(copy_config_file(f'params.yaml.{__version__}', 'adam.embedded_params', show_out=not is_user_entry)) as f:
                 self.params = cast(dict[str, any], yaml.safe_load(f))

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>'}}, '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-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, 'via-sh': True, 'via-sh-excludes': ''}}, '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': 'jit'}}, 'debug': False, 'debugs': {'complete': False, 'timings': False, 'exit-on-error': False}}

adam/log.py

@@ -4,6 +4,8 @@ import os
 import sys
 import click
 
+from adam.utils import log_exc
+
 class Log:
     DEBUG = False
 
@@ -28,7 +30,7 @@ class Log:
             print(file=sys.stderr)
 
     def log_to_file(config: dict[any, any]):
-        try:
+        with log_exc():
             base = f"/tmp/logs"
             os.makedirs(base, exist_ok=True)
 
@@ -42,6 +44,4 @@ class Log:
                     except:
                         f.write(config)
                 else:
-                        f.write(config)
-        except:
-            pass
+                        f.write(config)

adam/repl.py

@@ -1,12 +1,11 @@
 import os
 import time
-import traceback
 from typing import cast
 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
@@ -17,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, deep_merge_dicts, deep_sort_dict, lines_to_tabular, log2, log_timing
+from adam.utils import CommandLog, 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.')
@@ -39,7 +43,7 @@ def enter_repl(state: ReplState):
 
     Log.log2(f'kaqing {__version__}')
 
-    Devices.device(state).enter(state)
+    Devices.of(state).enter(state)
 
     kb = KeyBindings()
 
@@ -68,10 +72,8 @@ def enter_repl(state: ReplState):
                             completions = log_timing('actions', lambda: Apps(path='apps.yaml').commands())
 
                         for c in sorted_cmds:
-                            try:
-                                completions = log_timing(c.command(), lambda: deep_sort_dict(deep_merge_dicts(completions, c.completion(state))))
-                            except:
-                                log2(f'* {c.command()} command returned None completions.')
+                            with log_exc(f'* {c.command()} command returned None completions.'):
+                                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)
@@ -91,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:])
@@ -112,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:
@@ -125,7 +129,7 @@ def enter_repl(state: ReplState):
                     raise e
                 else:
                     log2(e)
-                    debug(traceback.format_exc())
+                    debug_trace()
             finally:
                 if not state.bash_session:
                     state.pop()
@@ -138,14 +142,15 @@ def enter_repl(state: ReplState):
                 if cmd and (state.device != ReplState.L or Config().get('audit.log-audit-queries', False)):
                     exec.submit(Audits.log, cmd, state.namespace, state.device, time.time() - s0, get_audit_extra(result))
 
+                CommandLog.close_log_file()
+
 def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Command], cmd: str):
-    action_taken, result = Devices.device(state).try_fallback_action(cmds, state, cmd)
+    action_taken, result = Devices.of(state).try_fallback_action(cmds, state, cmd)
 
     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
 
@@ -177,6 +182,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)