          self._default_view = "avg" if data_points > 1000 else "smoothed"
          self._session_id = None if session_id == "Total" else int(session_id)
  
          self._graph_frame = ttk.Frame(self)
          self._graph: Optional[SessionGraph] = None
          self._display_data: Optional[Calculations] = None
  
          self._vars = self._set_vars()
  
          self._graph_initialised = False
  
 
</s> remove         self._thread: Optional[LongRunningTask] = None  # Thread for loading data in background
 </s> add         self._thread: LongRunningTask | None = None  # Thread for loading data in background </s> remove                 channel = None if mapping[1] == "" else mapping[1]
 </s> add                 channel = "" if mapping[1] is None else mapping[1] </s> remove         self._vars = dict(save=tk.BooleanVar(),
                          scale=tk.StringVar(),
                          slider=tk.IntVar(),
                          interpolator=tk.IntVar())
 </s> add         self._vars = {"save": tk.BooleanVar(),
                      "scale": tk.StringVar(),
                      "slider": tk.IntVar(),
                      "interpolator": tk.IntVar()} </s> remove         self._gui_mapped: List[tk.Widget] = []
 </s> add         self._gui_mapped: list[tk.Widget] = [] </s> remove                 centering: "CenteringType" = ("legacy" if self._alignments is not None and
                                              self._alignments.version == 1.0
                                              else mask.stored_centering)
 </s> add                 centering: CenteringType = ("legacy" if self._alignments is not None and
                                            self._alignments.version == 1.0
                                            else mask.stored_centering)
        self._graph: SessionGraph | None = None
        self._display_data: Calculations | None = None
          self._default_view = "avg" if data_points > 1000 else "smoothed"
          self._session_id = None if session_id == "Total" else int(session_id)
  
          self._graph_frame = ttk.Frame(self)
        self._graph: SessionGraph | None = None
        self._display_data: Calculations | None = None
        self._graph: SessionGraph | None = None
        self._display_data: Calculations | None = None
  
          self._vars = self._set_vars()
  
          self._graph_initialised = False
  
keep keep keep keep replace 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/gui/popup_session.py