kaqing 2.0.57__py3-none-any.whl → 2.0.59__py3-none-any.whl

adam/commands/cd.py

@@ -72,7 +72,8 @@ class Cd(Command):
                     if not state.sts:
                         ss_and_ns = dir.split('@')
                         state.sts = ss_and_ns[0]
-                        state.namespace = ss_and_ns[1]
+                        if len(ss_and_ns) > 1:
+                            state.namespace = ss_and_ns[1]
                     elif not state.pod:
                         p, _ = KubeContext.is_pod_name(dir)
                         if p:

adam/commands/ls.py

@@ -86,7 +86,7 @@ class Ls(Command):
         return state
 
     def show_statefulsets(self):
-        ss = StatefulSets.list_sts_names(show_namespace=not KubeContext.in_cluster_namespace())
+        ss = StatefulSets.list_sts_names()
         if len(ss) == 0:
             log2('No cassandra statefulsets found.')
             return

adam/k8s_utils/secrets.py

@@ -10,6 +10,8 @@ from adam.utils import log2
 # utility collection on secrets; methods are all static
 class Secrets:
     def list_secrets(namespace: str = None, name_pattern: str = None):
+        Config().wait_log('Inspecting Cassandra Instances...')
+
         secrets_names = []
 
         v1 = client.CoreV1Api()

adam/k8s_utils/statefulsets.py

@@ -28,8 +28,8 @@ class StatefulSets:
     def list_sts_name_and_ns():
         return [(statefulset.metadata.name, statefulset.metadata.namespace) for statefulset in StatefulSets.list_sts()]
 
-    def list_sts_names(show_namespace = True):
-        if show_namespace:
+    def list_sts_names():
+        if not KubeContext.in_cluster_namespace():
             return [f"{sts}@{ns}" for sts, ns in StatefulSets.list_sts_name_and_ns()]
         else:
             return [f"{sts}" for sts, _ in StatefulSets.list_sts_name_and_ns()]

adam/repl.py

@@ -61,26 +61,30 @@ def enter_repl(state: ReplState):
         return f"{msg}$ " if state.bash_session else f"{msg}> "
 
     Log.log2(f'kaqing {__version__}')
-    ss = StatefulSets.list_sts_name_and_ns()
 
     if state.device == ReplState.C:
+        ss = StatefulSets.list_sts_name_and_ns()
         if not ss:
             raise Exception("no Cassandra clusters found")
-        elif len(ss) == 1 and Config().get('repl.auto-enter-only-cluster', True):
+        elif not state.sts and len(ss) == 1 and Config().get('repl.auto-enter-only-cluster', True):
             cluster = ss[0]
             state.sts = cluster[0]
             state.namespace = cluster[1]
-            Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}@{state.namespace}...')
+            if KubeContext().in_cluster_namespace:
+                Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}...')
+            else:
+                Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}@{state.namespace}...')
     elif state.device == ReplState.A:
-        if app := Config().get('repl.auto-enter-app', 'c3/c3'):
-            if app != 'no':
-                ea = app.split('/')
-                state.app_env = ea[0]
-                if len(ea) > 1:
-                    state.app_app = ea[1]
-                    Config().wait_log(f'Moving to {state.app_env}/{state.app_app}...')
-                else:
-                    Config().wait_log(f'Moving to {state.app_env}...')
+        if not state.app_env:
+            if app := Config().get('repl.auto-enter-app', 'c3/c3'):
+                if app != 'no':
+                    ea = app.split('/')
+                    state.app_env = ea[0]
+                    if len(ea) > 1:
+                        state.app_app = ea[1]
+                        Config().wait_log(f'Moving to {state.app_env}/{state.app_app}...')
+                    else:
+                        Config().wait_log(f'Moving to {state.app_env}...')
 
     kb = KeyBindings()
 

adam/repl_state.py

@@ -1,5 +1,6 @@
 import copy
 from enum import Enum
+import re
 
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.k8s_utils.cassandra_clusters import CassandraClusters
@@ -128,8 +129,30 @@ class ReplState:
             if index < 6:
                 state = copy.copy(state)
 
