Switch order of kwargs to correspond between vision service and camera service

Author: hexbabe

src/viam/components/camera/service.py

@@ -62,7 +62,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, format=fmt, mime_type=img.mime_type, image=img_bytes))
+            img_bytes_lst.append(Image(source_name=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)
 

src/viam/services/vision/service.py

@@ -2,7 +2,7 @@
 
 from viam.media.video import CameraMimeType, ViamImage
 from viam.proto.common import DoCommandRequest, DoCommandResponse
-from viam.proto.component.camera import Format, Image
+from viam.proto.component.camera import Image
 from viam.proto.service.vision import (
     CaptureAllFromCameraRequest,
     CaptureAllFromCameraResponse,

tests/test_camera.py

@@ -14,7 +14,6 @@
     Format,
     CameraServiceStub,
     DistortionParameters,
-    Format,
     GetImageRequest,
     GetImageResponse,
     GetImagesRequest,

tests/test_media.py

@@ -9,8 +9,6 @@
 from viam.media.utils.pil import pil_to_viam_image, viam_to_pil_image
 from viam.media.video import CameraMimeType, Format, NamedImage, ViamImage
 
-UNSUPPORTED_MIME_TYPE = "unsupported_string_mime_type"
-
 
 class TestViamImage:
     UNSUPPORTED_MIME_TYPE = "unsupported_string_mime_type"
@@ -173,8 +171,5 @@ def test_image_conversion():
     v_img2 = pil_to_viam_image(pil_img, CameraMimeType.JPEG)
     assert v_img2.data == v_img.data
 
-    with pytest.raises(
-        ValueError,
-        match=f"Cannot encode to unsupported mimetype: {TestViamImage.UNSUPPORTED_MIME_TYPE}",
-    ):
+    with pytest.raises(ValueError, match=f"Cannot encode to unsupported mimetype: {TestViamImage.UNSUPPORTED_MIME_TYPE}"):
         pil_to_viam_image(i, CameraMimeType.CUSTOM(TestViamImage.UNSUPPORTED_MIME_TYPE))

tests/test_vision_service.py

@@ -84,12 +84,7 @@
             reference_frame="depth1",
             geometries=[
                 Geometry(
-                    center=Pose(
-                        x=282.45238095238096,
-                        y=241.66666666666666,
-                        z=902.8809523809524,
-                        o_z=1.0,
-                    ),
+                    center=Pose(x=282.45238095238096, y=241.66666666666666, z=902.8809523809524, o_z=1.0),
                     box=RectangularPrism(dims_mm=Vector3(x=13, y=7, z=11)),
                 )
             ],
@@ -101,12 +96,7 @@
             reference_frame="depth1",
             geometries=[
                 Geometry(
-                    center=Pose(
-                        x=-129.84615384615384,
-                        y=165.53846153846155,
-                        z=511.46153846153845,
-                        o_z=1.0,
-                    ),
+                    center=Pose(x=-129.84615384615384, y=165.53846153846155, z=511.46153846153845, o_z=1.0),
                     box=RectangularPrism(dims_mm=Vector3(x=5.0, y=4.0, z=7.0)),
                 )
             ],