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

adam/commands/preview_table.py

@@ -1,13 +1,7 @@
-import functools
-
+from adam.commands import validate_args
 from adam.commands.command import Command
-from adam.commands.cql.cql_table_completer import CqlTableNameCompleter
-from adam.commands.cql.cql_utils import run_cql, table_names, tables
-from adam.commands.postgres.postgres_session import PostgresSession
-from adam.commands.postgres.psql_table_completer import PsqlTableNameCompleter
-from adam.config import Config
+from adam.commands.devices.devices import Devices
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log, log2
 
 class PreviewTable(Command):
     COMMAND = 'preview'
@@ -25,66 +19,21 @@ class PreviewTable(Command):
         return PreviewTable.COMMAND
 
     def required(self):
-        return RequiredState.CLUSTER_OR_POD
+        return [RequiredState.CLUSTER_OR_POD, RequiredState.PG_DATABASE, ReplState.L, RequiredState.EXPORT_DB]
 
     def run(self, cmd: str, state: ReplState):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if state.device == ReplState.P:
-            if not self.validate_state(state, RequiredState.PG_DATABASE):
-                return state
-        else:
-            if not self.validate_state(state):
-                return state
-
-        if not args:
-            def show_tables():
-                if state.device == ReplState.P:
-                    pg = PostgresSession(state.namespace, state.pg_path)
-                    lines = [db["name"] for db in pg.tables() if db["schema"] == PostgresSession.default_schema()]
-                    log(lines_to_tabular(lines, separator=','))
-                else:
-                    run_cql(state, f'describe tables', show_out=True)
-
-            if state.in_repl:
-                log2('Table is required.')
-                log2()
-                log2('Tables:')
-                show_tables()
-            else:
-                log2('* Table is missing.')
-                show_tables()
-
-                Command.display_help()
-
-            return 'command-missing'
+        with self.validate(args, state) as (args, state):
+            with validate_args(args, state, at_least=1) as table:
+                Devices.device(state).preview(table, state)
 
