Jaculabilis
/
amanuensis
1
1
Fork 0
Code Issues 19 Pull Requests Projects 1 Releases Activity

Allow require wrappers to check and load models

This commit is contained in:
Tim Van Baak 2020-01-22 17:21:25 -08:00
parent 4661b232c2
commit f0cdcb8d8c
1 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
amanuensis/cli/helpers.py
View File

@ -29,35 +29,49 @@ def no_argument(command):
command(cmd_args) command(cmd_args)
return augmented_command return augmented_command
# Wrapper for commands requiring lexicon or username options # Wrappers for commands requiring lexicon or username options
def requires(arg, metavar, dest, fallback, help): def requires_lexicon(command):
"""Subparser fallback for -u and -n options"""
def req_checker(command):
@wraps(command) @wraps(command)
def augmented_command(cmd_args): def augmented_command(cmd_args):
if type(cmd_args) is ArgumentParser: if type(cmd_args) is ArgumentParser:
cmd_args.add_argument(arg, metavar=metavar, dest=dest, help=help) cmd_args.add_argument("-n", metavar="LEXICON", dest="lexicon", help="Specify a lexicon to operate on")
if command.__dict__.get('wrapper', False): if command.__dict__.get('wrapper', False):
command(cmd_args) command(cmd_args)
if type(cmd_args) is Namespace: if type(cmd_args) is Namespace:
base_val = hasattr(cmd_args, fallback) and getattr(cmd_args, fallback) base_val = hasattr(cmd_args, "tl_lexicon") and getattr(cmd_args, "tl_lexicon")
subp_val = hasattr(cmd_args, dest) and getattr(cmd_args, dest) subp_val = hasattr(cmd_args, "lexicon") and getattr(cmd_args, "lexicon")
val = subp_val or base_val or None val = subp_val or base_val or None
if not val: if not val:
import config import config
config.logger.error("This command requires {}".format(arg)) config.logger.error("This command requires specifying a lexicon")
return -1 return -1
setattr(cmd_args, dest, val) from lexicon import LexiconModel
cmd_args.lexicon = val#LexiconModel.by(name=val).name
command(cmd_args) command(cmd_args)
augmented_command.__dict__['wrapper'] = True augmented_command.__dict__['wrapper'] = True
return augmented_command return augmented_command
return req_checker
requires_lexicon = requires("-n", "LEXICON", "lexicon", "tl_lexicon", def requires_username(command):
"Specify a lexicon to operate on") @wraps(command)
requires_username = requires("-u", "USERNAME", "username", "tl_username", def augmented_command(cmd_args):
"Specify a user to operate on") if type(cmd_args) is ArgumentParser:
cmd_args.add_argument("-u", metavar="USERNAME", dest="username", help="Specify a user to operate on")
if command.__dict__.get('wrapper', False):
command(cmd_args)
if type(cmd_args) is Namespace:
base_val = hasattr(cmd_args, "tl_username") and getattr(cmd_args, "tl_lexicon")
subp_val = hasattr(cmd_args, "username") and getattr(cmd_args, "username")
val = subp_val or base_val or None
if not val:
import config
config.logger.error("This command requires specifying a user")
return -1
from user import UserModel
cmd_args.username = val#UserModel.by(name=val).name
command(cmd_args)
augmented_command.__dict__['wrapper'] = True
return augmented_command
# Helpers for common command tasks # Helpers for common command tasks