kaqing 2.0.91__py3-none-any.whl → 2.0.93__py3-none-any.whl

adam/commands/bash.py

@@ -25,12 +25,16 @@ class Bash(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, s0)
 
-        state, args = self.apply_state(args, s0)
+        state, args = self.apply_state(args, s0, args_to_check=2)
         if not self.validate_state(state):
             return state
 
         if state.in_repl:
-            r = self.exec_with_dir(s0, args)
+            if s0.sts != state.sts or s0.pod != state.pod:
+                r = self.exec_with_dir(state, args)
+            else:
+                r = self.exec_with_dir(s0, args)
+
             if not r:
                 state.exit_bash()
 

adam/commands/command.py

@@ -53,8 +53,8 @@ class Command:
 
         return a
 
-    def apply_state(self, args: list[str], state: ReplState, resolve_pg = True) -> tuple[ReplState, list[str]]:
-        return state.apply_args(args, cmd=self.command_tokens(), resolve_pg=resolve_pg)
+    def apply_state(self, args: list[str], state: ReplState, resolve_pg = True, args_to_check = 6) -> tuple[ReplState, list[str]]:
+        return state.apply_args(args, cmd=self.command_tokens(), resolve_pg=resolve_pg, args_to_check=args_to_check)
 
     def command_tokens(self):
         return self.command().split(' ')

adam/commands/nodetool.py

@@ -43,13 +43,13 @@ class NodeTool(Command):
         if state.pod:
             results: PodExecResult = CassandraNodes.exec(state.pod, state.namespace, command, show_out=True)
             if results and results.log_file and Config().get('repl.history.push-cat-remote-log-file', True):
-                ReplSession().prompt_session.history.append_string(f'cat {results.log_file}')
+                ReplSession().prompt_session.history.append_string(f'bash cat {results.log_file}')
         elif state.sts:
             results: list[PodExecResult] = CassandraClusters.exec(state.sts, state.namespace, command, action='nodetool', show_out=True)
             if results and Config().get('repl.history.push-cat-remote-log-file', True):
                 for result in results:
                     if result.log_file:
-                        ReplSession().prompt_session.history.append_string(f'cat {result.log_file}@{result.pod}')
+                        ReplSession().prompt_session.history.append_string(f'bash {result.pod} cat {result.log_file}')
 
         return results
 

adam/k8s_utils/pods.py

@@ -1,5 +1,6 @@
 from collections.abc import Callable
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from datetime import datetime
 import sys
 import time
 from typing import TypeVar, cast
@@ -106,7 +107,7 @@ class Pods:
         tty = True
         exec_command = [shell, '-c', command]
         if command.endswith(' &'):
-            log_file = f'/tmp/qing-{random_alphanumeric(6)}.log'
+            log_file = f'/tmp/qing-{datetime.now().strftime("%Y%m%d_%H%M%S")}-{random_alphanumeric(3)}.log'
             command = f"nohup {command.strip(' &')} > {log_file} 2>&1 &"
             exec_command = [shell, '-c', command]
             # should be false for starting a backgroud process

adam/repl_commands.py

@@ -3,7 +3,6 @@ from adam.commands.app import App
 from adam.commands.app_ping import AppPing
 from adam.commands.audit.audit import Audit
 from adam.commands.audit.audit_repair_tables import AuditRepairTables
-from adam.commands.cat import Cat
 from adam.commands.deploy.code_start import CodeStart
 from adam.commands.deploy.code_stop import CodeStop
 from adam.commands.deploy.deploy import Deploy
@@ -15,10 +14,6 @@ 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.commands.describe.describe import Describe
-from adam.commands.describe.describe_keyspace import DescribeKeyspace
-from adam.commands.describe.describe_keyspaces import DescribeKeyspaces
-from adam.commands.describe.describe_table import DescribeTable
-from adam.commands.describe.describe_tables import DescribeTables
 from adam.commands.shell import Shell
 from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.cp import ClipboardCopy
@@ -80,7 +75,7 @@ class ReplCommands:
         return deduped
 
     def navigation() -> list[Command]:
-        return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), Cd(), Pwd(), Cat(), ClipboardCopy(),
+        return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), Cd(), Pwd(), ClipboardCopy(),
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
 
     def cassandra_check() -> list[Command]:

adam/repl_state.py

@@ -84,12 +84,12 @@ class ReplState:
     def __hash__(self):
         return hash((self.sts, self.pod))
 
-    def apply_args(self, args: list[str], cmd: list[str] = None, resolve_pg = True) -> tuple['ReplState', list[str]]:
+    def apply_args(self, args: list[str], cmd: list[str] = None, resolve_pg = True, args_to_check = 6) -> tuple['ReplState', list[str]]:
         state = self
 
         new_args = []
         for index, arg in enumerate(args):
