diff --git a/aiidalab_widgets_base/__init__.py b/aiidalab_widgets_base/__init__.py index 3cb9f1bca..1159f7ab4 100644 --- a/aiidalab_widgets_base/__init__.py +++ b/aiidalab_widgets_base/__init__.py @@ -79,4 +79,4 @@ "viewer", ] -__version__ = "1.0.0rc3" +__version__ = "1.0.0rc4" diff --git a/aiidalab_widgets_base/codes.py b/aiidalab_widgets_base/codes.py index b92947238..feb487017 100644 --- a/aiidalab_widgets_base/codes.py +++ b/aiidalab_widgets_base/codes.py @@ -69,7 +69,9 @@ def __init__( setup_code_params[key] = value # For later: use base_url here, when it will be implemented in the appmode. - url_string = f" + value=f""" Setup new computer""" ) @@ -869,7 +869,7 @@ def _get_computers(self): user = User.objects.get_default() return { - c[0].name: c[0] + c[0].label: c[0] for c in QueryBuilder().append(Computer).all() if c[0].is_user_configured(user) and (self.allow_select_disabled or c[0].is_user_enabled(user)) @@ -890,7 +890,7 @@ def refresh(self, _=None): @validate("selected_computer") def _validate_selected_computer(self, change): - """Select computer either by name or by class instance.""" + """Select computer either by label or by class instance.""" computer = change["value"] self.output.value = "" if not computer: @@ -902,7 +902,7 @@ def _validate_selected_computer(self, change): was found in your AiiDA database.""" if isinstance(computer, Computer): - if computer.name in self.computers: + if computer.label in self.computers: return computer self.output.value = f"""The computer instance '{computer}' supplied was not found in your AiiDA database.""" diff --git a/aiidalab_widgets_base/elns.py b/aiidalab_widgets_base/elns.py index 0a62563a8..dbcfd67ac 100644 --- a/aiidalab_widgets_base/elns.py +++ b/aiidalab_widgets_base/elns.py @@ -55,7 +55,7 @@ def __init__(self, path_to_root="../", **kwargs): eln = connect_to_eln(**kwargs) if eln is None: - url = f"{path_to_root}aiidalab-widgets-base/eln_configure.ipynb" + url = f"{path_to_root}aiidalab-widgets-base/notebooks/eln_configure.ipynb" error_message.value = f"""Warning! The access to ELN {kwargs['eln_instance']} is not configured. Please follow the link to configure it.""" return @@ -99,7 +99,7 @@ def __init__(self, path_to_root="../", **kwargs): else: self.modify_settings.disabled = True send_button.disabled = True - self.message.value = f"""Warning! The access to an ELN is not configured. Please follow the link to configure it.""" + self.message.value = f"""Warning! The access to an ELN is not configured. Please follow the link to configure it.""" super().__init__(children=children, **kwargs) @@ -137,7 +137,7 @@ def send_to_eln(self, _=None): f"\u2705 The data were successfully sent to {self.eln.eln_instance}." ) else: - self.message.value = f"""\u274C Something isn't right! We were not able to send the data to the "{self.eln.eln_instance}" ELN instance. Please follow the link to update the ELN's configuration.""" + self.message.value = f"""\u274C Something isn't right! We were not able to send the data to the "{self.eln.eln_instance}" ELN instance. Please follow the link to update the ELN's configuration.""" def handle_output(self, _=None): with self._output: @@ -145,7 +145,7 @@ def handle_output(self, _=None): if self.modify_settings.value: display( ipw.HTML( - f"""Currently used ELN is: "{self.eln.eln_instance}". To change it, please follow the link.""" + f"""Currently used ELN is: "{self.eln.eln_instance}". To change it, please follow the link.""" ) ) display(self.eln.sample_config_editor()) diff --git a/aiidalab_widgets_base/process.py b/aiidalab_widgets_base/process.py index 80525ce34..ab4410a4f 100644 --- a/aiidalab_widgets_base/process.py +++ b/aiidalab_widgets_base/process.py @@ -163,11 +163,11 @@ def on_btn_submit_press(self, _=None): if self.append_output: self.submit_out.value += f"""Submitted process {self.process}. Click - here to follow.
""" else: self.submit_out.value = f"""Submitted process {self.process}. Click - here to follow.""" for func in self._run_after_submitted: @@ -378,7 +378,7 @@ def calc_info(self, node): raise TypeError("Unknown type: {}".format(type(node))) process_state = node.process_state.value.capitalize() - pk = """{1}""".format( + pk = """{1}""".format( self.path_to_root, node.pk ) @@ -659,7 +659,7 @@ def update(self, _=None): # Add HTML links. dataf["PK"] = dataf["PK"].apply( - lambda x: """{1}""".format( + lambda x: """{1}""".format( self.path_to_root, x ) ) diff --git a/docs/source/widget-list/.gitignore b/docs/source/widget-list/.gitignore new file mode 100644 index 000000000..9a477bff9 --- /dev/null +++ b/docs/source/widget-list/.gitignore @@ -0,0 +1 @@ +notebooks diff --git a/docs/source/widget-list/index.rst b/docs/source/widget-list/index.rst index 63329bef0..6c4f0d43c 100644 --- a/docs/source/widget-list/index.rst +++ b/docs/source/widget-list/index.rst @@ -18,7 +18,6 @@ See also the `corresponding git repository - Basic data objects. - Codes and computers. Processes. Electronic Lab Notebook. -