kaqing 2.0.43__tar.gz → 2.0.44__tar.gz

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

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

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

@@ -1,7 +1,7 @@
-import functools
 import click
 
 from adam.commands.command import Command
+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
@@ -69,20 +69,7 @@ class Postgres(Command):
         session = PostgresSession(state.namespace, state.pg_path)
         if session.db:
           if pg_table_names(state.namespace, state.pg_path):
-            ts = f'<pg_tables:{state.namespace}:{state.pg_path}>'
-            leaf = {
-                '\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}},
-            }
+            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.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.43 → kaqing-2.0.44}/adam/repl.py

@@ -1,4 +1,3 @@
-import json
 import os
 import re
 import time
@@ -17,7 +16,6 @@ from adam.k8s_utils.kube_context import KubeContext
 from adam.k8s_utils.statefulsets import StatefulSets
 from adam.log import Log
 from adam.repl_commands import ReplCommands
-from adam.repl_completer import CompleterContext, ReplCompleter
 from adam.repl_session import ReplSession
 from adam.repl_state import ReplState
 from adam.utils import deep_merge_dicts, deep_sort_dict, lines_to_tabular, log2
@@ -94,7 +92,7 @@ def enter_repl(state: ReplState):
     sorted_cmds = sorted(cmd_list, key=lambda cmd: cmd.command())
     while True:
         try:
-            completer = ReplCompleter.from_nested_dict({})
+            completer = NestedCompleter.from_nested_dict({})
             if not state.bash_session:
                 completions = {}
                 # app commands are available only on a: drive
@@ -110,7 +108,7 @@ def enter_repl(state: ReplState):
                             log2(f'Timing auto-completion-calc {cmd.command()}: {time.time() - s1:.2f}')
 
                 # print(json.dumps(completions, indent=4))
-                completer = ReplCompleter.from_nested_dict(completions)
+                completer = NestedCompleter.from_nested_dict(completions)
 
             cmd = session.prompt(prompt_msg(), completer=completer, key_bindings=kb)
             s0 = time.time()
@@ -154,7 +152,6 @@ def enter_repl(state: ReplState):
                 log2(e)
                 Config().debug(traceback.format_exc())
         finally:
-            CompleterContext().reset()
             Config().clear_wait_log_flag()
             if Config().get('debugs.timings', False) and 'cmd' in locals() and 's0' in locals():
                 log2(f'Timing command {cmd}: {time.time() - s0:.2f}')

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.43 → kaqing-2.0.44}/kaqing.egg-info/PKG-INFO

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

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

@@ -10,10 +10,10 @@ 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
-adam/repl_completer.py
 adam/repl_session.py
 adam/repl_state.py
 adam/utils.py
@@ -108,6 +108,7 @@ adam/commands/medusa/medusa_show_backupjobs.py
 adam/commands/medusa/medusa_show_restorejobs.py
 adam/commands/postgres/__init__.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

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

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

kaqing-2.0.43/adam/repl_completer.py

@@ -1,74 +0,0 @@
-import re
-
-from typing import Iterable
-from prompt_toolkit.completion import CompleteEvent, Completion, NestedCompleter, WordCompleter
-from prompt_toolkit.document import Document
-
-from adam.commands.postgres.postgres_utils import pg_table_names
-
-class CompleterContext:
-    # the singleton pattern
-    def __new__(cls, *args, **kwargs):
-        if not hasattr(cls, 'instance'): cls.instance = super(CompleterContext, cls).__new__(cls)
-
-        return cls.instance
-
-    def __init__(self):
-        if not hasattr(self, 'table_resolver'):
-            self.table_resolver = None
-            self.tables = []
-
-    def produce(self, word: str):
-        if match := re.match(r'^<pg_tables:(.*?):(.*?)>$', word):
-            self.table_resolver = word
-            self.tables = pg_table_names(match.group(1), match.group(2))
-
-            return self.tables
-
-        return None
-
-    def is_table(self, word: str):
-        if word in self.tables and self.table_resolver:
-            return self.table_resolver
-
-        return None
-
-    def reset(self):
-        self.table_resolver = None
-        self.tables = []
-
-
-class ReplCompleter(NestedCompleter):
-    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:
-            first_term = text.split()[0]
-            completer = self.options.get(first_term)
-            if table_resolver := CompleterContext().is_table(first_term):
-                completer = self.options.get(table_resolver)
-
-            if completer is not None:
-                remaining_text = text[len(first_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):
-                    if words := CompleterContext().produce(c.text):
-                        for w in words:
-                            yield Completion(w)
-                    else:
-                        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

kaqing-2.0.43/adam/version.py

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