RSDK-12673 Update blurry-classifier vision module

.viam-gen-info

@@ -3,7 +3,7 @@
   "namespace": "viam",
   "language": "python",
   "resource_type": "service",
-  "resource_subtype": "vision",
+  "resource_api": "vision",
   "model_name": "blurry-classifier",
   "enable_cloud_build": true,
   "initialize_git": false,

src/blurry_classifier_module.py

@@ -1,8 +1,8 @@
-from typing import ClassVar, List, Mapping, Optional, Sequence
+from typing import ClassVar, List, Mapping, Optional, Sequence, Tuple
 from typing_extensions import Self
 
 from viam.components.camera import Camera
-from viam.media.video import CameraMimeType, ViamImage
+from viam.media.video import ViamImage
 from viam.proto.app.robot import ComponentConfig
 from viam.proto.common import PointCloudObject, ResourceName
 from viam.proto.service.vision import Classification, Detection
@@ -23,7 +23,7 @@ class BlurryClassifier(Vision, EasyResource):
     """
     BlurryClassifier implements a vision service that only supports classifications.
 
-    It inherits from the built-in resource subtype Vision and conforms to the
+    It inherits from the built-in resource api Vision and conforms to the
     ``Reconfigurable`` protocol, which signifies that this component can be
     reconfigured. Additionally, it specifies a constructor function
     ``BlurryClassifier.new`` which confirms to the
@@ -64,7 +64,7 @@ def new(
         return service
 
     @classmethod
-    def validate_config(cls, config: ComponentConfig) -> Sequence[str]:
+    def validate_config(cls, config: ComponentConfig) -> Tuple[Sequence[str], Sequence[str]]:
         """
         This method allows you to validate the configuration object received
         from the machine, as well as to return any implicit dependencies based
@@ -81,7 +81,7 @@ def validate_config(cls, config: ComponentConfig) -> Sequence[str]:
             raise ValueError(
                 "A camera name is required for face_identification vision service module."
             )
-        return [camera_name]
+        return [camera_name], []
 
     def reconfigure(
         self,
@@ -119,7 +119,10 @@ async def capture_all_from_camera(
                 f"Camera name {camera_name} does not match the camera name " +
                 f"{self.camera_name} in the config."
             )
-        im = await self.camera.get_image(mime_type=CameraMimeType.JPEG)
+        imgs, _ = await self.camera.get_images()
+        if imgs is None or len(imgs) == 0:
+            raise ValueError("No images returned by get_images")
+        im = imgs[0]
         classifications = None
         if return_classifications:
             classifications = await self.get_classifications(
@@ -159,7 +162,10 @@ async def get_classifications_from_camera(
                 f"Camera name {camera_name} does not match the camera name " +
                 f"{self.camera_name} in the config."
             )
-        im = await self.camera.get_image(mime_type=CameraMimeType.JPEG)
+        imgs, _ = await self.camera.get_images()
+        if imgs is None or len(imgs) == 0:
+            raise ValueError("No images returned by get_images")
+        im = imgs[0]
         return await self.get_classifications(im, 1, extra=extra, timeout=timeout)
 
     async def get_classifications(

tests/fake_camera.py

@@ -24,7 +24,7 @@ async def get_image(self, mime_type: str = "") -> Coroutine[Any, Any, ViamImage]
     async def get_images(
         self,
     ) -> Coroutine[Any, Any, Tuple[Union[List[NamedImage], ResponseMetadata]]]:
-        raise NotImplementedError
+        return [pil.pil_to_viam_image(self.image, CameraMimeType.JPEG)], None
 
     async def get_properties(self) -> Coroutine[Any, Any, GetPropertiesResponse]:
         raise NotImplementedError

tests/test_blurry_classifier.py

@@ -47,8 +47,11 @@ async def test_get_classifications(self, fake_cam):
         blurry_classifier = get_vision_service(True)
 
         # Test with a blurry image
+        images, _ = await blurry_classifier.camera.get_images()
+        image = images[0]
+        print(image)
         result = await blurry_classifier.get_classifications(
-            image= await blurry_classifier.camera.get_image(),
+            image = images[0],
             count=1,
         )
 
@@ -57,8 +60,9 @@ async def test_get_classifications(self, fake_cam):
 
         blurry_classifier = get_vision_service(False)
         # Test with a non-blurry image
+        images, _ =await blurry_classifier.camera.get_images()
         result = await blurry_classifier.get_classifications(
-            image=await blurry_classifier.camera.get_image(),
+            image= images[0],
             count=1,
         )