Merge pull request #13 from zpriddy/bots_config

Fix bots config

example/__init__.py

@@ -1,6 +1,2 @@
-from dotenv import load_dotenv
-
-load_dotenv(verbose=False)
-
 FLASK_PORT = 8083
 FLASK_HOST = "127.0.0.1"

example/glados_standalone/plugins_config/ExamplePlugin.yaml

@@ -1,4 +1,4 @@
 ExamplePlugin:
   enabled: yes
   bot:
-    name: glados
+    name: ExampleBot

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = glados
-version = 0.0.1-dev9
+version = 0.0.1-dev10
 description = A library to help with slackbot development
 long_description = file: README.md
 long_description_content_type = text/markdown

src/glados/core.py

@@ -87,7 +87,6 @@ def import_plugins(self):
         importer.load_discovered_plugins_config(False)
         importer.import_discovered_plugins(self.bots)
         for plugin in importer.plugins.values():
-            print(type(plugin))
             self.add_plugin(plugin)
         logging.info(f"successfully imported {len(self.plugins)} plugins")
 

src/glados/plugin.py

@@ -19,6 +19,7 @@
     GladosRequest,
     VERIFY_ROUTES,
     EventRoutes,
+    PyJSON,
 )
 
 from slack.web.classes.messages import Message
@@ -50,6 +51,7 @@ def __init__(
         self.enabled = enabled
         self.bot = PluginBotConfig(**bot)
         self.config_file = config_file
+        self.config = PyJSON(kwargs)
 
         package = config_file.replace("/", ".")
         package = package.replace(".config.yaml", "")
@@ -147,15 +149,16 @@ def load_discovered_plugins_config(self, write_to_user_config=True):
 
             with open(user_config_path) as file:
                 c = yaml.load(file, yaml.FullLoader)
+
                 if len(c.keys()) != 1:
                     logging.critical(
                         f"zero or more than one object in config file: {config_file}"
                     )
                     continue
+
                 c[plugin_name]["config_file"] = str(user_config_path)
                 plugin_user_config = PluginConfig(plugin_name, **c[plugin_name])
                 plugin_user_config.update(plugin_package_config)
-
             self.plugin_configs[plugin_name] = plugin_user_config
 
     def import_discovered_plugins(self, bots: Dict[str, GladosBot]):
@@ -220,8 +223,9 @@ class GladosPlugin:
     """
 
     def __init__(self, config: PluginConfig, bot: GladosBot, **kwargs):
-        self.config = config
-        self.name = self.config.name
+        self.name = config.name
+        self._config = config
+        self.config = config.config
         self.bot = bot
 
         self._routes = dict()  # type: Dict[int, Dict[str, GladosRoute]]

tests/plugins/test_plugin_1/test_plugin_1.py

@@ -1,10 +1,11 @@
 from glados import GladosBot, GladosPlugin
+from glados.plugin import PluginConfig
 import logging
 
 
 class TestPlugin1(GladosPlugin):
-    def __init__(self, bot: GladosBot, name, **kwargs):
-        super().__init__(name, bot, **kwargs)
+    def __init__(self, config: PluginConfig, bot: GladosBot, **kwargs):
+        super().__init__(config, bot, **kwargs)
         logging.info(f"plugin {self.name} imported")
 
     def test_function(self, echo, **kwargs):

tests/plugins/test_plugin_2/test_plugin_2.py

@@ -1,10 +1,11 @@
 from glados import GladosBot, GladosPlugin
+from glados.plugin import PluginConfig
 import logging
 
 
 class TestPlugin2(GladosPlugin):
-    def __init__(self, bot: GladosBot, name, **kwargs):
-        super().__init__(name, bot, **kwargs)
+    def __init__(self, config: PluginConfig, bot: GladosBot, **kwargs):
+        super().__init__(config, bot, **kwargs)
         logging.info(f"plugin {self.name} imported")
 
     def test_function(self, echo, **kwargs):

tests/plugins/test_plugin_3/test_plugin_3.py

@@ -1,10 +1,11 @@
 from glados import GladosBot, GladosPlugin
+from glados.plugin import PluginConfig
 import logging
 
 
 class TestPlugin3(GladosPlugin):
-    def __init__(self, bot: GladosBot, name, **kwargs):
-        super().__init__(name, bot, **kwargs)
+    def __init__(self, config: PluginConfig, bot: GladosBot, **kwargs):
+        super().__init__(config, bot, **kwargs)
         logging.info(f"plugin {self.name} imported")
 
     def test_function(self, echo, **kwargs):