kaqing 2.0.101__tar.gz → 2.0.102__tar.gz

{kaqing-2.0.101 → kaqing-2.0.102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.101
+Version: 2.0.102
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.101 → kaqing-2.0.102}/adam/commands/cql/cql_utils.py

@@ -27,28 +27,25 @@ def table_names(state: ReplState):
     return [f'{k}.{t}' for k, ts in tables(state, on_any=True).items() for t in ts]
 
 @functools.lru_cache()
-def tables(state: ReplState, on_any=False):
+def tables(state: ReplState, on_any=False) -> dict[str, list[str]]:
     r: list[PodExecResult] = run_cql(state, 'describe tables', show_out=False, on_any=on_any)
     if not r:
         log2('No pod is available')
-        return []
+        return {}
 
     return parse_cql_desc_tables(r.stdout if state.pod else r[0].stdout)
 
-def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, use_single_quotes = False, on_any = False):
+def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, use_single_quotes = False, on_any = False, background=False):
     user, pw = Secrets.get_user_pass(state.sts if state.sts else state.pod, state.namespace, secret_path='cql.secret')
     if use_single_quotes:
         command = f"cqlsh -u {user} -p {pw} {' '.join(opts)} -e '{cql}'"
     else:
         command = f'cqlsh -u {user} -p {pw} {" ".join(opts)} -e "{cql}"'
 
-    if not on_any:
-        command = f'{command} &'
-
     if state.pod:
-        return CassandraNodes.exec(state.pod, state.namespace, command, show_out=show_out)
+        return CassandraNodes.exec(state.pod, state.namespace, command, show_out=show_out, background=background)
     else:
-        return CassandraClusters.exec(state.sts, state.namespace, command, show_out=show_out, action='cql', on_any=on_any)
+        return CassandraClusters.exec(state.sts, state.namespace, command, show_out=show_out, action='cql', on_any=on_any, background=background)
 
 def parse_cql_desc_tables(out: str):
     # Keyspace data_endpoint_auth

{kaqing-2.0.101 → kaqing-2.0.102}/adam/commands/cql/cqlsh.py

@@ -33,11 +33,14 @@ class Cqlsh(Command):
         if not self.validate_state(state):
             return state
 
+        background = False
         opts = []
         cqls = []
-        for arg in args:
+        for index, arg in enumerate(args):
             if arg.startswith('--'):
                 opts.append(arg)
+            elif index == len(args) -1 and arg == '&':
+                background = True
             elif arg != '-e':
                 cqls.append(arg)
         if not cqls:
@@ -51,7 +54,7 @@ class Cqlsh(Command):
             return 'no-cql'
 
         cql = ' '.join(cqls)
-        return run_cql(state, cql, opts, show_out=True)
+        return run_cql(state, cql, opts, show_out=True, background=background)
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.device != state.C:

{kaqing-2.0.101 → kaqing-2.0.102}/adam/repl.py

@@ -141,7 +141,7 @@ def enter_repl(state: ReplState):
                     cmd = f'bash {cmd}'
 
                 if cmd and cmd.strip(' ') and not cmds.run(cmd, state):
-                    try_device_default_action(state, cmds, cmd_list)
+                    try_device_default_action(state, cmds, cmd_list, cmd)
                     # not served by any command in the chain; try SQL query or C3 action
                     # c_sql_tried = False
                     # if state.device == ReplState.P:
@@ -186,7 +186,7 @@ def enter_repl(state: ReplState):
                 if cmd and (state.device != ReplState.L or Config().get('audit.log-audit-queries', False)):
                     executor.submit(audit_log, cmd, state)
 
-def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Command]):
+def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Command], cmd: str):
     c_sql_tried = False
     if state.device == ReplState.P:
         pg = PostgresSession(state.namespace, state.pg_path)

{kaqing-2.0.101 → kaqing-2.0.102}/adam/repl_commands.py

@@ -58,7 +58,8 @@ class ReplCommands:
         cmds: list[Command] = ReplCommands.navigation() + ReplCommands.cassandra_check() + ReplCommands.cassandra_ops() + \
             ReplCommands.tools() + ReplCommands.app() + ReplCommands.exit()
 
-        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Describe(), Show(), Undeploy()]
+        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Show(), Undeploy()]
+        # intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Describe(), Show(), Undeploy()]
         ic = [c.command() for c in intermediate_cmds]
         # 1. dedup commands
         deduped = []
@@ -79,7 +80,8 @@ class ReplCommands:
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
 
     def cassandra_check() -> list[Command]:
-        return Describe.cmd_list() + [ShowCassandraStatus(),
+        # return Describe.cmd_list() + [ShowCassandraStatus(),
+        return [ShowCassandraStatus(),
                 ShowCassandraVersion(), ShowRepairs(), ShowStorage(), ShowProcesses(), Check(), Issues(), NodeTool(), Report()]
 
     def cassandra_ops() -> list[Command]:

{kaqing-2.0.101 → kaqing-2.0.102}/adam/utils_k8s/cassandra_clusters.py

@@ -14,12 +14,12 @@ T = TypeVar('T')
 # utility collection on cassandra clusters; methods are all static
 class CassandraClusters:
     def exec(statefulset: str, namespace: str, command: str, action: str = 'action',
-             max_workers=0, show_out=True, on_any = False, shell = '/bin/sh') -> list[PodExecResult]:
+             max_workers=0, show_out=True, on_any = False, shell = '/bin/sh', background = False) -> list[PodExecResult]:
         def body(executor: ThreadPoolExecutor, pod: str, namespace: str, show_out: bool):
             if executor:
