kaqing 2.0.42__tar.gz → 2.0.44__tar.gz

{kaqing-2.0.42 → kaqing-2.0.44}/PKG-INFO

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

{kaqing-2.0.42 → kaqing-2.0.44}/adam/commands/cd.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.postgres.pg_utils import pg_database_names
+from adam.commands.postgres.postgres_utils import pg_database_names
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.k8s_utils.cassandra_clusters import CassandraClusters
 from adam.k8s_utils.kube_context import KubeContext

{kaqing-2.0.42 → kaqing-2.0.44}/adam/commands/cql_utils.py

@@ -11,7 +11,7 @@ from adam.utils import log2
 
 @functools.lru_cache()
 def keyspaces(state: ReplState, on_any=False):
-    Config().wait_log("Inspecting Cassandra Keyspaces...")
+    Config().wait_log('Inspecting Cassandra Keyspaces...')
 
     r: list[PodExecResult] = run_cql(state, 'describe keyspaces', show_out=False, on_any=on_any)
     if not r:

{kaqing-2.0.42 → kaqing-2.0.44}/adam/commands/ls.py

@@ -1,16 +1,14 @@
 import copy
-import re
 
 from adam.commands.command import Command
 from adam.commands.commands_utils import show_pods, show_rollout
 from adam.commands.cqlsh import Cqlsh
-from adam.commands.postgres.pg_utils import pg_database_names, pg_table_names
+from adam.commands.postgres.postgres_utils import pg_database_names, pg_table_names
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.config import Config
 from adam.k8s_utils.custom_resources import CustomResources
 from adam.k8s_utils.ingresses import Ingresses
 from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.services import Services
 from adam.k8s_utils.statefulsets import StatefulSets
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState

{kaqing-2.0.42 → kaqing-2.0.44}/adam/commands/postgres/postgres.py

@@ -1,8 +1,8 @@
-import functools
 import click
 
 from adam.commands.command import Command
-from adam.commands.postgres.pg_utils import pg_table_names
+from adam.commands.postgres.postgres_completions import pg_completions
+from adam.commands.postgres.postgres_utils import pg_table_names
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview
 from .postgres_session import PostgresSession
@@ -68,20 +68,8 @@ class Postgres(Command):
         leaf = {}
         session = PostgresSession(state.namespace, state.pg_path)
         if session.db:
