VeniVidiVici
/
invest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up

This commit is contained in:
emlys 2021-10-12 16:23:08 -07:00
parent 35b64ade36
commit 0f7c8e0d65
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/natcap/invest/cli.py
View File

@ -31,15 +31,15 @@ DEFAULT_EXIT_CODE = 1
LOGGER = logging.getLogger(__name__)
# Build up an index mapping aliases to modelname.
# ``modelname`` is the key to the MODEL_METADATA dict, above.
# Build up an index mapping aliases to model_name.
# ``model_name`` is the key to the MODEL_METADATA dict.
_MODEL_ALIASES = {}
for _modelname, _meta in MODEL_METADATA.items():
for _alias in _meta.aliases:
assert _alias not in _MODEL_ALIASES, (
for model_name, meta in MODEL_METADATA.items():
for alias in meta.aliases:
assert alias not in _MODEL_ALIASES, (
'Alias %s already defined for model %s') % (
_alias, _MODEL_ALIASES[_alias])
_MODEL_ALIASES[_alias] = _modelname
alias, _MODEL_ALIASES[alias])
_MODEL_ALIASES[alias] = model_name
def build_model_list_table():
@ -58,9 +58,9 @@ def build_model_list_table():
# Adding 3 to max alias name length for the parentheses plus some padding.
max_alias_name_length = max(len(', '.join(meta.aliases))
for meta in MODEL_METADATA.values()) + 3
template_string = ' {modelname} {aliases} {modeltitle} {usage}'
template_string = ' {model_name} {aliases} {model_title} {usage}'
strings = ['Available models:']
for model_name in sorted(MODEL_METADATA.keys()):
for model_name in model_names:
usage_string = '(No GUI available)'
if MODEL_METADATA[model_name].gui is not None:
usage_string = ''
@ -70,9 +70,9 @@ def build_model_list_table():
alias_string = '(%s)' % alias_string
strings.append(template_string.format(
modelname=model_name.ljust(max_model_name_length),
model_name=model_name.ljust(max_model_name_length),
aliases=alias_string.ljust(max_alias_name_length),
modeltitle=MODEL_METADATA[model_name].model_title,
model_title=MODEL_METADATA[model_name].model_title,
usage=usage_string))
return '\n'.join(strings) + '\n'

4
src/natcap/invest/ui/cbc.py
View File

@ -68,10 +68,10 @@ class CoastalBlueCarbon(model.InVESTModel):
def __init__(self):
model.InVESTModel.__init__(
self,
label=MODEL_METADATA['coastal_blue_carbon_preprocessor'].model_title,
label=MODEL_METADATA['coastal_blue_carbon'].model_title,
target=coastal_blue_carbon.execute,
validator=coastal_blue_carbon.validate,
localdoc=MODEL_METADATA['coastal_blue_carbon_preprocessor'].userguide)
localdoc=MODEL_METADATA['coastal_blue_carbon'].userguide)
_ui_keys = functools.partial(
_create_input_kwargs_from_args_spec,

8
src/natcap/invest/ui/usage.py
View File

@ -196,11 +196,11 @@ def _log_exit_status(session_id, status):
str(exception))
def _log_model(model_name, model_args, session_id=None):
def _log_model(pyname, model_args, session_id=None):
"""Log information about a model run to a remote server.
Args:
model_name (string): a python string of the package version.
pyname (string): a python string of the package version.
model_args (dict): the traditional InVEST argument dictionary.
Returns:
@ -221,14 +221,14 @@ def _log_model(model_name, model_args, session_id=None):
md5.update(json.dumps(data).encode('utf-8'))
return md5.hexdigest()
args_spec = importlib.import_module(model_name).ARGS_SPEC
args_spec = importlib.import_module(pyname).ARGS_SPEC
try:
bounding_box_intersection, bounding_box_union = (
_calculate_args_bounding_box(model_args, args_spec))
payload = {
'model_name': model_name,
'model_name': pyname,
'invest_release': natcap.invest.__version__,
'node_hash': _node_hash(),
'system_full_platform_string': platform.platform(),