-            if index < 6:
+            if index < args_to_check:
                 state = copy.copy(state)
 
                 s, n = KubeContext.is_sts_name(arg)

adam/version.py

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

{kaqing-2.0.91.dist-info → kaqing-2.0.93.dist-info}/METADATA

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

{kaqing-2.0.91.dist-info → kaqing-2.0.93.dist-info}/RECORD

@@ -10,13 +10,13 @@ adam/embedded_params.py,sha256=LObTQtC5A6sfRPjHNNcJZr2GUVYoQ1TNAR-zPmQoZRc,4930
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
 adam/pod_exec_result.py,sha256=WBXJSvxzXp9TfsfXeHtIvgz8GvfMAAcH5M03GISLqzw,1046
 adam/repl.py,sha256=G2d9cMZfYQ7BMABCNXgc4RSdRhAPBhS5h3hFENTGRVM,9559
-adam/repl_commands.py,sha256=yJVVBAememAXU6NAIYOiOC7qwNsm3m1OYjoBlLKwG3Y,5004
+adam/repl_commands.py,sha256=GKdpHm4e0it7qVwjzBrsIoa5szpvZC30kJmHbWCvooA,4691
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
-adam/repl_state.py,sha256=dXyGlWXcSsfCjrYwMhU44PVn_oThSZ8dhJ5HCVE8-qU,8743
+adam/repl_state.py,sha256=QB6U-MJkOZEUU_7pc-cTBusnuvrphuxI8k7Y9jo19zU,8774
 adam/utils.py,sha256=sbsNZP3qGJtb6fXCa4dDXHry5ay9ev583cCZIQzy07s,7382
 adam/utils_athena.py,sha256=tU6Arg4g7eKV6ei9SLgakOJJqxKgSCsII-7a68OI7_g,3199
 adam/utils_net.py,sha256=65fhBnWMCkhGtyHqz95qcHaCo35q-WX1RBkkXG8dKpI,416
-adam/version.py,sha256=TE_FtcdQhHRvd4huualymKiwOVRcNwzqlVHBnhLSyV8,139
+adam/version.py,sha256=CF87sQqFhUHjH8upOFyh3pOn0m9iQJ3aDvGUkM8T2js,139
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -52,12 +52,11 @@ adam/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/alter_tables.py,sha256=Q5vXHE4_1_6v6wtYwqST7_QwpXINb1xq0Sm448Z2Y7Q,3582
 adam/commands/app.py,sha256=7alV8wK801t67_rUe6EmhtHJTl-6K7fGCm6Uz1dDgpM,1963
 adam/commands/app_ping.py,sha256=Xk7cfefphXM2w-UvpnhNUTZ3BU38f0deehUb2FEyLCI,1337
-adam/commands/bash.py,sha256=rWYY_dZ0ZaEsAHLVorCD5gPckjkKWH-o6dT4VmKDzmA,2758
-adam/commands/cat.py,sha256=YaefSfLKYJqd8j1oWjU8QWwAtcyl2I93e2NeMeMKud0,1590
+adam/commands/bash.py,sha256=ly2BGSvquCtvUazo2rtqxJkqzNHyf7_Gvt1IISNGR9w,2909
 adam/commands/cd.py,sha256=GyNyJnbxX7afrk7xwvXDhEtSdWnAgnz0dpDJXO2dO7w,4728
 adam/commands/check.py,sha256=853FPfgTMGxQXI_5UaPAtzaSWB_BvEVm48EkJhsHe4w,2181
 adam/commands/cli_commands.py,sha256=PEEyrG9yz7RAEZwHbbuFpyE3fVi8vrIWbr0d1H0Gp9o,3620
-adam/commands/command.py,sha256=w3AthcMShBfhVzRfFq3LhXN76pRNVAuqt5vdMkxHFls,4064
+adam/commands/command.py,sha256=PCnEOZqZP6lHONOz2HhoJqNhBfOckhgEauFjZq_mgHc,4112
 adam/commands/command_helpers.py,sha256=leOJJK1UXczNTJHN9TGMCbIpUpmpreULvQ-TvnsYS7w,1134
 adam/commands/commands_utils.py,sha256=ShUcxtDSd9B3NM0GDj3NBvKdmjCGY8qXgeUJpzNF63E,3122
 adam/commands/cp.py,sha256=dyQViRDPNqsKRkxPb7WyEVIBNw7YB6IfYa2q3VtfzyA,3107
