kaqing 2.0.14__py3-none-any.whl → 2.0.189__py3-none-any.whl

adam/commands/deploy/deploy_pod.py

@@ -1,17 +1,18 @@
 from kubernetes import client
-import yaml
 
+from adam.commands import extract_options
 from adam.commands.command import Command
-from adam.commands.deploy.deploy_utils import creating, deploy_frontend, gen_labels
+from adam.commands.deploy.deploy_utils import deploy_frontend, gen_labels
+from adam.commands.deploy.undeploy_pod import UndeployPod
 from adam.config import Config
-from adam.k8s_utils.config_maps import ConfigMaps
-from adam.k8s_utils.deployment import Deployments
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.pods import Pods
-from adam.k8s_utils.service_accounts import ServiceAccounts
-from adam.k8s_utils.volumes import ConfigMapMount
+from adam.utils_k8s.config_maps import ConfigMaps
+from adam.utils_k8s.deployment import Deployments
+from adam.utils_k8s.kube_context import KubeContext
+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 log2
+from adam.utils import ing, log2, log_exc
 
 class DeployPod(Command):
     COMMAND = 'deploy pod'
@@ -35,75 +36,71 @@ 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
-
-        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)
-
-        creating('service account', lambda: 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
-        }
-        creating('config map', lambda: 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"]
-            )
-        )
-        creating('deployment', lambda: 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)
+        return super().completion(state, {'--force': None})
 
     def help(self, _: ReplState):
-        return f'{DeployPod.COMMAND}\t deploy pod'
+        return f'{DeployPod.COMMAND} [--force]\t deploy Ops pod, --force to undeploy first'

adam/commands/deploy/deploy_utils.py

@@ -1,39 +1,29 @@
-from typing import Callable
 from adam.app_session import AppSession
-from adam.k8s_utils.ingresses import Ingresses
-from adam.k8s_utils.services import Services
-from adam.utils import log2
+from adam.utils import ing
+from adam.utils_k8s.ingresses import Ingresses
+from adam.utils_k8s.services import Services
 
 def deploy_frontend(name: str, namespace: str, label_selector: str):
     app_session: AppSession = AppSession.create('c3', 'c3', namespace)
     port = 7678
     labels = gen_labels(label_selector)
-    creating('service', lambda: Services.create_service(name, namespace, port, labels, labels=labels))
-    creating('ingress', lambda: Ingresses.create_ingress(name, namespace, app_session.host, '/c3/c3/ops($|/)', port, annotations={
-        'kubernetes.io/ingress.class': 'nginx',
-        'nginx.ingress.kubernetes.io/use-regex': 'true',
-        'nginx.ingress.kubernetes.io/rewrite-target': '/'
-    }, labels=labels))
+    with ing('Creating service'):
+        Services.create_service(name, namespace, port, labels, labels=labels)
+    with ing('Creating ingress'):
+        Ingresses.create_ingress(name, namespace, app_session.host, '/c3/c3/ops($|/)', port, annotations={
+            'kubernetes.io/ingress.class': 'nginx',
+            'nginx.ingress.kubernetes.io/use-regex': 'true',
+            'nginx.ingress.kubernetes.io/rewrite-target': '/'
+        }, labels=labels)
 
     return f'https://{app_session.host}/c3/c3/ops'
 
 def undeploy_frontend(namespace: str, label_selector: str):
-    deleting('ingress', lambda: Ingresses.delete_ingresses(namespace, label_selector=label_selector))
-    deleting('service', lambda: Services.delete_services(namespace, label_selector=label_selector))
+    with ing('Deleting ingress'):
+        Ingresses.delete_ingresses(namespace, label_selector=label_selector)
+    with ing('Deleting service'):
+        Services.delete_services(namespace, label_selector=label_selector)
 
 def gen_labels(label_selector: str):
     kv = label_selector.split('=')
-    return {kv[0]: kv[1]}
-
-def creating(name: str, body: Callable[[], None]):
-    log2(f'Creating {name}...', nl=False)
-    body()
-    log2(' OK')
-
-def deleting(name: str, body: Callable[[], None]):
-    try:
-        log2(f'Deleting {name}...', nl=False)
-        body()
-        log2(' OK')
-    except Exception as e:
-        log2(e)
+    return {kv[0]: kv[1]}

adam/commands/deploy/undeploy.py

@@ -1,15 +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
-from adam.utils import lines_to_tabular, log, log2
+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):
@@ -17,45 +14,12 @@ class Undeploy(Command):
 
         return cls.instance
 
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
     def command(self):
         return Undeploy.COMMAND
 
-    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.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Undeploy.cmd_list()], separator=':'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Undeploy.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
-
-    def cmd_list():
+    def cmd_list(self):
         return [UndeployFrontend(), UndeployPod(), UndeployPgAgent()]
 
