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

adam/commands/postgres/postgres_ls.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.ls import Ls
+from adam.commands.fs.ls import Ls
 from adam.repl_state import ReplState, RequiredState
 
 class PostgresLs(Command):
@@ -37,5 +37,5 @@ class PostgresLs(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return f'{PostgresLs.COMMAND}\t list postgres hosts, databases or tables'
+    def help(self, state: ReplState):
+        return super().help(state, 'list postgres hosts, databases or tables')

adam/commands/postgres/postgres_preview.py

@@ -37,5 +37,5 @@ class PostgresPreview(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return f'{PostgresPreview.COMMAND}\t preview postgres table'
+    def help(self, state: ReplState):
+        return super().help(state, 'preview postgres table')

adam/commands/postgres/utils_postgres.py

@@ -1,12 +1,22 @@
 import functools
 
-from adam.commands.postgres.postgres_databases import PostgresDatabases
+from adam.commands.postgres.postgres_databases import PostgresDatabases, pg_path
+from adam.config import Config
 from adam.repl_state import ReplState
 from adam.utils import log2, wait_log
 from adam.utils_k8s.pods import Pods
 
 TestPG = [False]
 
+def direct_dirs(state: ReplState) -> list[str]:
+    with pg_path(state) as (host, database):
+        if database:
+            return ['..']
+        elif host:
+            return ['..'] + pg_database_names(state)
+        else:
+            return PostgresDatabases.host_names(state.namespace)
+
 def pg_database_names(state: ReplState):
     # cache on pg_path
     return _pg_database_names(state, state.pg_path)
@@ -53,7 +63,7 @@ class PostgresPodService:
         if isinstance(args, list):
             query = ' '.join(args)
 
-        PostgresDatabases.run_sql(state, query, backgrounded=backgrounded)
+        PostgresDatabases.run_sql(state, query, show_out=Config().is_debug(), backgrounded=backgrounded)
 
 class PostgresExecHandler:
     def __init__(self, state: ReplState, backgrounded=False):

adam/commands/preview_table.py

@@ -27,13 +27,12 @@ class PreviewTable(Command):
 
         with self.validate(args, state) as (args, state):
             with validate_args(args, state, at_least=1) as table:
-                Devices.device(state).preview(table, state)
+                Devices.of(state).preview(table, state)
 
             return state
 
     def completion(self, _: ReplState):
-        # taken care of by the sql completer
         return {}
 
-    def help(self, _: ReplState):
-        return f'{PreviewTable.COMMAND} TABLE\t preview table'
+    def help(self, state: ReplState):
+        return super().help(state, 'preview table', args='TABLE')

adam/commands/reaper/reaper_forward.py

@@ -89,5 +89,5 @@ class ReaperForward(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{ReaperForward.COMMAND}\t port-forward to reaper'
+    def help(self, state: ReplState):
+        return super().help(state, 'port-forward to reaper')

adam/commands/reaper/reaper_forward_stop.py

@@ -39,5 +39,5 @@ class ReaperForwardStop(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{ReaperForwardStop.COMMAND}\t stop port-forward to reaper'
+    def help(self, state: ReplState):
+        return super().help(state, 'stop port-forward to reaper')

adam/commands/reaper/reaper_restart.py

@@ -36,5 +36,5 @@ class ReaperRestart(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{ReaperRestart.COMMAND}\t restart reaper'
+    def help(self, state: ReplState):
+        return super().help(state, 'restart reaper')

adam/commands/reaper/reaper_run_abort.py

@@ -36,5 +36,5 @@ class ReaperRunAbort(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{ReaperRunAbort.COMMAND} <run-id>\t abort reaper run'
+    def help(self, state: ReplState):
+        return super().help(state, 'abort reaper run', args='<run-id>')

adam/commands/reaper/reaper_runs.py

@@ -1,8 +1,8 @@
 from adam.commands.command import Command
-from adam.commands.reaper.utils_reaper import reaper
+from adam.commands.reaper.utils_reaper import reaper, Reapers
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import convert_seconds, epoch, tabulize, log, log2
+from adam.utils import convert_seconds, epoch, log2
 
 class ReaperRuns(Command):
     COMMAND = 'reaper show runs'
@@ -52,10 +52,11 @@ class ReaperRuns(Command):
                     'limit': Config().get('reaper.show-runs-batch', 10)
                 })
 
-                runs = response.json()
-                if runs:
-                    tabulize(sorted([line(run) for run in runs], reverse=True), header=header, separator=",")
-                else:
+                if not Reapers.tabulize_runs(state, response):
+                # runs = response.json()
+                # if runs:
+                #     tabulize(sorted([line(run) for run in runs], reverse=True), header=header, separator=",")
+                # else:
                     log2('No running runs found.')
                     log2()
 
@@ -64,10 +65,11 @@ class ReaperRuns(Command):
                     'limit': Config().get('reaper.show-runs-batch', 10)
                 })
 
-                runs = response.json()
-                if runs:
-                    tabulize(sorted([line(run) for run in runs], reverse=True), header=header, separator=",")
-                else:
+                if not Reapers.tabulize_runs(state, response):
+                # runs = response.json()
+                # if runs:
+                #     tabulize(sorted([line(run) for run in runs], reverse=True), header=header, separator=",")
+                # else:
                     log2('No runs found.')
 
             return state
@@ -78,5 +80,5 @@ class ReaperRuns(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return f'{ReaperRuns.COMMAND}\t show reaper runs'
+    def help(self, state: ReplState):
+        return super().help(state, 'show reaper runs')

adam/commands/reaper/reaper_runs_abort.py

@@ -59,5 +59,5 @@ class ReaperRunsAbort(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{ReaperRunsAbort.COMMAND}\t abort all running reaper runs'
+    def help(self, state: ReplState):
+        return super().help(state, 'abort all running reaper runs')

adam/commands/reaper/reaper_schedule_activate.py

@@ -2,7 +2,11 @@ from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.commands.reaper.utils_reaper import Reapers, reaper
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log2
+
+import nest_asyncio
+nest_asyncio.apply()
+
+import asyncio
 
 class ReaperScheduleActivate(Command):
     COMMAND = 'reaper activate schedule'
@@ -35,7 +39,7 @@ class ReaperScheduleActivate(Command):
                 return schedule_id
 
     def completion(self, state: ReplState):
-        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)})
+        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)}, auto_key='reaper.schedules')
 
