Disentangled dependacies from server and cli

Author: frankcorneliusmartin

setup.py

@@ -24,6 +24,9 @@
     packages=find_namespace_packages(),
     python_requires='>=3.6',
     install_requires=[
+        'schema==0.7.1',
+        'click==7.1.1',
+        'SQLAlchemy==1.3.15',
         'docker==4.2.0',
         'colorama==0.4.3',
         'questionary==1.5.1',

vantage6/cli/configuration_wizard.py

@@ -2,9 +2,11 @@
 
 from pathlib import Path
 
-from vantage6.cli.context import NodeContext
-from vantage6.cli.configuration_manager import NodeConfigurationManager
-
+from vantage6.cli.context import NodeContext, ServerContext
+from vantage6.cli.configuration_manager import (
+    NodeConfigurationManager,
+    ServerConfigurationManager
+)
 
 def node_configuration_questionaire(dirs, instance_name):
     """Questionary to generate a config file for the node instance."""
@@ -94,37 +96,99 @@ def node_configuration_questionaire(dirs, instance_name):
 
     return config
 
+def server_configuration_questionaire(dirs, instance_name):
+    """Questionary to generate a config file for the node instance."""
 
-def configuration_wizard(instance_name, environment, system_folders):
+    config = q.prompt([
+        {
+            "type": "text",
+            "name": "description",
+            "message": "Enter a human-readable description:"
+        },
+        {
+            "type": "text",
+            "name": "ip",
+            "message": "ip:",
+            "default": "127.0.0.1"
+        },
+        {
+            "type": "text",
+            "name": "port",
+            "message": "Enter port to which the server listens:",
+            "default": "5000"
+        },
+        {
+            "type": "text",
+            "name": "api_path",
+            "message": "Path of the api:",
+            "default": "/api"
+        },
+        {
+            "type": "text",
+            "name": "uri",
+            "message": "Database URI:"
+        },
+        {
+            "type": "select",
+            "name": "allow_drop_all",
+            "message": "Allowed to drop all tables: ",
+            "choices": ["True", "False"]
+        }
+    ])
+
+    res = q.select("Which level of logging would you like?",
+        choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL", "NOTSET"]
+    ).ask()
+
+    config["logging"] = {
+        "level": res,
+        "file": f"{instance_name}.log",
+        "use_console": True,
+        "backup_count":5,
+        "max_size": 1024,
+        "format": "%(asctime)s - %(name)-14s - %(levelname)-8s - %(message)s",
+        "datefmt": "%Y-%m-%d %H:%M:%S"
+    }
+
+    return config
+
+
+def configuration_wizard(type_, instance_name, environment, system_folders):
 
     # for defaults and where to save the config
-    dirs = NodeContext.instance_folders("node", instance_name, system_folders)
+    dirs = NodeContext.instance_folders(type_, instance_name, system_folders)
 
     # invoke questionaire to create configuration file
-    config = node_configuration_questionaire(dirs, instance_name)
+    if type_ == "node":
+        conf_manager = NodeConfigurationManager
+        config = node_configuration_questionaire(dirs, instance_name)
+    else:
+        conf_manager = ServerConfigurationManager
+        config = server_configuration_questionaire(dirs, instance_name)
 
     # in the case of an environment we need to add it to the current
     # configuration. In the case of application we can simply overwrite this
     # key (although there might be environments present)
     config_file = Path(dirs.get("config")) / (instance_name + ".yaml")
 
     if Path(config_file).exists():
-        config_manager = NodeConfigurationManager.from_file(config_file)
+        config_manager = conf_manager.from_file(config_file)
     else:
-        config_manager = NodeConfigurationManager(instance_name)
+        config_manager = conf_manager(instance_name)
 
     config_manager.put(environment, config)
     config_manager.save(config_file)
 
     return config_file
 
 
-def select_configuration_questionaire(system_folders):
+def select_configuration_questionaire(type_, system_folders):
     """Ask which configuration the user wants to use
 
     It shows only configurations that are in the default folder.
     """
-    configs, f = NodeContext.available_configurations(system_folders)
+    context = NodeContext if type_ == "node" else ServerContext
+    configs, f = context.available_configurations(system_folders)
 
     # each collection (file) can contain multiple configs. (e.g. test,
     # dev)

vantage6/cli/context.py

@@ -2,16 +2,14 @@
 
 from sqlalchemy.engine.url import make_url
 
-from vantage6.cli.configuration_manager import (NodeConfigurationManager,
-                                                ServerConfigurationManager)
 from vantage6.common.context import AppContext
 from vantage6.common.globals import APPNAME
-from vantage6.cli.globals import (
-    DEFAULT_NODE_ENVIRONMENT as N_ENV,
-    DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL,
-    DEFAULT_SERVER_ENVIRONMENT as S_ENV,
-    DEFAULT_SERVER_SYSTEM_FOLDERS as S_FOL
-)
+from vantage6.cli.configuration_manager import (NodeConfigurationManager,
+                                                ServerConfigurationManager)
+from vantage6.cli.globals import (DEFAULT_NODE_ENVIRONMENT as N_ENV,
+                                  DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL,
+                                  DEFAULT_SERVER_ENVIRONMENT as S_ENV,
+                                  DEFAULT_SERVER_SYSTEM_FOLDERS as S_FOL)
 
 
 class ServerContext(AppContext):

vantage6/cli/globals.py

@@ -28,5 +28,5 @@
 
 DATA_FOLDER = PACAKAGE_FOLDER / APPNAME / "_data"
 
-with open(Path(PACAKAGE_FOLDER) / APPNAME / "VERSION") as f:
-    VERSION = f.read()
+with open(Path(PACAKAGE_FOLDER) / APPNAME / "cli" / "VERSION") as f:
+    VERSION = f.read()

vantage6/cli/node.py

@@ -24,16 +24,16 @@
 from colorama import Fore, Style
 
 from vantage6.common.globals import (STRING_ENCODING, APPNAME)
+from vantage6.common import (warning, error, info, debug)
+from vantage6.cli.context import NodeContext
 from vantage6.cli.globals import (
     DEFAULT_NODE_ENVIRONMENT as N_ENV,
     DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
 )
-from vantage6.cli.context import NodeContext
 from vantage6.cli.configuration_wizard import (
     configuration_wizard,
     select_configuration_questionaire
 )
-from vantage6.common import (warning, error, info, debug)
 
 
 @click.group(name="node")
@@ -131,7 +131,7 @@ def cli_node_new_configuration(name, environment, system_folders):
         )
 
     # create config in ctx location
