convert str addition to f-str, skip mypy + flake8 in pre-commit.ci

Author: janosh

.pre-commit-config.yaml

@@ -1,5 +1,6 @@
 ci:
   autoupdate_schedule: quarterly
+  skip: [mypy, flake8]
 
 default_stages: [commit]
 

code-of-conduct.md

@@ -41,8 +41,7 @@ is deemed necessary and appropriate to the circumstances. Maintainers are
 obligated to maintain confidentiality with regard to the reporter of an
 incident to the extent possible by law and institutional policy.
 
+This Code of Conduct is adapted from the [Contributor Covenant][covenant],
+version 1.3.0, available at <https://www.contributor-covenant.org/version/1/3/0/code-of-conduct.html>
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at https://www.contributor-covenant.org/version/1/3/0/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
+[covenant]: https://www.contributor-covenant.org

crystal_toolkit/apps/examples/bandstructure.py

@@ -19,8 +19,8 @@
 # app.config["suppress_callback_exceptions"] = True
 
 path = os.path.dirname(os.path.realpath(__file__))
-bandstructure_symm_line = loadfn(path + "/GaN_bs.json")
-density_of_states = loadfn(path + "/GaN_dos.json")
+bandstructure_symm_line = loadfn(f"{path}/GaN_bs.json")
+density_of_states = loadfn(f"{path}/GaN_dos.json")
 
 # # create the Crystal Toolkit component
 bsdos_component = ctc.BandstructureAndDosComponent(

crystal_toolkit/apps/main.py

@@ -5,6 +5,7 @@
 import warnings
 from random import choice
 from time import time
+from typing import Any
 from urllib import parse
 from uuid import uuid4
 
@@ -20,6 +21,7 @@
 import crystal_toolkit.components as ctc
 from crystal_toolkit import __file__ as module_path
 from crystal_toolkit.core.mpcomponent import MPComponent
+from crystal_toolkit.core.panelcomponent import PanelComponent
 from crystal_toolkit.helpers.layouts import (
     Box,
     Column,
@@ -151,7 +153,7 @@
     links={"default": transformation_component.id()}
 )
 # pbx_component = ctc.PourbaixDiagramPanelComponent(origin_component=struct_component)
-#
+
 symmetry_panel = ctc.SymmetryPanel(links={"default": struct_component.id()})
 localenv_panel = ctc.LocalEnvironmentPanel(
     links={
@@ -179,7 +181,7 @@
 
 
 if SETTINGS.MP_EMBED_MODE:
-    mp_section = (html.Div(),)
+    mp_section: tuple[Any, ...] = (html.Div(),)
 else:
 
     # bsdos_component = ctc.BandstructureAndDosPanelComponent(
@@ -200,7 +202,7 @@
     #     literature_component,
     # ]
 
-    mp_panels = []
+    mp_panels: list[PanelComponent] = []
 
     mp_section = (
         html.H3("Materials Project"),

crystal_toolkit/components/bandstructure.py

@@ -587,14 +587,14 @@ def get_dos_traces(dos, dos_select, energy_window=(-6.0, 10.0)):
                     "x": -1.0 * proj_data[label].densities[Spin.down][dos_min:dos_max],
                     "y": dos.energies[dos_min:dos_max] - dos.efermi,
                     "mode": "lines",
-                    "name": str(label) + " (spin ↓)",
+                    "name": f"{label} (spin ↓)",
                     "line": dict(width=3, color=colors[count], dash="dot"),
                     "xaxis": "x2",
                     "yaxis": "y2",
                 }
 
                 dostraces.append(trace)
-                spin_up_label = str(label) + " (spin ↑)"
+                spin_up_label = f"{label} (spin ↑)"
 
             else:
                 spin_up_label = str(label)

crystal_toolkit/components/diffraction.py

@@ -364,7 +364,7 @@ def get_figure(
 
         hkl_list = [hkl[0]["hkl"] for hkl in hkls]
         hkls = [
-            "hkl: (" + " ".join([str(i) for i in hkl]) + ")" for hkl in hkl_list
+            f"hkl: ({' '.join([str(i) for i in hkl])})" for hkl in hkl_list
         ]  # convert to (h k l) format
 
         annotations = [

crystal_toolkit/components/phase_diagram.py

@@ -692,10 +692,10 @@ def create_table(chemsys, pd_time, n_clicks, pd, rows):
             trigger = ctx.triggered[0]
 
             # PD update trigger
-            if trigger["prop_id"] == self.id() + ".modified_timestamp":
+            if trigger["prop_id"] == f"{self.id()}.modified_timestamp":
                 table_content = self.create_table_content(self.from_data(pd))
                 return table_content
-            elif trigger["prop_id"] == self.id("editing-rows-button") + ".n_clicks":
+            elif trigger["prop_id"] == f"{self.id('editing-rows-button')}.n_clicks":
                 if n_clicks > 0 and rows:
                     rows.append(self.empty_row)
                     return rows
@@ -734,14 +734,14 @@ def get_chemsys_from_mpid_or_chemsys(mpid, chemsys_external: str):
             chemsys = None
 
             # get entries by mpid
-            if trigger["prop_id"] == self.id("mpid") + ".data":
+            if trigger["prop_id"] == f"{self.id('mpid')}.data":
                 with MPRester() as mpr:
                     entry = mpr.get_entry_by_material_id(mpid)
 
                 chemsys = entry.composition.chemical_system
 
             # get entries by chemsys
-            if trigger["prop_id"] == self.id("chemsys-external") + ".data":
+            if trigger["prop_id"] == f"{self.id('chemsys-external')}.data":
                 chemsys = chemsys_external
 
             return chemsys

crystal_toolkit/components/xas.py

@@ -143,7 +143,7 @@ def pattern_from_mpid(element, mpid, elements):
             if not element or not elements:
                 raise PreventUpdate
 
-            url_path = "/materials/" + mpid["mpid"] + "/xas/" + element
+            url_path = f"/materials/{mpid['mpid']}/xas/{element}"
 
             from mp_api.client import MPRester
 

crystal_toolkit/core/scene.py

@@ -18,10 +18,12 @@
 
 class Primitive:
     """
-    A Mixin class for standard plottable primitive behavior
-    For now, this just enforces some basic mergeability
+    A Mixin class for standard plottable primitive behavior.
+    For now, this just enforces some basic mergeability.
     """
 
+    positions: tuple
+
     @property
     @abstractmethod
     def key(self):
@@ -61,7 +63,7 @@ def __add__(self, other):
         :return:
         """
         return Scene(
-            name=self.name + "_" + other.name,
+            name=f"{self.name}_{other.name}",
             contents=self.contents + other.contents,
             origin=self.origin,
             visible=self.visible,

crystal_toolkit/helpers/asymptote_renderer.py

@@ -282,9 +282,7 @@ def _get_surface(ctk_scene, d_args=None):
     color = color.replace("#", "")
     opacity = ctk_scene.opacity or updated_defaults["opacity"]
 
-    positions = tuple(
-        map(lambda x: "{" + f"{x[0]}, {x[1]}, {x[2]}" + "}", ctk_scene.positions)
-    )
+    positions = tuple(map(lambda x: f"{{{x[0]}, {x[1]}, {x[2]}}}", ctk_scene.positions))
     num_triangle = len(ctk_scene.positions) / 3.0
     # sanity check the mesh must be triangles
     assert num_triangle.is_integer()