                  detected_face = self._load_detected_face(filename, meta["alignments"])
                  self._cache[key] = detected_face
                  self._partially_loaded.append(key)
  
      def _validate_version(self, png_meta: "PNGHeaderDict", filename: str) -> None:
          """ Validate that there are not a mix of v1.0 extracted faces and v2.x faces.
  
          Parameters
          ----------
          png_meta: dict
 
</s> remove     def _get_detected_face(cls, alignment: "AlignmentFileDict") -> DetectedFace:
 </s> add     def _get_detected_face(cls, alignment: AlignmentFileDict) -> DetectedFace: </s> remove     def _check_weights_file(cls, weights_file: str) -> T.Optional[str]:
 </s> add     def _check_weights_file(cls, weights_file: str) -> str | None: </s> remove     def load_video_frame(self, filename: str) -> "np.ndarray":
 </s> add     def load_video_frame(self, filename: str) -> np.ndarray: </s> remove     def _get_images(self) -> Dict[Literal["a", "b"], List[str]]:
 </s> add     def _get_images(self) -> dict[T.Literal["a", "b"], list[str]]: </s> remove     def _validate_image_counts(cls, images: Dict[Literal["a", "b"], List[str]]) -> None:
 </s> add     def _validate_image_counts(cls, images: dict[T.Literal["a", "b"], list[str]]) -> None:
    def _validate_version(self, png_meta: PNGHeaderDict, filename: str) -> None:
                  detected_face = self._load_detected_face(filename, meta["alignments"])
                  self._cache[key] = detected_face
                  self._partially_loaded.append(key)
  
    def _validate_version(self, png_meta: PNGHeaderDict, filename: str) -> None:
          """ Validate that there are not a mix of v1.0 extracted faces and v2.x faces.
  
          Parameters
          ----------
          png_meta: dict
keep keep keep keep replace keep keep keep keep keep
 Rebase code (#1326)

* Remove tensorflow_probability requirement

* setup.py - fix progress bars

* requirements.txt: Remove pre python 3.9 packages

* update apple requirements.txt

* update INSTALL.md

* Remove python<3.9 code

* setup.py - fix Windows Installer

* typing: python3.9 compliant

* Update pytest and readthedocs python versions

* typing fixes

* Python Version updates
  - Reduce max version to 3.10
  - Default to 3.10 in installers
  - Remove incompatible 3.11 tests

* Update dependencies

* Downgrade imageio dep for Windows

* typing: merge optional unions and fixes

* Updates
  - min python version 3.10
  - typing to python 3.10 spec
  - remove pre-tf2.10 code
  - Add conda tests

* train: re-enable optimizer saving

* Update dockerfiles

* Update setup.py
  - Apple Conda deps to setup.py
  - Better Cuda + dependency handling

* bugfix: Patch logging to prevent Autograph errors

* Update dockerfiles

* Setup.py - Setup.py - stdout to utf-8

* Add more OSes to github Actions

* suppress mac-os end to end test 
lib/training/cache.py