  import logging
  import sys
  
  from threading import Lock
  from typing import Dict, List, Optional, Tuple, TYPE_CHECKING, Union
  
  import numpy as np
  
  from lib.align import AlignedFace
  
 
</s> remove 
from typing import Dict, List, Optional, TYPE_CHECKING, Union
 </s> add import typing as T </s> remove import sys
 </s> add import typing as T </s> remove from typing import cast, Dict, List, Optional, Tuple, TYPE_CHECKING
 </s> add  </s> remove from typing import cast, Dict, List, Optional, Tuple, TYPE_CHECKING, Union
 </s> add  </s> remove from typing import Any, cast, Dict, Generator, List, Optional, Tuple, TYPE_CHECKING, Union
 </s> add from collections.abc import Generator
  import logging
  import sys
  
  from threading import Lock

  
  import numpy as np
  
  from lib.align import AlignedFace
  
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 
plugins/extract/align/_base/processing.py