@@ -68,7 +67,7 @@ adam/commands/issues.py,sha256=VS-PC7e-2lywsa-lbmoUX8IY77OPGzFudwbw1g8XmQc,2599
 adam/commands/login.py,sha256=bj95WWIF7mJDJhnyS9T8xvaZUGL37dj7GlH8TgmODbk,1877
 adam/commands/logs.py,sha256=T-O9DYXmWEm4G1I5SM6MwyeRwq2aT-WMqNW0XA2MWmo,1165
 adam/commands/ls.py,sha256=aNBIoUUCFxWMJ9O6IV6qbw5XRHmaQqOD6dgjMf9EWkU,5766
-adam/commands/nodetool.py,sha256=g_ADdVOM0VlYEsD5oa0nAylffkRz6jwkrShA9uKPU1s,2994
+adam/commands/nodetool.py,sha256=9OktRKHVpeVqThqFMk_v1hZA967OOJbRJawKePyaut4,3004
 adam/commands/nodetool_commands.py,sha256=5IgWC3rmeDD1cgwqQjiiWzi-wJpJ3n_8pAzz_9phXuk,2635
 adam/commands/param_get.py,sha256=kPAAppK2T0tEFRnSIVFLDPIIGHhgLA7drJhn8TRyvvE,1305
 adam/commands/param_set.py,sha256=QDIuqfU80aWCB16OK49yf7XRaRTWwiLkwMsJuVikq9I,1271
@@ -164,7 +163,7 @@ adam/k8s_utils/deployment.py,sha256=3oZPfPgQfqtAQaxEFL4daUfRSieRAhysmuaWMzUYgXk,
 adam/k8s_utils/ingresses.py,sha256=ul3Z6fDGc_Cxcn-ExP0vXhZatoShCUZFtpwtCY4Qx7o,3460
 adam/k8s_utils/jobs.py,sha256=gJpBpjcZ_FlkWJJIlavbHC_bqdmvv-GMVo8UZVh0sOQ,2610
 adam/k8s_utils/kube_context.py,sha256=xJF_72vUJu-X9MpIYzOIfnj7KEWU7a_sLBR-H3994Y0,3311
-adam/k8s_utils/pods.py,sha256=w8KyYryRi7LHjRP1yCxYYawe4zkmwRffg6uJgtZTTEw,10993
+adam/k8s_utils/pods.py,sha256=MzUazbOwp2VqjvOQlWNHqqBvIJZDsEord52_XLS2c2E,11066
 adam/k8s_utils/secrets.py,sha256=tBSKLknHlwdwyTzqvtJ2YS-y9x4gvW57Ug9sOkK_U50,2413
 adam/k8s_utils/service_accounts.py,sha256=v2oQSqCrNvt2uRnKlNwR3fjtpUG7oF5nqgzEB7NnT-U,6349
 adam/k8s_utils/services.py,sha256=EOJJGACVbbRvu5T3rMKqIJqgYic1_MSJ17EA0TJ6UOk,3156
@@ -184,8 +183,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-2.0.91.dist-info/METADATA,sha256=yagJcxO7gKMvac3lZBLG4NkmHwH5tlhragoKQfrm7xk,132
-kaqing-2.0.91.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.91.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.91.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.91.dist-info/RECORD,,
+kaqing-2.0.93.dist-info/METADATA,sha256=0Iyn4GWHg-GSuZwqsNUy-HPUfPQ31nr6u5-_3wHhIbg,132
+kaqing-2.0.93.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.93.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.93.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.93.dist-info/RECORD,,

adam/commands/cat.py

@@ -1,54 +0,0 @@
-from adam.commands.command import Command
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
-from adam.repl_state import ReplState, RequiredState
-from adam.utils import log2
-
-class Cat(Command):
-    COMMAND = 'cat'
-
-    # the singleton pattern
-    def __new__(cls, *args, **kwargs):
-        if not hasattr(cls, 'instance'): cls.instance = super(Cat, cls).__new__(cls)
-
-        return cls.instance
-
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
-    def command(self):
-        return Cat.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)
-
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if len(args) < 1:
-            if state.in_repl:
-                log2('File name is required.')
-            else:
-                log2('* File name is missing.')
-                Command.display_help()
-
-            return 'command-missing'
-
-        arg = args[0]
-        if '@' in arg:
-            path_and_pod = arg.split('@')
-            CassandraNodes.exec(path_and_pod[1], state.namespace, f'cat {path_and_pod[0]}')
-        else:
-            CassandraNodes.exec(state.pod, state.namespace, f'cat {arg}')
-
-        return state
-
-    def completion(self, state: ReplState):
-        return super().completion(state)
-
-    def help(self, _: ReplState):
-        return f'{Cat.COMMAND} <path>[@<pod>] \t print content of the file'