From 42afdd7e96b41500d7e88d0c44c9861547bebe80 Mon Sep 17 00:00:00 2001
From: Peter Chang <peter.chang@diamond.ac.uk>
Date: Thu, 3 Sep 2026 11:12:12 +0100
Subject: [PATCH] Minor fixes

Use ruff import sorting and clean up code

Update to python 3.11, pydantic 2.11.0, and httpx2. Update some workflow actions.

Fix setting selections, fix package exports, set line width to 1 if undefined
otherwise line is not visible, allow connected plots to have no toolbar and tight
axes, use json argument in request for stricter content type in FastAPI that broke
benchmark script, update from populate_by_name, use auto enums in benchmarks,
update react-draggable and remove workarounds, make example client a functional
component, add restrictions in component README

Finally update davidia packages version
---
 .github/workflows/python-package.yml          |   4 +-
 client/component/README.md                    |   4 +
 client/component/package.json                 |  10 +-
 client/component/src/AspectConfigModal.tsx    |   2 +-
 client/component/src/ConnectedPlot.tsx        |  21 +-
 client/component/src/LinePlot.tsx             |   2 +-
 client/component/src/Modal.tsx                |   1 -
 client/component/src/Modeless.tsx             |   1 -
 .../src/PlotCustomizationContext.tsx          |   4 +-
 client/example/package.json                   |   2 +-
 client/example/src/App.tsx                    | 451 ++++++++----------
 client/example/vite.config.ts                 |   1 -
 environment.yml                               |   5 +-
 package.json                                  |   2 +-
 pnpm-lock.yaml                                |  11 +-
 server/davidia/__init__.py                    |   2 +-
 server/davidia/main.py                        |  10 +-
 server/davidia/models/messages.py             |   8 +-
 server/davidia/models/parameters.py           |  17 +-
 server/davidia/models/selections.py           |  10 +-
 server/davidia/plot.py                        |  68 +--
 server/davidia/server/benchmarks.py           |  65 +--
 server/davidia/server/fastapi_utils.py        |  27 +-
 server/davidia/server/plotserver.py           |  56 ++-
 server/davidia/tests/test_api.py              | 278 +++++------
 server/davidia/tests/test_messages.py         |   8 +-
 server/davidia/tests/test_plotserver.py       |  18 +-
 server/davidia/tests/test_selections.py       |   3 +-
 server/demos/benchmark.py                     |   7 +-
 server/demos/simple.py                        |  10 +-
 server/example-client/pyproject.toml          |   8 +-
 server/pyproject.toml                         |   8 +-
 32 files changed, 575 insertions(+), 549 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 1dc588d3..eaac77b0 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -67,7 +67,7 @@ jobs:
           pipx run build server
           pipx run build server/example-client --outdir server/dist
       - name: Upload sdist and wheel as artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: dist
           path: server/dist
@@ -88,7 +88,7 @@ jobs:
 
     steps:
       # Download sdist and wheel from dist job
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           path: dist
       # Publish to PyPI using trusted publishing