-    def help(self, _: ReplState):
-        return f'{ReaperScheduleActivate.COMMAND} <schedule-id>\t resume reaper schedule'
+    def help(self, state: ReplState):
+        return super().help(state, 'resume reaper schedule', args='<schedule-id>')

adam/commands/reaper/reaper_schedule_start.py

@@ -2,7 +2,6 @@ from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.commands.reaper.utils_reaper import Reapers, reaper
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log2
 
 class ReaperScheduleStart(Command):
     COMMAND = 'reaper start schedule'
@@ -35,7 +34,7 @@ class ReaperScheduleStart(Command):
                 return schedule_id
 
     def completion(self, state: ReplState):
-        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)})
+        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)}, auto_key='reaper.schedules')
 
-    def help(self, _: ReplState):
-        return f'{ReaperScheduleStart.COMMAND} <schedule-id>\t start reaper runs for schedule'
+    def help(self, state: ReplState):
+        return super().help(state, 'start reaper runs for schedule', args='<schedule-id>')

adam/commands/reaper/reaper_schedule_stop.py

@@ -2,7 +2,6 @@ from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.commands.reaper.utils_reaper import Reapers, reaper
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log2
 
 class ReaperScheduleStop(Command):
     COMMAND = 'reaper stop schedule'
@@ -35,7 +34,7 @@ class ReaperScheduleStop(Command):
                 return schedule_id
 
     def completion(self, state: ReplState):
-        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)})
+        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)}, auto_key='reaper.schedules')
 
-    def help(self, _: ReplState):
-        return f'{ReaperScheduleStop.COMMAND} <schedule-id>\t pause reaper schedule'
+    def help(self, state: ReplState):
+        return super().help(state, 'pause reaper schedule', args='<schedule-id>')

adam/commands/reaper/reaper_schedules.py

