Improve JSON encoder and decoder

qiskit_experiments/database_service/db_analysis_result.py

@@ -18,8 +18,12 @@
 import copy
 import math
 
+from qiskit_experiments.framework.json import (
+    ExperimentEncoder,
+    ExperimentDecoder,
+    _serialize_safe_float,
+)
 from .database_service import DatabaseServiceV1
-from .json import ExperimentEncoder, ExperimentDecoder, serialize_safe_float
 from .utils import save_data, qiskit_version
 from .exceptions import DbExperimentDataError
 from .device_component import DeviceComponent, to_component
@@ -448,7 +452,7 @@ def _display_format(value):
             if math.isfinite(value):
                 return value
             else:
-                return serialize_safe_float(value)["__value__"]
+                return _serialize_safe_float(value)["__value__"]
         if isinstance(value, complex):
             # Convert complex floats to strings for display
             return f"{value}"

qiskit_experiments/database_service/db_experiment_data.py

@@ -29,11 +29,11 @@
 from qiskit.providers import Job, BaseJob, Backend, BaseBackend, Provider
 from qiskit.result import Result
 from qiskit.providers.jobstatus import JobStatus, JOB_FINAL_STATES
+from qiskit_experiments.framework.json import ExperimentEncoder, ExperimentDecoder
 
 from .database_service import DatabaseServiceV1
 from .exceptions import DbExperimentDataError, DbExperimentEntryNotFound, DbExperimentEntryExists
 from .db_analysis_result import DbAnalysisResultV1 as DbAnalysisResult
-from .json import ExperimentEncoder, ExperimentDecoder
 from .utils import (
     save_data,
     qiskit_version,

qiskit_experiments/framework/__init__.py

@@ -209,6 +209,8 @@
     FitVal
     AnalysisResultData
     ExperimentConfig
+    ExperimentEncoder
+    ExperimentDecoder
 
 .. _composite-experiment:
 
@@ -244,3 +246,4 @@
     BatchExperiment,
     CompositeAnalysis,
 )
+from .json import ExperimentEncoder, ExperimentDecoder

qiskit_experiments/framework/base_experiment.py

@@ -512,3 +512,12 @@ def _add_job_metadata(self, metadata: Dict[str, Any], jobs: BaseJob, **run_optio
                 "run_options": copy.copy(run_options),
             }
         ]
+
+    def __json_encode__(self):
+        """Convert to format that can be JSON serialized"""
+        return self.config
+
+    @classmethod
+    def __json_decode__(cls, value):
+        """Load from JSON compatible format"""
+        return cls.from_config(value)