-                return executor.submit(CassandraNodes.exec, pod, namespace, command, False, False, shell)
+                return executor.submit(CassandraNodes.exec, pod, namespace, command, False, False, shell, background)
 
-            return CassandraNodes.exec(pod, namespace, command, show_out=show_out)
+            return CassandraNodes.exec(pod, namespace, command, show_out=show_out, background=background)
 
         def post(result, show_out: bool):
             if KubeContext.show_out(show_out):
@@ -31,4 +31,4 @@ class CassandraClusters:
 
             return result
 
-        return StatefulSets.on_cluster(statefulset, namespace, body, post=post, action=action, max_workers=max_workers, show_out=show_out, on_any=on_any)
+        return StatefulSets.on_cluster(statefulset, namespace, body, post=post, action=action, max_workers=max_workers, show_out=show_out, on_any=on_any, background=background)

{kaqing-2.0.101 → kaqing-2.0.102}/adam/utils_k8s/cassandra_nodes.py

@@ -6,8 +6,8 @@ from adam.repl_session import ReplSession
 
 # utility collection on cassandra nodes; methods are all static
 class CassandraNodes:
-    def exec(pod_name: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh') -> PodExecResult:
-        r = Pods.exec(pod_name, "cassandra", namespace, command, show_out = show_out, throw_err = throw_err, shell = shell)
+    def exec(pod_name: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh', background = False) -> PodExecResult:
+        r = Pods.exec(pod_name, "cassandra", namespace, command, show_out = show_out, throw_err = throw_err, shell = shell, background = background)
 
         if r and Config().get('repl.history.push-cat-remote-log-file', True):
             if r.log_file:

{kaqing-2.0.101 → kaqing-2.0.102}/adam/utils_k8s/pods.py

@@ -43,7 +43,11 @@ class Pods:
                 namespace: str,
                 body: Callable[[ThreadPoolExecutor, str, str, bool], T],
                 post: Callable[[T], T] = None,
-                action: str = 'action', max_workers=0, show_out=True, on_any = False) -> list[T]:
+                action: str = 'action',
+                max_workers=0,
+                show_out=True,
+                on_any = False,
+                background = False) -> list[T]:
         show_out = KubeContext.show_out(show_out)
 
         if not max_workers:
@@ -94,7 +98,9 @@ class Pods:
 
             return results
 
-    def exec(pod_name: str, container: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh',
+    def exec(pod_name: str, container: str, namespace: str, command: str,
+             show_out = True, throw_err = False, shell = '/bin/sh',
+             background = False,
              interaction: Callable[[any, list[str]], any] = None):
         if _TEST_POD_EXEC_OUTS:
             return _TEST_POD_EXEC_OUTS
@@ -106,8 +112,8 @@ class Pods:
         log_file = None
         tty = True
         exec_command = [shell, '-c', command]
-        if command.endswith(' &'):
-            # should be false for starting a backgroud process
+        if background or command.endswith(' &'):
+            # should be false for starting a background process
             tty = False
 
             if Config().get('repl.background-process.auto-nohup', True):

{kaqing-2.0.101 → kaqing-2.0.102}/adam/utils_k8s/statefulsets.py

@@ -62,10 +62,10 @@ class StatefulSets:
                 namespace: str,
                 body: Callable[[ThreadPoolExecutor, str, str, bool], T],
                 post: Callable[[T], T] = None,
-                action: str = 'action', max_workers=0, show_out=True, on_any = False) -> list[T]:
+                action: str = 'action', max_workers=0, show_out=True, on_any = False, background = False) -> list[T]:
         pods = StatefulSets.pod_names(statefulset, namespace)
 
-        return Pods.on_pods(pods, namespace, body, post=post, action=action, max_workers=max_workers, show_out=show_out, on_any=on_any)
+        return Pods.on_pods(pods, namespace, body, post=post, action=action, max_workers=max_workers, show_out=show_out, on_any=on_any, background=background)
 
     @functools.lru_cache()
     def pod_names(ss: str, ns: str):

kaqing-2.0.102/adam/version.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__version__ = "2.0.102"  #: the working version
+__release__ = "1.0.0"  #: the release version

{kaqing-2.0.101 → kaqing-2.0.102}/kaqing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.101
+Version: 2.0.102
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.101 → kaqing-2.0.102}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='kaqing',
-    version='2.0.101',
+    version='2.0.102',
     packages=find_packages(),
     entry_points={
         'console_scripts': [

kaqing-2.0.101/adam/version.py

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-__version__ = "2.0.101"  #: the working version
-__release__ = "1.0.0"  #: the release version