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

adam/commands/param_set.py

@@ -22,20 +22,19 @@ class SetParam(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
+        with self.validate(args, state) as (args, state):
+            if len(args) < 2:
+                log2('set <key> <value>')
 
-        if len(args) < 2:
-            log2('set <key> <value>')
+                return 'invalid args'
 
-            return 'invalid args'
+            key = args[0]
+            value = args[1]
+            Config().set(key, value)
 
-        key = args[0]
-        value = args[1]
-        Config().set(key, value)
+            log(Config().get(key, None))
 
-        log(Config().get(key, None))
-
-        return value
+            return value
 
     def completion(self, _: ReplState):
         return {SetParam.COMMAND: {key: ({'true': None, 'false': None} if Config().get(key, None) in [True, False] else None) for key in Config().keys()}}

adam/commands/postgres/postgres.py

@@ -1,17 +1,18 @@
 import click
 
+from adam.commands import extract_trailing_options
 from adam.commands.command import Command
+from adam.commands.intermediate_command import IntermediateCommand
 from adam.commands.postgres.psql_completions import psql_completions
-from adam.commands.postgres.postgres_utils import pg_table_names
+from adam.commands.postgres.utils_postgres import pg_table_names, postgres
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview
 from .postgres_context import PostgresContext
 from adam.repl_state import ReplState
 from adam.utils import log, log2
 
-class Postgres(Command):
+class Postgres(IntermediateCommand):
     COMMAND = 'pg'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -29,40 +30,36 @@ class Postgres(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
+        with self.validate(args, state) as (args, state):
+            with extract_trailing_options(args, '&') as (args, backgrounded):
+                if not args:
+                    if state.in_repl:
+                        log2('Please use SQL statement. e.g. pg \l')
+                    else:
+                        log2('* Command or SQL statements is missing.')
+                        Command.display_help()
 
-        if not args:
-            if state.in_repl:
-                log2('Please use SQL statement. e.g. pg \l')
-            else:
-                log2('* Command or SQL statements is missing.')
-                Command.display_help()
+                    return 'command-missing'
 
-            return 'command-missing'
+                if not state.pg_path:
+                    if state.in_repl:
+                        log2('Enter "use <pg-name>" first.')
+                    else:
+                        log2('* pg-name is missing.')
 
-        if state.in_repl:
-            self.run_sql(state, args)
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Postgres.cmd_list())
-            if not cmds.run(cmd, state) :
-                self.run_sql(state, args)
-
-        return state
-
-    def cmd_list():
-        return [PostgresLs(), PostgresPreview()]
+                    return state
 
-    def run_sql(self, state: ReplState, args: list[str]):
-        if not state.pg_path:
-            if state.in_repl:
-                log2('Enter "use <pg-name>" first.')
-            else:
-                log2('* pg-name is missing.')
+                if state.in_repl:
+                    with postgres(state) as pod:
+                        pod.sql(args, background=backgrounded)
+                elif not self.run_subcommand(cmd, state):
+                    with postgres(state) as pod:
+                        pod.sql(args, background=backgrounded)
 
-            return state
+                return state
 
-        PostgresContext.apply(state.namespace, state.pg_path).run_sql(' '.join(args))
+    def cmd_list(self):
+        return [PostgresLs(), PostgresPreview(), PostgresPg()]
 
     def completion(self, state: ReplState):
         if state.device != state.P:
@@ -86,12 +83,22 @@ class Postgres(Command):
             return {}
 
     def help(self, _: ReplState):
-        return f'<sql-statements>\t run queries on Postgres databases'
+        return f'<sql-statements> [&]\t run queries on Postgres databases'
 
 class PostgresCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        Command.intermediate_help(super().get_help(ctx), Postgres.COMMAND, Postgres.cmd_list(), show_cluster_help=True)
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Postgres.COMMAND, Postgres().cmd_list(), show_cluster_help=True)
         log('PG-Name:  Kubernetes secret for Postgres credentials')
         log('          e.g. stgawsscpsr-c3-c3-k8spg-cs-001')
         log('Database: Postgres database name within a host')
