smtk cleanup

Author: rizac

egsim/smtk/registry.py

@@ -32,8 +32,9 @@ def gsim(model: Union[str, GMPE], raise_deprecated=True) -> GMPE:
         if model.startswith('GMPETable'):
             # GMPETable. raises: TypeError, ValueError, FileNotFoundError, OSError,
             # AttributeError
-            filepath = re.match(r'^GMPETable\(([^)]+?)\)$', model).\
-                group(1).split("=")[1]  # get table filename
+            filepath = (
+                re.match(r'^GMPETable\(([^)]+?)\)$', model).group(1).split("=")[1]
+            )
             return GMPETable(gmpe_table=filepath)
         else:
             # "normal" str case, calls valid_gsim which raises:
@@ -122,9 +123,7 @@ def sa_period(obj: Union[float, str, IMT]) -> Union[float, None]:
     return float(period) if np.isfinite(period) else None
 
 
-def get_sa_limits(
-        model: Union[str, GMPE]
-) -> Union[tuple[float, float], None]:
+def get_sa_limits(model: Union[str, GMPE]) -> Union[tuple[float, float], None]:
     """Return the SA period limits defined for the given gsim, or None"""
 
     if isinstance(model, str):

egsim/smtk/residuals.py

@@ -176,8 +176,9 @@ def get_observed_motions(flatfile: pd.DataFrame, imts: Container[str], log=True)
 
 
 def yield_event_contexts(flatfile: pd.DataFrame) -> Iterable[EventContext]:
-    """Group the flatfile by events, and yield `EventContext`s objects, one for each event"""
-
+    """
+    Group the flatfile by events, and yield `EventContext`s objects, one for each event
+    """
     # check event id column or use the event location to group events:
     # group flatfile by events. Use ev. id (_EVENT_COLUMNS[0]) or, when
     # no ID found, event spatio-temporal coordinates (_EVENT_COLUMNS[1:])
@@ -270,8 +271,11 @@ def get_expected_motions(
             columns.extend((i, Clabel.intra_ev_std, gsim_name) for i in imt_names)
             data.append(intra)
 
-    return pd.DataFrame(columns=pd.MultiIndex.from_tuples(columns),
-                        data=np.hstack(data), index=ctx.sids)
+    return pd.DataFrame(
+        columns=pd.MultiIndex.from_tuples(columns),
+        data=np.hstack(data),
+        index=ctx.sids
+    )
 
 
 def get_residuals_from_expected_and_observed_motions(
@@ -332,8 +336,9 @@ def _get_random_effects_residuals(obs, mean, inter, intra, normalise=True):
     # TODO this is the only part where grouping by event is relevant: maybe
     #  move groupby here?
     nvals = float(len(mean))
-    inter_res = ((inter ** 2.) * sum(obs - mean)) /\
-        (nvals * (inter ** 2.) + (intra ** 2.))
+    inter_res = (
+        ((inter ** 2.) * sum(obs - mean)) / (nvals * (inter ** 2.) + (intra ** 2.))
+    )
     intra_res = obs - (mean + inter_res)
     if normalise:
         return inter_res / inter, intra_res / intra
@@ -370,7 +375,8 @@ def get_residuals_likelihood(residuals: pd.DataFrame, inplace=True) -> pd.DataFr
 
 def get_likelihood(values: Union[np.ndarray, pd.Series]) -> Union[np.ndarray, pd.Series]:
     """
-    Return the likelihood of the given values according to Equation 9 of Scherbaum et al. (2004)
+    Return the likelihood of the given values according to
+    Equation 9 of Scherbaum et al. (2004)
     """
     zvals = np.fabs(values)
     return 1.0 - erf(zvals / sqrt(2.))
@@ -554,7 +560,7 @@ def get_required_ground_motion_properties(
     for p in required_props:
         try:
             # https://stackoverflow.com/a/29706954
-            # `required_props_flatfile` is a dataframe with a specific index (see above).
+            # `required_props_flatfile` is a dataframe with a specific index.
             # Adding a Series to it might result in NaNs where the Series index
             # does not match the DataFrame index. As such, assign the series.values to
             # the DataFrame (see test_residuals.test_assign_series to assure this is ok)

egsim/smtk/scenarios.py

@@ -140,7 +140,9 @@ class RuptureProperties)
 
     # sort columns (maybe we could use reindex but let's be more explicit):
     computed_cols = set(output.columns)
-    expected_cols = list(product(imts, [Clabel.median, Clabel.std], gsims)) + meta_columns
+    expected_cols = (
+        list(product(imts, [Clabel.median, Clabel.std], gsims)) + meta_columns
+    )
     output = output[[c for c in expected_cols if c in computed_cols]].copy()
     if header_sep:
         output.columns = [header_sep.join(c) for c in output.columns]
@@ -239,7 +241,8 @@ def create_planar_surface(
     :param aspect: Aspect ratio of rupture
     :param ztor: top of rupture depth, in km
 
-    :return: Rupture as instance of :class:`openquake.hazardlib.geo.surface.planar.PlanarSurface`
+    :return: Rupture as instance of
+        :class:`openquake.hazardlib.geo.surface.planar.PlanarSurface`
     """
     # If the top of rupture depth in the initial
     if fabs(top_centroid.depth - ztor) > 1E-9:

egsim/smtk/validation.py

@@ -165,7 +165,7 @@ def init_context_maker(
 
 
 def get_ground_motion_values(
-        model: GMPE, imts: list[IMT], ctx: np.recarray, *, model_name: Optional[str] = None
+    model: GMPE, imts: list[IMT], ctx: np.recarray, *, model_name: Optional[str] = None
 ):
     """
     Compute the ground motion values from the arguments returning 4 arrays each