-          if tables := pg_table_names(state.namespace, state.pg_path):
-            leaf = {
-                '\h': None,
-                '\d': None,
-                '\dt': None,
-                '\du': None,
-                'delete': {'from': {t: {'where': {'id': {'=': None}}} for t in tables}},
-                'insert': {'into': {t: {'values': None} for t in tables}},
-                'select': {'*': {'from': {t: {
-                    'limit': {'1': None},
-                    'where': {'id': {'=': None}}
-                } for t in tables}}},
-                'update': {t: {'set': None} for t in tables},
-            }
+          if pg_table_names(state.namespace, state.pg_path):
+            leaf = pg_completions(state.namespace, state.pg_path)
         elif state.pg_path:
             leaf = {
                 '\h': None,

kaqing-2.0.44/adam/commands/postgres/postgres_completions.py

@@ -0,0 +1,24 @@
+from adam.pg_table_completer import PgTableCompleter
+
+def pg_completions(ns: str, pg_path: str):
+    table = PgTableCompleter(ns, pg_path)
+    return {
+        '\h': None,
+        '\d': None,
+        '\dt': None,
+        '\du': None,
+        # 'delete': {'from': {ts: {'where': {'id': {'=': None}}}}},
+        # 'insert': {'into': {ts: {'values': None}}},
+        # 'select': {'*': {'from': {ts: {
+        #     'limit': {'1': None},
+        #     'where': {'id': {'=': None}}
+        # }}}},
+        # 'update': {ts: {'set': None}},
+        'delete': {'from': table.nested({'where': {'id': {'=': None}}})},
+        'insert': {'into': table.nested({'values': None})},
+        'select': {'*': {'from': table.nested({
+            'limit': {'1': None},
+            'where': {'id': {'=': None}}
+        })}},
+        'update': table.nested({'set': None}),
+    }

{kaqing-2.0.42 → kaqing-2.0.44}/adam/commands/postgres/postgres_session.py

@@ -25,13 +25,6 @@ class PostgresSession:
             if len(tks) > 1:
                 self.db = tks[1]
 
-    # works only for databases()
-    def __eq__(self, other: 'PostgresSession'):
-        return self.host == other.host
-
-    def __hash__(self):
-        return hash(self.host)
-
     def find_namespace(self, arg: str):
         if arg:
             tks = arg.split('@')
@@ -82,7 +75,6 @@ class PostgresSession:
 
         return [s for s in ss if not excludes(s)]
 
-    @functools.lru_cache()
     def databases(self):
         dbs = []
         #  List of databases

kaqing-2.0.42/adam/commands/postgres/pg_utils.py → kaqing-2.0.44/adam/commands/postgres/postgres_utils.py

@@ -1,13 +1,18 @@
 import functools
 
 from adam.commands.postgres.postgres_session import PostgresSession
+from adam.config import Config
 
+@functools.lru_cache()
 def pg_database_names(ns: str, pg_path: str):
+    Config().wait_log('Inspecting Postgres Databases...')
+
     pg = PostgresSession(ns, pg_path)
     return [db['name'] for db in pg.databases() if db['owner'] == PostgresSession.default_owner()]
 
 @functools.lru_cache()
 def pg_table_names(ns: str, pg_path: str):
+    Config().wait_log('Inspecting Postgres Database...')
     return [table['name'] for table in pg_tables(ns, pg_path) if table['schema'] == PostgresSession.default_schema()]
 
 def pg_tables(ns: str, pg_path: str):

{kaqing-2.0.42 → kaqing-2.0.44}/adam/commands/preview_table.py

@@ -2,7 +2,6 @@ import functools
 
 from adam.commands.command import Command
 from adam.commands.cql_utils import run_cql, tables
-from adam.commands.postgres.pg_utils import pg_table_names
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
@@ -72,8 +71,7 @@ class PreviewTable(Command):
 
     def completion(self, state: ReplState):
         if state.device == ReplState.P:
-            if tables := pg_table_names(state.namespace, state.pg_path):
-                return {PreviewTable.COMMAND: {table: None for table in tables}}
+            return {PreviewTable.COMMAND: {f'<pg_tables:{state.namespace}:{state.pg_path}>': None}}
         elif state.sts:
             tables = PreviewTable.cql_tables(state)
             return {PreviewTable.COMMAND: {f'{k}.{t}': None for k, ts in tables.items() for t in ts}}

{kaqing-2.0.42 → kaqing-2.0.44}/adam/commands/reaper/reaper_session.py

@@ -149,7 +149,7 @@ class ReaperSession:
             return ReaperSession.schedules_ids_by_cluster[state.sts]
 
         if reaper := ReaperSession.create(state):
-            Config().wait_log("Inspecting Cassandra Reaper...")
+            Config().wait_log('Inspecting Cassandra Reaper...')
 
             schedules = reaper.schedule_ids(state, show_output = False)
             ReaperSession.schedules_ids_by_cluster[state.sts] = schedules

{kaqing-2.0.42 → kaqing-2.0.44}/adam/k8s_utils/statefulsets.py

@@ -24,6 +24,7 @@ class StatefulSets:
 
         return statefulsets.items
 
+    @functools.lru_cache()
     def list_sts_name_and_ns():
         return [(statefulset.metadata.name, statefulset.metadata.namespace) for statefulset in StatefulSets.list_sts()]
 

kaqing-2.0.44/adam/pg_table_completer.py

@@ -0,0 +1,77 @@
+from typing import Any, Dict, Iterable, Mapping, Optional, Set, Union
+from prompt_toolkit.completion import CompleteEvent, Completer, Completion, NestedCompleter, WordCompleter
+from prompt_toolkit.document import Document
+
+from adam.commands.postgres.postgres_utils import pg_table_names
+
+NestedDict = Mapping[str, Union[Any, Set[str], None, Completer]]
+
+class PgTableCompleter(Completer):
+    def __init__(self, namespace: str, pg_path: str, nested_dict: NestedDict = None, ignore_case: bool = True):
+        self.namespace = namespace
+        self.pg_path = pg_path
+        self.ignore_case = ignore_case
+        if nested_dict:
+            self.append_nested_dict(nested_dict)
+
+    def __repr__(self) -> str:
+        return "PgTableCompleter(%r, pg_path=%r)" % (self.namespace, self.pg_path)
+
+    def nested(self, data: NestedDict):
+        return PgTableCompleter(self.namespace, self.pg_path).append_nested_dict(data)
+
+    def append_nested_dict(self, data: NestedDict) -> "PgTableCompleter":
+        options: Dict[str, Optional[Completer]] = {}
+        for key, value in data.items():
+            if isinstance(value, Completer):
+                options[key] = value
+            elif isinstance(value, dict):
+                options[key] = NestedCompleter.from_nested_dict(value)
+            elif isinstance(value, set):
+                options[key] = NestedCompleter.from_nested_dict({item: None for item in value})
+            else:
+                assert value is None
+                options[key] = None
+
+        self.options = options
+
+        return self
+
+    def get_completions(
+        self, document: Document, complete_event: CompleteEvent
+    ) -> Iterable[Completion]:
+        text = document.text_before_cursor.lstrip()
+        stripped_len = len(document.text_before_cursor) - len(text)
+
+        if " " in text:
+            second_term = None
+            tokens = text.split()
+            if len(tokens) > 1:
+                second_term = tokens[1]
+            if second_term:
+                completer = self.options.get(second_term)
+
+                if completer is not None:
+                    first_term = tokens[0]
+                    remaining_text = text[len(first_term) :].lstrip()
+                    move_cursor = len(text) - len(remaining_text) + stripped_len
+
+                    remaining_text = remaining_text[len(second_term) :].lstrip()
+                    move_cursor = len(text) - len(remaining_text) + stripped_len
+
+                    new_document = Document(
+                        remaining_text,
+                        cursor_position=document.cursor_position - move_cursor,
+                    )
+
+                    for c in completer.get_completions(new_document, complete_event):
+                        yield c
+            else:
+                completer = WordCompleter(
+                    list(self.options.keys()), ignore_case=self.ignore_case
+                )
+                for c in completer.get_completions(document, complete_event):
+                    yield c
+        else:
+            for t in pg_table_names(self.namespace, self.pg_path):
+                yield Completion(t)

{kaqing-2.0.42 → kaqing-2.0.44}/adam/repl.py

@@ -105,8 +105,9 @@ def enter_repl(state: ReplState):
                         completions = deep_sort_dict(deep_merge_dicts(completions, cmd.completion(state)))
                     finally:
                         if Config().get('debugs.timings', False):
-                            Config().debug('Timing completion calc', cmd.command(), f'{time.time() - s1:.2f}')
+                            log2(f'Timing auto-completion-calc {cmd.command()}: {time.time() - s1:.2f}')
 
+                # print(json.dumps(completions, indent=4))
                 completer = NestedCompleter.from_nested_dict(completions)
 
             cmd = session.prompt(prompt_msg(), completer=completer, key_bindings=kb)
@@ -153,7 +154,7 @@ def enter_repl(state: ReplState):
         finally:
             Config().clear_wait_log_flag()
             if Config().get('debugs.timings', False) and 'cmd' in locals() and 's0' in locals():
-                print('Timing command', cmd, f'{time.time() - s0:.2f}')
+                log2(f'Timing command {cmd}: {time.time() - s0:.2f}')
 
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterCommandHelper, help="Enter interactive shell.")
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')

kaqing-2.0.44/adam/version.py

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

{kaqing-2.0.42 → kaqing-2.0.44}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.42 → kaqing-2.0.44}/kaqing.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ adam/config.py
 adam/embedded_apps.py
 adam/embedded_params.py
 adam/log.py
+adam/pg_table_completer.py
 adam/pod_exec_result.py
 adam/repl.py
 adam/repl_commands.py
@@ -106,11 +107,12 @@ adam/commands/medusa/medusa_restore.py
 adam/commands/medusa/medusa_show_backupjobs.py
 adam/commands/medusa/medusa_show_restorejobs.py
 adam/commands/postgres/__init__.py
-adam/commands/postgres/pg_utils.py
 adam/commands/postgres/postgres.py
+adam/commands/postgres/postgres_completions.py
 adam/commands/postgres/postgres_ls.py
 adam/commands/postgres/postgres_preview.py
 adam/commands/postgres/postgres_session.py
+adam/commands/postgres/postgres_utils.py
 adam/commands/reaper/__init__.py
 adam/commands/reaper/reaper.py
 adam/commands/reaper/reaper_forward.py

{kaqing-2.0.42 → kaqing-2.0.44}/setup.py

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

kaqing-2.0.42/adam/version.py

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