fix(imports): remove dunder init

dimos/agents/agent.py

@@ -30,7 +30,7 @@
 from dimos.core.module import Module, ModuleConfig, SkillInfo
 from dimos.core.rpc_client import RpcCall, RPCClient
 from dimos.core.stream import In, Out
-from dimos.protocol.rpc import RPCSpec
+from dimos.protocol.rpc.spec import RPCSpec
 from dimos.spec.utils import Spec
 
 if TYPE_CHECKING:

dimos/agents/demo_agent.py

@@ -14,9 +14,9 @@
 
 from dimos.agents.agent import Agent
 from dimos.core.blueprints import autoconnect
-from dimos.hardware.sensors.camera import zed
 from dimos.hardware.sensors.camera.module import camera_module
 from dimos.hardware.sensors.camera.webcam import Webcam
+from dimos.hardware.sensors.camera.zed import compat as zed
 
 demo_agent = autoconnect(Agent.blueprint())
 

dimos/agents/mcp/test_mcp_client.py

@@ -19,7 +19,7 @@
 
 from dimos.agents.annotation import skill
 from dimos.core.module import Module
-from dimos.msgs.sensor_msgs import Image
+from dimos.msgs.sensor_msgs.Image import Image
 from dimos.utils.data import get_data
 
 

dimos/agents/skills/demo_robot.py

@@ -17,7 +17,7 @@
 
 from dimos.core.module import Module
 from dimos.core.stream import Out
-from dimos.mapping.types import LatLon
+from dimos.mapping.models import LatLon
 
 
 class DemoRobot(Module):

dimos/agents/skills/google_maps_skill_container.py

@@ -20,7 +20,7 @@
 from dimos.core.module import Module
 from dimos.core.stream import In
 from dimos.mapping.google_maps.google_maps import GoogleMaps
-from dimos.mapping.types import LatLon
+from dimos.mapping.models import LatLon
 from dimos.utils.logging_config import setup_logger
 
 logger = setup_logger()

dimos/agents/skills/gps_nav_skill.py

@@ -19,7 +19,7 @@
 from dimos.core.module import Module
 from dimos.core.rpc_client import RpcCall
 from dimos.core.stream import In, Out
-from dimos.mapping.types import LatLon
+from dimos.mapping.models import LatLon
 from dimos.mapping.utils.distance import distance_in_meters
 from dimos.utils.logging_config import setup_logger
 

dimos/agents/skills/navigation.py

@@ -22,9 +22,10 @@
 from dimos.core.module import Module
 from dimos.core.stream import In
 from dimos.models.qwen.bbox import BBox
-from dimos.msgs.geometry_msgs import PoseStamped, Quaternion, Vector3
-from dimos.msgs.geometry_msgs.Vector3 import make_vector3
-from dimos.msgs.sensor_msgs import Image
+from dimos.msgs.geometry_msgs.PoseStamped import PoseStamped
+from dimos.msgs.geometry_msgs.Quaternion import Quaternion
+from dimos.msgs.geometry_msgs.Vector3 import Vector3, make_vector3
+from dimos.msgs.sensor_msgs.Image import Image
 from dimos.navigation.base import NavigationState
 from dimos.navigation.visual.query import get_object_bbox_from_image
 from dimos.types.robot_location import RobotLocation

dimos/agents/skills/osm.py

@@ -16,8 +16,8 @@
 from dimos.agents.annotation import skill
 from dimos.core.module import Module
 from dimos.core.stream import In
+from dimos.mapping.models import LatLon
 from dimos.mapping.osm.current_location_map import CurrentLocationMap
-from dimos.mapping.types import LatLon
 from dimos.mapping.utils.distance import distance_in_meters
 from dimos.models.vl.qwen import QwenVlModel
 from dimos.utils.logging_config import setup_logger

dimos/agents/skills/person_follow.py

