kaqing 2.0.84__tar.gz → 2.0.86__tar.gz

{kaqing-2.0.84 → kaqing-2.0.86}/PKG-INFO

@@ -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 → kaqing-2.0.86}/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):

{kaqing-2.0.84 → kaqing-2.0.86}/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()))

{kaqing-2.0.84 → kaqing-2.0.86}/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')}")

kaqing-2.0.86/adam/version.py

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

{kaqing-2.0.84 → kaqing-2.0.86}/kaqing.egg-info/PKG-INFO

@@ -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 → kaqing-2.0.86}/setup.py

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

kaqing-2.0.84/adam/version.py

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