Replace APISchema Serialization with Pydantic 1.0

docs/user/explanations/components.rst

@@ -37,28 +37,28 @@ the master scheduler's wiring is correct, for example:
 
 .. code-block:: yaml
 
-    - examples.devices.trampoline.RandomTrampoline:
-        name: random_trampoline
-        inputs: {}
-        callback_period: 10000000000
-    - tickit.core.components.system_simulation.SystemSimulation:
-        name: internal_tickit
-        inputs:
-          input_1: random_trampoline:output
-        components:
-          - tickit.devices.sink.Sink:
-              name: internal_sink
-              inputs:
-                sink_1: external:input_1
-          - examples.devices.remote_controlled.RemoteControlled:
-              name: internal_tcp_controlled
-              inputs: {}
-        expose:
-          output_1: internal_tcp_controlled:observed
-    - tickit.devices.sink.Sink:
-        name: external_sink
-        inputs:
-          sink_1: internal_tickit:output_1
+    - type: examples.devices.trampoline.RandomTrampoline
+      name: random_trampoline
+      inputs: {}
+      callback_period: 10000000000
+    - type: tickit.core.components.system_simulation.SystemSimulation
+      name: internal_tickit
+      inputs:
+        input_1: random_trampoline:output
+      components:
+        - type: tickit.devices.sink.Sink
+          name: internal_sink
+          inputs:
+            sink_1: external:input_1
+        - type: examples.devices.remote_controlled.RemoteControlled
+          name: internal_tcp_controlled
+          inputs: {}
+      expose:
+        output_1: internal_tcp_controlled:observed
+    - type: tickit.devices.sink.Sink
+      name: external_sink
+      inputs:
+        sink_1: internal_tickit:output_1
 
 (See `SystemSimulationComponent`.)
 

docs/user/explanations/devices.rst

@@ -18,9 +18,9 @@ values and requests to be called back for an update sometime later.
     """A trivial toy device which produced a random output and requests a callback."""
 
         #: An empty typed mapping of device inputs
-        Inputs: TypedDict = TypedDict("Inputs", {})
+        Inputs: type = TypedDict("Inputs", {})
         #: A typed mapping containing the 'output' output value
-        Outputs: TypedDict = TypedDict("Outputs", {"output": int})
+        Outputs: type = TypedDict("Outputs", {"output": int})
 
         def __init__(self, callback_period: int = int(1e9)) -> None:
             self.callback_period = SimTime(callback_period)

docs/user/explanations/wiring.rst

@@ -23,11 +23,11 @@ which outputs random numbers, and a sink taking that output as an input:
 
 .. code-block:: yaml
 
-    - examples.devices.trampoline.RandomTrampoline:
-        name: rand_tramp
-        inputs: {}
-        callback_period: 1000000000
-    - tickit.devices.sink.Sink:
-        name: tramp_sink
-        inputs:
-          input: rand_tramp:output
+    - type: examples.devices.trampoline.RandomTrampoline
+      name: rand_tramp
+      inputs: {}
+      callback_period: 1000000000
+    - type: tickit.devices.sink.Sink
+      name: tramp_sink
+      inputs:
+        input: rand_tramp:output

docs/user/tutorials/create-a-device.rst

@@ -32,8 +32,8 @@ maps as members. As such we shall put in the following boilerplate.
 
     class AmplifierDevice(Device):
 
-    Inputs: TypedDict = TypedDict("Inputs", {})
-    Outputs: TypedDict = TypedDict("Outputs", {})
+    Inputs: type = TypedDict("Inputs", {})
+    Outputs: type = TypedDict("Outputs", {})
 
     def __init__(self) -> None:
 
@@ -59,8 +59,8 @@ here.
 
     class AmplifierDevice(Device):
 
-    Inputs: TypedDict = TypedDict("Inputs", {})
-    Outputs: TypedDict = TypedDict("Outputs", {})
+    Inputs: type = TypedDict("Inputs", {})
+    Outputs: type = TypedDict("Outputs", {})
 
     def __init__(self, initial_amplification: float = 2) -> None:
             self.amplification = initial_amplification
@@ -95,8 +95,8 @@ we define our inputs and outputs in the maps, and the line of logic in the ``upd
 
     class AmplifierDevice(Device):
 
