Merge remote-tracking branch 'origin/master'

Author: frankcorneliusmartin

vantage6/cli/configuration_manager.py

@@ -1,16 +1,11 @@
-import os
-import collections
-import yaml
-import logging
-
-from pathlib import Path
-from schema import Schema, And, Or, Use, Optional
+from schema import And, Or, Use, Optional
 
 from vantage6.common.configuration_manager import (
     Configuration,
     ConfigurationManager
 )
 
+
 class ServerConfiguration(Configuration):
 
     VALIDATORS = {
@@ -21,7 +16,8 @@ class ServerConfiguration(Configuration):
         "uri": Use(str),
         "allow_drop_all": Use(bool),
         "logging": {
-            "level": And(Use(str), lambda l: l in ("DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL")),
+            "level": And(Use(str), lambda l: l in ("DEBUG", "INFO", "WARNING",
+                                                   "ERROR", "CRITICAL")),
             "file": Use(str),
             "use_console": Use(bool),
             "backup_count": And(Use(int), lambda n: n > 0),
@@ -31,6 +27,7 @@ class ServerConfiguration(Configuration):
         }
     }
 
+
 class NodeConfiguration(Configuration):
 
     VALIDATORS = {
@@ -41,7 +38,8 @@ class NodeConfiguration(Configuration):
         "databases": {Use(str): Use(str)},
         "api_path": Use(str),
         "logging": {
-            "level": And(Use(str), lambda l: l in ("DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL")),
+            "level": And(Use(str), lambda l: l in ("DEBUG", "INFO", "WARNING",
+                                                   "ERROR", "CRITICAL")),
             "file": Use(str),
             "use_console": Use(bool),
             "backup_count": And(Use(int), lambda n: n > 0),
@@ -55,12 +53,15 @@ class NodeConfiguration(Configuration):
         }
     }
 
+
 class TestConfiguration(Configuration):
 
     VALIDATORS = {
         # "api_key": And(Use(str), len),
         # "logging": {
-        #     "level": And(Use(str), lambda l: l in ("DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL", "NONE")),
+        #     "level": And(Use(str), lambda l: l in ("DEBUG", "INFO",
+        #                                            "WARNING", "ERROR",
+        #                                            "CRITICAL", "NONE")),
         #     "file": Use(str),
         #     "use_console": Use(bool),
         #     "backup_count": And(Use(int), lambda n: n > 0),
@@ -71,7 +72,6 @@ class TestConfiguration(Configuration):
     }
 
 
-
 class NodeConfigurationManager(ConfigurationManager):
 
     def __init__(self, name, *args, **kwargs):
@@ -81,6 +81,7 @@ def __init__(self, name, *args, **kwargs):
     def from_file(cls, path):
         return super().from_file(path, conf_class=NodeConfiguration)
 
+
 class ServerConfigurationManager(ConfigurationManager):
 
     def __init__(self, name, *args, **kwargs):

vantage6/cli/configuration_wizard.py

@@ -1,14 +1,6 @@
-import click
-import sys
-import os
-import shutil
-import yaml
 import questionary as q
 
 from pathlib import Path
-from schema import Schema, And, Or, Use, Optional
-
-from vantage6.node import util
 
 from vantage6.cli.context import NodeContext
 from vantage6.cli.configuration_manager import NodeConfigurationManager
@@ -59,19 +51,19 @@ def node_configuration_questionaire(dirs, instance_name):
     i = 1
     while q.confirm("Do you want to add another database?").ask():
         q2 = q.prompt([
-        {
-            "type": "text",
-            "name": "label",
-            "message": "Enter the label for the database:",
-            "default": f"database_{i}"
-        },
-        {
-            "type": "text",
-            "name": "path",
-            "message": "The path of the database file:",
-            "default": str(
-                Path(config.get("databases").get("default")).parent)
-        }])
+            {
+                "type": "text",
+                "name": "label",
+                "message": "Enter the label for the database:",
+                "default": f"database_{i}"
+            },
+            {
+                "type": "text",
+                "name": "path",
+                "message": "The path of the database file:",
+                "default": str(
+                    Path(config.get("databases").get("default")).parent)
+            }])
         config["databases"][q2.get("label")] = q2.get("path")
         i += 1
 
@@ -152,4 +144,4 @@ def select_configuration_questionaire(system_folders):
     name, env = q.select("Select the configuration you want to use:",
                          choices=choices).ask()
 
-    return name, env
+    return name, env