keras-nightly 3.12.0.dev2025082103__py3-none-any.whl → 3.12.0.dev2025082203__py3-none-any.whl

keras/src/applications/mobilenet_v3.py

@@ -385,10 +385,10 @@ def MobileNetV3(
             model_type, "_minimalistic" if minimalistic else "", str(alpha)
         )
         if include_top:
-            file_name = "weights_mobilenet_v3_" + model_name + ".h5"
+            file_name = f"weights_mobilenet_v3_{model_name}.h5"
             file_hash = WEIGHTS_HASHES[model_name][0]
         else:
-            file_name = "weights_mobilenet_v3_" + model_name + "_no_top_v2.h5"
+            file_name = f"weights_mobilenet_v3_{model_name}_no_top_v2.h5"
             file_hash = WEIGHTS_HASHES[model_name][1]
         weights_path = file_utils.get_file(
             file_name,
@@ -570,23 +570,23 @@ def _depth(v, divisor=8, min_value=None):
 
 def _se_block(inputs, filters, se_ratio, prefix):
     x = layers.GlobalAveragePooling2D(
-        keepdims=True, name=prefix + "squeeze_excite_avg_pool"
+        keepdims=True, name=f"{prefix}squeeze_excite_avg_pool"
     )(inputs)
     x = layers.Conv2D(
         _depth(filters * se_ratio),
         kernel_size=1,
         padding="same",
-        name=prefix + "squeeze_excite_conv",
+        name=f"{prefix}squeeze_excite_conv",
     )(x)
-    x = layers.ReLU(name=prefix + "squeeze_excite_relu")(x)
+    x = layers.ReLU(name=f"{prefix}squeeze_excite_relu")(x)
     x = layers.Conv2D(
         filters,
         kernel_size=1,
         padding="same",
-        name=prefix + "squeeze_excite_conv_1",
+        name=f"{prefix}squeeze_excite_conv_1",
     )(x)
     x = hard_sigmoid(x)
-    x = layers.Multiply(name=prefix + "squeeze_excite_mul")([inputs, x])
+    x = layers.Multiply(name=f"{prefix}squeeze_excite_mul")([inputs, x])
     return x
 
 
@@ -605,33 +605,33 @@ def _inverted_res_block(
             kernel_size=1,
             padding="same",
             use_bias=False,
-            name=prefix + "expand",
+            name=f"{prefix}expand",
         )(x)
         x = layers.BatchNormalization(
             axis=channel_axis,
             epsilon=1e-3,
             momentum=0.999,
-            name=prefix + "expand_bn",
+            name=f"{prefix}expand_bn",
         )(x)
         x = activation(x)
 
     if stride == 2:
         x = layers.ZeroPadding2D(
             padding=imagenet_utils.correct_pad(x, kernel_size),
-            name=prefix + "depthwise_pad",
+            name=f"{prefix}depthwise_pad",
         )(x)
     x = layers.DepthwiseConv2D(
         kernel_size,
         strides=stride,
         padding="same" if stride == 1 else "valid",
         use_bias=False,
-        name=prefix + "depthwise",
+        name=f"{prefix}depthwise",
     )(x)
     x = layers.BatchNormalization(
         axis=channel_axis,
         epsilon=1e-3,
         momentum=0.999,
-        name=prefix + "depthwise_bn",
+        name=f"{prefix}depthwise_bn",
     )(x)
     x = activation(x)
 
@@ -643,17 +643,17 @@ def _inverted_res_block(
         kernel_size=1,
         padding="same",
         use_bias=False,
-        name=prefix + "project",
+        name=f"{prefix}project",
     )(x)
     x = layers.BatchNormalization(
         axis=channel_axis,
         epsilon=1e-3,
         momentum=0.999,
-        name=prefix + "project_bn",
+        name=f"{prefix}project_bn",
     )(x)
 
     if stride == 1 and infilters == filters:
-        x = layers.Add(name=prefix + "add")([shortcut, x])
+        x = layers.Add(name=f"{prefix}add")([shortcut, x])
     return x
 
 

keras/src/applications/nasnet.py

@@ -11,10 +11,10 @@ from keras.src.utils import file_utils
 BASE_WEIGHTS_PATH = (
     "https://storage.googleapis.com/tensorflow/keras-applications/nasnet/"
 )
-NASNET_MOBILE_WEIGHT_PATH = BASE_WEIGHTS_PATH + "NASNet-mobile.h5"
-NASNET_MOBILE_WEIGHT_PATH_NO_TOP = BASE_WEIGHTS_PATH + "NASNet-mobile-no-top.h5"
-NASNET_LARGE_WEIGHT_PATH = BASE_WEIGHTS_PATH + "NASNet-large.h5"
-NASNET_LARGE_WEIGHT_PATH_NO_TOP = BASE_WEIGHTS_PATH + "NASNet-large-no-top.h5"
+NASNET_MOBILE_WEIGHT_PATH = f"{BASE_WEIGHTS_PATH}NASNet-mobile.h5"
+NASNET_MOBILE_WEIGHT_PATH_NO_TOP = f"{BASE_WEIGHTS_PATH}NASNet-mobile-no-top.h5"
+NASNET_LARGE_WEIGHT_PATH = f"{BASE_WEIGHTS_PATH}NASNet-large.h5"
+NASNET_LARGE_WEIGHT_PATH_NO_TOP = f"{BASE_WEIGHTS_PATH}NASNet-large-no-top.h5"
 
 
 def NASNet(
@@ -137,10 +137,9 @@ def NASNet(
         and weights == "imagenet"
     ):
         raise ValueError(
-            "When specifying the input shape of a NASNet"
-            " and loading `ImageNet` weights, "
-            "the input_shape argument must be static "
-            "(no None entries). Got: `input_shape=" + str(input_shape) + "`."
+            "When specifying the input shape of a NASNet and loading "
+            "`ImageNet` weights, the input_shape argument must be static"
+            f" (no None entries). Got: `input_shape={input_shape}`."
         )
 
     if default_size is None:

keras/src/applications/resnet.py

@@ -196,16 +196,16 @@ def ResNet(
     # Load weights.
     if (weights == "imagenet") and (weights_name in WEIGHTS_HASHES):
         if include_top:
-            file_name = weights_name + "_weights_tf_dim_ordering_tf_kernels.h5"
+            file_name = f"{weights_name}_weights_tf_dim_ordering_tf_kernels.h5"
             file_hash = WEIGHTS_HASHES[weights_name][0]
         else:
             file_name = (
-                weights_name + "_weights_tf_dim_ordering_tf_kernels_notop.h5"
+                f"{weights_name}_weights_tf_dim_ordering_tf_kernels_notop.h5"
             )
             file_hash = WEIGHTS_HASHES[weights_name][1]
         weights_path = file_utils.get_file(
             file_name,
-            BASE_WEIGHTS_PATH + file_name,
+            f"{BASE_WEIGHTS_PATH}{file_name}",
             cache_subdir="models",
             file_hash=file_hash,
         )
@@ -241,35 +241,35 @@ def residual_block_v1(
 
     if conv_shortcut:
         shortcut = layers.Conv2D(
-            4 * filters, 1, strides=stride, name=name + "_0_conv"
+            4 * filters, 1, strides=stride, name=f"{name}_0_conv"
         )(x)
         shortcut = layers.BatchNormalization(
-            axis=bn_axis, epsilon=1.001e-5, name=name + "_0_bn"
+            axis=bn_axis, epsilon=1.001e-5, name=f"{name}_0_bn"
         )(shortcut)
     else:
         shortcut = x
 
-    x = layers.Conv2D(filters, 1, strides=stride, name=name + "_1_conv")(x)
+    x = layers.Conv2D(filters, 1, strides=stride, name=f"{name}_1_conv")(x)
     x = layers.BatchNormalization(
-        axis=bn_axis, epsilon=1.001e-5, name=name + "_1_bn"
+        axis=bn_axis, epsilon=1.001e-5, name=f"{name}_1_bn"
     )(x)
-    x = layers.Activation("relu", name=name + "_1_relu")(x)
+    x = layers.Activation("relu", name=f"{name}_1_relu")(x)
 
     x = layers.Conv2D(
-        filters, kernel_size, padding="SAME", name=name + "_2_conv"
+        filters, kernel_size, padding="SAME", name=f"{name}_2_conv"
     )(x)
     x = layers.BatchNormalization(
-        axis=bn_axis, epsilon=1.001e-5, name=name + "_2_bn"
+        axis=bn_axis, epsilon=1.001e-5, name=f"{name}_2_bn"
     )(x)
-    x = layers.Activation("relu", name=name + "_2_relu")(x)
+    x = layers.Activation("relu", name=f"{name}_2_relu")(x)
 
-    x = layers.Conv2D(4 * filters, 1, name=name + "_3_conv")(x)
+    x = layers.Conv2D(4 * filters, 1, name=f"{name}_3_conv")(x)
     x = layers.BatchNormalization(
-        axis=bn_axis, epsilon=1.001e-5, name=name + "_3_bn"
+        axis=bn_axis, epsilon=1.001e-5, name=f"{name}_3_bn"
     )(x)
 
-    x = layers.Add(name=name + "_add")([shortcut, x])
-    x = layers.Activation("relu", name=name + "_out")(x)
+    x = layers.Add(name=f"{name}_add")([shortcut, x])
+    x = layers.Activation("relu", name=f"{name}_out")(x)
     return x
 
 
@@ -287,10 +287,10 @@ def stack_residual_blocks_v1(x, filters, blocks, stride1=2, name=None):
         Output tensor for the stacked blocks.
     """
 
-    x = residual_block_v1(x, filters, stride=stride1, name=name + "_block1")
+    x = residual_block_v1(x, filters, stride=stride1, name=f"{name}_block1")
     for i in range(2, blocks + 1):
         x = residual_block_v1(
-            x, filters, conv_shortcut=False, name=name + "_block" + str(i)
+            x, filters, conv_shortcut=False, name=f"{name}_block{i}"
         )
     return x
 
@@ -319,13 +319,13 @@ def residual_block_v2(
         bn_axis = 1
 
     preact = layers.BatchNormalization(
-        axis=bn_axis, epsilon=1.001e-5, name=name + "_preact_bn"
+        axis=bn_axis, epsilon=1.001e-5, name=f"{name}_preact_bn"
     )(x)
-    preact = layers.Activation("relu", name=name + "_preact_relu")(preact)
+    preact = layers.Activation("relu", name=f"{name}_preact_relu")(preact)
 
     if conv_shortcut:
         shortcut = layers.Conv2D(
-            4 * filters, 1, strides=stride, name=name + "_0_conv"
+            4 * filters, 1, strides=stride, name=f"{name}_0_conv"
         )(preact)
     else:
         shortcut = (
@@ -333,28 +333,28 @@ def residual_block_v2(
         )
 
     x = layers.Conv2D(
-        filters, 1, strides=1, use_bias=False, name=name + "_1_conv"
+        filters, 1, strides=1, use_bias=False, name=f"{name}_1_conv"
     )(preact)
     x = layers.BatchNormalization(
-        axis=bn_axis, epsilon=1.001e-5, name=name + "_1_bn"
+        axis=bn_axis, epsilon=1.001e-5, name=f"{name}_1_bn"
     )(x)
-    x = layers.Activation("relu", name=name + "_1_relu")(x)
+    x = layers.Activation("relu", name=f"{name}_1_relu")(x)
 
-    x = layers.ZeroPadding2D(padding=((1, 1), (1, 1)), name=name + "_2_pad")(x)
+    x = layers.ZeroPadding2D(padding=((1, 1), (1, 1)), name=f"{name}_2_pad")(x)
     x = layers.Conv2D(
         filters,
         kernel_size,
         strides=stride,
         use_bias=False,
-        name=name + "_2_conv",
+        name=f"{name}_2_conv",
     )(x)
     x = layers.BatchNormalization(
-        axis=bn_axis, epsilon=1.001e-5, name=name + "_2_bn"
+        axis=bn_axis, epsilon=1.001e-5, name=f"{name}_2_bn"
     )(x)
-    x = layers.Activation("relu", name=name + "_2_relu")(x)
+    x = layers.Activation("relu", name=f"{name}_2_relu")(x)
 
-    x = layers.Conv2D(4 * filters, 1, name=name + "_3_conv")(x)
-    x = layers.Add(name=name + "_out")([shortcut, x])
+    x = layers.Conv2D(4 * filters, 1, name=f"{name}_3_conv")(x)
+    x = layers.Add(name=f"{name}_out")([shortcut, x])
     return x
 
 
@@ -372,11 +372,11 @@ def stack_residual_blocks_v2(x, filters, blocks, stride1=2, name=None):
         Output tensor for the stacked blocks.
     """
 
-    x = residual_block_v2(x, filters, conv_shortcut=True, name=name + "_block1")
+    x = residual_block_v2(x, filters, conv_shortcut=True, name=f"{name}_block1")
     for i in range(2, blocks):
-        x = residual_block_v2(x, filters, name=name + "_block" + str(i))
+        x = residual_block_v2(x, filters, name=f"{name}_block{i}")
     x = residual_block_v2(
-        x, filters, stride=stride1, name=name + "_block" + str(blocks)
+        x, filters, stride=stride1, name=f"{name}_block{str(blocks)}"
     )
     return x
 

keras/src/applications/xception.py

@@ -212,40 +212,40 @@ def Xception(
 
     for i in range(8):
         residual = x
-        prefix = "block" + str(i + 5)
+        prefix = f"block{i + 5}"
 
-        x = layers.Activation("relu", name=prefix + "_sepconv1_act")(x)
+        x = layers.Activation("relu", name=f"{prefix}_sepconv1_act")(x)
         x = layers.SeparableConv2D(
             728,
             (3, 3),
             padding="same",
             use_bias=False,
-            name=prefix + "_sepconv1",
+            name=f"{prefix}_sepconv1",
         )(x)
         x = layers.BatchNormalization(
-            axis=channel_axis, name=prefix + "_sepconv1_bn"
+            axis=channel_axis, name=f"{prefix}_sepconv1_bn"
         )(x)
-        x = layers.Activation("relu", name=prefix + "_sepconv2_act")(x)
+        x = layers.Activation("relu", name=f"{prefix}_sepconv2_act")(x)
         x = layers.SeparableConv2D(
             728,
             (3, 3),
             padding="same",
             use_bias=False,
-            name=prefix + "_sepconv2",
+            name=f"{prefix}_sepconv2",
         )(x)
         x = layers.BatchNormalization(
-            axis=channel_axis, name=prefix + "_sepconv2_bn"
+            axis=channel_axis, name=f"{prefix}_sepconv2_bn"
         )(x)
-        x = layers.Activation("relu", name=prefix + "_sepconv3_act")(x)
+        x = layers.Activation("relu", name=f"{prefix}_sepconv3_act")(x)
         x = layers.SeparableConv2D(
             728,
             (3, 3),
             padding="same",
             use_bias=False,
-            name=prefix + "_sepconv3",
+            name=f"{prefix}_sepconv3",
         )(x)
         x = layers.BatchNormalization(
-            axis=channel_axis, name=prefix + "_sepconv3_bn"
+            axis=channel_axis, name=f"{prefix}_sepconv3_bn"
         )(x)
 
         x = layers.add([x, residual])

keras/src/backend/common/dtypes.py

@@ -225,11 +225,11 @@ def _resolve_weak_type(dtype, precision="32"):
     if dtype_indicator == "b":
         return "bool"
     elif dtype_indicator == "i":
-        return "int" + precision
+        return f"int{precision}"
     elif dtype_indicator == "u":
-        return "uint" + precision
+        return f"uint{precision}"
     else:
-        return "float" + precision
+        return f"float{precision}"
 
 
 BIT64_TO_BIT16_DTYPE = {

keras/src/backend/common/variables.py

@@ -1,3 +1,5 @@
+import os.path
+
 import numpy as np
 
 from keras.src import backend
@@ -142,7 +144,7 @@ class Variable:
         self._name = name
         parent_path = current_path()
         if parent_path:
-            self._path = current_path() + "/" + name
+            self._path = os.path.join(current_path(), name)
         else:
             self._path = name
         self._shape = None

keras/src/backend/jax/export.py

@@ -159,7 +159,7 @@ class JaxExportArchive:
                     poly_shape.append("batch")
                 else:
                     poly_shape.append(next(dim_names))
-            return "(" + ", ".join(poly_shape) + ")"
+            return f"({', '.join(poly_shape)})"
 
         return tree.map_structure(convert_shape, struct)
 

keras/src/backend/jax/trainer.py

@@ -504,7 +504,7 @@ class JAXTrainer(base_trainer.Trainer):
                         _use_cached_eval_dataset=True,
                     )
                     val_logs = {
-                        "val_" + name: val for name, val in val_logs.items()
+                        f"val_{name}": val for name, val in val_logs.items()
                     }
                     epoch_logs.update(val_logs)
 

keras/src/backend/openvino/numpy.py

@@ -687,7 +687,7 @@ def diff(a, n=1, axis=-1):
     if n == 0:
         return OpenVINOKerasTensor(get_ov_output(a))
     if n < 0:
-        raise ValueError("order must be non-negative but got " + repr(n))
+        raise ValueError(f"order must be non-negative but got {repr(n)}")
     a = get_ov_output(a)
     a_type = a.get_element_type()
     if isinstance(a, np.ndarray):

keras/src/backend/tensorflow/trainer.py

@@ -1,4 +1,5 @@
 import contextlib
+import functools
 import warnings
 
 import numpy as np
@@ -107,6 +108,21 @@ class TensorFlowTrainer(base_trainer.Trainer):
             y_pred = self(x)
         return y_pred
 
+    def _autoconvert_optionals(self, step_func):
+        # Wrapper converting (nested) TF Optional in input data to None
+        @functools.wraps(step_func)
+        def wrapper(data):
+            converted_data = tree.map_structure(
+                lambda i: (
+                    None if isinstance(i, tf.experimental.Optional) else i
+                ),
+                data,
+            )
+            result = step_func(converted_data)
+            return result
+
+        return wrapper
+
     def _make_function(self, step_function):
         @tf.autograph.experimental.do_not_convert
         def one_step_on_data(data):
@@ -125,6 +141,7 @@ class TensorFlowTrainer(base_trainer.Trainer):
                 reduce_retracing=True,
                 jit_compile=self.jit_compile,
             )
+        one_step_on_data = self._autoconvert_optionals(one_step_on_data)
 
         @tf.autograph.experimental.do_not_convert
         def multi_step_on_iterator(iterator):
@@ -253,6 +270,7 @@ class TensorFlowTrainer(base_trainer.Trainer):
             one_step_on_data = tf.function(
                 one_step_on_data, reduce_retracing=True, jit_compile=True
             )
+        one_step_on_data = self._autoconvert_optionals(one_step_on_data)
 
         @tf.autograph.experimental.do_not_convert
         def one_step_on_data_distributed(data):
@@ -409,7 +427,7 @@ class TensorFlowTrainer(base_trainer.Trainer):
                     _use_cached_eval_dataset=True,
                 )
                 val_logs = {
-                    "val_" + name: val for name, val in val_logs.items()
+                    f"val_{name}": val for name, val in val_logs.items()
                 }
                 epoch_logs.update(val_logs)
 

keras/src/backend/torch/core.py

@@ -191,21 +191,18 @@ def convert_to_tensor(x, dtype=None, sparse=None, ragged=None):
         raise ValueError("`sparse=True` is not supported with torch backend")
     if ragged:
         raise ValueError("`ragged=True` is not supported with torch backend")
-    if isinstance(x, Variable):
-        if dtype is None:
-            return x.value
-        x = x.value
-        return x.to(to_torch_dtype(dtype))
-    if is_tensor(x):
+    if isinstance(x, Variable) or is_tensor(x):
+        if isinstance(x, Variable):
+            x = x.value
         device = get_device()
         if x.device != device:
             if x.is_meta:
                 x = torch.empty_like(x, device=device)
             else:
                 x = x.to(device)
-        if dtype is None:
-            return x
-        return x.to(to_torch_dtype(dtype))
+        if dtype is not None:
+            x = x.to(to_torch_dtype(dtype))
+        return x
     if dtype is None:
         if isinstance(x, bool):
             return torch.as_tensor(x, dtype=torch.bool, device=get_device())

keras/src/backend/torch/trainer.py

@@ -299,7 +299,7 @@ class TorchTrainer(base_trainer.Trainer):
                     _use_cached_eval_dataset=True,
                 )
                 val_logs = {
-                    "val_" + name: val for name, val in val_logs.items()
+                    f"val_{name}": val for name, val in val_logs.items()
                 }
                 epoch_logs.update(val_logs)
 

keras/src/callbacks/backup_and_restore.py

@@ -99,9 +99,9 @@ class BackupAndRestore(Callback):
         self._training_metadata_path = file_utils.join(
             backup_dir, "training_metadata.json"
         )
-        self._prev_weights_path = self._weights_path + ".bkp"
+        self._prev_weights_path = f"{self._weights_path}.bkp"
         self._prev_training_metadata_path = (
-            self._training_metadata_path + ".bkp"
+            f"{self._training_metadata_path}.bkp"
         )
         if save_freq != "epoch" and not isinstance(save_freq, int):
             raise ValueError(

keras/src/callbacks/csv_logger.py

@@ -79,7 +79,7 @@ class CSVLogger(Callback):
                     val_keys_found = True
                     break
             if not val_keys_found and self.keys:
-                self.keys.extend(["val_" + k for k in self.keys])
+                self.keys.extend([f"val_{k}" for k in self.keys])
 
         if not self.writer:
 

keras/src/callbacks/model_checkpoint.py

@@ -372,7 +372,7 @@ class ModelCheckpoint(MonitorCallback):
         """
         dir_name = os.path.dirname(pattern)
         base_name = os.path.basename(pattern)
-        base_name_regex = "^" + re.sub(r"{.*}", r".*", base_name) + "$"
+        base_name_regex = f"^{re.sub(r'{.*}', r'.*', base_name)}$"
 
         latest_mod_time = 0
         file_path_with_latest_mod_time = None

keras/src/callbacks/tensorboard.py

@@ -424,7 +424,7 @@ class TensorBoard(Callback):
             with self._val_writer.as_default():
                 for name, value in logs.items():
                     self.summary.scalar(
-                        "evaluation_" + name + "_vs_iterations",
+                        f"evaluation_{name}_vs_iterations",
                         value,
                         step=self.model.optimizer.iterations,
                     )
@@ -460,7 +460,7 @@ class TensorBoard(Callback):
         if isinstance(logs, dict):
             for name, value in logs.items():
                 self.summary.scalar(
-                    "batch_" + name, value, step=self._global_train_batch
+                    f"batch_{name}", value, step=self._global_train_batch
                 )
 
         if not self._should_trace:
@@ -548,12 +548,12 @@ class TensorBoard(Callback):
         if train_logs:
             with self._train_writer.as_default():
                 for name, value in train_logs.items():
-                    self.summary.scalar("epoch_" + name, value, step=epoch)
+                    self.summary.scalar(f"epoch_{name}", value, step=epoch)
         if val_logs:
             with self._val_writer.as_default():
                 for name, value in val_logs.items():
                     name = name[4:]  # Remove 'val_' prefix.
-                    self.summary.scalar("epoch_" + name, value, step=epoch)
+                    self.summary.scalar(f"epoch_{name}", value, step=epoch)
 
     def _log_weights(self, epoch):
         """Logs the weights of the Model to TensorBoard."""
@@ -562,14 +562,14 @@ class TensorBoard(Callback):
                 for weight in layer.weights:
                     weight_name = weight.name.replace(":", "_")
                     # Add a suffix to prevent summary tag name collision.
-                    histogram_weight_name = weight_name + "/histogram"
+                    histogram_weight_name = f"{weight_name}/histogram"
                     self.summary.histogram(
                         histogram_weight_name, weight, step=epoch
                     )
                     if self.write_images:
                         # Add a suffix to prevent summary tag name
                         # collision.
-                        image_weight_name = weight_name + "/image"
+                        image_weight_name = f"{weight_name}/image"
                         self._log_weight_as_image(
                             weight, image_weight_name, epoch
                         )

keras/src/datasets/boston_housing.py

@@ -48,7 +48,7 @@ def load_data(path="boston_housing.npz", test_split=0.2, seed=113):
     )
     path = get_file(
         path,
-        origin=origin_folder + "boston_housing.npz",
+        origin=f"{origin_folder}boston_housing.npz",
         file_hash=(  # noqa: E501
             "f553886a1f8d56431e820c5b82552d9d95cfcb96d1e678153f8839538947dff5"
         ),

keras/src/datasets/california_housing.py

@@ -73,7 +73,7 @@ def load_data(
     )
     path = get_file(
         path,
-        origin=origin_folder + "california_housing.npz",
+        origin=f"{origin_folder}california_housing.npz",
         file_hash=(  # noqa: E501
             "1a2e3a52e0398de6463aebe6f4a8da34fb21fbb6b934cf88c3425e766f2a1a6f"
         ),

keras/src/datasets/cifar10.py

@@ -79,7 +79,7 @@ def load_data():
     # batches are within an inner folder
     path = os.path.join(path, "cifar-10-batches-py")
     for i in range(1, 6):
-        fpath = os.path.join(path, "data_batch_" + str(i))
+        fpath = os.path.join(path, f"data_batch_{i}")
         (
             x_train[(i - 1) * 10000 : i * 10000, :, :, :],
             y_train[(i - 1) * 10000 : i * 10000],

keras/src/datasets/cifar100.py

@@ -71,10 +71,10 @@ def load_data(label_mode="fine"):
 
     path = os.path.join(path, "cifar-100-python")
     fpath = os.path.join(path, "train")
-    x_train, y_train = load_batch(fpath, label_key=label_mode + "_labels")
+    x_train, y_train = load_batch(fpath, label_key=f"{label_mode}_labels")
 
     fpath = os.path.join(path, "test")
-    x_test, y_test = load_batch(fpath, label_key=label_mode + "_labels")
+    x_test, y_test = load_batch(fpath, label_key=f"{label_mode}_labels")
 
     y_train = np.reshape(y_train, (len(y_train), 1))
     y_test = np.reshape(y_test, (len(y_test), 1))

keras/src/datasets/imdb.py

@@ -78,7 +78,7 @@ def load_data(
     )
     path = get_file(
         fname=path,
-        origin=origin_folder + "imdb.npz",
+        origin=f"{origin_folder}imdb.npz",
         file_hash=(  # noqa: E501
             "69664113be75683a8fe16e3ed0ab59fda8886cb3cd7ada244f7d9544e4676b9f"
         ),
@@ -181,7 +181,7 @@ def get_word_index(path="imdb_word_index.json"):
     )
     path = get_file(
         fname=path,
-        origin=origin_folder + "imdb_word_index.json",
+        origin=f"{origin_folder}imdb_word_index.json",
         file_hash="bfafd718b763782e994055a2d397834f",
     )
     with open(path) as f:

keras/src/datasets/mnist.py

@@ -59,7 +59,7 @@ def load_data(path="mnist.npz"):
     )
     path = get_file(
         fname=path,
-        origin=origin_folder + "mnist.npz",
+        origin=f"{origin_folder}mnist.npz",
         file_hash=(  # noqa: E501
             "731c5ac602752760c8e48fbffcf8c3b850d9dc2a2aedcf2cc48468fc17b673d1"
         ),