vantage6 4.2.1__py3-none-any.whl → 4.3.0b3__py3-none-any.whl

vantage6/cli/configuration_manager.py

@@ -1,9 +1,17 @@
 from schema import And, Or, Use, Optional
 
-from vantage6.common.configuration_manager import (
-    Configuration,
-    ConfigurationManager
-)
+from vantage6.common.configuration_manager import Configuration, ConfigurationManager
+
+LOGGING_VALIDATORS = {
+    "level": And(
+        Use(str), lambda lvl: lvl in ("DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL")
+    ),
+    "use_console": Use(bool),
+    "backup_count": And(Use(int), lambda n: n > 0),
+    "max_size": And(Use(int), lambda b: b > 16),
+    "format": Use(str),
+    "datefmt": Use(str),
+}
 
 
 class ServerConfiguration(Configuration):
@@ -11,6 +19,7 @@ class ServerConfiguration(Configuration):
     Stores the server's configuration and defines a set of server-specific
     validators.
     """
+
     VALIDATORS = {
         "description": Use(str),
         "ip": Use(str),
@@ -18,17 +27,7 @@ class ServerConfiguration(Configuration):
         "api_path": Use(str),
         "uri": Use(str),
         "allow_drop_all": Use(bool),
-        "logging": {
-            "level": And(Use(str), lambda lvl: lvl in (
-                "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"
-            )),
-            "file": Use(str),
-            "use_console": Use(bool),
-            "backup_count": And(Use(int), lambda n: n > 0),
-            "max_size": And(Use(int), lambda b: b > 16),
-            "format": Use(str),
-            "datefmt": Use(str)
-        }
+        "logging": {**LOGGING_VALIDATORS, "file": Use(str)},
     }
 
 
@@ -46,20 +45,10 @@ class NodeConfiguration(Configuration):
         # TODO: remove `dict` validation from databases
         "databases": Or([Use(dict)], dict, None),
         "api_path": Use(str),
-        "logging": {
-            "level": And(Use(str), lambda lvl: lvl in (
-                "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"
-            )),
-            "use_console": Use(bool),
-            "backup_count": And(Use(int), lambda n: n > 0),
-            "max_size": And(Use(int), lambda b: b > 16),
-            "format": Use(str),
-            "datefmt": Use(str)
-        },
-        "encryption": {
-            "enabled": bool,
-            Optional("private_key"): Use(str)
-        }
+        "logging": LOGGING_VALIDATORS,
+        "encryption": {"enabled": bool, Optional("private_key"): Use(str)},
+        Optional("node_extra_env"): dict,
+        Optional("node_extra_mounts"): [str],
     }
 
 
@@ -76,11 +65,12 @@ class NodeConfigurationManager(ConfigurationManager):
     name : str
         Name of the configuration file.
     """
+
     def __init__(self, name, *args, **kwargs) -> None:
         super().__init__(conf_class=NodeConfiguration, name=name)
 
     @classmethod
-    def from_file(cls, path: str) -> 'NodeConfigurationManager':
+    def from_file(cls, path: str) -> "NodeConfigurationManager":
         """
         Create a new instance of the NodeConfigurationManager from a
         configuration file.
@@ -107,11 +97,12 @@ class ServerConfigurationManager(ConfigurationManager):
     name : str
         Name of the configuration file.
     """
+
     def __init__(self, name, *args, **kwargs) -> None:
         super().__init__(conf_class=ServerConfiguration, name=name)
 
     @classmethod
-    def from_file(cls, path) -> 'ServerConfigurationManager':
+    def from_file(cls, path) -> "ServerConfigurationManager":
         """
         Create a new instance of the ServerConfigurationManager from a
         configuration file.
@@ -130,7 +121,6 @@ class ServerConfigurationManager(ConfigurationManager):
 
 
 class TestingConfigurationManager(ConfigurationManager):
-
     def __init__(self, name, *args, **kwargs):
         super().__init__(conf_class=TestConfiguration, name=name)