Change from_string usage

Author: hexbabe

src/viam/components/camera/client.py

@@ -41,7 +41,7 @@ async def get_image(
         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, CameraMimeType.from_string(response.mime_type))
+        return ViamImage(response.image, response.mime_type)
 
     async def get_images(
         self,
@@ -57,10 +57,10 @@ async def get_images(
         imgs = []
         for img_data in response.images:
             if img_data.mime_type:
-                mime_type = CameraMimeType.from_string(img_data.mime_type)
+                mime_type = img_data.mime_type
             else:
                 # TODO(RSDK-11728): remove this once we deleted the format field
-                mime_type = CameraMimeType.from_proto(img_data.format)
+                mime_type = str(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

src/viam/components/camera/service.py

@@ -58,10 +58,11 @@ async def GetImages(self, stream: Stream[GetImagesRequest, GetImagesResponse]) -
         )
         img_bytes_lst = []
         for img in images:
-            mime_type = CameraMimeType.from_string(img.mime_type)
-            if isinstance(mime_type, CameraMimeType):
+            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()
-            else:
+            except ValueError:
+                # TODO(RSDK-11728): remove this once we deleted the format field
                 fmt = Format.FORMAT_UNSPECIFIED
 
             img_bytes = img.data

src/viam/media/video.py

@@ -1,6 +1,7 @@
 from array import array
 from enum import Enum
-from typing import List, Optional, Tuple, Union
+from typing import List, Optional, Tuple
+from typing_extensions import Self
 
 from viam.errors import NotSupportedError
 from viam.proto.component.camera import Format
@@ -16,7 +17,7 @@ class CameraMimeType(str, Enum):
     PCD = "pointcloud/pcd"
 
     @classmethod
-    def from_string(cls, value: str) -> Union["CameraMimeType", str]:
+    def from_string(cls, value: str) -> Self:
         """Return the mimetype from a string.
 
         Args:
@@ -29,7 +30,7 @@ def from_string(cls, value: str) -> Union["CameraMimeType", str]:
         try:
             return cls(value_mime)
         except ValueError:
-            return value_mime
+            raise ValueError(f"Invalid mimetype: {value}")
 
     @classmethod
     def from_proto(cls, format: Format.ValueType) -> "CameraMimeType":

src/viam/services/vision/service.py

@@ -79,8 +79,7 @@ async def GetDetections(self, stream: Stream[GetDetectionsRequest, GetDetections
         extra = struct_to_dict(request.extra)
         timeout = stream.deadline.time_remaining() if stream.deadline else None
 
-        mime_type = CameraMimeType.from_string(request.mime_type)
-        image = ViamImage(request.image, mime_type)
+        image = ViamImage(request.image, request.mime_type)
 
         result = await vision.get_detections(image, extra=extra, timeout=timeout)
         response = GetDetectionsResponse(detections=result)
@@ -105,8 +104,7 @@ async def GetClassifications(self, stream: Stream[GetClassificationsRequest, Get
         extra = struct_to_dict(request.extra)
         timeout = stream.deadline.time_remaining() if stream.deadline else None
 
-        mime_type = CameraMimeType.from_string(request.mime_type)
-        image = ViamImage(request.image, mime_type)
+        image = ViamImage(request.image, request.mime_type)
 
         result = await vision.get_classifications(image, request.n, extra=extra, timeout=timeout)
         response = GetClassificationsResponse(classifications=result)