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

adam/commands/deploy/code_utils.py

@@ -7,7 +7,7 @@ from adam.apps import Apps
 from adam.config import Config
 from adam.utils_k8s.ingresses import Ingresses
 from adam.utils_k8s.services import Services
-from adam.utils import log2, random_alphanumeric
+from adam.utils import debug, log2, random_alphanumeric
 
 def start_user_code(namespace: str):
     try:
@@ -57,7 +57,7 @@ def kill_process_by_pattern(pattern, dry=False):
         pids = process.stdout.strip().split('\n')
 
         if not pids or pids == ['']:
-            Config().debug(f"No processes found matching pattern: '{pattern}'")
+            debug(f"No processes found matching pattern: '{pattern}'")
             return
 
         for pid in pids:
@@ -66,7 +66,7 @@ def kill_process_by_pattern(pattern, dry=False):
                     if not dry:
                         subprocess.run(f"kill -9 {pid}", shell=True, check=True)
 
-                    Config().debug(f"Killed process with PID: {pid} (matching pattern: '{pattern}')")
+                    debug(f"Killed process with PID: {pid} (matching pattern: '{pattern}')")
                 except subprocess.CalledProcessError as e:
                     log2(f"Error killing process {pid}: {e}")
 

adam/commands/deploy/deploy.py

@@ -1,14 +1,12 @@
 import click
 
-from adam.commands.command import Command
 from adam.commands.deploy.deploy_pg_agent import DeployPgAgent
 from adam.commands.deploy.deploy_pod import DeployPod
+from adam.commands.intermediate_command import IntermediateCommand
 from .deploy_frontend import DeployFrontend
-from adam.repl_state import ReplState, RequiredState
 
-class Deploy(Command):
+class Deploy(IntermediateCommand):
     COMMAND = 'deploy'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -16,33 +14,12 @@ class Deploy(Command):
 
         return cls.instance
 
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
     def command(self):
         return Deploy.COMMAND
 
-    def required(self):
-        return RequiredState.NAMESPACE
-
-    def run(self, cmd: str, state: ReplState):
-        if not(args := self.args(cmd)):
-            return super().run(cmd, state)
-
-        if not self.validate_state(state):
-            return state
-
-        return super().intermediate_run(cmd, state, args, Deploy.cmd_list())
-
-    def cmd_list():
+    def cmd_list(self):
         return [DeployFrontend(), DeployPod(), DeployPgAgent()]
 
-    def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
-
 class DeployCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        Command.intermediate_help(super().get_help(ctx), Deploy.COMMAND, Deploy.cmd_list())
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Deploy.COMMAND, Deploy().cmd_list())

adam/commands/deploy/deploy_frontend.py

