[RSDK-11704] Fix get images server source name (#999)

Author: hexbabe

src/viam/components/camera/service.py

@@ -45,8 +45,7 @@ async def GetImage(self, stream: Stream[GetImageRequest, GetImageResponse]) -> N
     async def GetImages(self, stream: Stream[GetImagesRequest, GetImagesResponse]) -> None:
         request = await stream.recv_message()
         assert request is not None
-        name = request.name
-        camera = self.get_resource(name)
+        camera = self.get_resource(request.name)
 
         timeout = stream.deadline.time_remaining() if stream.deadline else None
         images, metadata = await camera.get_images(
@@ -62,7 +61,7 @@ async def GetImages(self, stream: Stream[GetImagesRequest, GetImagesResponse]) -
             fmt = mime_type.to_proto()  # Will be Format.FORMAT_UNSPECIFIED if an unsupported/custom mime type is set
 
             img_bytes = img.data
-            img_bytes_lst.append(Image(source_name=name, mime_type=img.mime_type, format=fmt, image=img_bytes))
+            img_bytes_lst.append(Image(source_name=img.name, mime_type=img.mime_type, format=fmt, image=img_bytes))
         response = GetImagesResponse(images=img_bytes_lst, response_metadata=metadata)
         await stream.send_message(response)
 

tests/test_camera.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import Optional
 
 import pytest
 from google.api.httpbody_pb2 import HttpBody
@@ -165,6 +166,26 @@ async def test_get_images(self, camera: MockCamera, service: CameraRPCService, m
             assert response.response_metadata == metadata
             assert camera.timeout == loose_approx(18.1)
 
+    async def test_get_images_uses_source_name_not_resource_name(self):
+        class MockCameraWithCustomSource(MockCamera):
+            def __init__(self, name: str, source_name: str):
+                super().__init__(name)
+                self._source_name = source_name
+
+            async def get_images(self, timeout: Optional[float] = None, **kwargs):
+                self.timeout = timeout
+                return [NamedImage(self._source_name, self.image.data, self.image.mime_type)], self.metadata
+
+        custom_camera = MockCameraWithCustomSource("camera", "the_source")
+        rm = ResourceManager([custom_camera])
+        service = CameraRPCService(rm)
+
+        async with ChannelFor([service]) as channel:
+            client = CameraServiceStub(channel)
+            request = GetImagesRequest(name="camera")
+            response: GetImagesResponse = await client.GetImages(request)
+            assert response.images[0].source_name == "the_source"
+
     async def test_render_frame(self, camera: MockCamera, service: CameraRPCService, image: ViamImage):
         assert camera.timeout is None
         async with ChannelFor([service]) as channel: