From b982eec9024103735e2b90700cf5a0a8182f7f7e Mon Sep 17 00:00:00 2001 From: lesh Date: Mon, 14 Jul 2025 19:00:20 -0700 Subject: [PATCH 1/6] lcmspec change --- dimos/msgs/geometry_msgs/Pose.py | 2 +- dimos/msgs/geometry_msgs/PoseStamped.py | 2 +- dimos/msgs/geometry_msgs/Quaternion.py | 2 +- dimos/msgs/geometry_msgs/Vector3.py | 2 +- dimos/msgs/sensor_msgs/Image.py | 2 +- dimos/msgs/sensor_msgs/PointCloud2.py | 2 +- dimos/protocol/pubsub/lcmpubsub.py | 4 ++-- dimos/protocol/pubsub/test_lcmpubsub.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dimos/msgs/geometry_msgs/Pose.py b/dimos/msgs/geometry_msgs/Pose.py index 33f0ae22a9..6137810f33 100644 --- a/dimos/msgs/geometry_msgs/Pose.py +++ b/dimos/msgs/geometry_msgs/Pose.py @@ -36,7 +36,7 @@ class Pose(LCMPose): position: Vector3 orientation: Quaternion - name = "geometry_msgs.Pose" + msg_name = "geometry_msgs.Pose" @classmethod def lcm_decode(cls, data: bytes | BinaryIO): diff --git a/dimos/msgs/geometry_msgs/PoseStamped.py b/dimos/msgs/geometry_msgs/PoseStamped.py index 2a35ccf445..ced57029bf 100644 --- a/dimos/msgs/geometry_msgs/PoseStamped.py +++ b/dimos/msgs/geometry_msgs/PoseStamped.py @@ -41,7 +41,7 @@ def sec_nsec(ts): class PoseStamped(Pose, Timestamped): - name = "geometry_msgs.PoseStamped" + msg_name = "geometry_msgs.PoseStamped" ts: float frame_id: str diff --git a/dimos/msgs/geometry_msgs/Quaternion.py b/dimos/msgs/geometry_msgs/Quaternion.py index dfb0e21d95..081ef1a580 100644 --- a/dimos/msgs/geometry_msgs/Quaternion.py +++ b/dimos/msgs/geometry_msgs/Quaternion.py @@ -34,7 +34,7 @@ class Quaternion(LCMQuaternion): y: float = 0.0 z: float = 0.0 w: float = 1.0 - name = "geometry_msgs.Quaternion" + msg_name = "geometry_msgs.Quaternion" @classmethod def lcm_decode(cls, data: bytes | BinaryIO): diff --git a/dimos/msgs/geometry_msgs/Vector3.py b/dimos/msgs/geometry_msgs/Vector3.py index 0d63300505..873e39fe5c 100644 --- a/dimos/msgs/geometry_msgs/Vector3.py +++ b/dimos/msgs/geometry_msgs/Vector3.py @@ -45,7 +45,7 @@ class Vector3(LCMVector3): x: float = 0.0 y: float = 0.0 z: float = 0.0 - name = "geometry_msgs.Vector3" + msg_name = "geometry_msgs.Vector3" @classmethod def lcm_decode(cls, data: bytes | BinaryIO): diff --git a/dimos/msgs/sensor_msgs/Image.py b/dimos/msgs/sensor_msgs/Image.py index e32a838dfc..deb7123595 100644 --- a/dimos/msgs/sensor_msgs/Image.py +++ b/dimos/msgs/sensor_msgs/Image.py @@ -42,7 +42,7 @@ class ImageFormat(Enum): class Image(Timestamped): """Standardized image type with LCM integration.""" - name = "sensor_msgs.Image" + msg_name = "sensor_msgs.Image" data: np.ndarray format: ImageFormat = field(default=ImageFormat.BGR) frame_id: str = field(default="") diff --git a/dimos/msgs/sensor_msgs/PointCloud2.py b/dimos/msgs/sensor_msgs/PointCloud2.py index b2835196ea..84895a3c58 100644 --- a/dimos/msgs/sensor_msgs/PointCloud2.py +++ b/dimos/msgs/sensor_msgs/PointCloud2.py @@ -31,7 +31,7 @@ # TODO: encode/decode need to be updated to work with full spectrum of pointcloud2 fields class PointCloud2(Timestamped): - name = "sensor_msgs.PointCloud2" + msg_name = "sensor_msgs.PointCloud2" def __init__( self, diff --git a/dimos/protocol/pubsub/lcmpubsub.py b/dimos/protocol/pubsub/lcmpubsub.py index 3ea30c7074..68a5bd3008 100644 --- a/dimos/protocol/pubsub/lcmpubsub.py +++ b/dimos/protocol/pubsub/lcmpubsub.py @@ -31,7 +31,7 @@ @runtime_checkable class LCMMsg(Protocol): - name: str + msg_name: str @classmethod def lcm_decode(cls, data: bytes) -> "LCMMsg": @@ -51,7 +51,7 @@ class Topic: def __str__(self) -> str: if self.lcm_type is None: return self.topic - return f"{self.topic}#{self.lcm_type.name}" + return f"{self.topic}#{self.lcm_type.msg_name}" class LCMPubSubBase(PubSub[Topic, Any], LCMService): diff --git a/dimos/protocol/pubsub/test_lcmpubsub.py b/dimos/protocol/pubsub/test_lcmpubsub.py index a641dbd2cd..fb30f41a07 100644 --- a/dimos/protocol/pubsub/test_lcmpubsub.py +++ b/dimos/protocol/pubsub/test_lcmpubsub.py @@ -30,7 +30,7 @@ class MockLCMMessage: """Mock LCM message for testing""" - name = "geometry_msgs.Mock" + msg_name = "geometry_msgs.Mock" def __init__(self, data): self.data = data From e256ab65b3c2422752e7807397ef700b206057af Mon Sep 17 00:00:00 2001 From: lesh Date: Mon, 14 Jul 2025 19:06:39 -0700 Subject: [PATCH 2/6] pinned dep version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2d258827a7..071485b12a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,7 +93,7 @@ dependencies = [ "dask[complete]==2025.5.1", # LCM / DimOS utilities - "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@main", + "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@5ab210d9631f060efa437dc1faf58142d33e5ac5", ] From 3d409f4fc5ce2539ca7f36faf23c9743e0e12cdb Mon Sep 17 00:00:00 2001 From: lesh Date: Mon, 14 Jul 2025 19:22:12 -0700 Subject: [PATCH 3/6] new dimos-lcm --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 071485b12a..de835ad27c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,7 +93,7 @@ dependencies = [ "dask[complete]==2025.5.1", # LCM / DimOS utilities - "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@5ab210d9631f060efa437dc1faf58142d33e5ac5", + "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@57c5266f588a4ff4a7e1f28bd40f19124587b391", ] From 84a523d0f586f48be18e10dba7f3724d61f0d694 Mon Sep 17 00:00:00 2001 From: lesh Date: Mon, 14 Jul 2025 19:34:52 -0700 Subject: [PATCH 4/6] updated dimos-lcm commit ref --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index de835ad27c..dedaaf25ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,7 +93,7 @@ dependencies = [ "dask[complete]==2025.5.1", # LCM / DimOS utilities - "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@57c5266f588a4ff4a7e1f28bd40f19124587b391", + "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@c615b2a6d99613b6ebc80dcf3e8a2f59416958b3", ] From 31ba832462c57d3cd00c71be926bce5262c6710a Mon Sep 17 00:00:00 2001 From: lesh Date: Mon, 14 Jul 2025 19:55:10 -0700 Subject: [PATCH 5/6] correct lcm package ref pin --- pyproject.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dedaaf25ae..3999830dc9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,10 +93,11 @@ dependencies = [ "dask[complete]==2025.5.1", # LCM / DimOS utilities - "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@c615b2a6d99613b6ebc80dcf3e8a2f59416958b3", - + "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@57c5266f588a4ff4a7e1f28bd40f19124587b391" + ] + [project.optional-dependencies] manipulation = [ From 2b4e69da264af5316b59c26ff0dcece7bd7df47c Mon Sep 17 00:00:00 2001 From: lesh Date: Tue, 15 Jul 2025 01:00:44 -0700 Subject: [PATCH 6/6] updating commit ref --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3999830dc9..4a1eeccee5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,7 +93,7 @@ dependencies = [ "dask[complete]==2025.5.1", # LCM / DimOS utilities - "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@57c5266f588a4ff4a7e1f28bd40f19124587b391" + "dimos-lcm @ git+https://github.com/dimensionalOS/dimos-lcm.git@c615b2a6d99613b6ebc80dcf3e8a2f59416958b3" ]