-        log('          e.g. stgawsscpsr_c3_c3')
+        log('          e.g. stgawsscpsr_c3_c3')
+
+# No action body, only for a help entry and auto-completion
+class PostgresPg(Command):
+    COMMAND = 'pg'
+
+    def command(self):
+        return PostgresPg.COMMAND
+
+    def help(self, _: ReplState):
+        return f'pg <sql-statements>\t run queries on Postgres databases'

adam/commands/postgres/postgres_context.py

@@ -1,12 +1,14 @@
+from datetime import datetime
 import functools
 import re
 import subprocess
 
 from adam.config import Config
+from adam.repl_session import ReplSession
 from adam.utils_k8s.kube_context import KubeContext
 from adam.utils_k8s.pods import Pods
 from adam.utils_k8s.secrets import Secrets
-from adam.utils import log2
+from adam.utils import log2, log_exc
 
 class PostgresContext:
     def apply(namespace: str, path: str, arg: str = None) -> 'PostgresContext':
@@ -131,7 +133,7 @@ class PostgresContext:
 
         return dbs
 
-    def run_sql(self, sql: str, show_out = True):
+    def run_sql(self, sql: str, show_out = True, background = False):
         db = self.db if self.db else PostgresContext.default_db()
 
         if KubeContext.in_cluster():
@@ -139,36 +141,69 @@ class PostgresContext:
             log2(f'{cmd1} "{sql}"')
             # remove double quotes from the sql argument
             cmd = cmd1.split(' ') + [sql]
-            r = subprocess.run(cmd, capture_output=True, text=True)
+
+            r = subprocess.run(cmd, capture_output=not background, text=True)
             if show_out:
                 log2(r.stdout)
                 log2(r.stderr)
 
             return r
         else:
-            ns = self.namespace
-            pod_name = Config().get('pg.agent.name', 'ops-pg-agent')
+            pod_name, container_name = PostgresContext.pod_and_container(self.namespace)
+            if not pod_name:
+                return
+
+            # ns = self.namespace
+            # pod_name = Config().get('pg.agent.name', 'ops-pg-agent')
+
+            # if Config().get('pg.agent.just-in-time', False):
+            #     if not PostgresContext.deploy_pg_agent(pod_name, ns):
+            #         return
+
+            # real_pod_name = pod_name
+            # try:
+            #     # try with dedicated pg agent pod name configured
+            #     Pods.get(ns, pod_name)
+            # except:
+            #     try:
+            #         # try with the ops pod
+            #         pod_name = Config().get('pod.name', 'ops')
+            #         real_pod_name = Pods.get_with_selector(ns, label_selector = Config().get('pod.label-selector', 'run=ops')).metadata.name
+            #     except:
+            #         log2(f"Could not locate {pod_name} pod.")
+            #         return None
+
+            cmd = f'psql -h {self.endpoint()} -p {self.port()} -U {self.username()} {db} --pset pager=off -c "{sql}"'
+            env_prefix = f'PGPASSWORD="{self.password()}"'
+
+            r = Pods.exec(pod_name, container_name, self.namespace, cmd, show_out=show_out, background=background, env_prefix=env_prefix)
+            if r and Config().get('repl.history.push-cat-remote-log-file', True):
+                if r.log_file and ReplSession().prompt_session:
+                    ReplSession().prompt_session.history.append_string(f'@{r.pod} cat {r.log_file}')
+
+            return r
+
+    def pod_and_container(ns: str):
+        container_name = Config().get('pg.agent.name', 'ops-pg-agent')
 
-            if Config().get('pg.agent.just-in-time', False):
-                if not PostgresContext.deploy_pg_agent(pod_name, ns):
-                    return
+        if Config().get('pg.agent.just-in-time', False):
+            if not PostgresContext.deploy_pg_agent(container_name, ns):
+                return None
 
-            real_pod_name = pod_name
+        pod_name = container_name
+        try:
+            # try with dedicated pg agent pod name configured
+            Pods.get(ns, container_name)
+        except:
             try:
-                # try with dedicated pg agent pod name configured
-                Pods.get(ns, pod_name)
+                # try with the ops pod
+                container_name = Config().get('pod.name', 'ops')
+                pod_name = Pods.get_with_selector(ns, label_selector = Config().get('pod.label-selector', 'run=ops')).metadata.name
             except:
