viam-sdk 0.54.1b0__py3-none-win_amd64.whl → 0.54.2b0__py3-none-win_amd64.whl

viam/components/camera/camera.py

@@ -63,14 +63,7 @@ class Camera(ComponentBase):
         ...
 
     @abc.abstractmethod
-    async def get_images(
-        self,
-        *,
-        filter_source_names: Optional[List[str]] = None,
-        extra: Optional[Dict[str, Any]] = None,
-        timeout: Optional[float] = None,
-        **kwargs,
-    ) -> Tuple[List[NamedImage], ResponseMetadata]:
+    async def get_images(self, *, timeout: Optional[float] = None, **kwargs) -> Tuple[List[NamedImage], ResponseMetadata]:
         """Get simultaneous images from different imagers, along with associated metadata.
         This should not be used for getting a time series of images from the same imager.
 

viam/components/camera/client.py

@@ -41,26 +41,20 @@ class CameraClient(Camera, ReconfigurableResourceRPCClientBase):
         md = kwargs.get("metadata", self.Metadata()).proto
         request = GetImageRequest(name=self.name, mime_type=mime_type, extra=dict_to_struct(extra))
         response: GetImageResponse = await self.client.GetImage(request, timeout=timeout, metadata=md)
-        return ViamImage(response.image, response.mime_type)
+        return ViamImage(response.image, CameraMimeType.from_string(response.mime_type))
 
     async def get_images(
         self,
         *,
-        filter_source_names: Optional[List[str]] = None,
-        extra: Optional[Dict[str, Any]] = None,
         timeout: Optional[float] = None,
         **kwargs,
     ) -> Tuple[List[NamedImage], ResponseMetadata]:
         md = kwargs.get("metadata", self.Metadata()).proto
-        request = GetImagesRequest(name=self.name, extra=dict_to_struct(extra), filter_source_names=filter_source_names)
+        request = GetImagesRequest(name=self.name)
         response: GetImagesResponse = await self.client.GetImages(request, timeout=timeout, metadata=md)
         imgs = []
         for img_data in response.images:
-            if img_data.mime_type:
-                mime_type = img_data.mime_type
-            else:
-                # TODO(RSDK-11728): remove this once we deleted the format field
-                mime_type = str(CameraMimeType.from_proto(img_data.format))
+            mime_type = CameraMimeType.from_proto(img_data.format)
             img = NamedImage(img_data.source_name, img_data.image, mime_type)
             imgs.append(img)
         resp_metadata: ResponseMetadata = response.response_metadata

viam/components/camera/service.py

@@ -3,11 +3,9 @@
 from google.api.httpbody_pb2 import HttpBody  # type: ignore
 from grpclib.server import Stream
 
-from viam.media.video import CameraMimeType
 from viam.proto.common import DoCommandRequest, DoCommandResponse, GetGeometriesRequest, GetGeometriesResponse
 from viam.proto.component.camera import (
     CameraServiceBase,
-    Format,
     GetImageRequest,
     GetImageResponse,
     GetImagesRequest,
@@ -50,23 +48,12 @@ class CameraRPCService(CameraServiceBase, ResourceRPCServiceBase[Camera]):
         camera = self.get_resource(name)
 
         timeout = stream.deadline.time_remaining() if stream.deadline else None
-        images, metadata = await camera.get_images(
-            timeout=timeout,
-            metadata=stream.metadata,
-            extra=struct_to_dict(request.extra),
-            filter_source_names=list(request.filter_source_names),
-        )
+        images, metadata = await camera.get_images(timeout=timeout, metadata=stream.metadata)
         img_bytes_lst = []
         for img in images:
-            try:
-                mime_type = CameraMimeType.from_string(img.mime_type)  # this can ValueError if the mime_type is not a CameraMimeType
-                fmt = mime_type.to_proto()
-            except ValueError:
-                # TODO(RSDK-11728): remove this once we deleted the format field
-                fmt = Format.FORMAT_UNSPECIFIED
-
+            fmt = img.mime_type.to_proto()
             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=name, format=fmt, image=img_bytes))
         response = GetImagesResponse(images=img_bytes_lst, response_metadata=metadata)
         await stream.send_message(response)
 

viam/media/video.py

@@ -28,10 +28,7 @@ class CameraMimeType(str, Enum):
             Self: The mimetype
         """
         value_mime = value[:-5] if value.endswith("+lazy") else value  # ViamImage lazy encodes by default
-        try:
-            return cls(value_mime)
-        except ValueError:
-            raise ValueError(f"Invalid mimetype: {value}")
+        return cls(value_mime)
 
     @classmethod
     def from_proto(cls, format: Format.ValueType) -> "CameraMimeType":
