kaqing 2.0.41__py3-none-any.whl → 2.0.42__py3-none-any.whl

adam/commands/cd.py

@@ -1,4 +1,5 @@
 from adam.commands.command import Command
+from adam.commands.postgres.pg_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
@@ -91,7 +92,7 @@ class Cd(Command):
             if pg and pg.db:
                 return {Cd.COMMAND: {'..': None}}
             elif pg and pg.host:
-                return {Cd.COMMAND: {'..': None} | {p['name']: None for p in pg.databases()}}
+                return {Cd.COMMAND: {'..': None} | {p: None for p in pg_database_names(state.namespace, pg.directory())}}
             else:
                 return {Cd.COMMAND: {p: None for p in PostgresSession.hosts(state.namespace)}}
         elif state.device == ReplState.A:

adam/commands/ls.py

@@ -4,6 +4,7 @@ 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_session import PostgresSession
 from adam.config import Config
 from adam.k8s_utils.custom_resources import CustomResources
@@ -123,14 +124,10 @@ class Ls(Command):
             log(lines_to_tabular(lines, 'NAME,NAMESPACE,ENDPOINT,USERNAME,PASSWORD', separator=','))
 
     def show_pg_databases(self, pg: PostgresSession):
-        lines = [db["name"] for db in pg.databases() if db["owner"] == PostgresSession.default_owner()]
-
-        log(lines_to_tabular(lines, 'DATABASE', separator=','))
+        log(lines_to_tabular(pg_database_names(pg.namespace, pg.directory()), 'DATABASE', separator=','))
 
     def show_pg_tables(self, pg: PostgresSession):
-        lines = [db["name"] for db in pg.tables() if db["schema"] == PostgresSession.default_schema()]
-
-        log(lines_to_tabular(lines, 'NAME', separator=','))
+        log(lines_to_tabular(pg_table_names(pg.namespace, pg.directory()), 'NAME', separator=','))
 
     def completion(self, state: ReplState):
         if state.pod:

adam/commands/postgres/pg_utils.py

@@ -0,0 +1,18 @@
+import functools
+
+from adam.commands.postgres.postgres_session import PostgresSession
+
+def pg_database_names(ns: str, pg_path: str):
+    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):
+    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):
+    pg = PostgresSession(ns, pg_path)
+    if pg.db:
+        return pg.tables()
+
+    return []

adam/commands/postgres/postgres.py

@@ -2,6 +2,7 @@ import functools
 import click
 
 from adam.commands.command import Command
+from adam.commands.postgres.pg_utils import pg_table_names
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview
 from .postgres_session import PostgresSession
@@ -67,19 +68,19 @@ class Postgres(Command):
         leaf = {}
         session = PostgresSession(state.namespace, state.pg_path)
         if session.db:
-            ts = self.tables(state.namespace, state.pg_path)
+          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 ts}},
-                'insert': {'into': {t: {'values': None} for t in ts}},
+                '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 ts}}},
-                'update': {t: {'set': None} for t in ts},
+                } for t in tables}}},
+                'update': {t: {'set': None} for t in tables},
             }
         elif state.pg_path:
             leaf = {
@@ -92,15 +93,6 @@ class Postgres(Command):
         else:
             return {}
 
-    # TODO fix cache
-    # @functools.lru_cache()
-    def tables(self, ns: str, pg_path: str):
-        session = PostgresSession(ns, pg_path)
-        if session.db:
-            return [f'{t["schema"]}.{t["name"]}' for t in session.tables()]
-
-        return []
-
     def help(self, _: ReplState):
         return f'[{Postgres.COMMAND}] <sql-statements>\t run psql with queries'
 

adam/commands/preview_table.py

@@ -2,9 +2,9 @@ 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.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import lines_to_tabular, log, log2
 
@@ -72,8 +72,8 @@ class PreviewTable(Command):
 
     def completion(self, state: ReplState):
         if state.device == ReplState.P:
-            if tables := PreviewTable.pg_tables(state.namespace, state.pg_path):
-                return {PreviewTable.COMMAND: {db["name"]: None for db in tables if db["schema"] == PostgresSession.default_schema()}}
+            if tables := pg_table_names(state.namespace, state.pg_path):
+                return {PreviewTable.COMMAND: {table: None for table in tables}}
         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}}
@@ -88,18 +88,4 @@ class PreviewTable(Command):
         if state.pod:
             return tables(state)
 
-        return tables(state, on_any=True)
-
-        # r: list[PodExecResult] = run_cql(state, 'describe tables', show_out=False, on_any=True)
-        # if not r:
-        #     return []
-
-        # return parse_cql_desc_tables(r[0].stdout)
-
-    @functools.lru_cache()
-    def pg_tables(ns: str, pg_path: str):
-        pg = PostgresSession(ns, pg_path)
-        if pg.db:
-            return pg.tables()
-
-        return None
+        return tables(state, on_any=True)

adam/version.py

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

{kaqing-2.0.41.dist-info → kaqing-2.0.42.dist-info}/METADATA

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