-                try:
-                    # try with the ops pod
-                    pod_name = Config().get('pod.name', 'ops')
-                    real_pod_name = Pods.get_with_selector(ns, label_selector = Config().get('pod.label-selector', 'run=ops')).metadata.name
-                except:
-                    log2(f"Could not locate {pod_name} pod.")
-                    return None
-
-            cmd = f'PGPASSWORD="{self.password()}" psql -h {self.endpoint()} -p {self.port()} -U {self.username()} {db} --pset pager=off -c "{sql}"'
+                log2(f"Could not locate {container_name} pod.")
+                return None
 
-            return Pods.exec(real_pod_name, pod_name, ns, cmd, show_out=show_out)
+        return pod_name, container_name
 
     def deploy_pg_agent(pod_name: str, ns: str) -> str:
         image = Config().get('pg.agent.image', 'seanahnsf/kaqing')
@@ -178,11 +213,9 @@ class PostgresContext:
         except Exception as e:
             if e.status == 409:
                 if Pods.completed(ns, pod_name):
-                    try:
+                    with log_exc(lambda e2: "Exception when calling BatchV1Api->create_pod: %s\n" % e2):
                         Pods.delete(pod_name, ns)
                         Pods.create(ns, pod_name, image, ['sleep', f'{timeout}'], env={'NAMESPACE': ns}, sa_name='c3')
-                    except Exception as e2:
-                        log2("Exception when calling BatchV1Api->create_pod: %s\n" % e2)
 
                         return
             else:

adam/commands/postgres/postgres_ls.py