@@ -26,24 +26,21 @@ class DeployFrontend(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
-
-        log2('This will support c3/c3 only for demo.')
+        with self.validate(args, state) as (args, state):
+            log2('This will support c3/c3 only for demo.')
+
+            pod_name = Config().get('pod.name', 'ops')
+            label_selector = Config().get('pod.label-selector', 'run=ops')
+            try:
+                uri = deploy_frontend(pod_name, state.namespace, label_selector)
+                log2(f'Ops pod is available at {uri}.')
+            except Exception as e:
+                if e.status == 409:
+                    log2(f"Error: '{pod_name}' already exists in namespace '{state.namespace}'.")
+                else:
+                    log2(f"Error creating ingress or service: {e}")
 
-        pod_name = Config().get('pod.name', 'ops')
-        label_selector = Config().get('pod.label-selector', 'run=ops')
-        try:
-            uri = deploy_frontend(pod_name, state.namespace, label_selector)
-            log2(f'Ops pod is available at {uri}.')
-        except Exception as e:
-            if e.status == 409:
-                log2(f"Error: '{pod_name}' already exists in namespace '{state.namespace}'.")
-            else:
-                log2(f"Error creating ingress or service: {e}")
-
-        return state
+            return state
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/deploy/deploy_pg_agent.py

@@ -25,11 +25,8 @@ class DeployPgAgent(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
-
-        PostgresContext.deploy_pg_agent(Config().get('pg.agent.name', 'ops-pg-agent'), state.namespace)
+        with self.validate(args, state) as (args, state):
+            PostgresContext.deploy_pg_agent(Config().get('pg.agent.name', 'ops-pg-agent'), state.namespace)
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/deploy/deploy_pod.py

@@ -1,5 +1,6 @@
 from kubernetes import client
 
+from adam.commands import extract_options
 from adam.commands.command import Command
 from adam.commands.deploy.deploy_utils import deploy_frontend, gen_labels
 from adam.commands.deploy.undeploy_pod import UndeployPod
@@ -11,7 +12,7 @@ from adam.utils_k8s.pods import Pods
 from adam.utils_k8s.service_accounts import ServiceAccounts
 from adam.utils_k8s.volumes import ConfigMapMount
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import ing, log2
+from adam.utils import ing, log2, log_exc
 
 class DeployPod(Command):
     COMMAND = 'deploy pod'
@@ -35,73 +36,68 @@ class DeployPod(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
-
-        args, forced = Command.extract_options(args, '--force')
-        if forced:
-            UndeployPod().run(UndeployPod.COMMAND, state)
-
-        if KubeContext.in_cluster():
-            log2('This is doable only from outside of the Kubernetes cluster.')
-            return state
-
-        sa_name = Config().get('pod.sa.name', 'ops')
-        sa_proto = Config().get('pod.sa.proto', 'c3')
-        additional_cluster_roles = Config().get('pod.sa.additional-cluster-roles', 'c3aiops-k8ssandra-operator').split(',')
-        label_selector = Config().get('pod.label-selector', 'run=ops')
-        labels = gen_labels(label_selector)
-
-        with ing('Creating service account'):
-            ServiceAccounts.replicate(sa_name, state.namespace, sa_proto, labels=labels, add_cluster_roles=additional_cluster_roles)
-
-        settings_filename = 'settings.yaml'
-        settings_path = f'/kaqing/{settings_filename}'
-        settings_data = None
-        try:
-            with open(settings_filename, 'r') as file:
-                settings_data = file.read()
-        except:
-            try:
-                with open(settings_path, 'r') as file:
-                    settings_data = file.read()
-            except:
-                pass
-
-        if not settings_data:
-            log2(f'{settings_filename} not found.')
-            return state
-
-        cm_name = Config().get('pod.cm.name', 'ops')
-        map_data = {
-            settings_filename : settings_data
-        }
-        with ing('Creating config map'):
-            ConfigMaps.create(cm_name, state.namespace, map_data, labels=labels)
-
-        pod_name = Config().get('pod.name', 'ops')
-        image = Config().get('pod.image', 'seanahnsf/kaqing')
-        security_context = client.V1SecurityContext(
-            capabilities=client.V1Capabilities(
-                add=["SYS_PTRACE"]
-            )
-        )
-        with ing('Creating deployment'):
-            Deployments.create(state.namespace,
-                                pod_name,
-                                image,
-                                env={'NAMESPACE': state.namespace},
-                                container_security_context=security_context,
-                                labels=labels,
-                                sa_name=sa_name,
-                                config_map_mount=ConfigMapMount(cm_name, settings_filename, settings_path))
-
-        uri = deploy_frontend(pod_name, state.namespace, label_selector)
-
-        Pods.wait_for_running(state.namespace, pod_name, msg=f'In moments, ops pod will be available at {uri}.', label_selector=label_selector)
-
-        return state
+        with self.validate(args, state) as (args, state):
+            with extract_options(args, '--force') as (args, forced):
+                if forced:
+                    UndeployPod().run(UndeployPod.COMMAND, state)
+
+                if KubeContext.in_cluster():
+                    log2('This is doable only from outside of the Kubernetes cluster.')
+                    return state
+
+                sa_name = Config().get('pod.sa.name', 'ops')
+                sa_proto = Config().get('pod.sa.proto', 'c3')
+                additional_cluster_roles = Config().get('pod.sa.additional-cluster-roles', 'c3aiops-k8ssandra-operator').split(',')
+                label_selector = Config().get('pod.label-selector', 'run=ops')
+                labels = gen_labels(label_selector)
+
+                with ing('Creating service account'):
+                    ServiceAccounts.replicate(sa_name, state.namespace, sa_proto, labels=labels, add_cluster_roles=additional_cluster_roles)
+
+                settings_filename = 'settings.yaml'
+                settings_path = f'/kaqing/{settings_filename}'
+                settings_data = None
+                try:
+                    with open(settings_filename, 'r') as file:
+                        settings_data = file.read()
+                except:
+                    with log_exc():
+                        with open(settings_path, 'r') as file:
+                            settings_data = file.read()
+
+                if not settings_data:
+                    log2(f'{settings_filename} not found.')
+                    return state
+
+                cm_name = Config().get('pod.cm.name', 'ops')
+                map_data = {
+                    settings_filename : settings_data
+                }
+                with ing('Creating config map'):
+                    ConfigMaps.create(cm_name, state.namespace, map_data, labels=labels)
+
+                pod_name = Config().get('pod.name', 'ops')
+                image = Config().get('pod.image', 'seanahnsf/kaqing')
+                security_context = client.V1SecurityContext(
+                    capabilities=client.V1Capabilities(
+                        add=["SYS_PTRACE"]
+                    )
+                )
+                with ing('Creating deployment'):
+                    Deployments.create(state.namespace,
+                                        pod_name,
+                                        image,
+                                        env={'NAMESPACE': state.namespace},
+                                        container_security_context=security_context,
+                                        labels=labels,
+                                        sa_name=sa_name,
+                                        config_map_mount=ConfigMapMount(cm_name, settings_filename, settings_path))
+
+                uri = deploy_frontend(pod_name, state.namespace, label_selector)
+
+                Pods.wait_for_running(state.namespace, pod_name, msg=f'In moments, ops pod will be available at {uri}.', label_selector=label_selector)
+
+                return state
 
     def completion(self, state: ReplState):
         return super().completion(state, {'--force': None})

adam/commands/deploy/undeploy.py

@@ -1,14 +1,12 @@
 import click
 
-from adam.commands.command import Command
 from adam.commands.deploy.undeploy_frontend import UndeployFrontend
 from adam.commands.deploy.undeploy_pg_agent import UndeployPgAgent
 from adam.commands.deploy.undeploy_pod import UndeployPod
-from adam.repl_state import ReplState, RequiredState
+from adam.commands.intermediate_command import IntermediateCommand
 
-class Undeploy(Command):
+class Undeploy(IntermediateCommand):
     COMMAND = 'undeploy'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -16,33 +14,12 @@ class Undeploy(Command):
 
         return cls.instance
 
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
     def command(self):
         return Undeploy.COMMAND
 
-    def required(self):
-        return RequiredState.NAMESPACE
-
-    def run(self, cmd: str, state: ReplState):
-        if not(args := self.args(cmd)):
-            return super().run(cmd, state)
-
-        if not self.validate_state(state):
-            return state
-
-        return super().intermediate_run(cmd, state, args, Undeploy.cmd_list())
-
-    def cmd_list():
+    def cmd_list(self):
         return [UndeployFrontend(), UndeployPod(), UndeployPgAgent()]
 
-    def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
-
 class UndeployCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        Command.intermediate_help(super().get_help(ctx), Undeploy.COMMAND, Undeploy.cmd_list())
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Undeploy.COMMAND, Undeploy().cmd_list())

adam/commands/deploy/undeploy_frontend.py

@@ -25,14 +25,11 @@ class UndeployFrontend(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
-
-        label_selector = Config().get('pod.label-selector', 'run=ops')
-        undeploy_frontend(state.namespace, label_selector)
+        with self.validate(args, state) as (args, state):
+            label_selector = Config().get('pod.label-selector', 'run=ops')
+            undeploy_frontend(state.namespace, label_selector)
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/deploy/undeploy_pg_agent.py

@@ -26,14 +26,11 @@ class UndeployPgAgent(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 ing('Deleting pod'):
-            PostgresContext.undeploy_pg_agent(Config().get('pg.agent.name', 'ops-pg-agent'), state.namespace)
+        with self.validate(args, state) as (args, state):
+            with ing('Deleting pod'):
+                PostgresContext.undeploy_pg_agent(Config().get('pg.agent.name', 'ops-pg-agent'), state.namespace)
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/deploy/undeploy_pod.py

@@ -30,19 +30,16 @@ class UndeployPod(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
-
-        label_selector = Config().get('pod.label-selector', 'run=ops')
-        with ing('Deleting service account'):
-            ServiceAccounts.delete(state.namespace, label_selector=label_selector)
-        with ing('Deleting config map'): ConfigMaps.delete_with_selector(state.namespace, label_selector)
-        with ing('Deleting deployment'): Deployments.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
-        with ing('Deleting pod'): Pods.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
-        undeploy_frontend(state.namespace, label_selector)
+        with self.validate(args, state) as (args, state):
+            label_selector = Config().get('pod.label-selector', 'run=ops')
+            with ing('Deleting service account'):
+                ServiceAccounts.delete(state.namespace, label_selector=label_selector)
+            with ing('Deleting config map'): ConfigMaps.delete_with_selector(state.namespace, label_selector)
+            with ing('Deleting deployment'): Deployments.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
+            with ing('Deleting pod'): Pods.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
+            undeploy_frontend(state.namespace, label_selector)
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/devices/device.py

@@ -1,6 +1,10 @@
 from abc import abstractmethod
+
 from adam.commands.command import Command
-from adam.repl_state import ReplState
+from adam.config import Config
+from adam.pod_exec_result import PodExecResult
+from adam.repl_state import BashSession, ReplState
+from adam.utils import log2
 
 class Device:
     @abstractmethod
@@ -10,6 +14,13 @@ class Device:
     def ls_completion(self, cmd: str, state: ReplState, default: dict = {}):
         return default
 
+    @abstractmethod
+    def cat(self, cmd: str, state: ReplState):
+        pass
+
+    def cat_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        return default
+
     def cd(self, dir: str, state: ReplState):
         pass
 
@@ -23,5 +34,85 @@ class Device:
     def try_fallback_action(self, chain: Command, state: ReplState, cmd: str):
         return False, None
 
-    def enter(state: ReplState):
+    def enter(self, state: ReplState):
+        pass
+
+    def preview(self, table: str, state: ReplState):
+        if not table:
+            if state.in_repl:
+                log2('Table is required.')
+                log2()
+                log2('Tables:')
+                self.show_tables(state)
+            else:
+                log2('* Table is missing.')
+                self.show_tables(state)
+
+                Command.display_help()
+
+            return 'command-missing'
+
+        rows = Config().get('preview.rows', 10)
+        self.show_table_preview(state, table, rows)
+
+        return state
+
+    @abstractmethod
+    def show_tables(self, state: ReplState):
+        pass
+
+    @abstractmethod
+    def show_table_preview(self, state: ReplState, table: str, rows: int):
+        pass
+
+    def bash(self, s0: ReplState, s1: ReplState, args: list[str]):
+        if s1.in_repl:
+            if self.bash_target_changed(s0, s1):
+                r = self._exec_with_dir(s1, args)
+            else:
+                r = self._exec_with_dir(s0, args)
+
+            if not r:
+                s1.exit_bash()
+
+                return 'inconsistent pwd'
+
+            return r
+        else:
+            self.exec_no_dir(' '.join(args), s1)
+
+            return s1
+
+    def _exec_with_dir(self, state: ReplState, args: list[str]) -> list[PodExecResult]:
+        session_just_created = False
+        if not args:
+            session_just_created = True
+            session = BashSession(state.device)
+            state.enter_bash(session)
+
+        if state.bash_session:
+            if args != ['pwd']:
+                if args:
+                    args.append('&&')
+                args.extend(['pwd', '>', f'/tmp/.qing-{state.bash_session.session_id}'])
+
+            if not session_just_created:
+                if pwd := state.bash_session.pwd(state):
+                    args = ['cd', pwd, '&&'] + args
+
+        return self.exec_with_dir(' '.join(args), session_just_created, state)
+
+    @abstractmethod
+    def bash_target_changed(self, s0: ReplState, s1: ReplState):
+        pass
+
+    @abstractmethod
+    def exec_no_dir(self, command: str, state: ReplState):
         pass
+
+    @abstractmethod
+    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState):
+        pass
+
+    def bash_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        return default

adam/commands/devices/device_app.py

@@ -1,10 +1,11 @@
 from adam.apps import Apps
-from adam.commands.bash.bash import Bash
-from adam.commands.command import Command
+from adam.commands import app
+from adam.commands.bash.bash_completer import BashCompleter
+from adam.commands.command import Command, InvalidState
 from adam.commands.devices.device import Device
 from adam.config import Config
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log
+from adam.utils import lines_to_tabular, log, wait_log
 from adam.utils_k8s.app_pods import AppPods
 from adam.utils_k8s.ingresses import Ingresses
 
@@ -39,7 +40,7 @@ class DeviceApp(Command, Device):
 
     def ls(self, cmd: str, state: ReplState):
         if state.app_pod:
-            return Bash().run('bash ' + cmd, state)
+            return self.bash(state, state, cmd.split(' '))
         elif state.app_app:
             pods = AppPods.pod_names(state.namespace, state.app_env, state.app_app)
 
@@ -64,7 +65,6 @@ class DeviceApp(Command, Device):
 
             log(lines_to_tabular(svcs, 'ENV', separator=','))
 
-
     def ls_completion(self, cmd, state, default: dict = {}):
         if state.app_app:
             def pod_names():
@@ -74,6 +74,18 @@ class DeviceApp(Command, Device):
 
         return default
 
+    def cat(self, cmd: str, state: ReplState):
+        if state.app_pod:
+            return self.bash(state, state, cmd.split(' '))
+
+        return InvalidState()
+
+    def cat_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        if state.app_app:
+            return {f'@{p}': {cmd: None} for p in AppPods.pod_names(state.namespace, state.app_env, state.app_app)}
+
+        return default
+
     def cd(self, dir: str, state: ReplState):
         if dir == '':
             state.app_env = None
@@ -134,13 +146,28 @@ class DeviceApp(Command, Device):
                         if state.app_pod == '*':
                             if (pods := AppPods.pod_names(state.namespace, ea[0], ea[1])):
                                 state.app_pod = pods[0]
-                                Config().wait_log(f'Moving to {state.app_env}/{state.app_app}/{state.app_pod}...')
+                                wait_log(f'Moving to {state.app_env}/{state.app_app}/{state.app_pod}...')
                             else:
-                                Config().wait_log(f'No pods found, moving to {state.app_env}/{state.app_app}...')
+                                wait_log(f'No pods found, moving to {state.app_env}/{state.app_app}...')
                         else:
-                            Config().wait_log(f'Moving to {state.app_env}/{state.app_app}/{state.app_pod}...')
+                            wait_log(f'Moving to {state.app_env}/{state.app_app}/{state.app_pod}...')
                     elif len(ea) > 1:
                         state.app_app = ea[1]
-                        Config().wait_log(f'Moving to {state.app_env}/{state.app_app}...')
+                        wait_log(f'Moving to {state.app_env}/{state.app_app}...')
                     else:
-                        Config().wait_log(f'Moving to {state.app_env}...')
+                        wait_log(f'Moving to {state.app_env}...')
+
+    def bash_target_changed(self, s0: ReplState, s1: ReplState):
+        return s0.app_env != s1.app_env or s0.app_app != s1.app_app or s0.app_pod != s1.app_pod
+
+    def exec_no_dir(self, command: str, state: ReplState):
+        with app(state) as pods:
+            return pods.exec(command)
+
+    def exec_with_dir(self, command: str, session_just_created: bool, state: ReplState):
+        with app(state) as pods:
+            return pods.exec(command, not session_just_created)
+
+    def bash_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        return {cmd: BashCompleter(lambda: [])} | \
+               {f'@{p}': {cmd: BashCompleter(lambda: [])} for p in AppPods.pod_names(state.namespace, state.app_env, state.app_app)}

adam/commands/devices/device_auit_log.py

@@ -36,8 +36,14 @@ class DeviceAuditLog(Command, Device):
     def ls(self, cmd: str, _: ReplState):
         log(lines_to_tabular(Athena.table_names(), 'NAME', separator=','))
 
-    def pwd(self, state: ReplState):
+    def pwd(self, _: ReplState):
         return '\t'.join([f'{ReplState.L}:>', '/'])
 
     def try_fallback_action(self, chain: Command, state: ReplState, cmd: str):
-        return True, chain.run(f'audit {cmd}', state)
+        return True, chain.run(f'audit {cmd}', state)
+
+    def show_tables(self, _: ReplState):
+        log(lines_to_tabular(Athena.table_names(), separator=','))
+
+    def show_table_preview(self, _: ReplState, table: str, rows: int):
+        Athena.run_query(f'select * from {table} limit {rows}')