-    def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
-
-    def help(self, _: ReplState):
-        return None
-
 class UndeployCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Undeploy.COMMAND} ', '  ', 1) for c in Undeploy.cmd_list()], separator=':'))
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Undeploy.COMMAND, Undeploy().cmd_list())

adam/commands/deploy/undeploy_frontend.py

@@ -25,17 +25,14 @@ 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)
 
     def help(self, _: ReplState):
-        return f'{UndeployFrontend.COMMAND}\t undeploy frontend'
+        return f'{UndeployFrontend.COMMAND}\t undeploy Web frontend'

adam/commands/deploy/undeploy_pg_agent.py

@@ -1,7 +1,8 @@
 from adam.commands.command import Command
-from adam.commands.postgres.postgres_session import PostgresSession
+from adam.commands.postgres.postgres_databases import PostgresDatabases
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
+from adam.utils import ing
 
 class UndeployPgAgent(Command):
     COMMAND = 'undeploy pg-agent'
@@ -25,16 +26,14 @@ 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
-
-        PostgresSession.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'):
+                PostgresDatabases.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)
 
     def help(self, _: ReplState):
-        return f'{UndeployPgAgent.COMMAND}\t undeploy postgres agent'
+        return f'{UndeployPgAgent.COMMAND}\t undeploy Postgres agent'

adam/commands/deploy/undeploy_pod.py

@@ -1,10 +1,11 @@
 from adam.commands.command import Command
-from adam.commands.deploy.deploy_utils import undeploy_frontend, deleting
+from adam.commands.deploy.deploy_utils import undeploy_frontend
 from adam.config import Config
-from adam.k8s_utils.config_maps import ConfigMaps
-from adam.k8s_utils.deployment import Deployments
-from adam.k8s_utils.pods import Pods
-from adam.k8s_utils.service_accounts import ServiceAccounts
+from adam.utils import ing
+from adam.utils_k8s.config_maps import ConfigMaps
+from adam.utils_k8s.deployment import Deployments
+from adam.utils_k8s.pods import Pods
+from adam.utils_k8s.service_accounts import ServiceAccounts
 from adam.repl_state import ReplState, RequiredState
 
 class UndeployPod(Command):
@@ -29,21 +30,19 @@ 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')
-        deleting('service account', lambda: ServiceAccounts.delete(state.namespace, label_selector=label_selector))
-        deleting('config map', lambda: ConfigMaps.delete_with_selector(state.namespace, label_selector))
-        deleting('deployment', lambda: Deployments.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0))
-        deleting('pod', lambda: 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)
 
     def help(self, _: ReplState):
-        return f'{UndeployPod.COMMAND}\t undeploy pod'
+        return f'{UndeployPod.COMMAND}\t undeploy Ops pod'

adam/commands/devices/device.py

@@ -0,0 +1,149 @@
+from abc import abstractmethod
+
+from adam.commands.command import Command
+from adam.config import Config
+from adam.pod_exec_result import PodExecResult
+from adam.repl_state import BashSession, ReplState
+from adam.utils import log2
+from adam.utils_k8s.pods import Pods
+
+class Device:
+    def pods(self, state: ReplState, me: str = None) -> tuple[list[str], str]:
+        return self.pod_names(state), me if me else self.pod(state)
+
+    def default_pod(self, state: ReplState) -> tuple[list[str], str]:
+        if me := self.pod(state):
+            return me
+
+        if pods := self.pod_names(state):
+            return pods[0]
+
+        return None
+
+    def pod(self, state: ReplState) -> str:
+        return None
+
+    def pod_names(self, state: ReplState) -> list[str]:
+        return []
+
+    def default_container(self, state: ReplState) -> str:
+        return None
+
+    @abstractmethod
+    def ls(self, cmd: str, state: ReplState):
+        pass
+
+    def ls_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        return default
+
+    def cd(self, dir: str, state: ReplState):
+        pass
+
+    def cd_completion(self, cmd: str, state: ReplState, default: dict = {}):
+        return default
+
+    def direct_dirs(self, cmd: str, state: ReplState, default: dict = {}) -> list[str]:
+        return []
+
+    @abstractmethod
+    def pwd(self, state: ReplState):
+        pass
+
+    def try_fallback_action(self, chain: Command, state: ReplState, cmd: str):
+        return False, None
+
+    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
+
+    def files(self, state: ReplState):
+        r: PodExecResult = Pods.exec(self.default_pod(state), self.default_container(state), state.namespace, f'find -maxdepth 1 -type f', show_out=Config().is_debug(), shell='bash')
+
+        log_files = []
+        for line in r.stdout.split('\n'):
+            line = line.strip(' \r')
+            if line:
+                if line.startswith('./'):
+                    line = line[2:]
+                log_files.append(line)
+
+        return log_files