diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 2f7ee36..567a9ca 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.0.rc6" +__version__ = "4.1.0.rc7" __codename__ = "Groundhog Day" diff --git a/cbpi/controller/plugin_controller.py b/cbpi/controller/plugin_controller.py index 26081e6..e958371 100644 --- a/cbpi/controller/plugin_controller.py +++ b/cbpi/controller/plugin_controller.py @@ -190,14 +190,14 @@ class PluginController(): return result - async def load_plugin_list(self): + async def load_plugin_list(self, filter="cbpi"): result = [] try: discovered_plugins = { name: importlib.import_module(name) for finder, name, ispkg in pkgutil.iter_modules() - if name.startswith('cbpi') and len(name) > 4 + if name.startswith(filter) and len(name) > 4 } for key, module in discovered_plugins.items(): from importlib.metadata import version diff --git a/cbpi/http_endpoints/http_system.py b/cbpi/http_endpoints/http_system.py index 823ef6f..8de8af2 100644 --- a/cbpi/http_endpoints/http_system.py +++ b/cbpi/http_endpoints/http_system.py @@ -28,6 +28,12 @@ class SystemHttpEndpoints: "200": description: successful operation """ + plugin_list = await self.cbpi.plugin.load_plugin_list("cbpi4gui") + try: + version= plugin_list[0].get("Version", "not detected") + except: + version="not detected" + return web.json_response(data=dict( actor=self.cbpi.actor.get_state(), fermenter=self.cbpi.fermenter.get_state(), @@ -37,6 +43,7 @@ class SystemHttpEndpoints: fermentersteps=self.cbpi.fermenter.get_fermenter_steps(), config=self.cbpi.config.get_state(), version=__version__, + guiversion=version, codename=__codename__) , dumps=json_dumps)