remove dataclasses_json

setup.cfg

@@ -20,7 +20,6 @@ install_requires =
     bluesky
     pyepics
     flask-restful
-    dataclasses-json
     zocalo
     ispyb
     scanspec

src/artemis/__main__.py

@@ -1,15 +1,15 @@
 import argparse
 import atexit
 import threading
-from dataclasses import dataclass
+from dataclasses import asdict
 from queue import Queue
 from traceback import format_exception
 from typing import Callable, Optional, Tuple
 
 from bluesky import RunEngine
-from dataclasses_json import dataclass_json
 from flask import Flask, request
 from flask_restful import Api, Resource
+from pydantic.dataclasses import dataclass
 
 import artemis.log
 from artemis.exceptions import WarningException
@@ -34,7 +34,6 @@ class Command:
     parameters: Optional[InternalParameters] = None
 
 
-@dataclass_json
 @dataclass
 class StatusAndMessage:
     status: str
@@ -45,7 +44,6 @@ def __init__(self, status: Status, message: str = "") -> None:
         self.message = message
 
 
-@dataclass_json
 @dataclass
 class ErrorStatusAndMessage(StatusAndMessage):
     exception_type: str = ""
@@ -189,7 +187,7 @@ def put(self, plan_name: str, action: Actions):
             status_and_message = self.runner.stop()
         # no idea why mypy gives an attribute error here but nowhere else for this
         # exact same situation...
-        return status_and_message.to_dict()  # type: ignore
+        return asdict(status_and_message)  # type: ignore
 
 
 class StopOrStatus(Resource):
@@ -201,14 +199,14 @@ def put(self, action):
         status_and_message = StatusAndMessage(Status.FAILED, f"{action} not understood")
         if action == Actions.STOP.value:
             status_and_message = self.runner.stop()
-        return status_and_message.to_dict()
+        return asdict(status_and_message)
 
     def get(self, **kwargs):
         action = kwargs.get("action")
         status_and_message = StatusAndMessage(Status.FAILED, f"{action} not understood")
         if action == Actions.STATUS.value:
             status_and_message = self.runner.current_status
-        return status_and_message.to_dict()
+        return asdict(status_and_message)
 
 
 def create_app(

src/artemis/parameters/plan_specific/grid_scan_with_edge_detect_params.py

@@ -3,7 +3,6 @@
 from typing import Any
 
 import numpy as np
-from dataclasses_json import DataClassJsonMixin
 from dodal.devices.detector import TriggerMode
 from dodal.parameters.experiment_parameter_base import AbstractExperimentParameterBase
 from pydantic import validator
@@ -18,7 +17,7 @@
 
 
 @dataclass
-class GridScanWithEdgeDetectParams(DataClassJsonMixin, AbstractExperimentParameterBase):
+class GridScanWithEdgeDetectParams(AbstractExperimentParameterBase):
     """
     Holder class for the parameters of a grid scan that uses edge detection to detect the grid.
     """

src/artemis/system_tests/test_main_system.py

@@ -384,7 +384,7 @@ def test_when_blueskyrunner_initiated_and_skip_flag_is_set_then_setup_called_upo
     ):
         runner = BlueskyRunner(MagicMock(), skip_startup_connection=True)
         mock_setup.assert_not_called()
-        runner.start(MagicMock(), MagicMock(), "fast_grid_scan")
+        runner.start(None, None, "fast_grid_scan")
         mock_setup.assert_called_once()