@@ -32,5 +32,5 @@ class ReaperSchedules(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{ReaperSchedules.COMMAND}\t show reaper schedules'
+    def help(self, state: ReplState):
+        return super().help(state, 'show reaper schedules')

adam/commands/reaper/reaper_status.py

@@ -52,5 +52,5 @@ class ReaperStatus(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{ReaperStatus.COMMAND}\t show reaper status'
+    def help(self, state: ReplState):
+        return super().help(state, 'show reaper status')

adam/commands/reaper/utils_reaper.py

@@ -7,7 +7,7 @@ import re
 import requests
 from adam.config import Config
 from adam.repl_state import ReplState
-from adam.utils import tabulize, log2, wait_log
+from adam.utils import Color, convert_seconds, epoch, tabulize, log2, wait_log
 from adam.utils_k8s.k8s import port_forwarding
 
 class ReaperService:
@@ -41,7 +41,7 @@ class ReaperLogginHandler:
             self.svc.headers = Reapers.cookie_header(self.svc.state, self.svc.local_addr, self.svc.remote_addr, show_output=self.svc.show_out)
 
         if self.svc.show_out and self.method:
-            log2(f'{self.method} {self.svc.remote_addr}/{self.path}')
+            log2(f'{self.method} {self.svc.remote_addr}/{self.path}', text_color=Color.gray)
 
         return (f'http://{self.svc.local_addr}/{self.path}', self.svc.headers)
 
@@ -139,12 +139,12 @@ class Reapers:
             'username':user,
             'password':pw})
         if show_output:
-            log2(f'POST {remote_addr}/login')
-            log2(f'     username={user}&password={pw}')
+            log2(f'POST {remote_addr}/login', text_color=Color.gray)
+            log2(f'      username={user}&password={pw}', text_color=Color.gray)
 
         if int(response.status_code / 100) != 2:
             if show_output:
-                log2("login failed")
+                log2("login failed", text_color=Color.gray)
             return None
 
         return response.headers['Set-Cookie']
@@ -191,4 +191,39 @@ class Reapers:
         if is_service:
             return Reapers.svc_name()
         else:
-            return Reapers.pod_name(state)
+            return Reapers.pod_name(state)
+
+    def schedules_auto_completion(ids: callable):
+        auto = Config().get('reaper.schedules-auto-complete', 'off')
+
+        leaf = None
+        if auto == 'on':
+            leaf = {id: None for id in ids()}
+
+        return (leaf, auto == 'lazy')
+
+    def tabulize_runs(state: ReplState, response: dict) -> dict[str, any]:
+        header = 'ID,START,DURATION,STATE,CLUSTER,KEYSPACE,TABLES,REPAIRED'
+
+        def line(run):
+            id = run['id']
+            state = run['state']
+            start_time = run['start_time']
+            end_time = run['end_time']
+            duration = '-'
+            if state == 'DONE' and end_time:
+                hours, minutes, seconds = convert_seconds(epoch(end_time) - epoch(start_time))
+                if hours:
+                    duration = f"{hours:2d}h {minutes:2d}m {seconds:2d}s"
+                elif minutes:
+                    duration = f"{minutes:2d}m {seconds:2d}s"
+                else:
+                    duration = f"{seconds:2d}s"
+
+            return f"{id},{start_time},{duration},{state},{run['cluster_name']},{run['keyspace_name']},{len(run['column_families'])},{run['segments_repaired']}/{run['total_segments']}"
+
+        runs = response.json()
+        if runs:
+            tabulize(sorted([line(run) for run in runs], reverse=True), header=header, separator=",")
+
+        return runs

adam/commands/repair/repair_log.py

