From 5e91836978415a08e8c6492662d2265aabe75934 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Sun, 22 Mar 2020 18:05:41 -0700 Subject: [PATCH] fix image validation errors --- hyperglass/configuration/__init__.py | 2 ++ hyperglass/configuration/models/_utils.py | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hyperglass/configuration/__init__.py b/hyperglass/configuration/__init__.py index f4f7923..6813ec8 100644 --- a/hyperglass/configuration/__init__.py +++ b/hyperglass/configuration/__init__.py @@ -24,6 +24,7 @@ from hyperglass.constants import ( DEFAULT_DETAILS, LOG_HANDLER_FILE, SUPPORTED_QUERY_TYPES, + __version__, ) from hyperglass.exceptions import ConfigError, ConfigInvalid, ConfigMissing from hyperglass.configuration.models import params as _params @@ -437,6 +438,7 @@ _frontend_fields = { _frontend_params = params.dict(include=_frontend_fields) _frontend_params.update( { + "hyperglass_version": __version__, "queries": {**params.queries.map, "list": params.queries.list}, "devices": frontend_devices, "networks": networks, diff --git a/hyperglass/configuration/models/_utils.py b/hyperglass/configuration/models/_utils.py index 4d01394..e7df553 100644 --- a/hyperglass/configuration/models/_utils.py +++ b/hyperglass/configuration/models/_utils.py @@ -151,8 +151,7 @@ def validate_image(value): if base_path[0] not in ("images", "custom"): raise ValueError( - "Logo files must be in the 'custom/' directory of your hyperglass directory. Got: {f}", - f=value, + f"Logo files must be in the 'custom/' directory of your hyperglass directory. Got: {value}" ) if base_path[0] == "custom": @@ -160,6 +159,6 @@ def validate_image(value): custom_file = config_path / "static" / value if not custom_file.exists(): - raise ValueError("'{f}' does not exist", f=str(custom_file)) + raise ValueError(f"'{str(custom_file)}' does not exist") return value