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

keras/src/trainers/data_adapters/data_adapter_utils.py

@@ -101,7 +101,9 @@ def list_to_tuple(maybe_list):
 
 
 def check_data_cardinality(data):
-    num_samples = set(int(i.shape[0]) for i in tree.flatten(data))
+    num_samples = set(
+        int(i.shape[0]) for i in tree.flatten(data) if i is not None
+    )
     if len(num_samples) > 1:
         msg = (
             "Data cardinality is ambiguous. "
@@ -186,7 +188,9 @@ def get_keras_tensor_spec(batches):
         else:
             return backend.KerasTensor(shape=shape, dtype=dtype)
 
-    return tree.map_structure(get_single_tensor_spec, *batches)
+    return tree.map_structure(
+        get_single_tensor_spec, *batches, none_is_leaf=False
+    )
 
 
 def convert_to_tf_tensor_spec(keras_tensor, batch_axis_to_none=True):
@@ -199,6 +203,8 @@ def convert_to_tf_tensor_spec(keras_tensor, batch_axis_to_none=True):
     """
     from keras.src.utils.module_utils import tensorflow as tf
 
+    if keras_tensor is None:
+        return tf.OptionalSpec(None)
     if not isinstance(keras_tensor, backend.KerasTensor):
         raise TypeError(
             f"Expected a KerasTensor, but got {keras_tensor} of type "
@@ -252,7 +258,9 @@ def get_jax_iterator(iterable):
             return np.asarray(x)
 
     for batch in iterable:
-        yield tree.map_structure(convert_to_jax_compatible, batch)
+        yield tree.map_structure(
+            convert_to_jax_compatible, batch, none_is_leaf=False
+        )
 
 
 def get_numpy_iterator(iterable):
@@ -268,7 +276,7 @@ def get_numpy_iterator(iterable):
         return x
 
     for batch in iterable:
-        yield tree.map_structure(convert_to_numpy, batch)
+        yield tree.map_structure(convert_to_numpy, batch, none_is_leaf=False)
 
 
 def get_torch_dataloader(iterable):
@@ -282,7 +290,9 @@ def get_torch_dataloader(iterable):
 
         def __iter__(self):
             for batch in self.iterable:
-                yield tree.map_structure(convert_to_tensor, batch)
+                yield tree.map_structure(
+                    convert_to_tensor, batch, none_is_leaf=False
+                )
 
     dataset = ConverterIterableDataset(iterable)
     # `batch_size=None` indicates that we should not re-batch

keras/src/trainers/data_adapters/generator_data_adapter.py

@@ -32,6 +32,8 @@ class GeneratorDataAdapter(DataAdapter):
         from keras.src.utils.module_utils import tensorflow as tf
 
         def convert_to_tf(x, spec):
+            if x is None:
+                return tf.experimental.Optional.empty(None)
             if data_adapter_utils.is_scipy_sparse(x):
                 x = data_adapter_utils.scipy_sparse_to_tf_sparse(x)
             elif data_adapter_utils.is_jax_sparse(x):

keras/src/trainers/data_adapters/grain_dataset_adapter.py

@@ -80,7 +80,9 @@ class GrainDatasetAdapter(DataAdapter):
 
         class ConvertToNumpy(grain.transforms.Map):
             def map(self, x):
-                return tree.map_structure(convert_to_numpy, x)
+                return tree.map_structure(
+                    convert_to_numpy, x, none_is_leaf=False
+                )
 
         if isinstance(self._dataset, (grain.MapDataset, grain.IterDataset)):
             dataset = self._dataset.map(ConvertToNumpy())
@@ -109,7 +111,9 @@ class GrainDatasetAdapter(DataAdapter):
 
         class ConvertToJaxCompatible(grain.transforms.Map):
             def map(self, x):
-                return tree.map_structure(convert_to_jax_compatible, x)
+                return tree.map_structure(
+                    convert_to_jax_compatible, x, none_is_leaf=False
+                )
 
         if isinstance(self._dataset, (grain.MapDataset, grain.IterDataset)):
             dataset = self._dataset.map(ConvertToJaxCompatible())
@@ -131,6 +135,8 @@ class GrainDatasetAdapter(DataAdapter):
 
     def get_tf_dataset(self):
         def convert_to_tf(x):
+            if x is None:
+                return tf.experimental.Optional.empty(None)
             if data_adapter_utils.is_scipy_sparse(x):
                 x = data_adapter_utils.scipy_sparse_to_tf_sparse(x)
             elif data_adapter_utils.is_jax_sparse(x):

keras/src/trainers/data_adapters/tf_dataset_adapter.py

@@ -38,7 +38,9 @@ class TFDatasetAdapter(DataAdapter):
         from keras.src.backend.tensorflow.core import convert_to_numpy
 
         for batch in self._dataset:
-            yield tree.map_structure(convert_to_numpy, batch)
+            yield tree.map_structure(
+                convert_to_numpy, batch, none_is_leaf=False
+            )
 
     def get_jax_iterator(self):
         from keras.src.backend.tensorflow.core import convert_to_numpy
@@ -52,7 +54,7 @@ class TFDatasetAdapter(DataAdapter):
                 return convert_to_numpy(x)
 
         for batch in self._dataset:
-            yield tree.map_structure(convert_to_jax, batch)
+            yield tree.map_structure(convert_to_jax, batch, none_is_leaf=False)
 
     def get_tf_dataset(self):
         return self._dataset

keras/src/trainers/data_adapters/torch_data_loader_adapter.py

@@ -35,7 +35,9 @@ class TorchDataLoaderAdapter(DataAdapter):
         for batch in self._dataloader:
             # shared memory using `np.asarray`
             yield tuple(
-                tree.map_structure(lambda x: np.asarray(x.cpu()), batch)
+                tree.map_structure(
+                    lambda x: np.asarray(x.cpu()), batch, none_is_leaf=False
+                )
             )
 
     def get_jax_iterator(self):

keras/src/tree/dmtree_impl.py

@@ -194,16 +194,32 @@ def flatten_with_path(structure):
     return flattened
 
 
-def map_structure(func, *structures):
+def map_structure(func, *structures, none_is_leaf=True):
     if not callable(func):
         raise TypeError(
             f"`func` must be callable, got {func} of type {type(func)}"
         )
 
+    map_func = func
+    if not none_is_leaf:
+
+        def func_skipping_none(*args):
+            # Check if the reference entry (first one) is None
+            if args[0] is None:
+                if not all(s is None for s in args):
+                    raise ValueError(
+                        "Structure mismatch: some arguments are None, others "
+                        f"are not. Received arguments: {args}."
+                    )
+                return None
+            return func(*args)
+
+        map_func = func_skipping_none
+
     def func_traverse_wrapper(s):
         if is_nested(s):
             return None
-        ret = func(s)
+        ret = map_func(s)
         if ret is None:
             return dmtree.MAP_TO_NONE
         return ret
@@ -212,7 +228,7 @@ def map_structure(func, *structures):
         return traverse(func_traverse_wrapper, structures[0])
 
     with TypeErrorRemapping():
-        return dmtree.map_structure(func, *structures)
+        return dmtree.map_structure(map_func, *structures)
 
 
 def map_structure_up_to(shallow_structure, func, *structures):

keras/src/tree/optree_impl.py

@@ -93,14 +93,14 @@ def flatten_with_path(structure):
     return list(zip(paths, leaves))
 
 
-def map_structure(func, *structures):
+def map_structure(func, *structures, none_is_leaf=True):
     if not structures:
         raise ValueError("Must provide at least one structure")
 
     # Add check for same structures, otherwise optree just maps to shallowest.
     def func_with_check(*args):
         if not all(
-            optree.tree_is_leaf(s, none_is_leaf=True, namespace="keras")
+            optree.tree_is_leaf(s, none_is_leaf=none_is_leaf, namespace="keras")
             for s in args
         ):
             raise ValueError("Structures don't have the same nested structure.")
@@ -109,7 +109,7 @@ def map_structure(func, *structures):
     map_func = func_with_check if len(structures) > 1 else func
 
     return optree.tree_map(
-        map_func, *structures, none_is_leaf=True, namespace="keras"
+        map_func, *structures, none_is_leaf=none_is_leaf, namespace="keras"
     )
 
 

keras/src/tree/tree_api.py

@@ -160,7 +160,7 @@ def flatten_with_path(structure):
 
 
 @keras_export("keras.tree.map_structure")
-def map_structure(func, *structures):
+def map_structure(func, *structures, none_is_leaf=True):
     """Maps `func` through given structures.
 
     Examples:
@@ -179,6 +179,9 @@ def map_structure(func, *structures):
     Args:
         func: A callable that accepts as many arguments as there are structures.
         *structures: Arbitrarily nested structures of the same layout.
+        none_is_leaf: If True, `func` will be called on `None` leaves. If False,
+            `None` values are not passed to `func` and are returned in the
+            output directly.
 
     Returns:
         A new structure with the same layout as the given ones.
@@ -189,7 +192,7 @@ def map_structure(func, *structures):
             the nested structures don't match according to the rules of
             `assert_same_structure`.
     """
-    return tree_impl.map_structure(func, *structures)
+    return tree_impl.map_structure(func, *structures, none_is_leaf=none_is_leaf)
 
 
 @keras_export("keras.tree.map_structure_up_to")

keras/src/utils/file_utils.py

@@ -3,7 +3,10 @@ import os
 import re
 import shutil
 import tarfile
+import tempfile
 import urllib
+import urllib.error
+import urllib.parse
 import warnings
 import zipfile
 from urllib.request import urlretrieve
@@ -159,7 +162,7 @@ def get_file(
     ```python
     path_to_downloaded_file = get_file(
         origin="https://storage.googleapis.com/download.tensorflow.org/example_images/flower_photos.tgz",
-        extract=True,
+        extract=True
     )
     ```
 
@@ -221,7 +224,9 @@ def get_file(
         hash_algorithm = "md5"
     datadir_base = os.path.expanduser(cache_dir)
     if not os.access(datadir_base, os.W_OK):
-        datadir_base = os.path.join("/tmp", ".keras")
+        datadir_base = os.path.join(
+            "/tmp" if os.path.isdir("/tmp") else tempfile.gettempdir(), ".keras"
+        )
     datadir = os.path.join(datadir_base, cache_subdir)
     os.makedirs(datadir, exist_ok=True)
 
@@ -249,13 +254,13 @@ def get_file(
             if "." in fname:
                 download_target = os.path.join(datadir, fname)
                 fname = fname[: fname.find(".")]
-                extraction_dir = os.path.join(datadir, fname + "_extracted")
+                extraction_dir = os.path.join(datadir, f"{fname}_extracted")
             else:
                 extraction_dir = os.path.join(datadir, fname)
-                download_target = os.path.join(datadir, fname + "_archive")
+                download_target = os.path.join(datadir, f"{fname}_archive")
         else:
             extraction_dir = os.path.join(datadir, fname)
-            download_target = os.path.join(datadir, fname + "_archive")
+            download_target = os.path.join(datadir, f"{fname}_archive")
     else:
         download_target = os.path.join(datadir, fname)
 
@@ -520,3 +525,6 @@ def makedirs(path):
         else:
             _raise_if_no_gfile(path)
     return os.makedirs(path)
+
+
+"/fo"

keras/src/utils/io_utils.py

@@ -93,7 +93,7 @@ def print_msg(message, line_break=True):
     """Print the message to absl logging or stdout."""
     message = str(message)
     if is_interactive_logging_enabled():
-        message = message + "\n" if line_break else message
+        message = f"{message}\n" if line_break else message
         try:
             sys.stdout.write(message)
         except UnicodeEncodeError:

keras/src/utils/model_visualization.py

@@ -178,7 +178,7 @@ def make_layer_label(layer, **kwargs):
         colspan = 1
 
     if cols:
-        table += "<tr>" + "".join(cols) + "</tr>"
+        table += f"<tr>{''.join(cols)}</tr>"
     table += "</table>>"
     return table
 

keras/src/utils/progbar.py

@@ -120,16 +120,16 @@ class Progbar:
 
             if self.target is not None:
                 numdigits = int(math.log10(self.target)) + 1
-                bar = ("%" + str(numdigits) + "d/%d") % (current, self.target)
+                bar = (f"%{numdigits}d/%d") % (current, self.target)
                 bar = f"\x1b[1m{bar}\x1b[0m "
                 special_char_len += 8
                 prog = float(current) / self.target
                 prog_width = int(self.width * prog)
 
                 if prog_width > 0:
-                    bar += "\33[32m" + "━" * prog_width + "\x1b[0m"
+                    bar += f"\33[32m{'━' * prog_width}\x1b[0m"
                     special_char_len += 9
-                bar += "\33[37m" + "━" * (self.width - prog_width) + "\x1b[0m"
+                bar += f"\33[37m{'━' * (self.width - prog_width)}\x1b[0m"
                 special_char_len += 9
 
             else:
@@ -189,9 +189,9 @@ class Progbar:
         elif self.verbose == 2:
             if finalize:
                 numdigits = int(math.log10(self.target)) + 1
-                count = ("%" + str(numdigits) + "d/%d") % (current, self.target)
+                count = f"%{numdigits}d/%d" % (current, self.target)
                 info = f"{count} - {now - self._start:.0f}s"
-                info += " -" + self._format_time(time_per_unit, self.unit_name)
+                info += f" -{self._format_time(time_per_unit, self.unit_name)}"
                 for k in self._values_order:
                     info += f" - {k}:"
                     avg = backend.convert_to_numpy(

keras/src/utils/summary_utils.py

@@ -87,7 +87,7 @@ def format_layer_shape(layer):
 
     def format_shape(shape):
         highlighted = [highlight_number(x) for x in shape]
-        return "(" + ", ".join(highlighted) + ")"
+        return f"({', '.join(highlighted)})"
 
     # There are 2 approaches to get output shapes:
     # 1. Using `layer._inbound_nodes`, which is possible if the model is a
@@ -268,7 +268,7 @@ def print_summary(
 
     def get_layer_fields(layer, prefix=""):
         output_shape = format_layer_shape(layer)
-        name = prefix + layer.name
+        name = f"{prefix}{layer.name}"
         cls_name = layer.__class__.__name__
         name = rich.markup.escape(name)
         name += f" ({highlight_symbol(rich.markup.escape(cls_name))})"
@@ -276,7 +276,7 @@ def print_summary(
         if not hasattr(layer, "built"):
             params = highlight_number(0)
         elif not layer.built:
-            params = highlight_number(0) + " (unbuilt)"
+            params = f"{highlight_number(0)} (unbuilt)"
         else:
             params = highlight_number(f"{layer.count_params():,}")
 
@@ -296,7 +296,7 @@ def print_summary(
 
     def print_layer(layer, nested_level=0):
         if nested_level:
-            prefix = "   " * nested_level + "└" + " "
+            prefix = "   " * nested_level + "└ "
         else:
             prefix = ""
 

keras/src/version.py

@@ -1,7 +1,7 @@
 from keras.src.api_export import keras_export
 
 # Unique source of truth for the version number.
-__version__ = "3.12.0.dev2025082103"
+__version__ = "3.12.0.dev2025082303"
 
 
 @keras_export("keras.version")

{keras_nightly-3.12.0.dev2025082103.dist-info → keras_nightly-3.12.0.dev2025082303.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: keras-nightly
-Version: 3.12.0.dev2025082103
+Version: 3.12.0.dev2025082303
 Summary: Multi-backend Keras
 Author-email: Keras team <keras-users@googlegroups.com>
 License: Apache License 2.0