@@ -33,5 +33,5 @@ class RepairLog(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{RepairLog.COMMAND}\t get repair job logs'
+    def help(self, state: ReplState):
+        return super().help(state, 'get repair job logs')

adam/commands/repair/repair_run.py

@@ -61,5 +61,5 @@ class RepairRun(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{RepairRun.COMMAND} [replace]\t start a repair job, default not replacing'
+    def help(self, state: ReplState):
+        return super().help(state, 'start a repair job, default not replacing', args='[replace]')

adam/commands/repair/repair_scan.py

@@ -1,5 +1,3 @@
-import time
-
 from adam.commands.command import Command
 from adam.utils_k8s.pods import Pods
 from adam.repl_state import ReplState, RequiredState
@@ -64,5 +62,5 @@ class RepairScan(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{RepairScan.COMMAND} [n]\t scan last n days repair log, default 7 days'
+    def help(self, state: ReplState):
+        return super().help(state, 'scan last n days repair log, default 7 days')

adam/commands/repair/repair_stop.py

@@ -1,7 +1,6 @@
 from adam.commands.command import Command
 from adam.utils_k8s.jobs import Jobs
 from adam.repl_state import ReplState, RequiredState
-from adam.config import Config
 
 class RepairStop(Command):
     COMMAND = 'repair stop'
@@ -34,5 +33,5 @@ class RepairStop(Command):
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f'{RepairStop.COMMAND}\t delete a repair job'
+    def help(self, state: ReplState):
+        return super().help(state, 'delete a repair job')

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

@@ -3,19 +3,20 @@ 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.cassandra.show_cassandra_repairs import ShowCassandraRepairs
+from adam.commands.cassandra.show_cassandra_status import ShowCassandraStatus
+from adam.commands.cassandra.show_cassandra_version import ShowCassandraVersion
+from adam.commands.cassandra.show_processes import ShowProcesses
+from adam.commands.cassandra.show_storage import ShowStorage
+from adam.commands.cli.show_cli_commands import ShowKubectlCommands
+from adam.commands.config.show_params import ShowParams
+from adam.commands.debug.show_offloaded_completes import ShowOffloadedCompletes
+from adam.commands.fs.show_adam import ShowAdam
 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_host import ShowHost
-from adam.commands.show.show_login import ShowLogin
-from .show_params import ShowParams
-from .show_cassandra_status import ShowCassandraStatus
-from .show_cassandra_version import ShowCassandraVersion
-from .show_commands import ShowKubectlCommands
-from .show_processes import ShowProcesses
-from .show_cassandra_repairs import ShowCassandraRepairs
-from .show_storage import ShowStorage
-from .show_adam import ShowAdam
+from adam.commands.fs.show_host import ShowHost
+from adam.commands.app.show_login import ShowLogin
 
 class Show(IntermediateCommand):
     COMMAND = 'show'
@@ -30,7 +31,7 @@ class Show(IntermediateCommand):
         return Show.COMMAND
 
     def cmd_list(self):
-        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowHost(), ShowLogin(), ShowKubectlCommands(),
+        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowOffloadedCompletes(), ShowHost(), ShowLogin(), ShowKubectlCommands(),
                 ShowParams(), ShowProcesses(), ShowCassandraRepairs(), ShowStorage(), ShowAdam(),
                 ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs()]
 

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'}, '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', 'medusa': {'restore-auto-complete': False}, '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}, '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/q/export/db'}, 'athena': {'workers': 8, 'columns': '<keys>', 'bucket': 'c3.ops--qing'}, 'csv': {'workers': 8, 'columns': '<row-key>'}, 'log-dir': '/tmp/qing-db/q/export/logs', 'remote': {'log-dir': '/tmp/q/export/logs'}}, '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}, 'job': {'log-to-pods': True}, 'local-qing-dir': '/tmp/qing-db/q', 'local-downloads-dir': '/tmp/qing-db/q/downloads', 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'log-dir': '/tmp/qing-db/q/logs', 'nodetool': {'workers': 96, 'commands_in_line': 40, 'grace-period-after-abort': 10, '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-mpstat': {'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', 'table-props-value': 'jit'}, '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/repl.py

@@ -3,6 +3,7 @@ import time
 from typing import cast
 import click
 from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit import HTML
 
 from adam.cli_group import cli
 from adam.commands.command import Command, InvalidArgumentsException, InvalidStateException
@@ -10,17 +11,23 @@ from adam.commands.command_helpers import ClusterCommandHelper
 from adam.commands.devices.devices import Devices
 from adam.commands.help import Help
 from adam.config import Config
+from adam.sql.async_executor import AsyncExecutor
 from adam.utils_audits import Audits
 from adam.utils_k8s.kube_context import KubeContext
 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_trace, deep_merge_dicts, deep_sort_dict, tabulize, log2, log_exc, 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.')
@@ -38,7 +45,7 @@ def enter_repl(state: ReplState):
 
     Log.log2(f'kaqing {__version__}')
 
-    Devices.device(state).enter(state)
+    Devices.of(state).enter(state)
 
     kb = KeyBindings()
 
@@ -55,6 +62,8 @@ def enter_repl(state: ReplState):
         # use sorted command list only for auto-completion
         sorted_cmds = sorted(cmd_list, key=lambda cmd: cmd.command())
         while True:
+            AsyncExecutor.reset()
+
             cmd: str = None
             result = None
             try:
@@ -68,12 +77,12 @@ 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)
 
-                cmd = session.prompt(prompt_msg(), completer=completer, key_bindings=kb)
+                cmd = session.prompt(HTML(f'<ansibrightblue>{prompt_msg()}</ansibrightblue>'), completer=completer, key_bindings=kb)
                 s0 = time.time()
 
                 if state.bash_session:
@@ -88,17 +97,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:])
@@ -137,8 +146,10 @@ 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}')
@@ -175,6 +186,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)