-        table = args[0]
-
-        rows = Config().get('preview.rows', 10)
-        if state.device == ReplState.P:
-            PostgresSession(state.namespace, state.pg_path).run_sql(f'select * from {table} limit {rows}')
-        else:
-            run_cql(state, f'select * from {table} limit {rows}', show_out=True, use_single_quotes=True)
-
-        return state
-
-    def completion(self, state: ReplState):
-        if state.device == ReplState.P:
-            return {PreviewTable.COMMAND: PsqlTableNameCompleter(state.namespace, state.pg_path)}
-        elif state.sts:
-            return {PreviewTable.COMMAND: CqlTableNameCompleter(table_names(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'
-
-    @functools.lru_cache()
-    def cql_tables(state: ReplState):
-        if state.pod:
-            return tables(state)
-
-        return tables(state, on_any=True)
+        return f'{PreviewTable.COMMAND} TABLE\t preview table'

adam/commands/pwd.py

@@ -1,8 +1,8 @@
 from adam.app_session import AppSession
 from adam.commands.command import Command
-from adam.commands.postgres.postgres_session import PostgresSession
+from adam.commands.devices.devices import Devices
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log
+from adam.utils import tabulize, log, log_exc
 
 class Pwd(Command):
     COMMAND = 'pwd'
@@ -23,49 +23,20 @@ class Pwd(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, _ = self.apply_state(args, state)
+        with self.validate(args, state) as (_, state):
+            host = "unknown"
+            with log_exc():
+                app_session: AppSession = AppSession.create('c3', 'c3')
+                host = app_session.host
 
-        def device_line(state: ReplState, device: str):
-            words = []
+            tabulize([device.pwd(state) for device in Devices.all()] + [
+                f'',
+                f'HOST\t{host}',
+                f'NAMESPACE\t{state.namespace if state.namespace else "/"}',
+            ], header='DEVICE\tLOCATION', separator='\t')
+            log()
 
-            if device == ReplState.P:
-                pg = PostgresSession(state.namespace, state.pg_path)
-
-                if pg.host:
-                    words.append(f'host/{pg.host}')
-                if pg.db:
-                    words.append(f'database/{pg.db}')
-            elif device == ReplState.A:
-                if state.app_env:
-                    words.append(f'env/{state.app_env}')
-                if state.app_app:
-                    words.append(f'app/{state.app_app}')
-            else:
-                if state.sts:
-                    words.append(f'sts/{state.sts}')
-                if state.pod:
-                    words.append(f'pod/{state.pod}')
-
-            return '\t'.join([f'{device}:>'] + (words if words else ['/']))
-
-        host = "unknown"
-        try:
-            app_session: AppSession = AppSession.create('c3', 'c3')
-            host = app_session.host
-        except:
-            pass
-
-        log(lines_to_tabular([
-            device_line(state, ReplState.A),
-            device_line(state, ReplState.C),
-            device_line(state, ReplState.P),
-            f'',
-            f'HOST\t{host}',
-            f'NAMESPACE\t{state.namespace if state.namespace else "/"}',
-        ], 'DEVICE\tLOCATION', separator='\t'))
-        log()
-
-        return state
+            return state
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/reaper/reaper.py

@@ -1,6 +1,6 @@
 import click
 
-from adam.commands.command import Command
+from adam.commands.intermediate_command import IntermediateCommand
 from .reaper_forward import ReaperForward
 from .reaper_forward_stop import ReaperForwardStop
 from .reaper_restart import ReaperRestart
@@ -12,11 +12,9 @@ from .reaper_schedule_start import ReaperScheduleStart
 from .reaper_schedule_stop import ReaperScheduleStop
 from .reaper_schedules import ReaperSchedules
 from .reaper_status import ReaperStatus
-from adam.repl_state import ReplState, RequiredState
 
-class Reaper(Command):
+class Reaper(IntermediateCommand):
     COMMAND = 'reaper'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -24,32 +22,14 @@ class Reaper(Command):
 
         return cls.instance
 
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
     def command(self):
         return Reaper.COMMAND
 
-    def required(self):
-        return RequiredState.CLUSTER
-
-    def run(self, cmd: str, state: ReplState):
-        if not(args := self.args(cmd)):
-            return super().run(cmd, state)
-
-        return super().intermediate_run(cmd, state, args, Reaper.cmd_list())
-
-    def cmd_list():
+    def cmd_list(self):
         return [ReaperSchedules(), ReaperScheduleStop(), ReaperScheduleActivate(), ReaperScheduleStart(),
                 ReaperForwardStop(), ReaperForward(), ReaperRunAbort(), ReaperRunsAbort(), ReaperRestart(),
                 ReaperRuns(), ReaperStatus()]
 
-    def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
-
 class ReaperCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        Command.intermediate_help(super().get_help(ctx), Reaper.COMMAND, Reaper.cmd_list(), show_cluster_help=True)
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Reaper.COMMAND, Reaper().cmd_list(), show_cluster_help=True)

adam/commands/reaper/reaper_forward.py

@@ -1,16 +1,17 @@
+from functools import partial
 import threading
 import time
 
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.reaper_forward_session import ReaperForwardSession
+from adam.commands.reaper.utils_reaper import Reapers, port_forwarding
 from adam.config import Config
 from adam.repl_session import ReplSession
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log2
+from adam.utils import tabulize, log2
 
 class ReaperForward(Command):
     COMMAND = 'reaper forward'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -31,70 +32,62 @@ class ReaperForward(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            if not Reapers.pod_name(state):
+                return state
 
-        if not(reaper := ReaperSession.create(state)):
-            return state
+            spec = Reapers.reaper_spec(state)
+            if state.in_repl:
+                if ReaperForwardSession.is_forwarding:
+                    log2("Another port-forward is already running.")
 
-        spec = reaper.reaper_spec(state)
-        if state.in_repl:
-            if ReaperSession.is_forwarding:
-                log2("Another port-forward is already running.")
-
-                return "already-running"
-
-            # make it a daemon to exit with a Ctrl-D
-            thread = threading.Thread(target=self.loop, args=(state, reaper), daemon=True)
-            thread.start()
-
-            while not ReaperSession.is_forwarding:
-                time.sleep(1)
-
-            d = {
-                'reaper-ui': spec["web-uri"],
-                'reaper-username': spec["username"],
-                'reaper-password': spec["password"]
-            }
-            log2()
-            log2(lines_to_tabular([f'{k},{v}' for k, v in d.items()], separator=','))
-
-            for k, v in d.items():
-                ReplSession().prompt_session.history.append_string(f'cp {k}')
-            log2()
-            log2(f'Use <Up> arrow key to copy the values to clipboard.')
-        else:
-            try:
-                log2(f'Click: {spec["web-uri"]}')
-                log2(f'username: {spec["username"]}')
-                log2(f'password: {spec["password"]}')
+                    return "already-running"
+
+                # make it a daemon to exit with a Ctrl-D
+                thread = threading.Thread(target=self.loop, args=(state,), daemon=True)
+                thread.start()
+
+                while not ReaperForwardSession.is_forwarding:
+                    time.sleep(1)
+
+                d = {
+                    'reaper-ui': spec["web-uri"],
+                    'reaper-username': spec["username"],
+                    'reaper-password': spec["password"]
+                }
                 log2()
-                log2(f"Press Ctrl+C to break.")
+                tabulize(d.items(), lambda a: f'{a[0]},{a[1]}', separator=',')
 
-                time.sleep(Config().get('reaper.port-forward.timeout', 3600 * 24))
-            except KeyboardInterrupt:
-                pass
+                for k, v in d.items():
+                    ReplSession().prompt_session.history.append_string(f'cp {k}')
+                log2()
+                log2(f'Use <Up> arrow key to copy the values to clipboard.')
+            else:
+                try:
+                    log2(f'Click: {spec["web-uri"]}')
+                    log2(f'username: {spec["username"]}')
+                    log2(f'password: {spec["password"]}')
+                    log2()
+                    log2(f"Press Ctrl+C to break.")
+
+                    time.sleep(Config().get('reaper.port-forward.timeout', 3600 * 24))
+                except KeyboardInterrupt:
+                    pass
 
-        return state
+            return state
 
-    def loop(self, state: ReplState, reaper: ReaperSession):
-        def body(uri: str, _: dict[str, str]):
-            ReaperSession.is_forwarding = True
+    def loop(self, state: ReplState):
+        with port_forwarding(state, Reapers.local_port(), partial(Reapers.svc_or_pod, state), Reapers.target_port()):
+            ReaperForwardSession.is_forwarding = True
             try:
-                while not ReaperSession.stopping.is_set():
+                while not ReaperForwardSession.stopping.is_set():
                     time.sleep(1)
             finally:
-                ReaperSession.stopping.clear()
-                ReaperSession.is_forwarding = False
-
-        return reaper.port_forwarded(state, 'webui', body)
+                ReaperForwardSession.stopping.clear()
+                ReaperForwardSession.is_forwarding = False
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ReaperForward.COMMAND}\t port-forward to reaper'

adam/commands/reaper/reaper_forward_session.py

@@ -0,0 +1,6 @@
+import threading
+
+class ReaperForwardSession:
+    is_forwarding = False
+    stopping = threading.Event()
+    schedules_ids_by_cluster: dict[str, list[str]] = {}

adam/commands/reaper/reaper_forward_stop.py

@@ -1,11 +1,11 @@
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.reaper_forward_session import ReaperForwardSession
+from adam.commands.reaper.utils_reaper import Reapers
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 
 class ReaperForwardStop(Command):
     COMMAND = 'reaper forward stop'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -26,24 +26,18 @@ class ReaperForwardStop(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if not ReaperSession.create(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            if not Reapers.pod_name(state):
+                return state
 
-        ReaperSession.is_forwarding = False
-        ReaperSession.stopping.set()
-        log2("Stopped reaper forward session.")
+            ReaperForwardSession.is_forwarding = False
+            ReaperForwardSession.stopping.set()
+            log2("Stopped reaper forward session.")
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ReaperForwardStop.COMMAND}\t stop port-forward to reaper'

adam/commands/reaper/reaper_restart.py

@@ -1,11 +1,10 @@
 from adam.commands.command import Command
-from adam.k8s_utils.pods import Pods
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import Reapers
+from adam.utils_k8s.pods import Pods
 from adam.repl_state import ReplState, RequiredState
 
 class ReaperRestart(Command):
     COMMAND = 'reaper restart'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -26,22 +25,16 @@ class ReaperRestart(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if not(reaper := ReaperSession.create(state)):
-            return state
+        with self.validate(args, state) as (args, state):
+            if not (pod := Reapers.pod_name(state)):
+                return state
 
-        Pods.delete(reaper.pod, state.namespace)
+            Pods.delete(pod, state.namespace)
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ReaperRestart.COMMAND}\t restart reaper'

adam/commands/reaper/reaper_run_abort.py

@@ -1,13 +1,11 @@
-import requests
-
+from adam.commands import validate_args
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import reaper
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 
 class ReaperRunAbort(Command):
     COMMAND = 'reaper abort run'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -28,38 +26,15 @@ class ReaperRunAbort(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if not args:
-            if state.in_repl:
-                log2('Specify run id to abort.')
-            else:
-                Command.display_help()
-
-            return state
-
-        if not(reaper := ReaperSession.create(state)):
-            return state
+        with self.validate(args, state) as (args, state):
+            with validate_args(args, state, name='run id') as run_id:
+                with reaper(state) as http:
+                    http.put(f'repair_run/{run_id}/state/ABORTED')
 
-        self.stop_run(state, reaper, args[0])
-
-        return state
-
-    def stop_run(self, state: ReplState, reaper: ReaperSession, run_id: str):
-        def body(uri: str, headers: dict[str, str]):
-            return requests.put(uri, headers=headers)
-
-        # PAUSED, RUNNING, ABORTED
-        # PUT /repair_run/{id}/state/{state}
-        reaper.port_forwarded(state, f'repair_run/{run_id}/state/ABORTED', body, method='PUT')
+                return state
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ReaperRunAbort.COMMAND} <run-id>\t abort reaper run'

adam/commands/reaper/reaper_runs.py

@@ -1,14 +1,11 @@
-import requests
-
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import reaper
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import convert_seconds, epoch, lines_to_tabular, log, log2
+from adam.utils import convert_seconds, epoch, tabulize, log, log2
 
 class ReaperRuns(Command):
     COMMAND = 'reaper show runs'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -29,63 +26,51 @@ class ReaperRuns(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if not(reaper := ReaperSession.create(state)):
-            return state
-
-        self.show_runs(state, reaper)
-
-        return state
-
-    def show_runs(self, state: ReplState, reaper: ReaperSession):
-        def body(uri: str, headers: dict[str, str]):
-            return requests.get(uri, headers=headers, params={
-                'cluster_name': 'all',
-                'limit': Config().get('reaper.show-runs-batch', 10)
-            })
-
-        def line(run):
-            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"
+        with self.validate(args, state) as (args, state):
+            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']}"
+
+            with reaper(state) as http:
+                response = http.get('repair_run?state=RUNNING', params={
+                    'cluster_name': 'all',
+                    '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:
-                    duration = f"{seconds:2d}s"
+                    log2('No running runs found.')
+                    log2()
 
-            return f"{start_time},{duration},{state},{run['cluster_name']},{run['keyspace_name']},{len(run['column_families'])},{run['segments_repaired']}/{run['total_segments']}"
+                response = http.get('repair_run?state=PAUSED,ABORTED,DONE', params={
+                    'cluster_name': 'all',
+                    'limit': Config().get('reaper.show-runs-batch', 10)
+                })
 
-        # PAUSED, RUNNING, ABORTED
-        response = reaper.port_forwarded(state, 'repair_run?state=RUNNING', body, method='GET')
-        if not response:
-            return
-
-        header = 'Start,Duration,State,Cluster,Keyspace,Tables,Repaired'
-
-        runs = response.json()
-        if runs:
-            log(lines_to_tabular(sorted([line(run) for run in runs], reverse=True), header, separator=","))
-        else:
-            log2('No running runs found.')
-            log2()
-
-        response = reaper.port_forwarded(state, 'repair_run?state=PAUSED,ABORTED,DONE', body, method='GET')
-        if not response:
-            return
+                runs = response.json()
+                if runs:
+                    tabulize(sorted([line(run) for run in runs], reverse=True), header=header, separator=",")
+                else:
+                    log2('No runs found.')
 
-        runs = response.json()
-        if runs:
-            log(lines_to_tabular(sorted([line(run) for run in runs], reverse=True), header, separator=","))
-        else:
-            log2('No runs found.')
+            return state
 
     def completion(self, state: ReplState):
         if state.sts: