diff --git a/src/aiidalab_qe_wannier90/model.py b/src/aiidalab_qe_wannier90/model.py index bb50a1b..a036115 100644 --- a/src/aiidalab_qe_wannier90/model.py +++ b/src/aiidalab_qe_wannier90/model.py @@ -1,14 +1,14 @@ import traitlets as tl from aiidalab_qe.common.mixins import HasInputStructure -from aiidalab_qe.common.panel import ConfigurationSettingsModel +from aiidalab_qe.common.panel import PanelModel -class ConfigurationSettingsModel(ConfigurationSettingsModel, HasInputStructure): +class Wannier90ConfigurationSettingsModel(PanelModel, HasInputStructure): title = 'Wannier functions' identifier = 'wannier90' dependencies = [ - 'input_structure', + 'structure_uuid', 'workchain.protocol', 'workchain.electronic_type', ] diff --git a/src/aiidalab_qe_wannier90/resources.py b/src/aiidalab_qe_wannier90/resources.py index 41e02a6..e9b9c94 100644 --- a/src/aiidalab_qe_wannier90/resources.py +++ b/src/aiidalab_qe_wannier90/resources.py @@ -7,7 +7,7 @@ ) -class ResourceSettingsModel(PluginResourceSettingsModel): +class Wannier90ResourceSettingsModel(PluginResourceSettingsModel): """Model for the wannier90 code setting plugin.""" title = 'Wannier functions' @@ -58,7 +58,7 @@ def needs_skeaf(parameters: dict) -> bool: ) -class ResourceSettingsPanel( - PluginResourceSettingsPanel[ResourceSettingsModel], +class Wannier90ResourceSettingsPanel( + PluginResourceSettingsPanel[Wannier90ResourceSettingsModel], ): """Panel for configuring the wannier90 plugin.""" diff --git a/src/aiidalab_qe_wannier90/setting.py b/src/aiidalab_qe_wannier90/setting.py index 614e21c..4305907 100644 --- a/src/aiidalab_qe_wannier90/setting.py +++ b/src/aiidalab_qe_wannier90/setting.py @@ -1,15 +1,16 @@ """Panel for Wannier90 plugin.""" -from aiidalab_qe.common.panel import ConfigurationSettingsPanel import ipywidgets as ipw -from .model import ConfigurationSettingsModel from aiidalab_qe.common.infobox import InAppGuide +from aiidalab_qe.common.panel import ConfigurationSettingsPanel + +from .model import Wannier90ConfigurationSettingsModel -class ConfigurationSettingPanel( - ConfigurationSettingsPanel[ConfigurationSettingsModel], +class Wannier90ConfigurationSettingPanel( + ConfigurationSettingsPanel[Wannier90ConfigurationSettingsModel], ): - def __init__(self, model: ConfigurationSettingsModel, **kwargs): + def __init__(self, model: Wannier90ConfigurationSettingsModel, **kwargs): super().__init__(model, **kwargs) self._model.observe( diff --git a/src/aiidalab_qe_wannier90/wannier90.py b/src/aiidalab_qe_wannier90/wannier90.py index 0e9bc2e..e51fb03 100644 --- a/src/aiidalab_qe_wannier90/wannier90.py +++ b/src/aiidalab_qe_wannier90/wannier90.py @@ -1,12 +1,12 @@ +from pathlib import Path + from aiidalab_qe.common.panel import PluginOutline -from .model import ConfigurationSettingsModel -from .resources import ResourceSettingsModel, ResourceSettingsPanel -from .setting import ConfigurationSettingPanel +from .model import Wannier90ConfigurationSettingsModel +from .resources import Wannier90ResourceSettingsModel, Wannier90ResourceSettingsPanel +from .result import Wannier90ResultsModel, Wannier90ResultsPanel +from .setting import Wannier90ConfigurationSettingPanel from .workchain import workchain_and_builder -from .result import Wannier90ResultsPanel, Wannier90ResultsModel - -from pathlib import Path class PluginOutline(PluginOutline): @@ -16,12 +16,12 @@ class PluginOutline(PluginOutline): wannier90 = { 'outline': PluginOutline, 'configuration': { - 'panel': ConfigurationSettingPanel, - 'model': ConfigurationSettingsModel, + 'panel': Wannier90ConfigurationSettingPanel, + 'model': Wannier90ConfigurationSettingsModel, }, 'resources': { - 'panel': ResourceSettingsPanel, - 'model': ResourceSettingsModel, + 'panel': Wannier90ResourceSettingsPanel, + 'model': Wannier90ResourceSettingsModel, }, 'workchain': workchain_and_builder, 'result': {