kaqing 2.0.91__tar.gz → 2.0.92__tar.gz

{kaqing-2.0.91 → kaqing-2.0.92}/PKG-INFO

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

{kaqing-2.0.91 → kaqing-2.0.92}/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()
 

{kaqing-2.0.91 → kaqing-2.0.92}/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(' ')

{kaqing-2.0.91 → kaqing-2.0.92}/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
 

{kaqing-2.0.91 → kaqing-2.0.92}/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]:

{kaqing-2.0.91 → kaqing-2.0.92}/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)

kaqing-2.0.92/adam/version.py

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

{kaqing-2.0.91 → kaqing-2.0.92}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.91 → kaqing-2.0.92}/kaqing.egg-info/SOURCES.txt

@@ -55,7 +55,6 @@ adam/commands/alter_tables.py
 adam/commands/app.py
 adam/commands/app_ping.py
 adam/commands/bash.py
-adam/commands/cat.py
 adam/commands/cd.py
 adam/commands/check.py
 adam/commands/cli_commands.py

{kaqing-2.0.91 → kaqing-2.0.92}/setup.py

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

kaqing-2.0.91/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'

kaqing-2.0.91/adam/version.py

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