diff --git a/client/component/README.md b/client/component/README.md
index 9badcd71..28c35ef6 100644
--- a/client/component/README.md
+++ b/client/component/README.md
@@ -4,10 +4,14 @@ View the frontend Typescript documentation [here](https://diamondlightsource.git
 
 ## Installation
 
+Currently, only React 18 is supported.
+
 ### `pnpm add @diamondlightsource/davidia`
 
 ## Vite configuration
 
+Use `vite < 8` in your devDependencies.
+
 Some davidia dependencies require a global object to be defined when used in Vite applications. Add the following to your vite.config.ts:
 
 ```js
diff --git a/client/component/package.json b/client/component/package.json
index e2c95ac8..39d79788 100644
--- a/client/component/package.json
+++ b/client/component/package.json
@@ -6,7 +6,7 @@
     "url": "git+https://github.com/DiamondLightSource/davidia.git"
   },
   "private": false,
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "scripts": {
     "build": "tsc && vite build",
@@ -23,8 +23,10 @@
   },
   "publishConfig": {
     "exports": {
-      ".": "./dist/index.js",
-      "types": "./dist/index.d.ts",
+      ".": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
       "./index.css": "./dist/index.css"
     }
   },
@@ -43,7 +45,7 @@
     "ndarray-tile": "^1.0.3",
     "ndarray-unsqueeze": "^1.0.3",
     "react-colorful": "^5.8.0",
-    "react-draggable": "^4.7.0",
+    "react-draggable": "^4.7.1",
     "react-icons": "^5.7.0",
     "react-select": "^5.10.2",
     "react-use-websocket": "^4.13.0",
diff --git a/client/component/src/AspectConfigModal.tsx b/client/component/src/AspectConfigModal.tsx
index 9063c445..a82ab453 100644
--- a/client/component/src/AspectConfigModal.tsx
+++ b/client/component/src/AspectConfigModal.tsx
@@ -33,8 +33,8 @@ function AspectConfigModal(props: PropsWithChildren<AspectConfigModalProps>) {
   const [aspectRatio, setAspectRatio] = useState<number>(2.0);
 
   const initType = getAspectType(initAspect);
-  console.log('Set initial type', props);
   if (initType != aspectType) {
+    console.log('Set initial type', props);
     setAspectType(initType);
     if (initType === 'number') {
       setAspectRatio(initAspect as number);
diff --git a/client/component/src/ConnectedPlot.tsx b/client/component/src/ConnectedPlot.tsx
index 8c5c8d17..2e1afc0a 100644
--- a/client/component/src/ConnectedPlot.tsx
+++ b/client/component/src/ConnectedPlot.tsx
@@ -226,6 +226,16 @@ interface ConnectedPlotProps {
   port?: string;
   /** The universally unique identifier */
   uuid: string;
+  /**
+   * If enabled, forces the plot to shrink or expand to keep the image flush with the axes.
+   * Has no effect if the aspect is not equal.
+   */
+  tightAxes?: boolean;
+  /**
+   * Children to customize the toolbar. If undefined then use default toolbar, if null, disable toolbar,
+   * otherwise use given children
+   */
+  customToolbarChildren?: React.ReactNode;
 }
 
 /**
@@ -239,6 +249,8 @@ function ConnectedPlot({
   hostname = '127.0.0.1',
   port = '80',
   uuid,
+  tightAxes = false,
+  customToolbarChildren = undefined,
 }: ConnectedPlotProps) {
   const [plotProps, setPlotProps] = useState<AnyPlotProps | null>();
   const [lineData, setLineData] = useState<LineData[]>([]);
@@ -648,7 +660,14 @@ function ConnectedPlot({
 
   let currentProps = plotProps;
   if (currentProps) {
-    currentProps = { ...currentProps, batonProps, updateSelection, selections };
+    currentProps = {
+      ...currentProps,
+      batonProps,
+      updateSelection,
+      selections,
+      tightAxes,
+      customToolbarChildren,
+    };
   }
 
   if (currentProps) {
diff --git a/client/component/src/LinePlot.tsx b/client/component/src/LinePlot.tsx
index 66ebf263..249d8fba 100644
--- a/client/component/src/LinePlot.tsx
+++ b/client/component/src/LinePlot.tsx
@@ -120,7 +120,7 @@ function createDataCurve(
       curveType={curveType}
       glyphType={p.glyphType ?? GlyphType.Circle}
       glyphSize={p.pointSize}
-      width={p.width}
+      width={p.width ?? 1}
       visible={visible}
     />
   );
diff --git a/client/component/src/Modal.tsx b/client/component/src/Modal.tsx
index 969d199c..9d2fe3cc 100644
--- a/client/component/src/Modal.tsx
+++ b/client/component/src/Modal.tsx
@@ -67,7 +67,6 @@ function Modal(props: PropsWithChildren<ModalProps>) {
     <Fragment key={'Modal-' + toggleTitle}>
       {!toggleHidden && toggle}
       {showModal && props.children && (
-        /* @ts-expect-error see https://github.com/react-grid-layout/react-draggable/issues/807, fix post 4.7.0 */
         <Draggable key={toggleTitle} handle="strong" nodeRef={rootRef}>
           <div hidden={!showModal} className={styles.modal} ref={rootRef}>
             <div
diff --git a/client/component/src/Modeless.tsx b/client/component/src/Modeless.tsx
index ed3aefc0..eca873e5 100644
--- a/client/component/src/Modeless.tsx
+++ b/client/component/src/Modeless.tsx
@@ -34,7 +34,6 @@ function Modeless(props: PropsWithChildren<ModelessProps>) {
 
   const modeless =
     showModeless && props.children ? (
-      /* @ts-expect-error see https://github.com/react-grid-layout/react-draggable/issues/807, fix post 4.7.0 */
       <Draggable key={title} handle="strong" nodeRef={rootRef}>
         <div hidden={!showModeless} ref={rootRef} className={styles.modeless}>
           <div
diff --git a/client/component/src/PlotCustomizationContext.tsx b/client/component/src/PlotCustomizationContext.tsx
index 1529f6e7..a166fa86 100644
--- a/client/component/src/PlotCustomizationContext.tsx
+++ b/client/component/src/PlotCustomizationContext.tsx
@@ -305,7 +305,9 @@ export function PlotCustomizationContextProvider(
   } = useSelections([], props.selectionsListener);
 
   const isSurfacePlot = plotType === 'Surface';
-  if (!selections && props.selections) setSelections(props.selections);
+  if (props.selections != undefined && selections != props.selections) {
+    setSelections(props.selections);
+  }
 
   const newUpdateSelection = useMemo(() => {
     if (isSurfacePlot) {
diff --git a/client/example/package.json b/client/example/package.json
index 9434559c..9909291b 100644
--- a/client/example/package.json
+++ b/client/example/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@diamondlightsource/davidia-example",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "scripts": {
     "start": "vite",
diff --git a/client/example/src/App.tsx b/client/example/src/App.tsx
index 655f432d..9d66ac3f 100644
--- a/client/example/src/App.tsx
+++ b/client/example/src/App.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { ToastContainer } from 'react-toastify';
 
 import 'react-tabs/style/react-tabs.css';
@@ -25,15 +25,6 @@ import {
 } from '@diamondlightsource/davidia';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 
-interface AppMainProps {
-  instance: number;
-}
-
-interface AppMainStates {
-  plots: string[];
-  tightImagePlots: boolean;
-}
-
 function SelectionHeatmapPlot(props: HeatmapPlotProps) {
   const selectionsListener: SelectionsEventListener = (
     type: SelectionsEventType,
@@ -72,260 +63,232 @@ function generateGreyImage(width: number, height: number, threeD = false) {
   return ndarray(rgb, [height, width]) as NDT;
 }
 
-class AppMain extends React.Component<AppMainProps, AppMainStates> {
-  uuid: string;
-  constructor(props: AppMainProps) {
-    super(props);
-    this.state = {
-      plots: ['plot_0', 'plot_1'],
-      tightImagePlots: true,
-    };
-    this.uuid = crypto.randomUUID().slice(-8);
-  }
+export default function App() {
+  const plots = ['plot_0', 'plot_1'];
+  const uuid = crypto.randomUUID().slice(-8);
+  const [tightImagePlots, setTightImagePlots] = useState(true);
 
-  render() {
-    console.log('new App created with uuid: ', this.uuid);
+  console.log('new App created with uuid: ', uuid);
 
-    const x = ndarray(new Float32Array([1, 2, 3, 4, 6, 10])) as NDT;
-    const y = ndarray(new Float32Array([1, 4, 9, 16, 36, 100])) as NDT;
-    const lineProps = {
-      plotConfig: {
-        title: 'Sample Line Plot',
-        xLabel: 'x-axis',
-        yLabel: 'y-axis',
+  const x = ndarray(new Float32Array([1, 2, 3, 4, 6, 10])) as NDT;
+  const y = ndarray(new Float32Array([1, 4, 9, 16, 36, 100])) as NDT;
+  const lineProps = {
+    plotConfig: {
+      title: 'Sample Line Plot',
+      xLabel: 'x-axis',
+      yLabel: 'y-axis',
+    },
+    lineData: [
+      {
+        key: 'squares',
+        lineParams: {
+          colour: 'purple',
+          width: 2.4,
+          pointSize: 6,
+          lineOn: true,
+          glyphType: GlyphType.Square,
+        } as LineParams,
+        x,
+        xDomain: [1, 10],
+        y,
+        yDomain: [1, 100],
+        defaultIndices: false,
       },
-      lineData: [
-        {
-          key: 'squares',
-          lineParams: {
-            colour: 'purple',
-            width: 2.4,
-            pointSize: 6,
-            lineOn: true,
-            glyphType: GlyphType.Square,
-          } as LineParams,
-          x,
-          xDomain: [1, 10],
-          y,
-          yDomain: [1, 100],
-          defaultIndices: false,
-        },
-      ],
-      xDomain: [0, 11],
-      yDomain: [0, 101],
-    } as LinePlotProps;
-    const linePropsNoSelection = { ...lineProps };
-    linePropsNoSelection.plotConfig = {
-      ...lineProps.plotConfig,
-      title: 'Sample Line Plot (no selection)',
-    };
+    ],
+    xDomain: [0, 11],
+    yDomain: [0, 101],
+  } as LinePlotProps;
+  const linePropsNoSelection = { ...lineProps };
+  linePropsNoSelection.plotConfig = {
+    ...lineProps.plotConfig,
+    title: 'Sample Line Plot (no selection)',
+  };
 
-    const values = ndarray(
-      new Float32Array([5, 10, 15, 1.5, 4.5, 3.5]),
-      [3, 2]
-    ) as NDT;
-    const heatmapProps = {
-      plotConfig: {
-        title: 'Sample Heatmap Plot',
-        xLabel: 'x-axis',
-        yLabel: 'y-axis',
-      },
-      values,
-      aspect: 'auto',
-      domain: [0, 20] as Domain,
-      heatmapScale: ScaleType.Linear,
-      colourMap: 'Sinebow',
-    } as HeatmapPlotProps;
-    const heatmapPropsNoToolbar = { ...heatmapProps };
-    heatmapPropsNoToolbar.plotConfig = {
-      ...heatmapProps.plotConfig,
-      title: 'Sample Heatmap Plot (no toolbar)',
-    };
+  const values = ndarray(
+    new Float32Array([5, 10, 15, 1.5, 4.5, 3.5]),
+    [3, 2]
+  ) as NDT;
+  const heatmapProps = {
+    plotConfig: {
+      title: 'Sample Heatmap Plot',
+      xLabel: 'x-axis',
+      yLabel: 'y-axis',
+    },
+    values,
+    aspect: 'auto',
+    domain: [0, 20] as Domain,
+    heatmapScale: ScaleType.Linear,
+    colourMap: 'Sinebow',
+  } as HeatmapPlotProps;
+  const heatmapPropsNoToolbar = { ...heatmapProps };
+  heatmapPropsNoToolbar.plotConfig = {
+    ...heatmapProps.plotConfig,
+    title: 'Sample Heatmap Plot (no toolbar)',
+  };
 
-    const host = import.meta.env.VITE_WS_HOST ?? window.location.hostname;
-    const port = import.meta.env.VITE_WS_PORT ?? window.location.port;
-    console.log('host:', host, 'port:', port);
+  const host = import.meta.env.VITE_WS_HOST ?? window.location.hostname;
+  const port = import.meta.env.VITE_WS_PORT ?? window.location.port;
+  console.log('host:', host, 'port:', port);
 
-    const portraitImage = generateImage(6, 12);
-    const landscapeImage = generateGreyImage(9, 2);
-    const squareImage = generateGreyImage(6, 6, true);
+  const portraitImage = generateImage(6, 12);
+  const landscapeImage = generateGreyImage(9, 2);
+  const squareImage = generateGreyImage(6, 6, true);
 
-    return (
-      <Tabs className={'outer-tabs'}>
-        <TabList>
-          <Tab>Connected</Tab>
-          <Tab>Line</Tab>
-          <Tab>Image</Tab>
-          <Tab>Any</Tab>
-        </TabList>
-        <TabPanel>
-          <div
-            style={{
-              display: 'grid',
-              height: '49vh',
-              gridTemplateColumns: '67% 33%',
-            }}
-          >
-            <ConnectedPlot
-              plotId={this.state.plots[0]}
-              uuid={this.uuid}
-              hostname={host}
-              port={port}
-            />
-          </div>
-          <div style={{ display: 'grid', height: '49vh' }}>
-            <ConnectedPlot
-              plotId={this.state.plots[1]}
-              uuid={this.uuid}
-              hostname={host}
-              port={port}
-            />
-          </div>
-          <ToastContainer closeOnClick draggable />
-        </TabPanel>
-        <TabPanel>
-          <div style={{ display: 'grid', height: '80vh' }}>
-            <LinePlot {...linePropsNoSelection} updateSelection={null} />
-          </div>
-        </TabPanel>
-        <TabPanel>
-          <Tabs className={'inner-image-tabs'}>
-            <TabList>
-              <Tab>Sample Heatmap</Tab>
-              <Tab>Equal Aspect Images</Tab>
-            </TabList>
-            <TabPanel>
-              <div style={{ display: 'grid', height: '80vh' }}>
-                <HeatmapPlot {...heatmapProps} />
+  return (
+    <Tabs className={'outer-tabs'}>
+      <TabList>
+        <Tab>Connected</Tab>
+        <Tab>Line</Tab>
+        <Tab>Image</Tab>
+        <Tab>Any</Tab>
+      </TabList>
+      <TabPanel>
+        <div
+          style={{
+            display: 'grid',
+            height: '49vh',
+            gridTemplateColumns: '67% 33%',
+          }}
+        >
+          <ConnectedPlot
+            plotId={plots[0]}
+            uuid={uuid}
+            hostname={host}
+            port={port}
+          />
+        </div>
+        <div style={{ display: 'grid', height: '49vh' }}>
+          <ConnectedPlot
+            plotId={plots[1]}
+            uuid={uuid}
+            hostname={host}
+            port={port}
+          />
+        </div>
+        <ToastContainer closeOnClick draggable />
+      </TabPanel>
+      <TabPanel>
+        <div style={{ display: 'grid', height: '80vh' }}>
+          <LinePlot {...linePropsNoSelection} updateSelection={null} />
+        </div>
+      </TabPanel>
+      <TabPanel>
+        <Tabs className={'inner-image-tabs'}>
+          <TabList>
+            <Tab>Sample Heatmap</Tab>
+            <Tab>Equal Aspect Images</Tab>
+          </TabList>
+          <TabPanel>
+            <div style={{ display: 'grid', height: '80vh' }}>
+              <HeatmapPlot {...heatmapProps} />
+            </div>
+          </TabPanel>
+          <TabPanel>
+            <h4>
+              When the aspect is set to &apos;equal&apos; an ImagePlot will keep
+              pixels square. Setting the &apos;tightAxes&apos; prop will make
+              the ImagePlot attempt to use space more efficiently by removing
+              the padding between the axes. In a flex container, this means the
+              plot will seize more space.
+            </h4>
+            <button onClick={() => setTightImagePlots((t) => !t)}>
+              {tightImagePlots ? 'Disable' : 'Enable'} tight axes
+            </button>
+            <div
+              style={{
+                display: 'grid',
+                gridTemplateColumns: '33vw 67vw',
+                maxHeight: '80vh',
+                outline: '1px solid gray',
+              }}
+            >
+              <div style={{ maxHeight: '80vh' }}>
+                <ImagePlot
+                  aspect="equal"
+                  plotConfig={{ title: 'Sample Portrait Image' }}
+                  values={portraitImage}
+                  tightAxes={tightImagePlots}
+                />
               </div>
-            </TabPanel>
-            <TabPanel>
-              <h4>
-                When the aspect is set to &apos;equal&apos; an ImagePlot will
-                keep pixels square. Setting the &apos;tightAxes&apos; prop will
-                make the ImagePlot attempt to use space more efficiently by
-                removing the padding between the axes. In a flex container, this
-                means the plot will seize more space.
-              </h4>
-              <button
-                onClick={() =>
-                  this.setState((prevState) => {
-                    return {
-                      ...prevState,
-                      tightImagePlots: !prevState.tightImagePlots,
-                    };
-                  })
-                }
-              >
-                {this.state.tightImagePlots ? 'Disable' : 'Enable'} tight axes
-              </button>
               <div
                 style={{
                   display: 'grid',
-                  gridTemplateColumns: '33vw 67vw',
-                  maxHeight: '80vh',
+                  gridTemplateRows: '40vh 1fr',
                   outline: '1px solid gray',
+                  maxHeight: '80vh',
                 }}
               >
-                <div style={{ maxHeight: '80vh' }}>
+                <div style={{ outline: '1px solid gray' }}>
                   <ImagePlot
                     aspect="equal"
-                    plotConfig={{ title: 'Sample Portrait Image' }}
-                    values={portraitImage}
-                    tightAxes={this.state.tightImagePlots}
+                    plotConfig={{ title: 'Sample Landscape Image' }}
+                    values={landscapeImage}
+                    tightAxes={tightImagePlots}
                   />
                 </div>
-                <div
-                  style={{
-                    display: 'grid',
-                    gridTemplateRows: '40vh 1fr',
-                    outline: '1px solid gray',
-                    maxHeight: '80vh',
+                <ImagePlot
+                  aspect="equal"
+                  plotConfig={{
+                    title: 'Sample Image With Axis Labels',
+                    xLabel: 'X Co-ordinate',
+                    yLabel: 'Y Co-ordinate',
                   }}
-                >
-                  <div style={{ outline: '1px solid gray' }}>
-                    <ImagePlot
-                      aspect="equal"
-                      plotConfig={{ title: 'Sample Landscape Image' }}
-                      values={landscapeImage}
-                      tightAxes={this.state.tightImagePlots}
-                    />
-                  </div>
-                  <ImagePlot
-                    aspect="equal"
-                    plotConfig={{
-                      title: 'Sample Image With Axis Labels',
-                      xLabel: 'X Co-ordinate',
-                      yLabel: 'Y Co-ordinate',
-                    }}
-                    tightAxes={this.state.tightImagePlots}
-                    values={squareImage}
-                  />
-                </div>
-              </div>
-            </TabPanel>
-          </Tabs>
-        </TabPanel>
-        <TabPanel>
-          <Tabs className={'inner-any-tabs'}>
-            <TabList>
-              <Tab>Line</Tab>
-              <Tab>Line (selection option)</Tab>
-              <Tab>Line (selection options)</Tab>
-              <Tab>Line (no selection options)</Tab>
-              <Tab>Heatmap</Tab>
-              <Tab>Heatmap (selection)</Tab>
-            </TabList>
-            <TabPanel>
-              <div style={{ display: 'grid', height: '80vh' }}>
-                <AnyPlot {...lineProps} />
-              </div>
-            </TabPanel>
-            <TabPanel>
-              <div style={{ display: 'grid', height: '80vh' }}>
-                <AnyPlot
-                  {...lineProps}
-                  selectionOptions={{ verticalAxis: 1 }}
-                />
-              </div>
-            </TabPanel>
-            <TabPanel>
-              <div style={{ display: 'grid', height: '80vh' }}>
-                <AnyPlot
-                  {...lineProps}
-                  selectionOptions={{ verticalAxis: 2, line: 0 }}
-                />
-              </div>
-            </TabPanel>
-            <TabPanel>
-              <div style={{ display: 'grid', height: '80vh' }}>
-                <AnyPlot {...lineProps} selectionOptions={{}} />
-              </div>
-            </TabPanel>
-            <TabPanel>
-              <div style={{ display: 'grid', height: '80vh' }}>
-                <AnyPlot
-                  {...heatmapPropsNoToolbar}
-                  customToolbarChildren={null}
+                  tightAxes={tightImagePlots}
+                  values={squareImage}
                 />
               </div>
-            </TabPanel>
-            <TabPanel>
-              <div style={{ display: 'grid', height: '80vh' }}>
-                <SelectionHeatmapPlot {...heatmapProps} />
-              </div>
-            </TabPanel>
-          </Tabs>
-        </TabPanel>
-      </Tabs>
-    );
-  }
-}
-
-export default function App() {
-  return (
-    <>
-      <AppMain instance={0} />
-    </>
+            </div>
+          </TabPanel>
+        </Tabs>
+      </TabPanel>
+      <TabPanel>
+        <Tabs className={'inner-any-tabs'}>
+          <TabList>
+            <Tab>Line</Tab>
+            <Tab>Line (selection option)</Tab>
+            <Tab>Line (selection options)</Tab>
+            <Tab>Line (no selection options)</Tab>
+            <Tab>Heatmap</Tab>
+            <Tab>Heatmap (selection)</Tab>
+          </TabList>
+          <TabPanel>
+            <div style={{ display: 'grid', height: '80vh' }}>
+              <AnyPlot {...lineProps} />
+            </div>
+          </TabPanel>
+          <TabPanel>
+            <div style={{ display: 'grid', height: '80vh' }}>
+              <AnyPlot {...lineProps} selectionOptions={{ verticalAxis: 1 }} />
+            </div>
+          </TabPanel>
+          <TabPanel>
+            <div style={{ display: 'grid', height: '80vh' }}>
+              <AnyPlot
+                {...lineProps}
+                selectionOptions={{ verticalAxis: 2, line: 0 }}
+              />
+            </div>
+          </TabPanel>
+          <TabPanel>
+            <div style={{ display: 'grid', height: '80vh' }}>
+              <AnyPlot {...lineProps} selectionOptions={{}} />
+            </div>
+          </TabPanel>
+          <TabPanel>
+            <div style={{ display: 'grid', height: '80vh' }}>
+              <AnyPlot
+                {...heatmapPropsNoToolbar}
+                customToolbarChildren={null}
+              />
+            </div>
+          </TabPanel>
+          <TabPanel>
+            <div style={{ display: 'grid', height: '80vh' }}>
+              <SelectionHeatmapPlot {...heatmapProps} />
+            </div>
+          </TabPanel>
+        </Tabs>
+      </TabPanel>
+    </Tabs>
   );
 }
diff --git a/client/example/vite.config.ts b/client/example/vite.config.ts
index cc1a3ad0..dbbe5af8 100644
--- a/client/example/vite.config.ts
+++ b/client/example/vite.config.ts
@@ -7,7 +7,6 @@ export default defineConfig({
   base: './',
   define: {
     global: 'window', // this fixes global is not defined
-    'process.env.DRAGGABLE_DEBUG': 'undefined', // fixes react-draggable issue in its log function
   },
   build: {
     outDir: '../../server/example-client/sdist',
diff --git a/environment.yml b/environment.yml
index 083100ef..b2fd5bae 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,8 +2,9 @@ name: davidia
 channels:
   - conda-forge
 dependencies:
-  - python == 3.10.*
+  - python == 3.11.*
   - fastapi >= 0.100
+  - pydantic >= 2.11.0
   - websockets
   - uvicorn
   - requests
@@ -14,7 +15,7 @@ dependencies:
   - pillow
   - pytest
   - pytest-asyncio
-  - httpx
+  - httpx2
   - pip
   - semver # next packages for pydantic-numpy
   - ruamel.yaml
diff --git a/package.json b/package.json
index 78ae5db4..99617266 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/DiamondLightSource/davidia.git"
   },
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": true,
   "type": "module",
   "packageManager": "pnpm@11.13.1+sha512.b2fc7683b8a6525414e7d13e1ba28caaddde96bf66ec540bfaeb7e702b81f3e0be4d1f295edf7f9fe0396740a8dce4509c582ddf79891f4543fea32d37645f25",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e1d37322..6fc61e5c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -115,8 +115,8 @@ importers:
         specifier: ^5.8.0
         version: 5.8.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-draggable:
-        specifier: ^4.7.0
-        version: 4.7.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: ^4.7.1
+        version: 4.7.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-icons:
         specifier: ^5.7.0
         version: 5.7.0(react@18.3.1)
@@ -2674,6 +2674,7 @@ packages:
   eslint@9.39.5:
     resolution: {integrity: sha512-DgZS62aPLXKlnxILS/AYCoRvHaZeXceIzlXPkkGGzJWSow1aEk0lbTlxUSlyjC8jcaKxAdOnTDz+o1JFSBsyjw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
     hasBin: true
     peerDependencies:
       jiti: '*'
@@ -3678,8 +3679,8 @@ packages:
     peerDependencies:
       react: ^18.3.1
 
-  react-draggable@4.7.0:
-    resolution: {integrity: sha512-kTpANmKWVnFXiZ76Ag2ZowiFStuBYnJ606PI1TbUsOg29/400/JNIxI9+CuenhiAqFuXWJffz6F4UI3R51kUug==}
+  react-draggable@4.7.1:
+    resolution: {integrity: sha512-wa3tzfFnYt3yaZLuyU58fl1TNunfWfBekDgWhZA1+gb2jnp42wZ0ymuopR6M5kqDYmm4hKmzGlcKWjZf3Zb6RQ==}
     peerDependencies:
       react: '>= 16.3.0'
       react-dom: '>= 16.3.0'
@@ -8610,7 +8611,7 @@ snapshots:
       react: 18.3.1
       scheduler: 0.23.2
 
-  react-draggable@4.7.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  react-draggable@4.7.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       clsx: 2.1.1
       prop-types: 15.8.1
diff --git a/server/davidia/__init__.py b/server/davidia/__init__.py
index 742a5798..b62a39ca 100644
--- a/server/davidia/__init__.py
+++ b/server/davidia/__init__.py
@@ -1,2 +1,2 @@
-version_info = (1, 1, 0)
+version_info = (1, 2, 0)
 __version__ = ".".join(str(c) for c in version_info)
diff --git a/server/davidia/main.py b/server/davidia/main.py
index 1e4f5624..be7568b0 100644
--- a/server/davidia/main.py
+++ b/server/davidia/main.py
@@ -12,7 +12,6 @@
 from pydantic import TypeAdapter
 
 from davidia import __version__
-
 from davidia.models.messages import EndPointMessage
 from davidia.models.selections import AnySelection
 from davidia.server.benchmarks import BenchmarkParams
@@ -50,7 +49,7 @@ def customize_openapi():
         CORSMiddleware, allow_origins=origins
     )  # comment this on deployment
     ps = PlotServer()
-    setattr(app, "_plot_server", ps)
+    setattr(app, "_plot_server", ps)  # noqa: B010
 
     @app.websocket("/plot/{uuid}/{plot_id}")
     async def websocket(websocket: WebSocket, uuid: str, plot_id: str):
@@ -174,7 +173,7 @@ def find_client_build():
 
 
 def create_parser():
-    from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter, SUPPRESS
+    from argparse import SUPPRESS, ArgumentDefaultsHelpFormatter, ArgumentParser
 
     CLIENT_BUILD_DIR = str(CLIENT_BUILD_PATH)
     parser = ArgumentParser(
@@ -205,9 +204,8 @@ def create_app(client_path=CLIENT_BUILD_PATH, benchmark=False):
     app = _create_bare_app(
         benchmark or os.getenv("DVD_BENCHMARK", "off").lower() == "on"
     )
-    if client_path:
-        if client_path.is_dir():
-            add_client_endpoint(app, client_path)
+    if client_path and client_path.is_dir():
+        add_client_endpoint(app, client_path)
     return app
 
 
diff --git a/server/davidia/models/messages.py b/server/davidia/models/messages.py
index 663b68c5..b1b31b65 100644
--- a/server/davidia/models/messages.py
+++ b/server/davidia/models/messages.py
@@ -1,18 +1,18 @@
-from pydantic_core.core_schema import ValidationInfo
 from enum import auto
 from typing import Any
 from uuid import uuid4
 
 from numpy import asanyarray as _asanyarray
 from pydantic import ConfigDict, Field, field_validator, model_validator
+from pydantic_core.core_schema import ValidationInfo
 
 from .parameters import (
     Aspect,
     AutoNameEnum,
-    PlotConfig,
     DvDModel,
     DvDNDArray,
     DvDNpModel,
+    PlotConfig,
     ScaleType,
     TableDisplayParams,
     validate_scale_type,
@@ -388,7 +388,7 @@ class ClientScatterParametersMessage(DvDModel):
     ClearPlotMessage,
 )
 
-ALL_MODELS = (
+ALL_MODELS = [
     LineData,
     LineParams,
     ScatterData,
@@ -397,7 +397,7 @@ class ClientScatterParametersMessage(DvDModel):
     SurfaceData,
     TableData,
     PlotConfig,
-) + ALL_MESSAGES
+] + list(ALL_MESSAGES)
 
 if __name__ == "__main__":
     import json
diff --git a/server/davidia/models/parameters.py b/server/davidia/models/parameters.py
index 84994772..5d50c8d6 100644
--- a/server/davidia/models/parameters.py
+++ b/server/davidia/models/parameters.py
@@ -1,10 +1,11 @@
-from pydantic_core.core_schema import ValidationInfo
-from enum import auto as _auto, Enum
-from typing import Any, Annotated
+from enum import Enum
+from enum import auto as _auto
+from typing import Annotated, Any
 
 import numpy as np
 from pydantic import BaseModel, ConfigDict, field_validator
 from pydantic.alias_generators import to_camel
+from pydantic_core.core_schema import ValidationInfo
 from pydantic_numpy.helper.annotation import NpArrayPydanticAnnotation
 from pydantic_numpy.model import NumpyModel
 
@@ -56,7 +57,10 @@ class DvDModel(BaseModel):
     """Base model can serialize to and validate camelCase aliases of its attributes"""
 
     model_config = ConfigDict(
-        alias_generator=to_camel, populate_by_name=True, use_enum_values=True
+        alias_generator=to_camel,
+        validate_by_name=True,
+        validate_by_alias=True,
+        use_enum_values=True,
     )
 
 
@@ -64,7 +68,10 @@ class DvDNpModel(NumpyModel):
     """Base model can serialize to and validate camelCase aliases of its attributes"""
 
     model_config = ConfigDict(
-        alias_generator=to_camel, populate_by_name=True, use_enum_values=True
+        alias_generator=to_camel,
+        validate_by_name=True,
+        validate_by_alias=True,
+        use_enum_values=True,
     )
 
 
diff --git a/server/davidia/models/selections.py b/server/davidia/models/selections.py
index c5e804f4..b1c0a690 100644
--- a/server/davidia/models/selections.py
+++ b/server/davidia/models/selections.py
@@ -7,19 +7,21 @@
 
 import logging
 from math import atan2, cos, degrees, hypot, pi, radians, sin
+from typing import Annotated, Any
 from uuid import uuid4
 
 from pydantic import (
     BeforeValidator,
     ConfigDict,
     Field,
-    model_validator,
     ValidationError,
+    model_validator,
 )
-from typing import Annotated, Any, Type
 
 from .parameters import DvDModel
 
+logger = logging.getLogger("main")
+
 
 def _make_id():
     return uuid4().hex[-8:]  # use last 8 characters only
@@ -198,7 +200,7 @@ def check_start(self) -> "PolygonalSelection":
         pt = self.points[0]
         if self.start is not pt and (self.start[0] != pt[0] or self.start[1] != pt[1]):
             self.start = pt
-            logging.warning("Overwriting start with first point")
+            logger.warning("Overwriting start with first point")
         return self
 
 
@@ -257,7 +259,7 @@ def as_selection(raw: dict | SelectionBase) -> AnySelection:
     if isinstance(raw, SelectionBase):
         return raw
 
-    oc: Type[AnySelection]
+    oc: type[AnySelection]
     if "dimension" in raw:
         oc = AxialSelection
     elif "length" in raw:
diff --git a/server/davidia/plot.py b/server/davidia/plot.py
index 5f10da67..08afa564 100644
--- a/server/davidia/plot.py
+++ b/server/davidia/plot.py
@@ -6,8 +6,8 @@
 from typing import Any
 
 import numpy as np
-from numpy.typing import ArrayLike
 import requests
+from numpy.typing import ArrayLike
 
 from davidia.models.messages import (
     ClearSelectionsMessage,
@@ -15,20 +15,19 @@
     GlyphType,
     HeatmapData,
     ImageData,
+    ImageMessage,
     LineData,
     LineParams,
+    MultiLineMessage,
     ScaleType,
     ScatterData,
+    ScatterMessage,
     SelectionsMessage,
     SurfaceData,
-    TableData,
-    MultiLineMessage,
-    ScatterMessage,
-    ImageMessage,
     SurfaceMessage,
+    TableData,
     TableMessage,
 )
-
 from davidia.models.parameters import PlotConfig, TableDisplayParams, TableDisplayType
 from davidia.models.selections import (
     AnySelection,
@@ -45,7 +44,9 @@
 OptionalArrayLike = ArrayLike | None
 OptionalLists = OptionalArrayLike | list[OptionalArrayLike] | None
 
-Selections = AnySelection | list[AnySelection]
+Selections = AnySelection | list[AnySelection] | tuple[AnySelection]
+
+logger = logging.getLogger(__name__)
 
 
 class PlotConnection:
@@ -73,12 +74,12 @@ def _post(
         endpoint="push_data",
     ):
         url = self.url_prefix + endpoint
-        logging.debug("posting PM: %s", data)
+        logger.debug("posting PM: %s", data)
         start = time_ns()
         data, headers = self._prepare_request(data)
         resp = requests.post(url, data=data, headers=headers)
         elapsed = (time_ns() - start) // 1000000
-        logging.info("plot_server.post %d, %dms", resp.status_code, elapsed)
+        logger.info("plot_server.post %d, %dms", resp.status_code, elapsed)
         return resp
 
     def _put(self, data, endpoint):
@@ -87,7 +88,7 @@ def _put(self, data, endpoint):
         data, headers = self._prepare_request(data)
         resp = requests.put(url, data=data, headers=headers)
         elapsed = (time_ns() - start) // 1000000
-        logging.info("plot_server.put %d, %dms", resp.status_code, elapsed)
+        logger.info("plot_server.put %d, %dms", resp.status_code, elapsed)
         return resp
 
     def _get(self, endpoint):
@@ -95,14 +96,14 @@ def _get(self, endpoint):
         start = time_ns()
         resp = requests.get(url)
         elapsed = (time_ns() - start) // 1000000
-        logging.info("plot_server.get %d, %dms", resp.status_code, elapsed)
+        logger.info("plot_server.get %d, %dms", resp.status_code, elapsed)
         return resp
 
     def get_plots_ids(self) -> list[str]:
         ids = j_loads(self._get("get_plot_ids").content)
         if isinstance(ids, list):
             return ids
-        logging.warning("Fetched values not a list (%s): %s", type(ids), ids)
+        logger.warning("Fetched values not a list (%s): %s", type(ids), ids)
         return []
 
     @staticmethod
@@ -110,7 +111,7 @@ def _as_list(item_list, n):
         if isinstance(item_list, list):
             n_items = len(item_list)
             if n_items < n:
-                logging.warning("Supplied list is too short: %d cf %d", n_items, n)
+                logger.warning("Supplied list is too short: %d cf %d", n_items, n)
                 return item_list * (n // n_items) + item_list[: (n % n_items)]
             return item_list
         return [item_list] * n
@@ -208,7 +209,6 @@ def _asanyarray(x):
             colours = PlotConnection._as_list(colour, n_plots)
             widths = PlotConnection._as_list(width, n_plots)
             point_sizes = PlotConnection._as_list(point_size, n_plots)
-            plot_config = PlotConnection._populate_plot_config(plot_config)
             lds = []
             for xi, yi, ci, wi, li, ps, gt in zip(
                 xl, yf, colours, widths, lines_on, point_sizes, glyph_types
@@ -247,10 +247,11 @@ def _asanyarray(x):
                 )
             ]
 
+        plot_conf = PlotConnection._populate_plot_config(plot_config)
         return self._post(
             MultiLineMessage(
                 plot_id=self.plot_id,
-                plot_config=plot_config,
+                plot_config=plot_conf,
                 append=append,
                 ml_data=lds,
             )
@@ -285,10 +286,10 @@ def scatter(
             domain=domain,
             **attribs,
         )
-        plot_config = PlotConnection._populate_plot_config(plot_config)
+        plot_conf = PlotConnection._populate_plot_config(plot_config)
 
         return self._post(
-            ScatterMessage(plot_id=self.plot_id, plot_config=plot_config, sc_data=sc)
+            ScatterMessage(plot_id=self.plot_id, plot_config=plot_conf, sc_data=sc)
         )
 
     def image(
@@ -321,10 +322,10 @@ def image(
             im = ImageData(values=values, **attribs)
         else:
             raise ValueError("Data cannot be interpreted as heatmap or image data")
-        plot_config = PlotConnection._populate_plot_config(plot_config, x, y)
+        plot_conf = PlotConnection._populate_plot_config(plot_config, x, y)
 
         return self._post(
-            ImageMessage(plot_id=self.plot_id, plot_config=plot_config, im_data=im)
+            ImageMessage(plot_id=self.plot_id, plot_config=plot_conf, im_data=im)
         )
 
     def surface(
@@ -351,10 +352,10 @@ def surface(
             Response from push_data POST request
         """
         su = SurfaceData(height_values=np.asanyarray(values), domain=domain, **attribs)
-        plot_config = PlotConnection._populate_plot_config(plot_config, x, y)
+        plot_conf = PlotConnection._populate_plot_config(plot_config, x, y)
 
         return self._post(
-            SurfaceMessage(plot_id=self.plot_id, plot_config=plot_config, su_data=su)
+            SurfaceMessage(plot_id=self.plot_id, plot_config=plot_conf, su_data=su)
         )
 
     def table(
@@ -427,8 +428,10 @@ def region(
         if selections is None and delete is False:
             return j_loads(self._get(f"get_regions/{self.plot_id}").content)
 
-        if selections and not isinstance(selections, (tuple, list)):
-            selections = [selections]
+        if selections is not None:
+            s_seq = (
+                selections if isinstance(selections, (tuple, list)) else [selections]
+            )
 
         if delete:
             if isinstance(delete, str):
@@ -438,25 +441,25 @@ def region(
             elif selections is None:
                 remove = []
             else:
-                remove = [s.id for s in selections]
+                remove = [s.id for s in s_seq]
             sm = ClearSelectionsMessage(plot_id=self.plot_id, selection_ids=remove)
         elif selections is not None:
             sm = SelectionsMessage(
-                plot_id=self.plot_id, update=update, set_selections=selections
+                plot_id=self.plot_id, update=update, set_selections=s_seq
             )
         else:
             raise ValueError("Should not be reached")
         return self._post(sm)
 
 
-_ALL_PLOTS: dict[str, PlotConnection] = dict()
+_ALL_PLOTS: dict[str, PlotConnection] = {}
 _DEF_PLOT_ID = None
 
 _DEF_PS_HOST = "localhost"
 _DEF_PS_PORT = 8000
 
 
-def set_default_plot_server(host: str, port: int):
+def set_default_plot_server(host: str | None = None, port: int | None = None):
     """Set default host and port for plot server
 
     Parameters
@@ -467,8 +470,10 @@ def set_default_plot_server(host: str, port: int):
         port number
     """
     global _DEF_PS_HOST, _DEF_PS_PORT
-    _DEF_PS_HOST = host
-    _DEF_PS_PORT = port
+    if host is not None:
+        _DEF_PS_HOST = host
+    if port is not None:
+        _DEF_PS_PORT = port
 
 
 def get_plot_connection(plot_id="", host=None, port=None):
@@ -508,7 +513,7 @@ def get_plot_connection(plot_id="", host=None, port=None):
     global _DEF_PLOT_ID
     if plot_id:
         if plot_id in _ALL_PLOTS and pc is not _ALL_PLOTS[plot_id]:
-            logging.warning(
+            logger.warning(
                 "Plot ID %s already exists in another connection, replacing"
                 " with new connection",
                 plot_id,
@@ -758,7 +763,8 @@ def region(
     return pc.region(selections, update, delete)
 
 
-__all__ = [  # pyright: ignore[reportUnsupportedDunderAll]
+# pyrefly: ignore [unresolvable-dunder-all]
+__all__ = [  # noqa: PLE0604
     PlotConnection,
     get_plot_connection,
     set_default_plot_id,
diff --git a/server/davidia/server/benchmarks.py b/server/davidia/server/benchmarks.py
index 1a62fa1c..7c4b264f 100644
--- a/server/davidia/server/benchmarks.py
+++ b/server/davidia/server/benchmarks.py
@@ -1,11 +1,11 @@
 import logging
-from datetime import datetime
-from enum import Enum
+import time
+from enum import auto as _auto
 from pathlib import Path
 
 import numpy as np
 from PIL import Image as im
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 from ..models.messages import (
     HeatmapData,
@@ -15,23 +15,25 @@
     LineParams,
     MultiLineMessage,
 )
-from ..models.parameters import Aspect, PlotConfig, ScaleType
+from ..models.parameters import Aspect, AutoNameEnum, PlotConfig, ScaleType
 
 logger = logging.getLogger("benchmarks")
 
 
-class PlotType(str, Enum):
+class PlotType(AutoNameEnum):
     """Class for plot type"""
 
-    multiline = "multiline"
-    add_data = "add_data"
-    heatmap = "heatmap"
-    image = "image"
+    multiline = _auto()
+    add_data = _auto()
+    heatmap = _auto()
+    image = _auto()
 
 
 class BenchmarkParams(BaseModel):
     """Parameters for benchmark"""
 
+    model_config = ConfigDict(use_enum_values=True)
+
     plot_type: PlotType
     params: list[int | float]
     iterations: int = 1
@@ -39,7 +41,7 @@ class BenchmarkParams(BaseModel):
 
 
 def _timestamp():
-    return datetime.now().strftime("%Y%m%d%H%M%S")
+    return time.strftime("%Y%m%d%H%M%S", time.localtime())
 
 
 DATA_PATH = Path(__file__).parents[1] / "data"
@@ -52,16 +54,6 @@ def _timestamp():
 
 
 def multiline(params: list[int | float]):
-    f"""Generate messages for benchmarking the plotting of lines
-
-    Parameters
-    ----------
-    params: [int, int] = {BENCHMARK_HELP[PlotType.multiline]}
-
-    Returns
-    -------
-    Generator of messages
-    """
     params.extend(ML_DEFAULT_PARAMS[len(params) :])
     lines, points = (int(p) for p in params)
     multilines = []
@@ -77,23 +69,24 @@ def multiline(params: list[int | float]):
     yield MultiLineMessage(ml_data=multilines)
 
 
-AD_DEFAULT_PARAMS = [5, 10240, 512, 32]
-BENCHMARK_HELP[PlotType.add_data] = f"""number of lines, number of initial points,
-    number of additional points, number of batches,
-    {AD_DEFAULT_PARAMS}"""
-
-
-def add_data(params: list[int | float]):
-    f"""Generate messages for benchmarking the plotting of extra data for lines
+multiline.__doc__ = f"""Generate messages for benchmarking the plotting of lines
 
     Parameters
     ----------
-    params: [int, int, int, int] = {BENCHMARK_HELP[PlotType.add_data]}
+    params: [int, int] = {BENCHMARK_HELP[PlotType.multiline]}
 
     Returns
     -------
-    Generator of plot messages
+    Generator of messages
     """
+
+AD_DEFAULT_PARAMS = [5, 10240, 512, 32]
+BENCHMARK_HELP[PlotType.add_data] = f"""number of lines, number of initial points,
+    number of additional points, number of batches,
+    {AD_DEFAULT_PARAMS}"""
+
+
+def add_data(params: list[int | float]):
     params.extend(AD_DEFAULT_PARAMS[len(params) :])
     params = [int(p) for p in params]
     logger.debug("Using parameters: %s", params)
@@ -117,6 +110,18 @@ def add_data(params: list[int | float]):
         yield MultiLineMessage(append=True, ml_data=multilines)
 
 
+add_data.__doc__ = f"""Generate messages for benchmarking the plotting of extra data for lines
+
+    Parameters
+    ----------
+    params: [int, int, int, int] = {BENCHMARK_HELP[PlotType.add_data]}
+
+    Returns
+    -------
+    Generator of plot messages
+    """
+
+
 def get_image(cache: list, name: str, i: int):
     if len(cache) <= i:
         cache.append(np.asarray(im.open(DATA_PATH / name)))
diff --git a/server/davidia/server/fastapi_utils.py b/server/davidia/server/fastapi_utils.py
index 12d2a269..95896f0b 100644
--- a/server/davidia/server/fastapi_utils.py
+++ b/server/davidia/server/fastapi_utils.py
@@ -17,12 +17,13 @@
 logger = logging.getLogger("main")
 
 
-def as_model(raw: dict) -> BaseModel | None:
+def as_model(raw: dict, log_exc=False) -> BaseModel | None:
     for m in ALL_MODELS:
         try:
             return m.model_validate(raw)
         except Exception:
-            pass
+            if log_exc:
+                logger.exception("Raw %s not %s", raw, m)
     return None
 
 
@@ -41,9 +42,8 @@ def j_dumps(data, default=None) -> bytes:
 def _deserialize_selection(item):
     if isinstance(item, (tuple, list)):
         return [_deserialize_selection(i) for i in item]
-    elif isinstance(item, dict):
-        if "id" in item and "start" in item:
-            return as_selection(item)
+    elif isinstance(item, dict) and "id" in item and "start" in item:
+        return as_selection(item)
     return item
 
 
@@ -77,13 +77,16 @@ def j_loads(data):
     try:
         return _deserialize_any(d)
     except ValidationError:
-        logger.error("Could not deserialize: %s", d, exc_info=True)
+        logger.exception("Could not deserialize: %s", d)
 
 
 def decode_ndarray(obj) -> DvDNDArray:
-    if isinstance(obj, dict):
-        if all(i in obj for i in ("nd", "dtype", "shape", "data")) and obj["nd"]:
-            obj = np.ndarray(buffer=obj["data"], shape=obj["shape"], dtype=obj["dtype"])
+    if (
+        isinstance(obj, dict)
+        and all(i in obj for i in ("nd", "dtype", "shape", "data"))
+        and obj["nd"]
+    ):
+        obj = np.ndarray(buffer=obj["data"], shape=obj["shape"], dtype=obj["dtype"])
     return obj  # pyright: ignore[reportGeneralTypeIssues]
 
 
@@ -113,7 +116,7 @@ def encode_ndarray(obj) -> dict[str, Any]:
     return obj
 
 
-def ws_pack(obj) -> bytes | None:
+def ws_pack(obj) -> bytes:
     """Pack object for a websocket message
 
     Packs object by converting Pydantic models and ndarrays to dicts before
@@ -154,7 +157,7 @@ def _instantiate_obj(model_class, obj):
                     return m.model_validate(obj)
                 except ValidationError as e:
                     excs[m] = e
-            logger.error("No valid models for", obj)
+            logger.error("No valid models for %s", obj)
             for m, e in excs.items():
                 logger.error("%s: %s", m, e)
             return None
@@ -192,7 +195,7 @@ async def wrapper(request: Request) -> Response:
 
         response = await func(**kwargs)
         if not isinstance(response, f_class):
-            raise ValueError(
+            raise TypeError(
                 f"Return value was not expected type {type(response)} cf {f_class}"
             )
 
diff --git a/server/davidia/server/plotserver.py b/server/davidia/server/plotserver.py
index 9d9a015d..62213b39 100644
--- a/server/davidia/server/plotserver.py
+++ b/server/davidia/server/plotserver.py
@@ -9,36 +9,36 @@
 from fastapi import WebSocket, WebSocketDisconnect
 from pydantic import ValidationError
 
-from . import benchmarks as _benchmark
-from ..models.parameters import DvDNDArray
 from ..models.messages import (
     BatonDonateMessage,
-    BatonRequestMessage,
     BatonMessage,
-    _BasePlotMessage,
-    _PlotDataMessage,
+    BatonRequestMessage,
     ClearPlotMessage,
     ClearSelectionsMessage,
-    ClientSelectionMessage,
-    ClientStatusMessage,
     ClientLineParametersMessage,
+    ClientMessage,
     ClientScatterParametersMessage,
+    ClientSelectionMessage,
+    ClientStatusMessage,
     ColourMap,
     HeatmapData,
     ImageMessage,
     LineData,
     MultiLineMessage,
-    _BaseSelectionsMessage,
-    SelectionsMessage,
     ScatterData,
     ScatterMessage,
+    SelectionsMessage,
     StatusType,
     SurfaceData,
     SurfaceMessage,
-    ClientMessage,
+    _BasePlotMessage,
+    _BaseSelectionsMessage,
+    _PlotDataMessage,
 )
+from ..models.parameters import DvDNDArray
 from ..models.selections import SelectionBase
-from .fastapi_utils import ws_pack, ws_unpack, as_model
+from . import benchmarks as _benchmark
+from .fastapi_utils import as_model, ws_pack, ws_unpack
 
 logger = logging.getLogger("main")
 
@@ -394,7 +394,7 @@ def get_plot_ids(self) -> list[str]:
         """Get plot IDs
         Returns sorted list of plot IDs in all plot clients
         """
-        return sorted(list(self._clients.keys()))
+        return sorted(self._clients.keys())
 
     async def clear_plot_states(self, plot_id: str):
         """
@@ -513,7 +513,7 @@ def convert_line_params_to_data_message(
 
         ml_data_msg = self.plot_states[plot_id].current_data
         if not isinstance(ml_data_msg, MultiLineMessage):
-            raise ValueError(
+            raise TypeError(
                 f"Wrong type of message given: MultiLineMessage expected: {type(ml_data_msg)}"
             )
 
@@ -563,7 +563,7 @@ def convert_scatter_params_to_data_message(
 
         sc_data_msg = self.plot_states[plot_id].current_data
         if not isinstance(sc_data_msg, ScatterMessage):
-            raise ValueError(
+            raise TypeError(
                 f"Wrong type of message given: ScatterMessage expected: {type(sc_data_msg)}"
             )
 
@@ -596,7 +596,7 @@ def combine_line_messages(
         """
         ml_data_msg = self.plot_states[plot_id].current_data
         if not isinstance(ml_data_msg, MultiLineMessage):
-            raise ValueError(
+            raise TypeError(
                 f"Wrong type of message given: MultiLineMessage expected: {type(ml_data_msg)}"
             )
         return combine_line_messages(ml_data_msg, new_points_msg)
@@ -684,7 +684,7 @@ async def update_plot_states_with_message(
                     new_msg = ws_pack(msg)
 
                 case MultiLineMessage():
-                    if any([not isinstance(d, LineData) for d in msg.ml_data]):
+                    if any(not isinstance(d, LineData) for d in msg.ml_data):
                         logger.warning("Not all line data!")
 
                     data = [
@@ -759,10 +759,10 @@ async def _update_and_add_message(self, plot_id, processed_msg, omit_client):
                 if c is not omit_client:
                     await c.add_message(new_msg)
 
-    async def prepare_client(
+    async def process_client_message(
         self, plot_id: str, msg: ClientMessage, omit_client: PlotClient | None = None
     ):
-        """Processes PlotMessage into a client message and adds that to any client
+        """Processes ClientMessage into a client message and adds that to any client
 
         Parameters
         ----------
@@ -860,7 +860,9 @@ async def handle_client(server: PlotServer, plot_id: str, socket: WebSocket, uui
                         client.uuid,
                         received_message,
                     )
-                    is_valid = client.uuid == server.baton
+                    is_valid = (
+                        received_message is not None and client.uuid == server.baton
+                    )
                     if is_valid:
                         omit = client  # omit originating client
                     else:
@@ -871,10 +873,14 @@ async def handle_client(server: PlotServer, plot_id: str, socket: WebSocket, uui
 
                     if is_valid:
                         try:
-                            assert isinstance(received_message, ClientMessage)
-                            await server.prepare_client(
+                            assert isinstance(
+                                received_message,
+                                ClientMessage,
+                            )
+                            await server.process_client_message(
                                 plot_id, received_message, omit_client=omit
                             )
+                            # TODO add event to queue
                         except Exception:
                             logger.debug(
                                 "Failed with message type: %s",
@@ -888,9 +894,7 @@ async def handle_client(server: PlotServer, plot_id: str, socket: WebSocket, uui
                 await server.send_next_message()
 
     except WebSocketDisconnect:
-        logger.error(
-            "Websocket disconnected: %s:%s", client.name, client.uuid, exc_info=True
-        )
+        logger.exception("Websocket disconnected: %s:%s", client.name, client.uuid)
         update_all = await server.remove_client(plot_id, client)
 
     if update_all:
@@ -899,7 +903,7 @@ async def handle_client(server: PlotServer, plot_id: str, socket: WebSocket, uui
 
 def check_line_names(lines: list[LineData]) -> list[LineData]:
     """Autonames lines that do not have names"""
-    used_names = set(line.line_params.name for line in lines if line.line_params.name)
+    used_names = {line.line_params.name for line in lines if line.line_params.name}
     index = 0
     for line in lines:
         if not line.line_params.name:
@@ -937,7 +941,7 @@ def add_default_indices(
     msg : MultiLineMessage
         A multiline message to add default indices
     """
-    default_indices = any([a.default_indices for a in msg.ml_data])
+    default_indices = any(a.default_indices for a in msg.ml_data)
     if default_indices:
         for m in msg.ml_data:
             m.x = np.arange(m.y.size, dtype=np.min_scalar_type(m.y.size))
diff --git a/server/davidia/tests/test_api.py b/server/davidia/tests/test_api.py
index 53bb5b48..564a33d8 100644
--- a/server/davidia/tests/test_api.py
+++ b/server/davidia/tests/test_api.py
@@ -1,14 +1,20 @@
 from __future__ import annotations
 
-import datetime
 import itertools
 import time
+from asyncio import sleep
+from collections.abc import Callable
+from dataclasses import asdict, dataclass, is_dataclass
 from enum import Enum
-from typing import Any, Callable
+from typing import Any
 
 import numpy as np
 import pytest
-from dataclasses import asdict, dataclass, is_dataclass
+from fastapi.testclient import TestClient
+from httpx2 import ASGITransport, AsyncClient
+from pydantic import BaseModel
+from pydantic_numpy.model import NumpyModel
+
 from davidia.main import _create_bare_app
 from davidia.models.messages import (
     DvDNDArray,
@@ -24,10 +30,6 @@
     ws_pack,
     ws_unpack,
 )
-from fastapi.testclient import TestClient
-from httpx import AsyncClient, ASGITransport
-from pydantic import BaseModel
-from pydantic_numpy.model import NumpyModel
 
 
 @pytest.mark.asyncio
@@ -100,105 +102,101 @@ async def test_status_ws():
 
     app = _create_bare_app()
 
-    with TestClient(app=app) as client:
-        with client.websocket_connect("/plot/30064551/plot_0") as ws_0:
-            with client.websocket_connect("/plot/30064551/plot_1") as ws_1:
-                ps = getattr(app, "_plot_server")
-                client_0 = ps._clients["plot_0"]
-                client_1 = ps._clients["plot_1"]
-                plot_state_0 = ps.plot_states["plot_0"]
-                plot_state_1 = ps.plot_states["plot_1"]
-                assert ps.client_status == StatusType.busy
-                assert len(client_0) == 1
-                assert len(client_1) == 1
-
-                assert plot_state_0.current_data is None
-                assert plot_state_0.current_selections is None
-                assert plot_state_0.new_data_message is None
-                assert plot_state_0.new_selections_message is None
-                assert plot_state_1.new_data_message is None
-                assert plot_state_1.new_selections_message is None
-                assert plot_state_1.current_data is None
-                assert plot_state_1.current_selections is None
-
-                await ps.update(plot_msg_0)
-                await ps.send_next_message()
-                time.sleep(1)
-                assert ps.client_status == StatusType.busy
-                assert plot_state_0.current_data
-                assert plot_state_0.current_selections is None
-                assert plot_state_0.new_data_message
-                assert plot_state_0.new_selections_message is None
-                assert plot_state_1.new_data_message is None
-                assert plot_state_1.new_selections_message is None
-                assert plot_state_1.current_data is None
-                assert plot_state_1.current_selections is None
-
-                await ps.update(plot_msg_1)
-                await ps.send_next_message()
-                time.sleep(1)
-                assert ps.client_status == StatusType.busy
-                assert len(client_0) == 1
-                assert len(client_1) == 1
-                assert plot_state_0.new_data_message
-                assert plot_state_1.new_data_message
-                assert plot_state_0.new_selections_message is None
-                assert plot_state_1.new_selections_message is None
-                ws_0.send_bytes(
-                    ws_pack(
-                        {
-                            "status": "ready",
-                        }
-                    )
-                )
-                time.sleep(1)
-                assert ps.client_status == StatusType.busy
-
-                received_0_0 = ws_0.receive()
-                received_0_1 = ws_0.receive()
-                rec_text_0_0 = ws_unpack(received_0_0["bytes"])
-                rec_text_0_1 = ws_unpack(received_0_1["bytes"])
-
-                assert (
-                    rec_text_0_0
-                    == rec_text_0_1
-                    == {"baton": "30064551", "uuids": ["30064551"]}
-                )
+    with (
+        TestClient(app=app) as client,
+        client.websocket_connect("/plot/30064551/plot_0") as ws_0,
+        client.websocket_connect("/plot/30064551/plot_1") as ws_1,
+    ):
+        ps = getattr(app, "_plot_server")  # noqa: B009
+        client_0 = ps._clients["plot_0"]
+        client_1 = ps._clients["plot_1"]
+        plot_state_0 = ps.plot_states["plot_0"]
+        plot_state_1 = ps.plot_states["plot_1"]
+        assert ps.client_status == StatusType.busy
+        assert len(client_0) == 1
+        assert len(client_1) == 1
+
+        assert plot_state_0.current_data is None
+        assert plot_state_0.current_selections is None
+        assert plot_state_0.new_data_message is None
+        assert plot_state_0.new_selections_message is None
+        assert plot_state_1.new_data_message is None
+        assert plot_state_1.new_selections_message is None
+        assert plot_state_1.current_data is None
+        assert plot_state_1.current_selections is None
+
+        await ps.update(plot_msg_0)
+        await ps.send_next_message()
+        await sleep(1)
+        assert ps.client_status == StatusType.busy
+        assert plot_state_0.current_data
+        assert plot_state_0.current_selections is None
+        assert plot_state_0.new_data_message
+        assert plot_state_0.new_selections_message is None
+        assert plot_state_1.new_data_message is None
+        assert plot_state_1.new_selections_message is None
+        assert plot_state_1.current_data is None
+        assert plot_state_1.current_selections is None
+
+        await ps.update(plot_msg_1)
+        await ps.send_next_message()
+        await sleep(1)
+        assert ps.client_status == StatusType.busy
+        assert len(client_0) == 1
+        assert len(client_1) == 1
+        assert plot_state_0.new_data_message
+        assert plot_state_1.new_data_message
+        assert plot_state_0.new_selections_message is None
+        assert plot_state_1.new_selections_message is None
+        ws_0.send_bytes(
+            ws_pack(
+                {
+                    "status": "ready",
+                }
+            )
+        )
+        await sleep(1)
+        assert ps.client_status == StatusType.busy
 
-                received_0_2 = ws_0.receive()
-                rec_text_0_2 = ws_unpack(received_0_2["bytes"])
-                nppd_assert_equal(
-                    rec_text_0_2["mlData"][2]["y"], np.array([0, 10, 40, 10, 0])
-                )
+        received_0_0 = ws_0.receive()
+        received_0_1 = ws_0.receive()
+        rec_text_0_0 = ws_unpack(received_0_0["bytes"])
+        rec_text_0_1 = ws_unpack(received_0_1["bytes"])
 
-                ws_1.send_bytes(
-                    ws_pack(
-                        {
-                            "status": "ready",
-                        }
-                    )
-                )
-                time.sleep(1)
-                assert ps.client_status == StatusType.busy
+        assert (
+            rec_text_0_0 == rec_text_0_1 == {"baton": "30064551", "uuids": ["30064551"]}
+        )
 
-                received_1_0 = ws_1.receive()
-                rec_text_1_0 = ws_unpack(received_1_0["bytes"])
-                assert rec_text_1_0 == {"baton": "30064551", "uuids": ["30064551"]}
+        received_0_2 = ws_0.receive()
+        rec_text_0_2 = ws_unpack(received_0_2["bytes"])
+        nppd_assert_equal(rec_text_0_2["mlData"][2]["y"], np.array([0, 10, 40, 10, 0]))
 
-                received_1_1 = ws_1.receive()
-                rec_text_1_1 = ws_unpack(received_1_1["bytes"])
-                nppd_assert_equal(
-                    rec_text_1_1["mlData"][1]["x"], np.array([3, 5, 7, 9, 11])
-                )
+        ws_1.send_bytes(
+            ws_pack(
+                {
+                    "status": "ready",
+                }
+            )
+        )
+        await sleep(1)
+        assert ps.client_status == StatusType.busy
+
+        received_1_0 = ws_1.receive()
+        rec_text_1_0 = ws_unpack(received_1_0["bytes"])
+        assert rec_text_1_0 == {"baton": "30064551", "uuids": ["30064551"]}
 
-                await ps.update(plot_msg_2)
-                await ps.send_next_message()
-                time.sleep(1)
-                assert ps.client_status == StatusType.busy
-                received_new_line = ws_0.receive()
-                rec_data = ws_unpack(received_new_line["bytes"])
-                line_msg = MultiLineMessage.model_validate(rec_data)
-                assert line_msg is not None
+        received_1_1 = ws_1.receive()
+        rec_text_1_1 = ws_unpack(received_1_1["bytes"])
+        nppd_assert_equal(rec_text_1_1["mlData"][1]["x"], np.array([3, 5, 7, 9, 11]))
+
+        await ps.update(plot_msg_2)
+        await ps.send_next_message()
+        await sleep(1)
+        assert ps.client_status == StatusType.busy
+        received_new_line = ws_0.receive()
+        rec_data = ws_unpack(received_new_line["bytes"])
+        line_msg = MultiLineMessage.model_validate(rec_data)
+        assert line_msg is not None
 
 
 @dataclass
@@ -247,41 +245,43 @@ async def test_clear_data_via_message():
     app = _create_bare_app()
 
     with TestClient(app) as client:
-        ps = getattr(app, "_plot_server")
-
-        with client.websocket_connect("/plot/8123f452/plot_0"):
-            with client.websocket_connect("/plot/fc8ed0e5/plot_1"):
-                async with AsyncClient(
-                    transport=ASGITransport(app=app), base_url="http://test"
-                ) as ac:
-                    response = await ac.put(
-                        "/clear_data/plot_0",
-                        params={},
-                        headers={"Content-Type": "application/json"},
-                    )
-                    assert response.status_code == 200
-                    assert response.json() == "data cleared"
-
-                    response = await ac.put(
-                        "/clear_data/plot_1",
-                        params={},
-                        headers={"Content-Type": "application/json"},
-                    )
-                    assert response.status_code == 200
-                    assert response.json() == "data cleared"
-
-                plot_state_0 = ps.plot_states["plot_0"]
-                assert plot_state_0.new_data_message is None
-                assert plot_state_0.new_selections_message is None
-                assert plot_state_0.current_data is None
-                assert plot_state_0.current_selections is None
+        ps = getattr(app, "_plot_server")  # noqa: B009
+
+        with (
+            client.websocket_connect("/plot/8123f452/plot_0"),
+            client.websocket_connect("/plot/fc8ed0e5/plot_1"),
+        ):
+            async with AsyncClient(
+                transport=ASGITransport(app=app), base_url="http://test"
+            ) as ac:
+                response = await ac.put(
+                    "/clear_data/plot_0",
+                    params={},
+                    headers={"Content-Type": "application/json"},
+                )
+                assert response.status_code == 200
+                assert response.json() == "data cleared"
+
+                response = await ac.put(
+                    "/clear_data/plot_1",
+                    params={},
+                    headers={"Content-Type": "application/json"},
+                )
+                assert response.status_code == 200
+                assert response.json() == "data cleared"
+
+            plot_state_0 = ps.plot_states["plot_0"]
+            assert plot_state_0.new_data_message is None
+            assert plot_state_0.new_selections_message is None
+            assert plot_state_0.current_data is None
+            assert plot_state_0.current_selections is None
 
 
 @pytest.mark.asyncio
 async def test_push_points():
     x = [i for i in range(10)]
     y = [j % 10 for j in x]
-    time_id = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+    time_id = time.strftime("%Y%m%d%H%M%S", time.localtime())
     line = LineData(
         key=time_id,
         line_params=LineParams(colour="purple"),
@@ -296,14 +296,13 @@ async def test_push_points():
     }
     app = _create_bare_app()
 
-    with TestClient(app) as client:
-        with client.websocket_connect("/plot/99a81b01/plot_0"):
-            async with AsyncClient(
-                transport=ASGITransport(app=app), base_url="http://test"
-            ) as ac:
-                response = await ac.post("/push_data", content=msg, headers=headers)
-            assert response.status_code == 200
-            assert ws_unpack(response._content) == "data sent"
+    with TestClient(app) as client, client.websocket_connect("/plot/99a81b01/plot_0"):
+        async with AsyncClient(
+            transport=ASGITransport(app=app), base_url="http://test"
+        ) as ac:
+            response = await ac.post("/push_data", content=msg, headers=headers)
+        assert response.status_code == 200
+        assert ws_unpack(response._content) == "data sent"
 
 
 class TrialA(NumpyModel):
@@ -322,7 +321,7 @@ class TrialB(NumpyModel):
 _nptest_assert_eq = np.testing.assert_equal  # supports dict testing
 
 
-def nppd_assert_equal(this, other: Any) -> None:
+def nppd_assert_equal(this: Any, other: Any) -> None:
     is_enum = isinstance(this, Enum)
     assert is_enum or isinstance(this, type(other))
     if is_enum:
@@ -341,6 +340,7 @@ def nppd_assert_equal(this, other: Any) -> None:
     elif isinstance(this, np.ndarray):
         _nptest_assert_eq(this, other)
     elif is_dataclass(this):
+        # pyrefly: ignore [bad-argument-type]
         nppd_assert_equal(asdict(this), asdict(other))
     else:
         assert this == other
diff --git a/server/davidia/tests/test_messages.py b/server/davidia/tests/test_messages.py
index cdd03b91..bfe3159f 100644
--- a/server/davidia/tests/test_messages.py
+++ b/server/davidia/tests/test_messages.py
@@ -1,18 +1,18 @@
 import numpy as np
 import pytest
 
-from davidia.models.parameters import PlotConfig
-from davidia.models.messages import GlyphType
 from davidia.models.messages import (
     DvDNDArray,
+    GlyphType,
     LineData,
     LineParams,
     MultiLineMessage,
 )
+from davidia.models.parameters import PlotConfig
 from davidia.server.plotserver import (
-    add_indices,
-    add_default_indices,
     add_colour_to_lines,
+    add_default_indices,
+    add_indices,
     check_line_names,
     combine_line_messages,
 )
diff --git a/server/davidia/tests/test_plotserver.py b/server/davidia/tests/test_plotserver.py
index 1772fa35..e63755e3 100644
--- a/server/davidia/tests/test_plotserver.py
+++ b/server/davidia/tests/test_plotserver.py
@@ -1,4 +1,3 @@
-import datetime
 import logging
 import time
 from collections import defaultdict
@@ -62,7 +61,7 @@ async def test_send_points():
     plot_state_0 = ps.plot_states["plot_0"]
     x = np.array([i for i in range(50)])
     y = np.array([j % 10 for j in x])
-    time_id = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+    time_id = time.strftime("%Y%m%d%H%M%S", time.localtime())
     new_line = MultiLineMessage(
         plot_id="plot_0",
         ml_data=[
@@ -76,7 +75,7 @@ async def test_send_points():
 
     msg = ws_pack(line_as_dict)
     assert msg is not None
-    plot_state_0.current_data = line_as_dict  # pyrefly: ignore[bad-argument-type]
+    plot_state_0.current_data = line_as_dict  # pyrefly: ignore [bad-argument-type, bad-assignment]
     plot_state_0.new_data_message = msg
     assert not ps.clients_available()
 
@@ -110,8 +109,8 @@ async def test_add_and_remove_clients(caplog):
     plot_state_0 = ps.plot_states["plot_0"]
     plot_state_0.new_data_message = msg_00
     plot_state_0.new_selections_message = msg_01
-    plot_state_0.current_data = data_0  # pyrefly: ignore[bad-argument-type]
-    plot_state_0.current_selections = selection_0  # pyrefly: ignore[bad-argument-type]
+    plot_state_0.current_data = data_0  # pyrefly: ignore [bad-assignment]
+    plot_state_0.current_selections = selection_0  # pyrefly: ignore [bad-assignment]
 
     def update_plot_state(pc, bytes):
         time.sleep(2)
@@ -158,8 +157,10 @@ def test_get_plot_ids():
 
     assert ps.get_plot_ids() == []
 
-    ps._clients["plot_0"].append("0")  # ppyrefly: ignore[bad-argument-type]
-    ps._clients["plot_1"].append("1")  # pyrefly: ignore[bad-argument-type]
+    # pyrefly: ignore [bad-argument-type]
+    ps._clients["plot_0"].append("0")
+    # pyrefly: ignore [bad-argument-type]
+    ps._clients["plot_1"].append("1")
 
     assert ps.get_plot_ids() == ["plot_0", "plot_1"]
 
@@ -324,10 +325,11 @@ async def test_clear_plot_states():
 
     def add_current_data(plotserver: PlotServer, plot_id: str):
         if not plot_state_1.lock.locked():
+            # pyrefly: ignore [bad-assignment]
             plot_state_1.current_data = {
                 "a": 10,
                 "b": 20,
-            }  # pyrefly: ignore[bad-argument-type]
+            }
 
     with before_after.after(
         "davidia.server.plotserver.PlotServer.clear_plot_states", add_current_data
diff --git a/server/davidia/tests/test_selections.py b/server/davidia/tests/test_selections.py
index 1c1e88b8..e345c0ea 100644
--- a/server/davidia/tests/test_selections.py
+++ b/server/davidia/tests/test_selections.py
@@ -2,6 +2,8 @@
 
 import numpy as np
 import pytest
+from pydantic import BaseModel
+
 from davidia.models.selections import (
     AnySelection,
     AxialSelection,
@@ -14,7 +16,6 @@
     SelectionBase,
     as_selection,
 )
-from pydantic.main import BaseModel
 
 parameters = [
     (
diff --git a/server/demos/benchmark.py b/server/demos/benchmark.py
index 1c2ad7ec..870c6585 100644
--- a/server/demos/benchmark.py
+++ b/server/demos/benchmark.py
@@ -1,6 +1,7 @@
 import logging
 
 import requests
+
 from davidia.server.benchmarks import BENCHMARK_HELP, BenchmarkParams, PlotType
 
 logger = logging.getLogger("benchmark")
@@ -27,7 +28,7 @@ def start_benchmark(
 
     url = f"http://{host}:{port}/benchmark/{plot_id}"
     logger.debug("Sending POST to %s: %s", url, params)
-    response = requests.post(url, data=params.model_dump_json())
+    response = requests.post(url, json=params.model_dump())
 
     logger.debug(
         f"{params} plotted in {response.elapsed}s with response"
@@ -38,13 +39,13 @@ def start_benchmark(
 
 
 def create_parser():
-    from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
+    from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
 
     parser = ArgumentParser(
         description="Benchmark plotting client",
         formatter_class=ArgumentDefaultsHelpFormatter,
     )
-    plot_types = list(p.name for p in PlotType)
+    plot_types = [p.name for p in PlotType]
     parser.add_argument("-i", "--id", help="Plot ID", default="plot_0")
     parser.add_argument(
         "-t", "--type", help="Plot type", choices=plot_types, default=plot_types[0]
diff --git a/server/demos/simple.py b/server/demos/simple.py
index 593a7a46..5b6d2f26 100644
--- a/server/demos/simple.py
+++ b/server/demos/simple.py
@@ -1,8 +1,9 @@
-from davidia.models.selections import AnySelection
 from time import sleep
 
 import numpy as np
+
 from davidia.models.parameters import Aspect, TableDisplayType
+from davidia.models.selections import AnySelection
 from davidia.plot import (
     LinearSelection,
     RectangularSelection,
@@ -11,9 +12,9 @@
     line,
     region,
     scatter,
+    set_default_plot_server,
     surface,
     table,
-    set_default_plot_server,
 )
 
 
@@ -278,7 +279,7 @@ def run_all_demos(wait=3, repeats=5):
 
 
 def create_parser():
-    from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
+    from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
 
     parser = ArgumentParser(
         description="Simple demo of plotting client and server",
@@ -304,9 +305,10 @@ def create_parser():
 
 
 def start_and_run_all_demos():
+    import webbrowser
     from threading import Thread
     from time import sleep
-    import webbrowser
+
     from davidia.main import run_app
 
     args = create_parser().parse_args()
diff --git a/server/example-client/pyproject.toml b/server/example-client/pyproject.toml
index 8926ca4c..3cf740f1 100644
--- a/server/example-client/pyproject.toml
+++ b/server/example-client/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "davidia-example-client"
 description = "Example frontend for Davidia"
 readme = "Static files to serve for an example Davidia plot client"
-version = "1.1.0"
+version = "1.2.0"
 license = "MIT"
 maintainers = [
     {name = "Data Analysis group", email = "dataanalysis@diamond.ac.uk"}
@@ -17,7 +17,7 @@ classifiers = [
     "Programming Language :: JavaScript",
     "Programming Language :: Python :: 3 :: Only",
 ]
-requires-python = ">= 3.10"
+requires-python = ">= 3.11"
 dependencies = [
     "davidia",
 ]
@@ -43,6 +43,10 @@ line-length = 88
 
 [tool.ruff.lint]
 ignore = ["E501", "W505"]
+extend-select = ["I001"]
+
+[tool.ruff.lint.isort]
+known-third-party = ["davidia"]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 10
diff --git a/server/pyproject.toml b/server/pyproject.toml
index cf7bee61..5dc0ec97 100644
--- a/server/pyproject.toml
+++ b/server/pyproject.toml
@@ -15,13 +15,13 @@ classifiers = [
     "Natural Language :: English",
     "Programming Language :: Python :: 3 :: Only",
 ]
-requires-python = ">= 3.10"
+requires-python = ">= 3.11"
 dependencies = [
     "before-after",
     "fastapi",
-    "httpx>=0.13",
     "msgpack",
     "pillow",
+    "pydantic>=2.11.0",
     "pydantic-numpy",
     "orjson",
     "requests",
@@ -31,6 +31,7 @@ dependencies = [
 
 [project.optional-dependencies]
 testing = [
+    "httpx2",
     "pytest",
     "pytest-asyncio",
 ]
@@ -66,7 +67,8 @@ plugins = "numpy.typing.mypy_plugin"
 line-length = 88
 
 [tool.ruff.lint]
-ignore = ["E501", "W505"]
+ignore = ["E501", "W505", "C408"]
+extend-select = ["I001"]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 10