fix: remove legacy code: moved control.py.

tests/conftest.py

@@ -34,11 +34,8 @@
 from trano.models.constants import Azimuth, Flow, Tilt
 from trano.models.elements.base import Port, param_from_config
 from trano.models.elements.boundary import Boundary
-from trano.models.elements.controls.ahu import AhuControl
-from trano.models.elements.controls.boiler import BoilerControl
-from trano.models.elements.controls.collector import CollectorControl
-from trano.models.elements.controls.emission import EmissionControl
-from trano.models.elements.controls.three_way_valve import ThreeWayValveControl
+from trano.models.elements.control import ThreeWayValveControl, EmissionControl, CollectorControl, \
+    BoilerControl, AhuControl
 from trano.models.elements.envelope import ExternalWall, FloorOnGround, InternalElement, Window
 from trano.models.elements.space import Space
 from trano.models.elements.system import System, Weather, ThreeWayValve, TemperatureSensor, SplitValve, Radiator, Pump, \

tests/fixtures/house.py

@@ -5,9 +5,7 @@
 from trano.material import Material
 from trano.models.constants import Azimuth, Tilt
 from trano.models.elements.base import param_from_config
-from trano.models.elements.controls.collector import CollectorControl
-from trano.models.elements.controls.emission import EmissionControl
-from trano.models.elements.controls.three_way_valve import ThreeWayValveControl
+from trano.models.elements.control import ThreeWayValveControl, EmissionControl, CollectorControl
 from trano.models.elements.envelope import ExternalDoor, ExternalWall, FloorOnGround, InternalElement, Window
 from trano.models.elements.space import Space
 from trano.models.elements.system import Weather, Valve, ThreeWayValve, TemperatureSensor, SplitValve, Radiator, Pump, \

tests/fixtures/spaces_with_emissions.py

@@ -1,7 +1,7 @@
 from trano.construction import Constructions
 from trano.glass import Glasses
 from trano.models.constants import Azimuth, Tilt
-from trano.models.elements.controls.emission import EmissionControl
+from trano.models.elements.control import EmissionControl
 from trano.models.elements.envelope import ExternalWall, FloorOnGround, Window
 from trano.models.elements.space import Space
 from trano.models.elements.system import Valve, Radiator, Occupancy

tests/fixtures/spaces_with_ventilation.py

@@ -1,7 +1,7 @@
 from trano.construction import Constructions
 from trano.glass import Glasses
 from trano.models.constants import Azimuth, Tilt
-from trano.models.elements.controls.vav import VAVControl
+from trano.models.elements.control import VAVControl
 from trano.models.elements.envelope import ExternalWall, FloorOnGround, Window
 from trano.models.elements.system import Occupancy, Duct, DamperVariant, VAV
 from trano.models.elements.space import Space

trano/data_models/conversion.py

@@ -15,12 +15,6 @@
 from trano.glass import GasLayer, Glass, GlassLayer
 from trano.material import Gas, GlassMaterial, Material
 from trano.models.elements.base import param_from_config
-from trano.models.elements.controls.boiler import BoilerControl  # noqa: F401
-from trano.models.elements.controls.collector import CollectorControl  # noqa: F401
-from trano.models.elements.controls.emission import EmissionControl  # noqa: F401
-from trano.models.elements.controls.three_way_valve import (  # noqa: F401
-    ThreeWayValveControl,
-)
 from trano.models.elements.envelope import ExternalWall, FloorOnGround, Window
 from trano.models.elements.space import Space
 from trano.models.elements.system import Weather, Occupancy

trano/models/elements/base.py

@@ -256,7 +256,6 @@ def validate_targets(  # noqa: PLR0915, PLR0912, C901
 
                     targets.append(DataBus)
                 elif value == "Control":
-                    from trano.models.elements.controls.base import Control
 
                     targets.append(Control)
                 elif value == "Space":
@@ -270,7 +269,7 @@ def validate_targets(  # noqa: PLR0915, PLR0912, C901
 
                     targets.append(System)
                 elif value == "AhuControl":
-                    from trano.models.elements.controls.ahu import AhuControl
+                    from trano.models.elements.control import AhuControl
 
                     targets.append(AhuControl)
                 elif value == "BaseWeather":
@@ -298,7 +297,7 @@ def validate_targets(  # noqa: PLR0915, PLR0912, C901
 
                     targets.append(Emission)
                 elif value == "VAVControl":
-                    from trano.models.elements.controls.vav import VAVControl
+                    from trano.models.elements.control import VAVControl
 
                     targets.append(VAVControl)
                 elif value == "BaseWall":
@@ -327,7 +326,6 @@ def is_available(self) -> bool:
         return self.multi_connection or self.available
 
     def is_controllable(self) -> bool:
-        from trano.models.elements.controls.base import Control
 
         return self.targets is not None and any(
             target == Control for target in self.targets
@@ -758,3 +756,9 @@ class LibraryData(BaseModel):
 
 class BaseBoundary(BaseElement):
     ...
+
+
+class Control(BaseElement):
+    position: Optional[List[float]] = None
+    controllable_element: Optional[BaseElement] = None
+    space_name: Optional[str] = None

trano/models/elements/controls/ahu.py → trano/models/elements/control.py

@@ -2,9 +2,33 @@
 
 from pydantic import computed_field
 
-from trano.models.elements.controls.base import Control
-from trano.models.elements.system import VAV
+from trano.models.elements.base import BaseElement, BaseParameter, Control
 from trano.models.elements.space import Space
+from trano.models.elements.system import Valve, VAV
+
+
+class ControlParameters(BaseParameter):
+    ...
+
+
+class VAVControl(Control):
+    ahu: Optional[BaseElement] = None
+
+
+class ThreeWayValveControl(Control):
+    ...
+
+
+class EmissionControl(Control):
+    ...
+
+
+class CollectorControl(Control):
+    valves: Optional[List[Valve]] = None
+
+
+class BoilerControl(Control):
+    ...
 
 
 class AhuControl(Control):

trano/models/elements/system.py

@@ -1,12 +1,11 @@
-from typing import List, Optional
+from typing import List, Optional, TYPE_CHECKING
 
-from trano.models.elements.base import BaseElement, BaseVariant
-from trano.models.elements.controls.base import Control
+from trano.models.elements.base import BaseElement, BaseVariant, Control
 
 
 class System(BaseElement):
     position: Optional[List[float]] = None
-    control: Optional["Control"] = None
+    control: Optional[Control] = None
 
 
 class Sensor(System):

trano/topology.py

@@ -21,13 +21,10 @@
     BaseElement,
     Connection,
     DynamicTemplateCategories,
-    connect,
+    connect, Control,
 )
 from trano.models.elements.bus import DataBus
-from trano.models.elements.controls.ahu import AhuControl
-from trano.models.elements.controls.base import Control
-from trano.models.elements.controls.collector import CollectorControl
-from trano.models.elements.controls.vav import VAVControl
+from trano.models.elements.control import VAVControl, CollectorControl, AhuControl
 from trano.models.elements.envelope import InternalElement
 from trano.models.elements.materials.properties import extract_properties
 from trano.models.elements.space import Space, _get_controllable_element