@@ -29,8 +29,10 @@
 from dimos.models.segmentation.edge_tam import EdgeTAMProcessor
 from dimos.models.vl.base import VlModel
 from dimos.models.vl.create import create
-from dimos.msgs.geometry_msgs import Twist
-from dimos.msgs.sensor_msgs import CameraInfo, Image, PointCloud2
+from dimos.msgs.geometry_msgs.Twist import Twist
+from dimos.msgs.sensor_msgs.CameraInfo import CameraInfo
+from dimos.msgs.sensor_msgs.Image import Image
+from dimos.msgs.sensor_msgs.PointCloud2 import PointCloud2
 from dimos.navigation.visual.query import get_object_bbox_from_image
 from dimos.navigation.visual_servoing.detection_navigation import DetectionNavigation
 from dimos.navigation.visual_servoing.visual_servoing_2d import VisualServoing2D

dimos/agents/skills/test_google_maps_skill_container.py

@@ -21,8 +21,8 @@
 from dimos.agents.skills.google_maps_skill_container import GoogleMapsSkillContainer
 from dimos.core.module import Module
 from dimos.core.stream import Out
-from dimos.mapping.google_maps.types import Coordinates, LocationContext, Position
-from dimos.mapping.types import LatLon
+from dimos.mapping.google_maps.models import Coordinates, LocationContext, Position
+from dimos.mapping.models import LatLon
 
 
 class FakeGPS(Module):

dimos/agents/skills/test_gps_nav_skills.py

@@ -18,7 +18,7 @@
 from dimos.agents.skills.gps_nav_skill import GpsNavSkillContainer
 from dimos.core.module import Module
 from dimos.core.stream import Out
-from dimos.mapping.types import LatLon
+from dimos.mapping.models import LatLon
 
 
 class FakeGPS(Module):

dimos/agents/skills/test_navigation.py

@@ -18,8 +18,8 @@
 from dimos.agents.skills.navigation import NavigationSkillContainer
 from dimos.core.module import Module
 from dimos.core.stream import Out
-from dimos.msgs.geometry_msgs import PoseStamped
-from dimos.msgs.sensor_msgs import Image
+from dimos.msgs.geometry_msgs.PoseStamped import PoseStamped
+from dimos.msgs.sensor_msgs.Image import Image
 
 
 class FakeCamera(Module):

dimos/agents/test_agent.py

@@ -19,7 +19,7 @@
 
 from dimos.agents.annotation import skill
 from dimos.core.module import Module
-from dimos.msgs.sensor_msgs import Image
+from dimos.msgs.sensor_msgs.Image import Image
 from dimos.utils.data import get_data
 
 

dimos/agents/vlm_agent.py

@@ -21,7 +21,7 @@
 from dimos.core.core import rpc
 from dimos.core.module import Module, ModuleConfig
 from dimos.core.stream import In, Out
-from dimos.msgs.sensor_msgs import Image
+from dimos.msgs.sensor_msgs.Image import Image
 from dimos.utils.logging_config import setup_logger
 
 if TYPE_CHECKING:

dimos/agents/vlm_stream_tester.py

@@ -20,7 +20,7 @@
 from dimos.core.core import rpc
 from dimos.core.module import Module
 from dimos.core.stream import In, Out
-from dimos.msgs.sensor_msgs import Image
+from dimos.msgs.sensor_msgs.Image import Image
 from dimos.utils.logging_config import setup_logger
 
 logger = setup_logger()

dimos/agents_deprecated/modules/base.py

@@ -29,9 +29,9 @@
 from dimos.utils.logging_config import setup_logger
 
 try:
-    from .gateway import UnifiedGatewayClient
+    from dimos.agents_deprecated.modules.gateway.client import UnifiedGatewayClient
 except ImportError:
-    from dimos.agents_deprecated.modules.gateway import UnifiedGatewayClient
+    from dimos.agents_deprecated.modules.gateway.client import UnifiedGatewayClient
 
 logger = setup_logger()