fz0x1/HPI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cli/query: add short flags, stream affects pprint

Browse source 
adds some short flags as CLI flags for convenience
the --stream flag previously only affected json, but
I can imagine '-o pprint -s -l 5' to print the first
5 items from some function could be useful as well
This commit is contained in:
Sean Breckenridge 2022-01-27 00:33:29 -08:00 • committed by karlicoss
parent 3f4fb64d56
commit 03dd1271f4
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
my/core/__main__.py
View file

@ -410,7 +410,7 @@ def _locate_functions_or_prompt(qualified_names: List[str], prompt: bool = True)
def query_hpi_functions( def query_hpi_functions(
*, *,
output: str = 'json', output: str = 'json',
stream_json: bool = False, stream: bool = False,
qualified_names: List[str], qualified_names: List[str],
order_key: Optional[str], order_key: Optional[str],
order_by_value_type: Optional[Type], order_by_value_type: Optional[Type],
@ -447,7 +447,7 @@ def query_hpi_functions(
if output == 'json': if output == 'json':
from .serialize import dumps from .serialize import dumps
if stream_json: if stream:
for item in res: for item in res:
# use sys.stdout directly # use sys.stdout directly
# the overhead form click.echo isn't a *lot*, but when called in a loop # the overhead form click.echo isn't a *lot*, but when called in a loop
@ -460,7 +460,11 @@ def query_hpi_functions(
elif output == 'pprint': elif output == 'pprint':
from pprint import pprint from pprint import pprint
pprint(list(res)) if stream:
for item in res:
pprint(item)
else:
pprint(list(res))
else: else:
res = list(res) # type: ignore[assignment] res = list(res) # type: ignore[assignment]
# output == 'repl' # output == 'repl'
@ -508,8 +512,8 @@ def main() -> None:
@main.command(name='doctor', short_help='run various checks') @main.command(name='doctor', short_help='run various checks')
@click.option('--verbose/--quiet', default=False, help='Print more diagnostic information') @click.option('--verbose/--quiet', default=False, help='Print more diagnostic information')
@click.option('--all', 'list_all', is_flag=True, help='List all modules, including disabled') @click.option('--all', 'list_all', is_flag=True, help='List all modules, including disabled')
@click.option('--quick', is_flag=True, help='Only run partial checks (first 100 items)') @click.option('-q', '--quick', is_flag=True, help='Only run partial checks (first 100 items)')
@click.option('--skip-config-check', 'skip_conf', is_flag=True, help='Skip configuration check') @click.option('-S', '--skip-config-check', 'skip_conf', is_flag=True, help='Skip configuration check')
@click.argument('MODULE', nargs=-1, required=False) @click.argument('MODULE', nargs=-1, required=False)
def doctor_cmd(verbose: bool, list_all: bool, quick: bool, skip_conf: bool, module: Sequence[str]) -> None: def doctor_cmd(verbose: bool, list_all: bool, quick: bool, skip_conf: bool, module: Sequence[str]) -> None:
''' '''
@ -590,7 +594,7 @@ def module_install_cmd(user: bool, module: str) -> None:
'--stream', '--stream',
default=False, default=False,
is_flag=True, is_flag=True,
help='stream json objects from the data source instead of printing a list at the end') help='stream objects from the data source instead of printing a list at the end')
@click.option('-k', @click.option('-k',
'--order-key', '--order-key',
default=None, default=None,
@ -601,26 +605,31 @@ def module_install_cmd(user: bool, module: str) -> None:
default=None, default=None,
type=click.Choice(['datetime', 'date', 'int', 'float']), type=click.Choice(['datetime', 'date', 'int', 'float']),
help='order by searching for some type on the iterable') help='order by searching for some type on the iterable')
@click.option('--after', @click.option('-a',
'--after',
default=None, default=None,
type=str, type=str,
help='while ordering, filter items for the key or type larger than or equal to this') help='while ordering, filter items for the key or type larger than or equal to this')
@click.option('--before', @click.option('-b',
'--before',
default=None, default=None,
type=str, type=str,
help='while ordering, filter items for the key or type smaller than this') help='while ordering, filter items for the key or type smaller than this')
@click.option('--within', @click.option('-w',
'--within',
default=None, default=None,
type=str, type=str,
help="a range 'after' or 'before' to filter items by. see above for further explanation") help="a range 'after' or 'before' to filter items by. see above for further explanation")
@click.option('--recent', @click.option('-r',
'--recent',
default=None, default=None,
type=str, type=str,
help="a shorthand for '--order-type datetime --reverse --before now --within'. e.g. --recent 5d") help="a shorthand for '--order-type datetime --reverse --before now --within'. e.g. --recent 5d")
@click.option('--reverse/--no-reverse', @click.option('--reverse/--no-reverse',
default=False, default=False,
help='reverse the results returned from the functions') help='reverse the results returned from the functions')
@click.option('--limit', @click.option('-l',
'--limit',
default=None, default=None,
type=int, type=int,
help='limit the number of items returned from the (functions)') help='limit the number of items returned from the (functions)')
@ -710,7 +719,7 @@ def query_cmd(
try: try:
query_hpi_functions( query_hpi_functions(
output=output, output=output,
stream_json=stream, stream=stream,
qualified_names=list(function_name), qualified_names=list(function_name),
order_key=order_key, order_key=order_key,
order_by_value_type=chosen_order_type, order_by_value_type=chosen_order_type,