rc-0.21.0 (#621)

Co-authored-by: Ethan <[email protected]>
Co-authored-by: Nicole Jung <[email protected]>
Co-authored-by: Bijan Haney <[email protected]>

Author: 4 people

docs/examples/example.ipynb

@@ -161,11 +161,13 @@
    "source": [
     "from viam.components.camera import Camera\n",
     "from viam.media.video import CameraMimeType\n",
+    "from viam.media.utils.pil import viam_to_pil_image\n",
     "\n",
     "robot = await connect_with_channel()\n",
     "camera = Camera.from_robot(robot, \"camera0\")\n",
     "image = await camera.get_image(CameraMimeType.JPEG)\n",
-    "image.save(\"foo.png\")\n",
+    "pil = viam_to_pil_image(image)\n",
+    "pil.save(\"foo.png\")\n",
     "\n",
     "# Don't forget to close the robot when you're done!\n",
     "await robot.close()"
@@ -1356,7 +1358,7 @@
    "source": [
     "my_organizations = await app_client.list_organizations()\n",
     "MY_ORG_ID = my_organizations[0].id\n",
-    "my_locations = await app_client.list_locations()\n",
+    "my_locations = await app_client.list_locations(org_id=MY_ORG_ID)\n",
     "robots = []\n",
     "\n",
     "for location in my_locations:\n",
@@ -1489,7 +1491,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.6 (main, Oct  2 2023, 20:46:14) [Clang 14.0.3 (clang-1403.0.22.14.1)]"
+   "version": "3.11.9 (main, Apr  2 2024, 08:25:04) [Clang 15.0.0 (clang-1500.1.0.2.5)]"
   },
   "vscode": {
    "interpreter": {

examples/apis.json

@@ -19,9 +19,5 @@
   "pose_tracker": { "func": "get_poses" },
   "power_sensor": { "func": "get_power" },
   "motion": { "func": "get_pose" },
-  "vision": {
-    "func": "get_classifications_from_camera",
-    "args": ["YOURCAMERANAME", "1"],
-    "comment": "Note that the Camera supplied is a placeholder. Please change this to a valid Camera. Also note that the get_classifications method is a placeholder and is commented out to give you a choice to use get_detections method instead if you are doing detections."
-  }
+  "vision": { "func": "get_properties" }
 }

examples/server/v1/components.py

@@ -10,6 +10,7 @@
     from typing import AsyncIterator
 
 from datetime import timedelta
+from io import BytesIO
 from multiprocessing import Lock
 from pathlib import Path
 from typing import Any, Dict, List, Mapping, Optional, Tuple
@@ -33,7 +34,7 @@
 from viam.errors import ResourceNotFoundError
 from viam.streams import StreamWithIterator
 from viam.media.audio import Audio, AudioStream
-from viam.media.video import NamedImage
+from viam.media.video import CameraMimeType, NamedImage, ViamImage
 from viam.operations import run_with_operation
 from viam.proto.common import (
     Capsule,
@@ -324,14 +325,17 @@ async def get_geometries(self, extra: Optional[Dict[str, Any]] = None, **kwargs)
 class ExampleCamera(Camera):
     def __init__(self, name: str):
         p = Path(__file__)
-        self.image = Image.open(p.parent.absolute().joinpath("viam.webp"))
+        img = Image.open(p.parent.absolute().joinpath("viam.webp"))
+        buf = BytesIO()
+        img.copy().save(buf, format="JPEG")
+        self.image = ViamImage(buf.getvalue(), CameraMimeType.JPEG)
         super().__init__(name)
 
     def __del__(self):
         self.image.close()
 
-    async def get_image(self, mime_type: str = "", extra: Optional[Dict[str, Any]] = None, **kwargs) -> Image.Image:
-        return self.image.copy()
+    async def get_image(self, mime_type: str = "", extra: Optional[Dict[str, Any]] = None, **kwargs) -> ViamImage:
+        return self.image
 
     async def get_images(self, timeout: Optional[float] = None, **kwargs) -> Tuple[List[NamedImage], ResponseMetadata]:
         raise NotImplementedError()

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "viam-sdk"
-version = "0.20.0"
+version = "0.21.0b2"
 description = "Viam Robotics Python SDK"
 authors = [ "Naveed <[email protected]>" ]
 license = "Apache-2.0"
@@ -18,7 +18,6 @@ include = ["LICENSE", "src/viam/rpc/libviam_rust_utils.*"]
   ]
   googleapis-common-protos = ">=1.60.0,<2"
   typing-extensions = ">=4.8.0,<5"
-  Pillow = ">=9.1.0,<11"
   protobuf = ">=4.24.3,<5"
   numpy = { version = ">=1.21,<2", optional = true }
 
@@ -50,6 +49,7 @@ include = ["LICENSE", "src/viam/rpc/libviam_rust_utils.*"]
     {version = "<1.25.0", python = "<3.9"},
     {version = ">=1.26.2", python = ">=3.9"},
   ]
+  Pillow = ">=9.1.0,<11"
   pyright = "^1.1.339"
 
   [tool.poetry.extras]