-                if arg in [f'{ReplState.A}:', f'{ReplState.C}:', f'{ReplState.P}:']:
-                    state.device = arg.strip(':')
+                groups = re.match(r'^([a|c|p]):(.*)$', arg)
+                if groups:
+                    if groups[1] == 'p':
+                        state.device = 'p'
+                        state.pg_path = groups[2]
+                    elif groups[1] == 'c':
+                        state.device = 'c'
+                        if path := groups[2]:
+                            p_and_ns = path.split('@')
+                            sts_and_pod = p_and_ns[0].split('/')
+                            state.sts = sts_and_pod[0]
+                            if len(sts_and_pod) > 1:
+                                state.pod = sts_and_pod[1]
+                            if len(p_and_ns) > 1:
+                                state.namespace = p_and_ns[1]
+                            elif ns := KubeContext.in_cluster_namespace():
+                                state.namespace = ns
+                    else:
+                        state.device = 'a'
+                        if path := groups[2]:
+                            env_and_app = path.split('/')
+                            state.app_env = env_and_app[0]
+                            if len(env_and_app) > 1:
+                                state.app_app = env_and_app[1]
                 else:
                     new_args.append(arg)
             else:

adam/sql/sql_completer.py

@@ -181,7 +181,7 @@ class SqlCompleter(Completer):
             elif state == "select_where_":
                 completer = columns
             elif state in ["select_where_a", "select_where_a_"]:
-                completer = TermCompleter(['=', '<', '<=', '>', '>=', '<>', 'like', 'not'])
+                completer = TermCompleter(['=', '<', '<=', '>', '>=', '<>', 'like', 'not', 'in'])
             elif state == "select_where_a_not_":
                 completer = TermCompleter(['like', 'in'])
             elif state == "select_where_a_op":

adam/version.py

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

{kaqing-2.0.57.dist-info → kaqing-2.0.59.dist-info}/METADATA

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

{kaqing-2.0.57.dist-info → kaqing-2.0.59.dist-info}/RECORD

@@ -9,12 +9,12 @@ adam/embedded_apps.py,sha256=lKPx63mKzJbNmwz0rgL4gF76M9fDGxraYTtNAIGnZ_s,419
 adam/embedded_params.py,sha256=_9tBKpkSzBfzm-s3tUgZs8DcSVBnPA1iumG0ZRCbZIs,4586
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
 adam/pod_exec_result.py,sha256=nq0xnCNOpUGBSijGF0H-YNrwBc9vUQs4DkvLMIFS5LQ,951
-adam/repl.py,sha256=X9ga1iZFIXADQxBXvztFyVNBrfBRxiFLxTUYkm11img,7328
+adam/repl.py,sha256=hY1IC7GMy5268BL5i7EUlsKDBiRnqVnYjqmToMooXKE,7580
 adam/repl_commands.py,sha256=WA90Rl27Juctzr3U3kfCDk5N-oYMKlfWbZeafUgk7k0,4723
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
-adam/repl_state.py,sha256=591d7gV6uQSFtm7IWdlIYAHjfAzs9bdvIkwlIAeKddE,7540
+adam/repl_state.py,sha256=nZO5CucSIGz68f4JreadGphRzMXPUzkTn-4XcoJJOug,8643
 adam/utils.py,sha256=2DoWsrcaioFFH0-RjT30qelVRPUJqCGTfz_ucfE7F8g,7406
-adam/version.py,sha256=kXINOe-uvId2Kbv9pAAleFVyJC-tHoAx6EmOAUzCUjY,139
+adam/version.py,sha256=bZLF2XO6ZZlVFi6gyU2Pd1pWbqtTja4dmETU3w93K4k,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
@@ -51,7 +51,7 @@ adam/commands/alter_tables.py,sha256=Q5vXHE4_1_6v6wtYwqST7_QwpXINb1xq0Sm448Z2Y7Q
 adam/commands/app.py,sha256=7alV8wK801t67_rUe6EmhtHJTl-6K7fGCm6Uz1dDgpM,1963
 adam/commands/app_ping.py,sha256=Xk7cfefphXM2w-UvpnhNUTZ3BU38f0deehUb2FEyLCI,1337
 adam/commands/bash.py,sha256=1O9cCl9JHQdttqNAgdB44rO0NjCqHzHv4psAEQMJcjw,2714
