python · JelleZijlstra · Mar 13, 2024 · Jan 28, 2024 · Jan 31, 2024 · Feb 17, 2024
diff --git a/stubs/tensorflow/@tests/stubtest_allowlist.txt b/stubs/tensorflow/@tests/stubtest_allowlist.txt
@@ -73,7 +73,7 @@ tensorflow.keras.layers.*.call
 tensorflow.keras.regularizers.Regularizer.__call__
 tensorflow.keras.constraints.Constraint.__call__
 
-# Layer class does good deal of __new__ magic and actually returns one of two different internal
+# Layer/Model class does good deal of __new__ magic and actually returns one of two different internal
 # types depending on tensorflow execution mode. This feels like implementation internal.
 tensorflow.keras.layers.Layer.__new__
 
@@ -114,5 +114,8 @@ tensorflow.train.ServerDef.*
 # python.X
 tensorflow.python.*
 
+# The modules below are re-exported from tensorflow.python, and they therefore appear missing to stubtest.
+tensorflow.distribute.Strategy
+
 # sigmoid_cross_entropy_with_logits has default values (None), however those values are not valid.
 tensorflow.nn.sigmoid_cross_entropy_with_logits
diff --git a/stubs/tensorflow/tensorflow/distribute/__init__.pyi b/stubs/tensorflow/tensorflow/distribute/__init__.pyi
@@ -0,0 +1,5 @@
+from _typeshed import Incomplete
+
+from tensorflow.python.distribute.distribute_lib import Strategy as Strategy
+
+def __getattr__(name: str) -> Incomplete: ...
diff --git a/stubs/tensorflow/tensorflow/keras/__init__.pyi b/stubs/tensorflow/tensorflow/keras/__init__.pyi
@@ -2,6 +2,7 @@ from _typeshed import Incomplete
 
 from tensorflow.keras import (
     activations as activations,
+    callbacks as callbacks,
     constraints as constraints,
     initializers as initializers,
     layers as layers,

diff --git a/stubs/tensorflow/tensorflow/keras/callbacks.pyi b/stubs/tensorflow/tensorflow/keras/callbacks.pyi
@@ -7,14 +7,15 @@ import tensorflow as tf
 from requests.api import _HeadersMapping
 from tensorflow.keras import Model
 from tensorflow.keras.optimizers.schedules import LearningRateSchedule
+from tensorflow.saved_model import SaveOptions
 from tensorflow.train import CheckpointOptions
 
 _Logs: TypeAlias = Mapping[str, Any] | None | Any
 
 class Callback:
-    model: Model  # Model[Any, object]
+    model: Model[Any, Any]
     params: dict[str, Any]
-    def set_model(self, model: Model) -> None: ...
+    def set_model(self, model: Model[Any, Any]) -> None: ...
     def set_params(self, params: dict[str, Any]) -> None: ...
     def on_batch_begin(self, batch: int, logs: _Logs = None) -> None: ...
     def on_batch_end(self, batch: int, logs: _Logs = None) -> None: ...
@@ -35,18 +36,18 @@ class Callback:
 
 # A CallbackList has exact same api as a callback, but does not actually subclass it.
 class CallbackList:
-    model: Model
+    model: Model[Any, Any]
     params: dict[str, Any]
     def __init__(
         self,
         callbacks: Sequence[Callback] | None = None,
         add_history: bool = False,
         add_progbar: bool = False,
         # model: Model[Any, object] | None = None,
-        model: Model | None = None,
+        model: Model[Any, Any] | None = None,
         **params: Any,
     ) -> None: ...
-    def set_model(self, model: Model) -> None: ...
+    def set_model(self, model: Model[Any, Any]) -> None: ...
     def set_params(self, params: dict[str, Any]) -> None: ...
     def on_batch_begin(self, batch: int, logs: _Logs | None = None) -> None: ...
     def on_batch_end(self, batch: int, logs: _Logs | None = None) -> None: ...
@@ -115,7 +116,7 @@ class LearningRateScheduler(Callback):
 class ModelCheckpoint(Callback):
     monitor_op: Any
     filepath: str
-    _options: CheckpointOptions | tf.saved_model.SaveOptions | None
+    _options: CheckpointOptions | SaveOptions | None
     def __init__(
         self,
         filepath: str,
@@ -125,7 +126,7 @@ class ModelCheckpoint(Callback):
         save_weights_only: bool = False,
         mode: Literal["auto", "min", "max"] = "auto",
         save_freq: str | int = "epoch",
-        options: CheckpointOptions | tf.saved_model.SaveOptions | None = None,
+        options: CheckpointOptions | SaveOptions | None = None,
         initial_value_threshold: float | None = None,
     ) -> None: ...
     def _save_model(self, epoch: int, batch: int | None, logs: _Logs) -> None: ...

diff --git a/stubs/tensorflow/tensorflow/keras/models.pyi b/stubs/tensorflow/tensorflow/keras/models.pyi
@@ -1,3 +1,235 @@
 from _typeshed import Incomplete
+from collections.abc import Callable, Container, Iterator
+from pathlib import Path
+from typing import Any, Literal
+from typing_extensions import Self, TypeAlias
 
-Model = Incomplete
+import numpy as np
+import numpy.typing as npt
+import tensorflow
+import tensorflow as tf
+from tensorflow import Variable
+from tensorflow._aliases import ContainerGeneric, ShapeLike, TensorCompatible
+from tensorflow.keras.layers import Layer, _InputT, _OutputT
+from tensorflow.keras.optimizers import Optimizer
+
+_Loss: TypeAlias = str | tf.keras.losses.Loss | Callable[[TensorCompatible, TensorCompatible], tf.Tensor]
+_Metric: TypeAlias = str | tf.keras.metrics.Metric | Callable[[TensorCompatible, TensorCompatible], tf.Tensor] | None
+
+class Model(Layer[_InputT, _OutputT], tf.Module):
+    _train_counter: tf.Variable
+    _test_counter: tf.Variable
+    optimizer: Optimizer | None
+    loss: tf.keras.losses.Loss | dict[str, tf.keras.losses.Loss]
+    stop_training: bool
+
+    def __new__(cls, *args: Any, **kwargs: Any) -> Model[_InputT, _OutputT]: ...
+    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    def __setattr__(self, name: str, value: Any) -> None: ...
+    def __reduce__(self) -> Incomplete: ...
+    def __deepcopy__(self, memo: Incomplete) -> Incomplete: ...
+    def build(self, input_shape: ShapeLike) -> None: ...
+    def __call__(self, inputs: _InputT, *, training: bool = False, mask: TensorCompatible | None = None) -> _OutputT: ...
+    def call(self, inputs: _InputT, training: bool | None = None, mask: TensorCompatible | None = None) -> _OutputT: ...
+    # Ideally loss/metrics/output would share the same structure but higher kinded types are not supported.
+    def compile(
+        self,
+        optimizer: Optimizer | str = "rmsprop",
+        loss: ContainerGeneric[_Loss] | None = None,
+        metrics: ContainerGeneric[_Metric] | None = None,
+        loss_weights: ContainerGeneric[float] | None = None,
+        weighted_metrics: ContainerGeneric[_Metric] | None = None,
+        run_eagerly: bool | None = None,
+        steps_per_execution: int | Literal["auto"] | None = None,
+        jit_compile: bool | None = None,
+        pss_evaluation_shards: int | Literal["auto"] = 0,
+        **kwargs: Any,
+    ) -> None: ...
+    @property
+    def metrics(self) -> list[Incomplete]: ...
+    @property
+    def metrics_names(self) -> list[str]: ...
+    @property
+    def distribute_strategy(self) -> tf.distribute.Strategy: ...
+    @property
+    def run_eagerly(self) -> bool: ...
+    @property
+    def autotune_steps_per_execution(self) -> bool: ...
+    @property
+    def steps_per_execution(self) -> int | None: ...  # Returns None for a non-compiled model.
+    @property
+    def jit_compile(self) -> bool: ...
+    @property
+        def distribute_reduction_method(self) -> Incomplete | Literal["auto"]: ...
+    def train_step(self, data: TensorCompatible) -> Incomplete: ...
+    def compute_loss(
+        self,
+        x: TensorCompatible | None = None,
+        y: TensorCompatible | None = None,
+        y_pred: TensorCompatible | None = None,
+        sample_weight: Incomplete | None = None,
+    ) -> tf.Tensor | None: ...
+    def compute_metrics(
+        self, x: TensorCompatible, y: TensorCompatible, y_pred: TensorCompatible, sample_weight: Incomplete
+    ) -> dict[str, float]: ...
+    def get_metrics_result(self) -> dict[str, float]: ...
+    def make_train_function(self, force: bool = False) -> Callable[[tf.data.Iterator[Incomplete]], dict[str, float]]: ...
+    def fit(
+        self,
+        x: TensorCompatible | dict[str, TensorCompatible] | tf.data.Dataset[Incomplete] | None = None,
+        y: TensorCompatible | dict[str, TensorCompatible] | tf.data.Dataset[Incomplete] | None = None,
+        batch_size: int | None = None,
+        epochs: int = 1,
+        verbose: Literal["auto", 0, 1, 2] = "auto",
+        callbacks: list[tf.keras.callbacks.Callback] | None = None,
+        validation_split: float = 0.0,
+        validation_data: TensorCompatible | tf.data.Dataset[Any] | None = None,
+        shuffle: bool = True,
+        class_weight: dict[int, float] | None = None,
+        sample_weight: npt.NDArray[np.float_] | None = None,
+        initial_epoch: int = 0,
+        steps_per_epoch: int | None = None,
+        validation_steps: int | None = None,
+        validation_batch_size: int | None = None,
+        validation_freq: int | Container[int] = 1,
+        max_queue_size: int = 10,
+        workers: int = 1,
+        use_multiprocessing: bool = False,
+    ) -> tf.keras.callbacks.History: ...
+    def test_step(self, data: TensorCompatible) -> dict[str, float]: ...
+    def make_test_function(self, force: bool = False) -> Callable[[tf.data.Iterator[Incomplete]], dict[str, float]]: ...
+    def evaluate(
+        self,
+        x: TensorCompatible | dict[str, TensorCompatible] | tf.data.Dataset[Incomplete] | None = None,
+        y: TensorCompatible | dict[str, TensorCompatible] | tf.data.Dataset[Incomplete] | None = None,
+        batch_size: int | None = None,
+        verbose: Literal["auto", 0, 1, 2] = "auto",
+        sample_weight: npt.NDArray[np.float_] | None = None,
+        steps: int | None = None,
+        callbacks: list[tf.keras.callbacks.Callback] | None = None,
+        max_queue_size: int = 10,
+        workers: int = 1,
+        use_multiprocessing: bool = False,
+        return_dict: bool = False,
+        **kwargs: Any,
+    ) -> float | list[float]: ...
+    def predict_step(self, data: _InputT) -> _OutputT: ...
+    def make_predict_function(self, force: bool = False) -> Callable[[tf.data.Iterator[Incomplete]], _OutputT]: ...
+    def predict(
+        self,
+        x: TensorCompatible | tf.data.Dataset[Incomplete],
+        batch_size: int | None = None,
+        verbose: Literal["auto", 0, 1, 2] = "auto",
+        steps: int | None = None,
+        callbacks: list[tf.keras.callbacks.Callback] | None = None,
+        max_queue_size: int = 10,
+        workers: int = 1,
+        use_multiprocessing: bool = False,
+    ) -> _OutputT: ...
+    def reset_metrics(self) -> None: ...
+    def train_on_batch(
+        self,
+        x: TensorCompatible | dict[str, TensorCompatible] | tf.data.Dataset[Incomplete],
+        y: TensorCompatible | dict[str, TensorCompatible] | tf.data.Dataset[Incomplete] | None = None,
+        sample_weight: npt.NDArray[np.float_] | None = None,
+        class_weight: dict[int, float] | None = None,
+        reset_metrics: bool = True,
+        return_dict: bool = False,
+    ) -> float | list[float]: ...
    def test_on_batch(
+        self,
+        x: TensorCompatible | dict[str, TensorCompatible] | tf.data.Dataset[Incomplete],
+        y: TensorCompatible | dict[str, TensorCompatible] | tf.data.Dataset[Incomplete] | None = None,
+        sample_weight: npt.NDArray[np.float_] | None = None,
+        reset_metrics: bool = True,
+        return_dict: bool = False,
+    ) -> float | list[float]: ...
+    def predict_on_batch(self, x: Iterator[_InputT]) -> npt.NDArray[Incomplete]: ...
+    def fit_generator(
+        self,
+        generator: Iterator[Incomplete],
+        steps_per_epoch: int | None = None,
+        epochs: int = 1,
+        verbose: Literal["auto", 0, 1, 2] = 1,
+        callbacks: list[tf.keras.callbacks.Callback] | None = None,
+        validation_data: TensorCompatible | tf.data.Dataset[Any] | None = None,
+        validation_steps: int | None = None,
+        validation_freq: int | Container[int] = 1,
+        class_weight: dict[int, float] | None = None,
+        max_queue_size: int = 10,
+        workers: int = 1,
+        use_multiprocessing: bool = False,
+        shuffle: bool = True,
+        initial_epoch: int = 0,
+    ) -> tf.keras.callbacks.History: ...
+    def evaluate_generator(
+        self,
+        generator: Iterator[Incomplete],
+        steps: int | None = None,
+        callbacks: list[tf.keras.callbacks.Callback] | None = None,
+        max_queue_size: int = 10,
+        workers: int = 1,
+        use_multiprocessing: bool = False,
+        verbose: Literal["auto", 0, 1, 2] = 0,
+    ) -> float | list[float]: ...
+    def predict_generator(
+        self,
+        generator: Iterator[Incomplete],
+        steps: int | None = None,
+        callbacks: list[tf.keras.callbacks.Callback] | None = None,
+        max_queue_size: int = 10,
+        workers: int = 1,
+        use_multiprocessing: bool = False,
+        verbose: Literal["auto", 0, 1, 2] = 0,
+    ) -> _OutputT: ...
+    @property
+    def trainable_weights(self) -> list[Variable]: ...
+    @property
+    def non_trainable_weights(self) -> list[Variable]: ...
+    def get_weights(self) -> Incomplete: ...
+    def save(
+        self, filepath: str | Path, overwrite: bool = True, save_format: Literal["keras", "tf", "h5"] | None = None, **kwargs: Any
+    ) -> None: ...
+    def save_weights(
+        self,
+        filepath: str | Path,
+        overwrite: bool = True,
+        save_format: Literal["tf", "h5"] | None = None,
+        options: tf.train.CheckpointOptions | None = None,
+    ) -> None: ...
+    def load_weights(
+        self,
+        filepath: str | Path,
+        skip_mismatch: bool = False,
+        by_name: bool = False,
+        options: None | tensorflow.train.CheckpointOptions = None,
+    ) -> None: ...
+    def get_config(self) -> dict[str, Any]: ...
+    @classmethod
+    def from_config(cls, config: dict[str, Any], custom_objects: Incomplete | None = None) -> Self: ...
+    def to_json(self, **kwargs: Any) -> str: ...
+    def to_yaml(self, **kwargs: Any) -> str: ...
+    def reset_states(self) -> None: ...
+    @property
+    def state_updates(self) -> list[Incomplete]: ...
+    @property
+    def weights(self) -> list[Variable]: ...
+    def summary(
+        self,
+        line_length: None | int = None,
+        positions: None | list[float] = None,
+        print_fn: None | Callable[[str], None] = None,
+        expand_nested: bool = False,
+        show_trainable: bool = False,
+        layer_range: None | list[str] | tuple[str, str] = None,
+    ) -> None: ...
+    @property
+    def layers(self) -> list[Layer[Incomplete, Incomplete]]: ...
+    def get_layer(self, name: str | None = None, index: int | None = None) -> Layer[Incomplete, Incomplete]: ...
+    def get_weight_paths(self) -> dict[str, tf.Variable]: ...
+    def get_compile_config(self) -> dict[str, Any]: ...
+    def compile_from_config(self, config: dict[str, Any]) -> Self: ...
+    def export(self, filepath: str | Path) -> None: ...
+    def save_spec(self, dynamic_batch: bool = True) -> tuple[tuple[tf.TensorSpec, ...], dict[str, tf.TensorSpec]] | None: ...
+
+def __getattr__(name: str) -> Incomplete: ...
diff --git a/stubs/tensorflow/tensorflow/keras/optimizers/__init__.pyi b/stubs/tensorflow/tensorflow/keras/optimizers/__init__.pyi
@@ -2,4 +2,6 @@ from _typeshed import Incomplete
 
 from tensorflow.keras.optimizers import legacy as legacy, schedules as schedules
 
+Optimizer = Incomplete
+
 def __getattr__(name: str) -> Incomplete: ...
diff --git a/stubs/tensorflow/tensorflow/python/distribute/distribute_lib.pyi b/stubs/tensorflow/tensorflow/python/distribute/distribute_lib.pyi
@@ -0,0 +1,5 @@
+from _typeshed import Incomplete
+
+Strategy = Incomplete
+
+def __getattr__(name: str) -> Incomplete: ...
diff --git a/stubs/tensorflow/tensorflow/python/trackable/ressource.pyi b/stubs/tensorflow/tensorflow/python/trackable/ressource.pyi
@@ -0,0 +1,7 @@
+from tensorflow.python.trackable.base import Trackable
+
+class _ResourceMetaclass(type): ...
+
+# Internal type that is commonly used as a base class
+# and some public apis the signature needs it.
+class CapturableResource(Trackable, metaclass=_ResourceMetaclass): ...
diff --git a/stubs/tensorflow/tensorflow/train/__init__.pyi b/stubs/tensorflow/tensorflow/train/__init__.pyi
@@ -16,6 +16,7 @@ from tensorflow.core.example.feature_pb2 import (
 from tensorflow.core.protobuf.cluster_pb2 import ClusterDef as ClusterDef
 from tensorflow.core.protobuf.tensorflow_server_pb2 import ServerDef as ServerDef
 from tensorflow.python.trackable.base import Trackable
+from tensorflow.python.training.tracking.autotrackable import AutoTrackable
 
 class CheckpointOptions:
     experimental_io_device: None | str
@@ -44,7 +45,7 @@ class _CheckpointLoadStatus:
     def assert_nontrivial_match(self) -> Self: ...
     def expect_partial(self) -> Self: ...
 
-class Checkpoint:
+class Checkpoint(AutoTrackable):
     def __init__(self, root: Trackable | None = None, **kwargs: Trackable) -> None: ...
     def read(self, save_path: str, options: CheckpointOptions | None = None) -> _CheckpointLoadStatus: ...
     def restore(self, save_path: str, options: CheckpointOptions | None = None) -> _CheckpointLoadStatus: ...
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,6 @@ from _typeshed import Incomplete

		from tensorflow.keras.optimizers import legacy as legacy, schedules as schedules

		Optimizer = Incomplete

		def __getattr__(name: str) -> Incomplete: ...