-    cfg_file = configuration_wizard(name, environment, system_folders)
+    cfg_file = configuration_wizard("node", name, environment, system_folders)
     info(f"New configuration created: {Fore.GREEN}{cfg_file}{Style.RESET_ALL}")
 
 #
@@ -151,7 +151,7 @@ def cli_node_files(name, environment, system_folders):
     """
     # select configuration name if none supplied
     name, environment = (name, environment) if name else \
-        select_configuration_questionaire(system_folders)
+        select_configuration_questionaire("node", system_folders)
 
     # raise error if config could not be found
     if not NodeContext.config_exists(name, environment, system_folders):
@@ -215,7 +215,7 @@ def cli_node_start(name, config, environment, system_folders, image, keep,
         # in case no name is supplied, ask the user to select one
         if not name:
             name, environment = select_configuration_questionaire(
-                system_folders)
+                "node", system_folders)
 
         # check that config exists, if not a questionaire will be invoked
         if not NodeContext.config_exists(name, environment, system_folders):
@@ -224,7 +224,7 @@ def cli_node_start(name, config, environment, system_folders, image, keep,
             question += f" create this config now?"
 
             if q.confirm(question).ask():
-                configuration_wizard(name, environment, system_folders)
+                configuration_wizard("node", name, environment, system_folders)
 
             else:
                 error("Config file couldn't be loaded")