Merge branch 'add-slide-data' of https://github.com/TissueImageAnalytics/tiatoolbox into add-slide-data

Author: measty

tests/test_app_bokeh.py

@@ -11,19 +11,19 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+import bokeh.models as bkmodels
 import matplotlib.pyplot as plt
 import numpy as np
 import pytest
 import requests
+from bokeh.application import Application
+from bokeh.application.handlers import FunctionHandler
+from bokeh.events import ButtonClick, DoubleTap, MenuItemClick
 from flask_cors import CORS
 from matplotlib import colormaps
 from PIL import Image
 from scipy.ndimage import label
 
-import bokeh.models as bkmodels
-from bokeh.application import Application
-from bokeh.application.handlers import FunctionHandler
-from bokeh.events import ButtonClick, DoubleTap, MenuItemClick
 from tiatoolbox.data import _fetch_remote_sample
 from tiatoolbox.visualization.bokeh_app import main
 from tiatoolbox.visualization.tileserver import TileServer

tests/test_json_config_bokeh.py

@@ -10,8 +10,8 @@
 import pandas as pd
 import pytest
 import requests
-
 from bokeh.client.session import ClientSession, pull_session
+
 from tiatoolbox.cli.visualize import run_bokeh, run_tileserver
 from tiatoolbox.data import _fetch_remote_sample
 

tests/test_server_bokeh.py

@@ -9,9 +9,9 @@
 
 import pytest
 import requests
+from bokeh.client.session import ClientSession, pull_session
 from click.testing import CliRunner
 
-from bokeh.client.session import ClientSession, pull_session
 from tiatoolbox import cli
 from tiatoolbox.cli.visualize import run_bokeh, run_tileserver
 from tiatoolbox.data import _fetch_remote_sample

tiatoolbox/visualization/bokeh_app/main.py

@@ -16,10 +16,6 @@
 import pandas as pd
 import requests
 import torch
-from matplotlib import colormaps
-from PIL import Image
-from requests.adapters import HTTPAdapter, Retry
-
 from bokeh.events import ButtonClick, DoubleTap, MenuItemClick
 from bokeh.io import curdoc
 from bokeh.layouts import column, row
@@ -64,6 +60,9 @@
 from bokeh.models.tiles import WMTSTileSource
 from bokeh.plotting import figure
 from bokeh.util import token
+from matplotlib import colormaps
+from PIL import Image
+from requests.adapters import HTTPAdapter, Retry
 
 # GitHub actions seems unable to find TIAToolbox unless this is here
 sys.path.insert(0, str(Path(__file__).parent.parent.parent.parent))