@@ -73,11 +70,11 @@ class ViamImage:
     """
 
     _data: bytes
-    _mime_type: str
+    _mime_type: CameraMimeType
     _height: Optional[int] = None
     _width: Optional[int] = None
 
-    def __init__(self, data: bytes, mime_type: str) -> None:
+    def __init__(self, data: bytes, mime_type: CameraMimeType) -> None:
         self._data = data
         self._mime_type = mime_type
         self._width, self._height = _getDimensions(data, mime_type)
@@ -88,7 +85,7 @@ class ViamImage:
         return self._data
 
     @property
-    def mime_type(self) -> str:
+    def mime_type(self) -> CameraMimeType:
         """The mime type of the image"""
         return self._mime_type
 
@@ -131,12 +128,12 @@ class NamedImage(ViamImage):
     """The name of the image
     """
 
-    def __init__(self, name: str, data: bytes, mime_type: str) -> None:
+    def __init__(self, name: str, data: bytes, mime_type: CameraMimeType) -> None:
         self.name = name
         super().__init__(data, mime_type)
 
 
-def _getDimensions(image: bytes, mime_type: str) -> Tuple[Optional[int], Optional[int]]:
+def _getDimensions(image: bytes, mime_type: CameraMimeType) -> Tuple[Optional[int], Optional[int]]:
     try:
         if mime_type == CameraMimeType.JPEG:
             return _getDimensionsFromJPEG(image)

viam/services/vision/service.py

@@ -79,7 +79,8 @@ class VisionRPCService(UnimplementedVisionServiceBase, ResourceRPCServiceBase):
         extra = struct_to_dict(request.extra)
         timeout = stream.deadline.time_remaining() if stream.deadline else None
 
-        image = ViamImage(request.image, request.mime_type)
+        mime_type = CameraMimeType.from_string(request.mime_type)
+        image = ViamImage(request.image, mime_type)
 
         result = await vision.get_detections(image, extra=extra, timeout=timeout)
         response = GetDetectionsResponse(detections=result)
@@ -104,7 +105,8 @@ class VisionRPCService(UnimplementedVisionServiceBase, ResourceRPCServiceBase):
         extra = struct_to_dict(request.extra)
         timeout = stream.deadline.time_remaining() if stream.deadline else None
 
-        image = ViamImage(request.image, request.mime_type)
+        mime_type = CameraMimeType.from_string(request.mime_type)
+        image = ViamImage(request.image, mime_type)
 
         result = await vision.get_classifications(image, request.n, extra=extra, timeout=timeout)
         response = GetClassificationsResponse(classifications=result)

viam/version_metadata.py

@@ -1,4 +1,4 @@
-__version__ = "0.54.1b0"
+__version__ = "0.54.2b0"
 
 API_VERSION = "v0.1.474"
 SDK_VERSION = __version__

{viam_sdk-0.54.1b0.dist-info → viam_sdk-0.54.2b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viam-sdk
-Version: 0.54.1b0
+Version: 0.54.2b0
 Summary: Viam Robotics Python SDK
 Project-URL: Homepage, https://www.viam.com
 Project-URL: Documentation, https://python.viam.dev

{viam_sdk-0.54.1b0.dist-info → viam_sdk-0.54.2b0.dist-info}/RECORD

@@ -6,7 +6,7 @@ viam/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 viam/sessions_client.py,sha256=E4ThFCK1HCX_iAvEymvCdJ-H0ZlouzgoIwIE_nywfqc,9414
 viam/streams.py,sha256=VoM8FSMuGZmv4RPDHQy4FfHvJq36r4NY--gkQoaFkzs,1042
 viam/utils.py,sha256=xz7qb6bM-2qzOSQSsYHBheBidMbUAlQ2dHCi_GyPFnk,13579
-viam/version_metadata.py,sha256=FvWa4TEEJIU_XdFpKm3Y2HEWLWf7J4KEU-43uoQq50g,77
+viam/version_metadata.py,sha256=aIIuyI5xRKMbDLpsKkIYOfLw1dqDtvbfJpW3y__nino,77
 viam/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 viam/app/_logs.py,sha256=hWxRELRJCux-fQIQtDwztD3odjkBm7Vo8HUQ7XGICek,806
 viam/app/app_client.py,sha256=65PJBo8el0Mni59N9t4X1ca1LAnzhAAjLGARJoN-f98,115050
@@ -38,9 +38,9 @@ viam/components/button/button.py,sha256=JxDDnh0L1R7ssNEcgw6AiiytTgOBPfzTBrUoCg-B
 viam/components/button/client.py,sha256=nLXYVU9EBqz_mxCcotqrOpIpK_i2wlLZiOlHhTa7l54,1613
 viam/components/button/service.py,sha256=b60T2QK9EMNaKyfF-MoICFGxbEoxu4LOU9-_hHJW6Xc,1641
 viam/components/camera/__init__.py,sha256=A6qRK8YNTcGndum2dGrKsytnrzoVRptC-El9U8GDjW0,546
-viam/components/camera/camera.py,sha256=ZDomdim313xw3olU0tfIbVr1-8uae1x-bxLg1GMluog,5248
-viam/components/camera/client.py,sha256=rtcnUFyuFUTTiiRuOE3shiND-8fi9da3iXIHTczrbaI,4185
-viam/components/camera/service.py,sha256=O8GjtOLqFfW4ZFoOBHjqHBp4wNZkop5MhMXS7oyH4JE,5513
+viam/components/camera/camera.py,sha256=-y96Tie8kV1YXj8VZC5CUHda1e7HVpZ_WKrVYxhjs70,5104
+viam/components/camera/client.py,sha256=A-hqrNoC8QhPQnanxWtw_HFgoVggMGO4_efzAXcPSpU,3848
+viam/components/camera/service.py,sha256=0Aaqz5W3nvLkfvtETA6XKvXJpMZoDC8U14WHmKqLthE,4969
 viam/components/encoder/__init__.py,sha256=J31WFCzGPqHkPTYJEQOzdpB68EoQLdMWpyzBWqhHhYs,362
 viam/components/encoder/client.py,sha256=KmhyzTkcsbuduNgceEIQHFYO6hIbwg3cM1BgSRWJU4o,3244
 viam/components/encoder/encoder.py,sha256=rfqQX2MqUwTjndbCOEKefxb4NKuQFQ86fCOhgH9ZEu8,4074
@@ -354,7 +354,7 @@ viam/gen/tagger/v1/tagger_pb2.pyi,sha256=HCFLlOxnXs7VX3S8FTyrh0Q-kZLPaP1KRE8p1Tw
 viam/media/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 viam/media/audio.py,sha256=uWwpzYQZCfuLldNfsombV61ju-Tkx8CeVUR6fJyhFdc,380
 viam/media/viam_rgba.py,sha256=641MhSgRdo3q0FgxaxaPzRk-o8FP1EZx_kdTBOy-A7M,429
-viam/media/video.py,sha256=RnM11rG9V1iS0hnfJm2VfPVVVYMBli0dNecaj6E0WrY,6879
+viam/media/video.py,sha256=5HOnaqwBuhj2vETNOPwaL3olAw9-i4XCc3pQspV51cs,6831
 viam/media/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 viam/media/utils/pil/__init__.py,sha256=b8jSuxOzm1o9CMaJ186V5dMufw4_jXZG5g2U_EJ3bKQ,1466
 viam/media/utils/pil/viam_rgba_plugin.py,sha256=3vIevKK4pnB9EJV_n7bho3XEAzFyuMb3uRTedsvizxI,2563
@@ -468,9 +468,9 @@ viam/services/slam/service.py,sha256=e0tu63sja2EbeS3OOJTZdjY9pU1ToPzFEuxztS097Dc
 viam/services/slam/slam.py,sha256=2VgAXcFrAGkckfu2YOR9NGnioKau47E83JroNzbvExE,3964
 viam/services/vision/__init__.py,sha256=g4Dnz6BFgVZpvE6j6sNwxAc2baZfAKLA6XS2GaGgDcc,464
 viam/services/vision/client.py,sha256=uaFMlYwKE5N_Qp803aFGfk8k6KCWPKNwUxyV_fnlBp4,7776
-viam/services/vision/service.py,sha256=zQFcnWXSFYDwZQlnfTH5_bH5uXzMej5qjyABWdeV9nk,6826
+viam/services/vision/service.py,sha256=NWV3yY1ZyEbl4rrp28CtX9n-uIgyxSQbbKJTeoIVjCg,6942
 viam/services/vision/vision.py,sha256=MrQsTarahwGMEmqWX4ODCJT5wLOGHXNEuEyTQgOvsg4,12527
-viam_sdk-0.54.1b0.dist-info/METADATA,sha256=RB-ucRQBaAkUtW5cJYkmIhaq3eFgRGA9MXbK3aJKjtM,10322
-viam_sdk-0.54.1b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-viam_sdk-0.54.1b0.dist-info/licenses/LICENSE,sha256=yVuuHRzgI17MzTVgt3LsHvuX80innw--CmNPDCzO_iw,11358
-viam_sdk-0.54.1b0.dist-info/RECORD,,
+viam_sdk-0.54.2b0.dist-info/METADATA,sha256=PecYp3B2ZosE8bcHxrfLxqZzfxF8MuL-5hKYsmKFrPs,10322
+viam_sdk-0.54.2b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+viam_sdk-0.54.2b0.dist-info/licenses/LICENSE,sha256=yVuuHRzgI17MzTVgt3LsHvuX80innw--CmNPDCzO_iw,11358
+viam_sdk-0.54.2b0.dist-info/RECORD,,