-        Inputs: TypedDict = TypedDict("Inputs", {"initial_signal":float})
-        Outputs: TypedDict = TypedDict("Outputs", {"amplified_signal":float})
+        Inputs: type = TypedDict("Inputs", {"initial_signal":float})
+        Outputs: type = TypedDict("Outputs", {"amplified_signal":float})
 
         def __init__(self, initial_amplification: float = 2.0) -> None:
             self.amplification = initial_amplification
@@ -118,13 +118,13 @@ if the device requires any adapters to control it externally.
 
 .. code-block:: python
 
-    from dataclasses import dataclass
+    import pydantic.v1.dataclasses
 
     from tickit.core.components.component import Component, ComponentConfig
     from tickit.core.components.device_simulation import DeviceSimulation
 
 
-    @dataclass
+    @pydantic.v1.dataclasses.dataclass
     class Amplifier(ComponentConfig):
         initial_amplification: float
 
@@ -147,19 +147,19 @@ and a `Sink`, named sink, which will receive the amplified signal.
 
 .. code-block:: yaml
 
-    - tickit.devices.source.Source:
-        name: source
-        inputs: {}
-        value: 10.0
-    - amp.Amplifier:
-        name: amp
-        inputs:
-          initial_signal: source:value
-        initial_amplification: 2.0
-    - tickit.devices.sink.Sink:
-        name: sink
-        inputs:
-          input: amp:amplified_signal
+    - type: tickit.devices.source.Source
+      name: source
+      inputs: {}
+      value: 10.0
+    - type: amp.Amplifier
+      name: amp
+      inputs:
+        initial_signal: source:value
+      initial_amplification: 2.0
+    - type: tickit.devices.sink.Sink
+      name: sink
+      inputs:
+        input: amp:amplified_signal
 
 
 Where in ``amp.Amplifier`` ``amp`` is the name of the ``.py`` file the amplifier

docs/user/tutorials/creating-a-simulation.rst

@@ -26,23 +26,23 @@ we may extend our config, as:
 
 .. code-block:: yaml
 
-    - examples.devices.trampoline.RandomTrampoline:
-        name: rand_tramp
-        inputs: {}
+    - type: examples.devices.trampoline.RandomTrampoline
+      name: rand_tramp
+      inputs: {}
 
 We will now add a `Sink` device. This device will be named ``tramp_sink``, will have
 no adapters but will take the ``output`` value of ``rand_tramp`` as ``input``. As
 such we may extend our config, as:
 
 .. code-block:: yaml
 
-    - examples.devices.trampoline.RandomTrampoline:
-        name: rand_tramp
-        inputs: {}
-    - tickit.devices.sink.Sink:
-        name: tramp_sink
-        inputs:
-          input: rand_tramp:output
+    - type: examples.devices.trampoline.RandomTrampoline
+      name: rand_tramp
+      inputs: {}
+    - type: tickit.devices.sink.Sink
+      name: tramp_sink
+      inputs:
+        input: rand_tramp:output
 
 Running the Simulation
 ----------------------

docs/user/tutorials/use-composed-adapter.rst

@@ -130,7 +130,7 @@ our amplifier `ComponentConfig`. To do this we simply add it to the arguments of
 
 .. code-block:: python
 
-    @dataclass
+    @pydantic.v1.dataclasses.dataclass
     class Amplifier(ComponentConfig):
         initial_amplification: int
 

examples/configs/amplifier.yaml

@@ -1,13 +1,13 @@
-- tickit.devices.source.Source:
-    name: source
-    inputs: {}
-    value: 10.0
-- examples.devices.amplifier.Amplifier:
-    name: amp
-    inputs:
-      initial_signal: source:value
-    initial_amplification: 2
-- tickit.devices.sink.Sink:
-    name: sink
-    inputs:
-      input: amp:amplified_signal
+- type: tickit.devices.source.Source
+  name: source
+  inputs: {}
+  value: 10.0
+- type: examples.devices.amplifier.Amplifier
+  name: amp
+  inputs:
+    initial_signal: source:value
+  initial_amplification: 2
+- type: tickit.devices.sink.Sink
+  name: sink
+  inputs:
+    input: amp:amplified_signal

examples/configs/counter.yaml

@@ -1,7 +1,7 @@
-- examples.devices.counter.Counter:
-    name: counter  
-    inputs: {}
-- tickit.devices.sink.Sink:
-    name: counter_sink
-    inputs:
-      input: counter:_value
+- type: examples.devices.counter.Counter
+  name: counter
+  inputs: {}
+- type: tickit.devices.sink.Sink
+  name: counter_sink
+  inputs:
+    input: counter:_value

examples/configs/http-device.yaml

@@ -1,3 +1,3 @@
-- examples.devices.http_device.ExampleHttpDevice:
-    name: http-device
-    inputs: {}
+- type: examples.devices.http_device.ExampleHttpDevice:
+  name: http-device
+  inputs: {}

examples/configs/isolated-device.yaml

@@ -1,6 +1,6 @@
-- examples.devices.isolated_device.IsolatedBox:
-    name: MrBox
-    inputs: {}
-    initial_value: 2
-    ioc_name: ISOLATED_BOX
-    port: 25561
+- type: examples.devices.isolated_device.IsolatedBox
+  name: MrBox
+  inputs: {}
+  initial_value: 2
+  ioc_name: ISOLATED_BOX
+  port: 25561

examples/configs/nested.yaml

@@ -1,22 +1,22 @@
-- examples.devices.trampoline.RandomTrampoline:
-    name: random_trampoline
-    inputs: {}
-    callback_period: 10000000000
-- tickit.core.components.system_simulation.SystemSimulation:
-    name: internal_tickit
-    inputs:
-      input_1: random_trampoline:output
-    components:
-      - tickit.devices.sink.Sink:
-          name: internal_sink
-          inputs:
-            sink_1: external:input_1
-      - examples.devices.remote_controlled.RemoteControlled:
-          name: internal_tcp_controlled
-          inputs: {}
-    expose:
-      output_1: internal_tcp_controlled:observed
-- tickit.devices.sink.Sink:
-    name: external_sink
-    inputs:
-      sink_1: internal_tickit:output_1
+- type: examples.devices.trampoline.RandomTrampoline
+  name: random_trampoline
+  inputs: {}
+  callback_period: 10000000000
+- type: tickit.core.components.system_simulation.SystemSimulation
+  name: internal_tickit
+  inputs:
+    input_1: random_trampoline:output
+  components:
+    - type: tickit.devices.sink.Sink
+      name: internal_sink
+      inputs:
+        sink_1: external:input_1
+    - type: examples.devices.remote_controlled.RemoteControlled
+      name: internal_tcp_controlled
+      inputs: {}
+  expose:
+    output_1: internal_tcp_controlled:observed
+- type: tickit.devices.sink.Sink
+  name: external_sink
+  inputs:
+    sink_1: internal_tickit:output_1

examples/configs/shutter.yaml

@@ -1,14 +1,14 @@
-- tickit.devices.source.Source:
-    name: source
-    inputs: {}
-    value: 42.0
-- examples.devices.shutter.Shutter:
-    name: shutter
-    inputs:
-      flux: source:value
-    default_position: 0.2
-    initial_position: 0.24
-- tickit.devices.sink.Sink:
-    name: sink
-    inputs:
-      flux: shutter:flux
+- type: tickit.devices.source.Source
+  name: source
+  inputs: {}
+  value: 42.0
+- type: examples.devices.shutter.Shutter
+  name: shutter
+  inputs:
+    flux: source:value
+  default_position: 0.2
+  initial_position: 0.24
+- type: tickit.devices.sink.Sink
+  name: sink
+  inputs:
+    flux: shutter:flux

examples/configs/sunk-tcp.yaml

@@ -1,8 +1,8 @@
-- examples.devices.remote_controlled.RemoteControlled:
-    name: tcp_contr
-    inputs: {}
-    format: "%b\r\n"
-- tickit.devices.sink.Sink:
-    name: contr_sink
-    inputs:
-      input: tcp_contr:observed
+- type: examples.devices.remote_controlled.RemoteControlled
+  name: tcp_contr
+  inputs: {}
+  format: "%b\r\n"
+- type: tickit.devices.sink.Sink
+  name: contr_sink
+  inputs:
+    input: tcp_contr:observed

examples/configs/sunk-trampoline.yaml

@@ -1,8 +1,8 @@
-- examples.devices.trampoline.RandomTrampoline:
-    name: rand_tramp
-    inputs: {}
-    callback_period: 1000000000
-- tickit.devices.sink.Sink:
-    name: tramp_sink
-    inputs:
-      input: rand_tramp:output
+- type: examples.devices.trampoline.RandomTrampoline
+  name: rand_tramp
+  inputs: {}
+  callback_period: 1000000000
+- type: tickit.devices.sink.Sink
+  name: tramp_sink
+  inputs:
+    input: rand_tramp:output