@@ -4,7 +4,6 @@ from adam.repl_state import ReplState, RequiredState
 
 class PostgresLs(Command):
     COMMAND = 'pg ls'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -25,15 +24,12 @@ class PostgresLs(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
-
-        state.device = ReplState.P
+        with self.validate(args, state) as (args, state):
+            state.device = ReplState.P
 
-        Ls().run('ls', state)
+            Ls().run('ls', state)
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
         if state.sts:

adam/commands/postgres/postgres_preview.py

@@ -4,7 +4,6 @@ from adam.repl_state import ReplState, RequiredState
 
 class PostgresPreview(Command):
     COMMAND = 'pg preview'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -19,21 +18,18 @@ class PostgresPreview(Command):
         return PostgresPreview.COMMAND
 
     def required(self):
-        return RequiredState.NAMESPACE
+        return RequiredState.PG_DATABASE
 
     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 not self.validate_state(state, RequiredState.PG_DATABASE):
-            return state
-
-        state.device = ReplState.P
+        with self.validate(args, state) as (args, state):
+            state.device = ReplState.P
 
-        PreviewTable().run(f'preview {" ".join(args)}', state)
+            PreviewTable().run(f'preview {" ".join(args)}', state)
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
         if state.sts:

adam/commands/postgres/psql_completions.py

@@ -1,4 +1,4 @@
-from adam.commands.postgres.postgres_utils import pg_table_names
+from adam.commands.postgres.utils_postgres import pg_table_names
 from adam.sql.sql_completer import SqlCompleter
 
 def psql_completions(ns: str, pg_path: str):

adam/commands/postgres/utils_postgres.py

@@ -0,0 +1,66 @@
+import functools
+
+from adam.commands.postgres.postgres_context import PostgresContext
+from adam.repl_state import ReplState
+from adam.utils import log2, wait_log
+from adam.utils_k8s.pods import Pods
+
+TestPG = [False]
+
+@functools.lru_cache()
+def pg_database_names(ns: str, pg_path: str):
+    if TestPG[0]:
+        return ['azops88_c3ai_c3']
+
+    wait_log('Inspecting Postgres Databases...')
+
+    pg = PostgresContext.apply(ns, pg_path)
+    return [db['name'] for db in pg.databases() if db['owner'] == PostgresContext.default_owner()]
+
+@functools.lru_cache()
+def pg_table_names(ns: str, pg_path: str):
+    if TestPG[0]:
+        return ['C3_2_XYZ1']
+
+    wait_log('Inspecting Postgres Database...')
+    return [table['name'] for table in pg_tables(ns, pg_path) if table['schema'] == PostgresContext.default_schema()]
+
+def pg_tables(ns: str, pg_path: str):
+    pg = PostgresContext.apply(ns, pg_path)
+    if pg.db:
+        return pg.tables()
+
+    return []
+
+class PostgresPodService:
+    def __init__(self, handler: 'PostgresExecHandler'):
+        self.handler = handler
+
+    def exec(self, command: str, show_out=True):
+        state = self.handler.state
+
+        pod, container = PostgresContext.pod_and_container(state.namespace)
+        if not pod:
+            log2('Cannot locate postgres agent or ops pod.')
+            return state
+
+        return Pods.exec(pod, container, state.namespace, command, show_out=show_out)
+
+    def sql(self, args: list[str], background=False):
+        state = self.handler.state
+
+        PostgresContext.apply(state.namespace, state.pg_path).run_sql(' '.join(args), background=background)
+
+class PostgresExecHandler:
+    def __init__(self, state: ReplState, background=False):
+        self.state = state
+        self.background = background
+
+    def __enter__(self):
+        return PostgresPodService(self)
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return False
+
+def postgres(state: ReplState, background=False):
+    return PostgresExecHandler(state, background=background)

adam/commands/preview_table.py

@@ -1,11 +1,6 @@
 from adam.commands.command import Command
-from adam.commands.cql.cql_utils import cassandra_table_names, run_cql
-from adam.commands.postgres.postgres_context import PostgresContext
-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
-from adam.utils_athena import Athena
-from adam.utils_audits import Audits
 
 class PreviewTable(Command):
     COMMAND = 'preview'
@@ -29,47 +24,13 @@ class PreviewTable(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:
-            def show_tables():
-                if state.device == ReplState.P:
-                    pg = PostgresContext.apply(state.namespace, state.pg_path)
-                    lines = [db["name"] for db in pg.tables() if db["schema"] == PostgresContext.default_schema()]
-                    log(lines_to_tabular(lines, separator=','))
-                elif state.device == ReplState.L:
-                    log(lines_to_tabular(Athena.table_names(), separator=','))
-                else:
-                    log(lines_to_tabular(cassandra_table_names(state), separator=','))
-
-            if state.in_repl:
-                log2('Table is required.')
-                log2()
-                log2('Tables:')
-                show_tables()
-            else:
-                log2('* Table is missing.')
-                show_tables()
-
-                Command.display_help()
+        with self.validate(args, state) as (args, state):
+            Devices.device(state).preview(args[0] if args else None, state)
 
-            return 'command-missing'
-
-        table = args[0]
-
-        rows = Config().get('preview.rows', 10)
-        if state.device == ReplState.P:
-            PostgresContext.apply(state.namespace, state.pg_path).run_sql(f'select * from {table} limit {rows}')
-        elif state.device == ReplState.L:
-            Athena.run_query(f'select * from {table} limit {rows}')
-        else:
-            run_cql(state, f'select * from {table} limit {rows}', show_out=True, use_single_quotes=True, on_any=True)
-
-        return state
+            return state
 
     def completion(self, _: ReplState):
+        # taken care of by the sql completer
         return {}
 
     def help(self, _: ReplState):

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_context import PostgresContext
+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 lines_to_tabular, log, log_exc
 
 class Pwd(Command):
     COMMAND = 'pwd'
@@ -23,53 +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 = []
+            log(lines_to_tabular([device.pwd(state) for device in Devices.all()] + [
+                f'',
+                f'HOST\t{host}',
+                f'NAMESPACE\t{state.namespace if state.namespace else "/"}',
+            ], 'DEVICE\tLOCATION', separator='\t'))
+            log()
 
-            if device == ReplState.P:
-                pg: PostgresContext = PostgresContext.apply(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}')
-            elif device in [ReplState.L, ReplState.X]:
-                pass
-            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.L),
-            device_line(state, ReplState.P),
-            device_line(state, ReplState.X),
-            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,35 +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)
-
-        if not self.validate_state(state):
-            return 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)