Merge pull request #108 from sdpython/fst

Uses f strings

Author: sdpython

_doc/examples/plot_constraint_kmeans.py

@@ -57,7 +57,7 @@
     x = [km.cluster_centers_[i, 0], km.cluster_centers_[i, 0]]
     y = [km.cluster_centers_[i, 1], km.cluster_centers_[i, 1]]
     ax.plot(x, y, colors[i] + '+')
-ax.set_title('KMeans 4 clusters\n%r' % hist)
+ax.set_title(f'KMeans 4 clusters\n{hist!r}')
 ax.legend()
 
 #####################################
@@ -94,9 +94,9 @@
     x = [km2.cluster_centers_[i, 0], km2.cluster_centers_[i, 0]]
     y = [km2.cluster_centers_[i, 1], km2.cluster_centers_[i, 1]]
     ax[1].plot(x, y, colors[i] + '+')
-ax[0].set_title('ConstraintKMeans 4 clusters (gains)\n%r' % hist1)
+ax[0].set_title(f'ConstraintKMeans 4 clusters (gains)\n{hist1!r}')
 ax[0].legend()
-ax[1].set_title('ConstraintKMeans 4 clusters (distances)\n%r' % hist2)
+ax[1].set_title(f'ConstraintKMeans 4 clusters (distances)\n{hist2!r}')
 ax[1].legend()
 
 
@@ -129,7 +129,7 @@ def plot_delaunay(ax, edges, points):
     x = [km.cluster_centers_[i, 0], km.cluster_centers_[i, 0]]
     y = [km.cluster_centers_[i, 1], km.cluster_centers_[i, 1]]
     ax[0].plot(x, y, colors[i] + '+')
-ax[0].set_title("ConstraintKMeans 4 clusters\nstrategy='weights'\n%r" % hist)
+ax[0].set_title(f"ConstraintKMeans 4 clusters\nstrategy='weights'\n{hist!r}")
 ax[0].legend()
 
 cls = km.cluster_centers_iter_

_unittests/ut_documentation/test_nb_search_keras.py

@@ -31,8 +31,7 @@ def test_notebook_search_images(self):
             except (SyntaxError, ModuleNotFoundError, AttributeError,
                     ImportError) as e:
                 warnings.warn(
-                    "tensorflow is probably not available yet on python 3.7: "
-                    "{0}".format(e))
+                    f"tensorflow is probably not available yet on python 3.7: {e}")
                 return
 
         self.assertTrue(mlinsights is not None)

_unittests/ut_plotting/test_plot_gallery.py

@@ -57,7 +57,7 @@ def test_plot_gallery_url(self):
         try:
             fig, ax = plot_gallery_images(files, return_figure=True)
         except http.client.RemoteDisconnected as e:
-            warnings.warn("Unable to fetch image {0}'".format(e))
+            warnings.warn(f"Unable to fetch image {e}'")
             return
         img = os.path.join(temp, "gallery.png")
         fig.savefig(img)
@@ -68,7 +68,7 @@ def test_plot_gallery_url(self):
             ax = plot_gallery_images(files, return_figure=False, ax=ax)
             self.assertNotEmpty(ax)
         except http.client.RemoteDisconnected as e:
-            warnings.warn("Unable to fetch image {0}'".format(e))
+            warnings.warn(f"Unable to fetch image {e}'")
             return
 
 

_unittests/ut_search_rank/test_LONG_search_images_keras.py

@@ -31,7 +31,7 @@ def test_search_predictions_keras(self):
             except (SyntaxError, ModuleNotFoundError, AttributeError,
                     ImportError) as e:
                 warnings.warn(
-                    "Issue with tensorflow or keras: {0}".format(e))
+                    f"Issue with tensorflow or keras: {e}")
                 return
             from keras.preprocessing.image import ImageDataGenerator  # pylint: disable=E0401,E0611
             from keras.preprocessing.image import img_to_array, load_img  # pylint: disable=E0401,E0611

_unittests/ut_search_rank/test_LONG_search_images_torch.py

@@ -32,7 +32,7 @@ def test_search_predictions_torch(self):
                 import torchvision.models as tmodels  # pylint: disable=E0401,C0415
             except (SyntaxError, ModuleNotFoundError) as e:
                 warnings.warn(
-                    "torch is not available: {0}".format(e))
+                    f"torch is not available: {e}")
                 return
             from torchvision import datasets, transforms  # pylint: disable=E0401
             from torch.utils.data import DataLoader  # pylint: disable=E0401

mlinsights/helpers/parameters.py

@@ -13,7 +13,7 @@ def format_value(v):
     @return                 a string
     """
     return ("'{0}'".format(v.replace("'", "\\'"))
-            if isinstance(v, str) else "{0}".format(v))
+            if isinstance(v, str) else f"{v}")
 
 
 def format_parameters(pdict):
@@ -33,7 +33,7 @@ def format_parameters(pdict):
     """
     res = []
     for k, v in sorted(pdict.items()):
-        res.append('{0}={1}'.format(k, format_value(v)))
+        res.append(f'{k}={format_value(v)}')
     return ", ".join(res)
 
 
