kaqing 2.0.84__py3-none-any.whl → 2.0.86__py3-none-any.whl

adam/commands/audit/audit.py

@@ -28,8 +28,11 @@ class Audit(Command):
 
         state, args = self.apply_state(args, state)
 
-        r = super().intermediate_run(cmd, state, args, Audit.cmd_list(), display_help=False)
-        if isinstance(r, str) and r == 'command-missing':
+        r = None
+        if len(args) > 0:
+            r = super().intermediate_run(cmd, state, args, Audit.cmd_list(), display_help=False)
+
+        if not r or isinstance(r, str) and r == 'command-missing':
             sql = 'select * from audit order by ts desc limit 10'
             if args:
                 sql = ' '.join(args)
@@ -50,7 +53,7 @@ class Audit(Command):
         return [AuditRepairTables()]
 
     def help(self, _: ReplState):
-        return f"{Audit.COMMAND} \t run AWS Athena query on audit database"
+        return f'[{Audit.COMMAND}] <sql-statements>\t run SQL queries on Authena audit database'
 
 class AuditCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):

adam/commands/help.py

@@ -23,11 +23,12 @@ class Help(Command):
             return super().run(cmd, state)
 
         def section(cmds : list[ReplCommands]):
-            return [f'  {c.help(state)}' for c in cmds if c.help(state)]
+            sorted_cmds = sorted(cmds, key=lambda cmd: cmd.command())
+            return [f'  {c.help(state)}' for c in sorted_cmds if c.help(state)]
 
         lines = []
         lines.append('NAVIGATION')
-        lines.append('  a: | c: | p:\t switch to another operational device: App, Cassandra or Postgres')
+        lines.append('  a: | c: | l: | p:\t switch to another operational device: App, Cassandra, Audit or Postgres')
         lines.extend(section(ReplCommands.navigation()))
         lines.append('CHECK CASSANDRA')
         lines.extend(section(ReplCommands.cassandra_check()))

adam/utils_athena.py

@@ -48,14 +48,15 @@ def run_audit_query(sql: str):
 
    if state == 'SUCCEEDED':
       results_response = athena_client.get_query_results(QueryExecutionId=query_execution_id)
-      column_info = results_response['ResultSet']['Rows'][0]['Data']
-      columns = [col.get('VarCharValue') for col in column_info]
-      lines = []
-      for row in results_response['ResultSet']['Rows'][1:]:
-            row_data = [col.get('VarCharValue') for col in row['Data']]
-            lines.append('\t'.join(row_data))
-
-      log(lines_to_tabular(lines, header='\t'.join(columns), separator='\t'))
+      if results_response['ResultSet']['Rows']:
+         column_info = results_response['ResultSet']['Rows'][0]['Data']
+         columns = [col.get('VarCharValue') for col in column_info]
+         lines = []
+         for row in results_response['ResultSet']['Rows'][1:]:
+               row_data = [col.get('VarCharValue') for col in row['Data']]
+               lines.append('\t'.join(row_data))
+
+         log(lines_to_tabular(lines, header='\t'.join(columns), separator='\t'))
    else:
       log2(f"Query failed or was cancelled. State: {state}")
       log2(f"Reason: {query_status['QueryExecution']['Status'].get('StateChangeReason')}")

adam/version.py

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

{kaqing-2.0.84.dist-info → kaqing-2.0.86.dist-info}/METADATA

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

{kaqing-2.0.84.dist-info → kaqing-2.0.86.dist-info}/RECORD

@@ -14,9 +14,9 @@ adam/repl_commands.py,sha256=1AFE8AJoyQdJd0tlcwtMnwMjV5G7jL9MDkxJZxdo150,4963
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=dXyGlWXcSsfCjrYwMhU44PVn_oThSZ8dhJ5HCVE8-qU,8743
 adam/utils.py,sha256=sbsNZP3qGJtb6fXCa4dDXHry5ay9ev583cCZIQzy07s,7382
-adam/utils_athena.py,sha256=TbDv26_f7gCz0EmBJrtwmNPY0IRa7SaQIUrLiGaXh3o,2250
+adam/utils_athena.py,sha256=_E-Ik-rgpIhDhpwlllH3qlyI3P_8Jcw9b9qSj2Ql2UM,2319
 adam/utils_net.py,sha256=65fhBnWMCkhGtyHqz95qcHaCo35q-WX1RBkkXG8dKpI,416
-adam/version.py,sha256=V7DW_alZgubQUK1rhTS1PMRaCoPuOB_iZiB5r5OguYk,139
+adam/version.py,sha256=36vmTSVWv_AX6PKqQeB4jyszcc7H8wMS_veTlbjQeoo,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
@@ -62,7 +62,7 @@ adam/commands/commands_utils.py,sha256=ShUcxtDSd9B3NM0GDj3NBvKdmjCGY8qXgeUJpzNF6
 adam/commands/cp.py,sha256=dyQViRDPNqsKRkxPb7WyEVIBNw7YB6IfYa2q3VtfzyA,3107
 adam/commands/devices.py,sha256=ygpvjYa_NcezM_hctGOAAuBEHiDJtLtJNlOcLGvFJAc,3184
 adam/commands/exit.py,sha256=5MWUAmzYBlsrp0CoiTDB13SUkX9Ya18UlGeOIPia6TA,798
-adam/commands/help.py,sha256=Ey3R1X8w_CMhdADI0t8dSQ28euhDHheJm7NermiGni4,1645
+adam/commands/help.py,sha256=4IzR4p8UiXr00o1TaymHWm8957EWbWRyuvhrJzZzvc0,1734
 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
@@ -79,7 +79,7 @@ adam/commands/rollout.py,sha256=52_4ijna3v-8Oug12et43DRHFDNhiN34p6xLTQmhdbQ,2959
 adam/commands/shell.py,sha256=wY_PIx7Lt6vuxhFArlfxdEnBbrouCJ3yNHhFn17DEqw,848
 adam/commands/watch.py,sha256=mmBFpB8T1V7zrNs5b2YNyDDztMym_ILPDdkrbdAXTas,2438
 adam/commands/audit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/audit/audit.py,sha256=-LsGihEhS_CUr_cNvf4hS0z8SKr2cxcyH8loPcwGEvY,1807
+adam/commands/audit/audit.py,sha256=-sCbR-JxvI5qeUbuwF_HWI_j1pCpCntVZUB9sf3Vxs0,1885
 adam/commands/audit/audit_repair_tables.py,sha256=5Glsy29md3KH_4_smuVBeu6c4zygICPK8Jiv-fNRC38,1186
 adam/commands/cql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/cql/cql_completions.py,sha256=dXe51NTWEJis76587IWSn9Av-cjC0J6KMaxlBKfF4wM,411
@@ -183,8 +183,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.84.dist-info/METADATA,sha256=lmjAGlH1YfrrmAG9z7fwnrqxCzsW8QjdvZq5qTeuzQM,132
-kaqing-2.0.84.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.84.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.84.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.84.dist-info/RECORD,,
+kaqing-2.0.86.dist-info/METADATA,sha256=IzXUkh-9mv_JDa3XEl6ZFgmrln2ea5qqOOrGoZPHa9I,132
+kaqing-2.0.86.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.86.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.86.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.86.dist-info/RECORD,,