Merge branch 'koonpeng/hammer-jazzy-base' into ac/fix-build

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

packages/api-server/api_server/models/building_map.py

@@ -18,16 +18,16 @@ class Level(BaseModel):
     name: str
     elevation: float
     images: list[AffineImage]
-    places: list[rmf_building_map_msgs.Place]
-    doors: list[rmf_building_map_msgs.Door]
-    nav_graphs: list[rmf_building_map_msgs.Graph]
-    wall_graph: rmf_building_map_msgs.Graph
+    places: list[rmf_building_map_msgs.msg.Place]
+    doors: list[rmf_building_map_msgs.msg.Door]
+    nav_graphs: list[rmf_building_map_msgs.msg.Graph]
+    wall_graph: rmf_building_map_msgs.msg.Graph
 
 
 class BuildingMap(BaseModel):
     name: str
     levels: list[Level]
-    lifts: list[rmf_building_map_msgs.Lift]
+    lifts: list[rmf_building_map_msgs.msg.Lift]
 
     @staticmethod
     def from_tortoise(tortoise: ttm.BuildingMap) -> "BuildingMap":

packages/api-server/api_server/models/dispensers.py

@@ -2,7 +2,7 @@
 
 from .ros_pydantic import rmf_dispenser_msgs
 
-DispenserState = rmf_dispenser_msgs.DispenserState
+DispenserState = rmf_dispenser_msgs.msg.DispenserState
 
 
 class Dispenser(BaseModel):

packages/api-server/api_server/models/doors.py

@@ -2,11 +2,11 @@
 
 from .ros_pydantic import rmf_building_map_msgs, rmf_door_msgs
 
-Door = rmf_building_map_msgs.Door
-DoorMode = rmf_door_msgs.DoorMode
+Door = rmf_building_map_msgs.msg.Door
+DoorMode = rmf_door_msgs.msg.DoorMode
 
 
-DoorState = rmf_door_msgs.DoorState
+DoorState = rmf_door_msgs.msg.DoorState
 
 
 class DoorRequest(BaseModel):

packages/api-server/api_server/models/ingestors.py

@@ -2,7 +2,7 @@
 
 from .ros_pydantic import rmf_ingestor_msgs
 
-IngestorState = rmf_ingestor_msgs.IngestorState
+IngestorState = rmf_ingestor_msgs.msg.IngestorState
 
 
 class Ingestor(BaseModel):

packages/api-server/api_server/models/lifts.py

@@ -5,11 +5,11 @@
 from . import tortoise_models as ttm
 from .ros_pydantic import builtin_interfaces, rmf_building_map_msgs
 
-Lift = rmf_building_map_msgs.Lift
+Lift = rmf_building_map_msgs.msg.Lift
 
 
 class LiftState(BaseModel):
-    lift_time: builtin_interfaces.Time
+    lift_time: builtin_interfaces.msg.Time
     lift_name: str
     available_floors: list[str]
     current_floor: str

packages/api-server/api_server/models/ros_pydantic/builtin_interfaces/__init__.py

@@ -1,2 +1 @@
-from .Duration import Duration
-from .Time import Time
+from . import msg

packages/api-server/api_server/models/ros_pydantic/builtin_interfaces/msg/Duration.py

@@ -0,0 +1,12 @@
+# This is a generated file, do not edit
+
+from typing import Annotated
+
+import pydantic
+
+
+class Duration(pydantic.BaseModel):
+    model_config = pydantic.ConfigDict(from_attributes=True)
+
+    sec: Annotated[int, pydantic.Field(ge=-2147483648, le=2147483647)]
+    nanosec: Annotated[int, pydantic.Field(ge=0, le=4294967295)]

packages/api-server/api_server/models/ros_pydantic/builtin_interfaces/Time.py → packages/api-server/api_server/models/ros_pydantic/builtin_interfaces/msg/Time.py

@@ -8,15 +8,5 @@
 class Time(pydantic.BaseModel):
     model_config = pydantic.ConfigDict(from_attributes=True)
 
-    sec: Annotated[int, pydantic.Field(ge=-2147483648, le=2147483647)]  # int32
-    nanosec: Annotated[int, pydantic.Field(ge=0, le=4294967295)]  # uint32
-
-
-# # This message communicates ROS Time defined here:
-# # https://design.ros2.org/articles/clock_and_time.html
-#
-# # The seconds component, valid over all int32 values.
-# int32 sec
-#
-# # The nanoseconds component, valid in the range [0, 1e9).
-# uint32 nanosec
+    sec: Annotated[int, pydantic.Field(ge=-2147483648, le=2147483647)]
+    nanosec: Annotated[int, pydantic.Field(ge=0, le=4294967295)]

packages/api-server/api_server/models/ros_pydantic/builtin_interfaces/msg/__init__.py

@@ -0,0 +1,2 @@
+from .Duration import Duration
+from .Time import Time