{kaqing-2.0.41.dist-info → kaqing-2.0.42.dist-info}/RECORD

@@ -14,7 +14,7 @@ adam/repl_commands.py,sha256=aH7xxbsQGrpL9Ozk9QF54iToK6wbDT3Pu9rMyw9sDBY,4719
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=591d7gV6uQSFtm7IWdlIYAHjfAzs9bdvIkwlIAeKddE,7540
 adam/utils.py,sha256=2DoWsrcaioFFH0-RjT30qelVRPUJqCGTfz_ucfE7F8g,7406
-adam/version.py,sha256=dFQ-OBXEqCb5aUcKIvnOUqGZNXXCV8b55Fb031UN2b0,139
+adam/version.py,sha256=eljjZE7kqyuzTMa7Yo7ey3W4bRuXcbF2q2tkG1C7Izg,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=Y5cWg0Ow93rIDusbHgxQcC7sSB64LmULTlDxPLybiVM
 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=XEoiMhbJgA2KVKwhHFcs5BRAlf9qpgbAh6IImpKOtHI,4486
+adam/commands/cd.py,sha256=eOVpddySWkBSwaIocQ4xU_N_GwFcg6qF5mj2NcGfACE,4576
 adam/commands/check.py,sha256=853FPfgTMGxQXI_5UaPAtzaSWB_BvEVm48EkJhsHe4w,2181
 adam/commands/cli_commands.py,sha256=PEEyrG9yz7RAEZwHbbuFpyE3fVi8vrIWbr0d1H0Gp9o,3620
 adam/commands/command.py,sha256=Ph7IduCTGQ04dcwNegl1ekYbqCzOwAOYeWZVIRWnKyU,3958
@@ -66,12 +66,12 @@ 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=-AT0UnjvotSpFguaUoRAnJ8XXfshwh0ElHa_Ofl5l9w,5671
+adam/commands/ls.py,sha256=il1eQOLcfub0Yx8nDsCvlKpx2UONK7_WaidXLzlBvkU,5621
 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
 adam/commands/param_set.py,sha256=QDIuqfU80aWCB16OK49yf7XRaRTWwiLkwMsJuVikq9I,1271
-adam/commands/preview_table.py,sha256=ROEYHwCOhTxkSNqEyYZ9ASSevNmkN_mHEeH8LXa4gw8,3513
+adam/commands/preview_table.py,sha256=yxxSQDqwM-vYSZm6ITTC6b9t4rTVXtSzq3o6z8Cfx8A,3084
 adam/commands/pwd.py,sha256=VlgFjxFl66I7Df1YI6cuiEeY6Q13lEavMKfrzHLESKo,2340
 adam/commands/report.py,sha256=Ky45LIzSlB_X4V12JZWjU3SA2u4_FKRencRTq7psOWU,1944
 adam/commands/restart.py,sha256=Hik1t5rjH2ATZv4tzwrGB3e44b3dNuATgY327_Nb8Bs,2044
@@ -104,7 +104,8 @@ adam/commands/medusa/medusa_restore.py,sha256=MU47bmozrjfGJ6GVkj_OVgLH6Uz_fGh03M
 adam/commands/medusa/medusa_show_backupjobs.py,sha256=QekHpKezVJdgfa9hOxfgyx-y4D08tmHzyu_AAa8QPR0,1756
 adam/commands/medusa/medusa_show_restorejobs.py,sha256=wgPonSmC6buDIp3k3WUY-Yu2MyP1xyE3Q_XhvAwpnx4,1651
 adam/commands/postgres/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/postgres/postgres.py,sha256=zi6zicBLe2ZM6UCZgL3L3tdKIISEMGAh8UFcTuTUp5k,3649
+adam/commands/postgres/pg_utils.py,sha256=s9v28RGIhgPDfueucwTepedDWXBcIy85CwF2Zo266Uc,587
+adam/commands/postgres/postgres.py,sha256=95RPzGcVEWDR2Vhuy2RReJUGKdchZJjOWAtgvAbPnJ0,3473
 adam/commands/postgres/postgres_ls.py,sha256=HwZTgwGKXUqHX33S8aQPF6FqCrLqtoz4cLyJV2SpoE0,1186
 adam/commands/postgres/postgres_preview.py,sha256=MLzdEc4mvNj6V1Q8jO5OPznXyYELJHgd35_eQgLlNIU,1274
 adam/commands/postgres/postgres_session.py,sha256=CK5rkYcRHZqg2AR3fRrP81zF5P71yroPV7SvyQ6pJ7c,9509
@@ -167,8 +168,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.41.dist-info/METADATA,sha256=2BK4sM2oap6IJ6uhJ-SU_cXy8YJg3QKmd8peq4QhvYU,132
-kaqing-2.0.41.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.41.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.41.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.41.dist-info/RECORD,,
+kaqing-2.0.42.dist-info/METADATA,sha256=1AEwxOTmZfdz85m7S8MwkKLltlOtf6MxYvqjBHe7TB0,132
+kaqing-2.0.42.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.42.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.42.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.42.dist-info/RECORD,,