-adam/commands/cd.py,sha256=wJdfCzA2939PpGx4xKsfDxiu-64OC9SecgPDb7nd4O0,4582
+adam/commands/cd.py,sha256=3Iaerv88wPe5DgiRBIVRmKb8TIjEZrUHz8gx88WOA6s,4633
 adam/commands/check.py,sha256=853FPfgTMGxQXI_5UaPAtzaSWB_BvEVm48EkJhsHe4w,2181
 adam/commands/cli_commands.py,sha256=PEEyrG9yz7RAEZwHbbuFpyE3fVi8vrIWbr0d1H0Gp9o,3620
 adam/commands/command.py,sha256=Ph7IduCTGQ04dcwNegl1ekYbqCzOwAOYeWZVIRWnKyU,3958
@@ -64,7 +64,7 @@ adam/commands/help.py,sha256=Ey3R1X8w_CMhdADI0t8dSQ28euhDHheJm7NermiGni4,1645
 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=ZOhY_vEjOEbvI5n8c9ha-SqmJwK2b7sF94G1gDoQ5Y0,5576
+adam/commands/ls.py,sha256=u81ICKedZAqOmgY3-BaYBPnMAcQdriQnP-nDf_mg5lM,5523
 adam/commands/nodetool.py,sha256=HV9yDzMhRjS4lw6UfV7Hc1pcmeSx5a1jU6cAEKSZ1Bg,2334
 adam/commands/nodetool_commands.py,sha256=5IgWC3rmeDD1cgwqQjiiWzi-wJpJ3n_8pAzz_9phXuk,2635
 adam/commands/param_get.py,sha256=kPAAppK2T0tEFRnSIVFLDPIIGHhgLA7drJhn8TRyvvE,1305
@@ -158,13 +158,13 @@ adam/k8s_utils/ingresses.py,sha256=ul3Z6fDGc_Cxcn-ExP0vXhZatoShCUZFtpwtCY4Qx7o,3
 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=ljn5tB-j8bdof6X_YWS9Hf5cjAzwmYw61I9_0bwIjCc,10540
-adam/k8s_utils/secrets.py,sha256=pYaVKXTpx3-QgFtBjznWFq0N6ZcBdxnx21FRe5nBCCo,2305
+adam/k8s_utils/secrets.py,sha256=V8SAsGwIfJCrbARf6gtbsCNKeqobu_x8hdJ-ckNyr1M,2369
 adam/k8s_utils/service_accounts.py,sha256=v2oQSqCrNvt2uRnKlNwR3fjtpUG7oF5nqgzEB7NnT-U,6349
 adam/k8s_utils/services.py,sha256=EOJJGACVbbRvu5T3rMKqIJqgYic1_MSJ17EA0TJ6UOk,3156
-adam/k8s_utils/statefulsets.py,sha256=hiBOmJZ3KTI6_naAFzNoW1NoYnnBG35BZ7RMdPhNC6o,4664
+adam/k8s_utils/statefulsets.py,sha256=5g7KxGRHgEewT8rnZneDTaJDylUf-dHH2edWJEoorr8,4667
 adam/k8s_utils/volumes.py,sha256=RIBmlOSWM3V3QVXLCFT0owVOyh4rGG1ETp521a-6ndo,1137
 adam/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/sql/sql_completer.py,sha256=BAg1Ogn_q1JSjpQhN-2jVzIuMoH1FpFzn_xpMRvB-TQ,35882
+adam/sql/sql_completer.py,sha256=eYkW0WYV0mEMUgGcKvxTRbI6vO-q3rJ7dUWjqaOGfHc,35888
 adam/sql/term_completer.py,sha256=VCCMPUzvh_9lwIOwqQmeijM0V2JPADkBbNV4HQIqDCw,2538
 adam/sso/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/sso/authenticator.py,sha256=BCm16L9zf5aLU47-sTCnudn2zLPwd8M2wwRminJfsqw,615
@@ -176,8 +176,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.57.dist-info/METADATA,sha256=AJUgGbSTZ4aZy5vdBdNW076Iv-L5SKzR00IFzWOtDUk,132
-kaqing-2.0.57.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.57.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.57.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.57.dist-info/RECORD,,
+kaqing-2.0.59.dist-info/METADATA,sha256=was_BfF57P67JzKL4YjCWWXifFOLUENpUpudmhb1Z_8,132
+kaqing-2.0.59.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.59.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.59.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.59.dist-info/RECORD,,