@@ -52,5 +52,5 @@ def format_function_call(name, pdict):
         d = dict(i=2, x=6.7, s="r")
         print(format_function_call("fct", d))
     """
-    res = '{0}({1})'.format(name, format_parameters(pdict))
+    res = f'{name}({format_parameters(pdict)})'
     return "\n".join(textwrap.wrap(res, width=70, subsequent_indent='    '))

mlinsights/helpers/pipeline.py

@@ -71,7 +71,7 @@ class PassThrough:
             pass
         else:
             raise TypeError(  # pragma: no cover
-                "pipe is not a scikit-learn object: {}\n{}".format(type(pipe), pipe))
+                f"pipe is not a scikit-learn object: {type(pipe)}\n{pipe}")
 
 
 class BaseEstimatorDebugInformation:
@@ -112,8 +112,7 @@ def to_str(self, nrows=5):
         """
         Tries to produce a readable message.
         """
-        rows = ['BaseEstimatorDebugInformation({})'.format(
-            self.model.__class__.__name__)]
+        rows = [f'BaseEstimatorDebugInformation({self.model.__class__.__name__})']
         for k in sorted(self.inputs):
             if k in self.outputs:
                 rows.append('  ' + k + '(')
@@ -126,7 +125,7 @@ def to_str(self, nrows=5):
                 rows.append('  )')
             else:
                 raise KeyError(  # pragma: no cover
-                    "Unable to find output for method '{}'.".format(k))
+                    f"Unable to find output for method '{k}'.")
         return "\n".join(rows)
 
     def display(self, data, nrows):
@@ -139,9 +138,9 @@ def display(self, data, nrows):
             rows = rows[:nrows]
             rows.append('...')
         if hasattr(data, 'shape'):
-            rows.insert(0, "shape=%r type=%r" % (data.shape, type(data)))
+            rows.insert(0, f"shape={data.shape!r} type={type(data)!r}")
         else:
-            rows.insert(0, "type=%r" % type(data))  # pragma: no cover
+            rows.insert(0, f"type={type(data)!r}")  # pragma: no cover
         return "\n".join(rows)
 
 

mlinsights/metrics/correlations.py

@@ -126,13 +126,13 @@ def non_linear_correlations(df, model, draws=5, minmax=False):
                 xj_test = df_test[:, j:j + 1]
                 if len(xj_test) == 0 or len(xi_test) == 0:
                     raise ValueError(  # pragma: no cover
-                        "One column is empty i={0} j={1}.".format(i, j))
+                        f"One column is empty i={i} j={j}.")
                 mod = clone(model)
                 try:
                     mod.fit(xi_train, xj_train.ravel())
                 except Exception as e:  # pragma: no cover
                     raise ValueError(
-                        "Unable to compute correlation for i={0} j={1}.".format(i, j)) from e
+                        f"Unable to compute correlation for i={i} j={j}.") from e
                 v = mod.predict(xi_test)
                 c = (1 - numpy.var(v - xj_test.ravel()))
                 co = max(c, 0) ** 0.5

mlinsights/mlbatch/cache_model.py

@@ -31,7 +31,7 @@ def cache(self, params, value):
         key = MLCache.as_key(params)
         if key in self.cached:
             raise KeyError(  # pragma: no cover
-                "Key {0} already exists".format(params))
+                f"Key {params} already exists")
         self.cached[key] = value
         self.count_[key] = 0
 
@@ -77,7 +77,7 @@ def as_key(params):
             elif isinstance(v, tuple):
                 if not all(map(lambda e: isinstance(e, (int, float, str)), v)):
                     raise TypeError(  # pragma: no cover
-                        "Unable to create a key with value '{0}':{1}".format(k, v))
+                        f"Unable to create a key with value '{k}':{v}")
                 return str(v)
             elif isinstance(v, numpy.ndarray):
                 # id(v) may have been better but
@@ -87,7 +87,7 @@ def as_key(params):
                 sv = ""
             else:
                 raise TypeError(  # pragma: no cover
-                    "Unable to create a key with value '{0}':{1}".format(k, v))
+                    f"Unable to create a key with value '{k}':{v}")
             els.append((k, sv))
         return str(els)
 
@@ -122,7 +122,7 @@ def create_cache(name):
         global _caches  # pylint: disable=W0603,W0602
         if name in _caches:
             raise RuntimeError(  # pragma: no cover
-                "cache '{0}' already exists.".format(name))
+                f"cache '{name}' already exists.")
 
         cache = MLCache(name)
         _caches[name] = cache

mlinsights/mlmodel/_kmeans_022.py

@@ -45,7 +45,7 @@ def _labels_inertia_precompute_dense(norm, X, sample_weight, centers, distances)
             X=X, Y=centers, metric='manhattan')
     else:  # pragma no cover
         raise NotImplementedError(
-            "Not implemented for norm '{}'.".format(norm))
+            f"Not implemented for norm '{norm}'.")
     # cython k-means code assumes int32 inputs
     labels = labels.astype(numpy.int32, copy=False)
     if n_samples == distances.shape[0]: