Update class names for tickit 0.4.3

src/tickit_devices/cryostream/__init__.py

@@ -2,7 +2,7 @@
 from tickit.adapters.io import TcpIo
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 
 from .cryostream import CryostreamAdapter, CryostreamDevice
 
@@ -25,7 +25,7 @@ def __call__(self) -> Component:  # noqa: D102
                 ),
             )
         ]
-        return DeviceSimulation(
+        return DeviceComponent(
             name=self.name,
             device=device,
             adapters=adapters,

src/tickit_devices/eiger/__init__.py

@@ -2,7 +2,7 @@
 from tickit.adapters.io import HttpIo, ZeroMqPushIo
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 
 from tickit_devices.eiger.eiger import EigerDevice
 from tickit_devices.eiger.eiger_adapters import EigerRESTAdapter, EigerZMQAdapter
@@ -35,7 +35,7 @@ def __call__(self) -> Component:  # noqa: D102
                 ),
             ),
         ]
-        return DeviceSimulation(
+        return DeviceComponent(
             name=self.name,
             device=device,
             adapters=adapters,

src/tickit_devices/femto/__init__.py

@@ -2,7 +2,7 @@
 from tickit.adapters.io import EpicsIo
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 
 from .current import CurrentDevice
 from .femto import FemtoAdapter, FemtoDevice
@@ -30,7 +30,7 @@ def __call__(self) -> Component:  # noqa: D102
                 ),
             )
         ]
-        return DeviceSimulation(
+        return DeviceComponent(
             name=self.name,
             device=device,
             adapters=adapters,
@@ -44,7 +44,7 @@ class Current(ComponentConfig):
     callback_period: int = int(1e9)
 
     def __call__(self) -> Component:  # noqa: D102
-        return DeviceSimulation(
+        return DeviceComponent(
             name=self.name,
             device=CurrentDevice(callback_period=self.callback_period),
         )

src/tickit_devices/pneumatic/__init__.py

@@ -2,7 +2,7 @@
 from tickit.adapters.io import EpicsIo
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 
 from .pneumatic import PneumaticAdapter, PneumaticDevice
 
@@ -29,7 +29,7 @@ def __call__(self) -> Component:  # noqa: D102
                 ),
             )
         ]
-        return DeviceSimulation(
+        return DeviceComponent(
             name=self.name,
             device=device,
             adapters=adapters,

src/tickit_devices/synchrotron/synchrotron_current.py

@@ -9,7 +9,7 @@
 from tickit.adapters.tcp import CommandAdapter
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 from tickit.utils.byte_format import ByteFormat
@@ -186,7 +186,7 @@ def __call__(self) -> Component:  # noqa: D102
                 ),
             ),
         ]
-        return DeviceSimulation(
+        return DeviceComponent(
             name=self.name,
             device=device,
             adapters=adapters,

src/tickit_devices/synchrotron/synchrotron_machine.py

@@ -9,7 +9,7 @@
 from tickit.adapters.tcp import CommandAdapter
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 from tickit.utils.byte_format import ByteFormat
@@ -209,7 +209,7 @@ def __call__(self) -> Component:  # noqa: D102
                 ),
             ),
         ]
-        return DeviceSimulation(
+        return DeviceComponent(
             name=self.name,
             device=device,
             adapters=adapters,

src/tickit_devices/synchrotron/synchrotron_topup.py

@@ -9,7 +9,7 @@
 from tickit.adapters.tcp import CommandAdapter
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 from tickit.utils.byte_format import ByteFormat
@@ -230,7 +230,7 @@ def __call__(self) -> Component:  # noqa: D102
                 ),
             ),
         ]
-        return DeviceSimulation(
+        return DeviceComponent(
             name=self.name,
             device=device,
             adapters=adapters,

src/tickit_devices/zebra/__init__.py

@@ -6,7 +6,7 @@
 from tickit.adapters.io import TcpIo
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import ComponentConfig
-from tickit.core.components.system_simulation import SystemSimulationComponent
+from tickit.core.components.system_component import SystemComponent
 from tickit.core.typedefs import ComponentID, ComponentPort, PortID
 
 from tickit_devices.zebra._common import param_types
@@ -45,8 +45,8 @@ class Zebra(ComponentConfig):
     def add_defaults(cls, v: dict[str, int]) -> dict[str, int]:
         return {**_default(), **v}
 
-    def __call__(self) -> SystemSimulationComponent:
-        return SystemSimulationComponent(
+    def __call__(self) -> SystemComponent:
+        return SystemComponent(
             adapter=AdapterContainer(
                 adapter=ZebraAdapter(params=self.params),
                 io=TcpIo(host=self.host, port=self.port),

src/tickit_devices/zebra/and_or_block.py

@@ -3,7 +3,7 @@
 from typing import Dict, TypedDict
 
 import pydantic.v1.dataclasses
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 
 from tickit_devices.zebra._common import Block, BlockConfig, extract_bit
 
@@ -44,5 +44,5 @@ def _get_next_outputs(self, inputs: Inputs) -> Outputs:
 
 @pydantic.v1.dataclasses.dataclass
 class AndOrBlockConfig(BlockConfig):
-    def __call__(self) -> DeviceSimulation:
-        return DeviceSimulation(name=self.name, device=AndOrBlock(name=self.name))
+    def __call__(self) -> DeviceComponent:
+        return DeviceComponent(name=self.name, device=AndOrBlock(name=self.name))

src/tickit_devices/zebra/zebra.py

@@ -3,15 +3,15 @@
 
 from tickit.adapters.specifications import RegexCommand
 from tickit.adapters.system import BaseSystemSimulationAdapter
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.management.event_router import InverseWiring, Wiring
 from tickit.core.typedefs import ComponentID
 
 from tickit_devices.zebra._common import param_types, register_names
 
 
 class ZebraAdapter(BaseSystemSimulationAdapter):
-    _components: Dict[ComponentID, DeviceSimulation]
+    _components: Dict[ComponentID, DeviceComponent]
     params: dict[str, int]
     """
     Network adapter for a Zebra system simulation, which operates a TCP server for
@@ -34,7 +34,7 @@ def __init__(self, params: dict[str, int]):
 
     def setup_adapter(
         self,
-        components: Dict[ComponentID, DeviceSimulation],
+        components: Dict[ComponentID, DeviceComponent],
         wiring: Union[Wiring, InverseWiring],
     ) -> None:
         """

tests/zebra/devices.py

@@ -3,7 +3,7 @@
 
 import pydantic.v1.dataclasses
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceSimulation
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 
@@ -15,7 +15,7 @@ class Counter(ComponentConfig):
     """Simulation of simple counting device."""
 
     def __call__(self) -> Component:  # noqa: D102
-        return DeviceSimulation(name=self.name, device=CounterDevice())
+        return DeviceComponent(name=self.name, device=CounterDevice())
 
 
 class CounterDevice(Device):
@@ -85,9 +85,9 @@ def update(self, time: SimTime, inputs: Inputs) -> DeviceUpdate[Outputs]:
 class DividingConfig(ComponentConfig):
     denominator: int
 
-    def __call__(self) -> DeviceSimulation:
+    def __call__(self) -> DeviceComponent:
         """Create the component from the given config."""
-        return DeviceSimulation(
+        return DeviceComponent(
             name=self.name, device=DividingDevice(denominator=self.denominator)
         )
 
@@ -112,6 +112,6 @@ def update(self, time: SimTime, inputs: Inputs) -> DeviceUpdate[Outputs]:
 
 @pydantic.v1.dataclasses.dataclass
 class FizzBang(ComponentConfig):
-    def __call__(self) -> DeviceSimulation:
+    def __call__(self) -> DeviceComponent:
         """Create the component from the given config."""
-        return DeviceSimulation(name=self.name, device=FizzBangDevice())
+        return DeviceComponent(name=self.name, device=FizzBangDevice())