channels as str

src/tomato/models.py

@@ -5,11 +5,12 @@
     Peter Kraus
 """
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from typing import Optional, Any, Mapping, Sequence, Literal
 from pathlib import Path
 import logging
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -26,19 +27,39 @@ class Device(BaseModel):
     name: str
     driver: str
     address: str
-    channels: Sequence[int]
+    channels: Sequence[str]
     pollrate: int = 1
 
+    @field_validator("channels", mode="before")
+    def coerce_channels(cls, v):
+        if any([isinstance(vv, int) for vv in v]):
+            logger.warning(
+                "Supplying 'channels' as a Sequence[int] is deprecated "
+                "and will stop working in tomato-2.0."
+            )
+            return [str(vv) for vv in v]
+        return v
+
 
 class Component(BaseModel):
     name: str
     driver: str
     device: str
     address: str
-    channel: int
+    channel: str
     role: str
     capabilities: Optional[set[str]] = None
 
+    @field_validator("channel", mode="before")
+    def coerce_channel(cls, v):
+        if isinstance(v, int):
+            logger.warning(
+                "Supplying 'channel' as an int is deprecated "
+                "and will stop working in tomato-2.0."
+            )
+            return str(v)
+        return v
+
 
 class Pipeline(BaseModel):
     name: str

src/tomato/tomato/__init__.py

@@ -78,7 +78,7 @@ def get_pipelines(
                 dev = devs[comp["device"]]
                 for ch in dev.channels:
                     name = pip["name"].replace("*", f"{ch}")
-                    h = "/".join((dev.driver, dev.address, str(ch)))
+                    h = f"{dev.driver}:({dev.address},{ch})"
                     c = Component(
                         name=h,
                         driver=dev.driver,
@@ -97,14 +97,20 @@ def get_pipelines(
                     logger.error("device '%s' not found", comp["device"])
                     break
                 dev = devs[comp["device"]]
+                if isinstance(comp["channel"], int):
+                    logger.warning(
+                        "Supplying 'channel' as an int is deprecated "
+                        "and will stop working in tomato-2.0."
+                    )
+                    comp["channel"] = str(comp["channel"])
                 if comp["channel"] not in dev.channels:
                     logger.error(
-                        "channel %d not found on device '%s'",
+                        "channel %s not found on device '%s'",
                         comp["channel"],
                         comp["device"],
                     )
                     break
-                h = "/".join((dev.driver, dev.address, str(comp["channel"])))
+                h = f"{dev.driver}:({dev.address},{comp['channel']})"
                 c = Component(
                     name=h,
                     driver=dev.driver,