Skip to content

rc-0.5.0 #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "viam-sdk"
version = "0.4.8"
version = "0.5.0"
description = "Viam Robotics Python SDK"
authors = [ "Naveed <[email protected]>" ]
license = "Apache-2.0"
Expand Down
3 changes: 1 addition & 2 deletions src/viam/components/arm/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import asyncio

from viam.proto.common import Geometry, KinematicsFileFormat, Pose
from viam.proto.common import KinematicsFileFormat, Pose
from viam.proto.component.arm import JointPositions
from viam.proto.component.arm import Status as ArmStatus
from viam.proto.robot import Status
Expand All @@ -13,7 +13,6 @@

__all__ = [
"Arm",
"Geometry",
"JointPositions",
"KinematicsFileFormat",
"Pose",
Expand Down
14 changes: 2 additions & 12 deletions src/viam/components/arm/arm.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import abc
from typing import Any, Dict, Final, List, Optional, Tuple
from typing import Any, Dict, Final, Optional, Tuple

from viam.resource.types import RESOURCE_NAMESPACE_RDK, RESOURCE_TYPE_COMPONENT, Subtype

from ..component_base import ComponentBase
from . import Geometry, JointPositions, KinematicsFileFormat, Pose
from . import JointPositions, KinematicsFileFormat, Pose


class Arm(ComponentBase):
Expand Down Expand Up @@ -122,13 +122,3 @@ async def get_kinematics(
- bytes: The byte contents of the file.
"""
...

@abc.abstractmethod
async def get_geometries(self) -> List[Geometry]:
"""
Get all geometries associated with the arm, in their current configuration, in the frame of the arm.

Returns:
List[Geometry]: The geometries associated with the arm.
"""
...
4 changes: 2 additions & 2 deletions src/viam/components/arm/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from grpclib.client import Channel

from viam.proto.common import DoCommandRequest, DoCommandResponse, GetKinematicsRequest, GetKinematicsResponse
from viam.proto.common import DoCommandRequest, DoCommandResponse, Geometry, GetKinematicsRequest, GetKinematicsResponse
from viam.proto.component.arm import (
ArmServiceStub,
GetEndPositionRequest,
Expand All @@ -19,7 +19,7 @@
from viam.resource.rpc_client_base import ReconfigurableResourceRPCClientBase
from viam.utils import ValueTypes, dict_to_struct, get_geometries, struct_to_dict

from . import Arm, Geometry, KinematicsFileFormat, Pose
from . import Arm, KinematicsFileFormat, Pose


class ArmClient(Arm, ReconfigurableResourceRPCClientBase):
Expand Down
2 changes: 0 additions & 2 deletions src/viam/components/audio_input/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from viam.proto.common import Geometry
from viam.resource.registry import Registry, ResourceRegistration

from .audio_input import AudioInput
Expand All @@ -7,7 +6,6 @@

__all__ = [
"AudioInput",
"Geometry",
]


Expand Down
13 changes: 1 addition & 12 deletions src/viam/components/audio_input/audio_input.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import abc
from dataclasses import dataclass
from datetime import timedelta
from typing import Final, List, Optional
from typing import Final, Optional

from google.protobuf.duration_pb2 import Duration
from typing_extensions import Self
Expand All @@ -12,7 +12,6 @@
from viam.resource.types import RESOURCE_NAMESPACE_RDK, RESOURCE_TYPE_COMPONENT, Subtype

from ..component_base import ComponentBase
from . import Geometry


class AudioInput(ComponentBase, MediaSource[Audio]):
Expand Down Expand Up @@ -78,13 +77,3 @@ async def get_properties(self, *, timeout: Optional[float] = None, **kwargs) ->
Properties: The audio input properties
"""
...

@abc.abstractmethod
async def get_geometries(self) -> List[Geometry]:
"""
Get all geometries associated with the audio input, in their current configuration, in the frame of the audio input.

Returns:
List[Geometry]: The geometries associated with the audio input.
"""
...
4 changes: 2 additions & 2 deletions src/viam/components/audio_input/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from viam.media import MediaStream, MediaStreamWithIterator
from viam.media.audio import Audio
from viam.proto.common import DoCommandRequest, DoCommandResponse
from viam.proto.common import DoCommandRequest, DoCommandResponse, Geometry
from viam.proto.component.audioinput import (
AudioInputServiceStub,
ChunksRequest,
Expand All @@ -16,7 +16,7 @@
from viam.resource.rpc_client_base import ReconfigurableResourceRPCClientBase
from viam.utils import ValueTypes, dict_to_struct, get_geometries, struct_to_dict

from .audio_input import AudioInput, Geometry
from .audio_input import AudioInput


class AudioInputClient(AudioInput, ReconfigurableResourceRPCClientBase):
Expand Down
3 changes: 1 addition & 2 deletions src/viam/components/base/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from viam.proto.common import ActuatorStatus, Geometry, Vector3
from viam.proto.common import ActuatorStatus, Vector3
from viam.proto.robot import Status
from viam.resource.registry import Registry, ResourceRegistration
from viam.utils import message_to_struct
Expand All @@ -9,7 +9,6 @@

__all__ = [
"Base",
"Geometry",
"Vector3",
]

Expand Down
14 changes: 2 additions & 12 deletions src/viam/components/base/base.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import abc
from dataclasses import dataclass
from typing import Any, Dict, Final, List, Optional
from typing import Any, Dict, Final, Optional

from viam.resource.types import RESOURCE_NAMESPACE_RDK, RESOURCE_TYPE_COMPONENT, Subtype

from ..component_base import ComponentBase
from . import Geometry, Vector3
from . import Vector3


class Base(ComponentBase):
Expand Down Expand Up @@ -149,13 +149,3 @@ async def get_properties(self, *, timeout: Optional[float] = None, **kwargs) ->
Properties: The properties of the base
"""
...

@abc.abstractmethod
async def get_geometries(self) -> List[Geometry]:
"""
Get all geometries associated with the base, in their current configuration, in the frame of the base.

Returns:
List[Geometry]: The geometries associated with the base.
"""
...
4 changes: 2 additions & 2 deletions src/viam/components/base/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from grpclib.client import Channel

from viam.proto.common import DoCommandRequest, DoCommandResponse
from viam.proto.common import DoCommandRequest, DoCommandResponse, Geometry
from viam.proto.component.base import (
BaseServiceStub,
GetPropertiesRequest,
Expand All @@ -18,7 +18,7 @@
from viam.resource.rpc_client_base import ReconfigurableResourceRPCClientBase
from viam.utils import ValueTypes, dict_to_struct, get_geometries, struct_to_dict

from . import Base, Geometry, Vector3
from . import Base, Vector3


class BaseClient(Base, ReconfigurableResourceRPCClientBase):
Expand Down
2 changes: 0 additions & 2 deletions src/viam/components/board/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from viam.proto.common import Geometry
from viam.proto.robot import Status
from viam.resource.registry import Registry, ResourceRegistration
from viam.utils import message_to_struct
Expand All @@ -9,7 +8,6 @@

__all__ = [
"Board",
"Geometry",
]


Expand Down
10 changes: 0 additions & 10 deletions src/viam/components/board/board.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from viam.resource.types import RESOURCE_NAMESPACE_RDK, RESOURCE_TYPE_COMPONENT, Subtype

from ..component_base import ComponentBase
from . import Geometry

PostProcessor = Callable[[int], int]

Expand Down Expand Up @@ -263,13 +262,4 @@ async def set_power_mode(
Args:
mode: the desired power mode
"""

@abc.abstractmethod
async def get_geometries(self) -> List[Geometry]:
"""
Get all geometries associated with the board, in their current configuration, in the frame of the board.

Returns:
List[Geometry]: The geometries associated with the board.
"""
...
4 changes: 2 additions & 2 deletions src/viam/components/board/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from google.protobuf.duration_pb2 import Duration
from grpclib.client import Channel

from viam.proto.common import BoardStatus, DoCommandRequest, DoCommandResponse
from viam.proto.common import BoardStatus, DoCommandRequest, DoCommandResponse, Geometry
from viam.proto.component.board import (
BoardServiceStub,
GetDigitalInterruptValueRequest,
Expand All @@ -29,7 +29,7 @@
from viam.resource.rpc_client_base import ReconfigurableResourceRPCClientBase
from viam.utils import ValueTypes, dict_to_struct, get_geometries, struct_to_dict

from . import Board, Geometry
from . import Board
from .board import PostProcessor


Expand Down
2 changes: 0 additions & 2 deletions src/viam/components/camera/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from viam.media.video import RawImage
from viam.proto.common import Geometry
from viam.proto.component.camera import DistortionParameters, IntrinsicParameters
from viam.resource.registry import Registry, ResourceRegistration

Expand All @@ -9,7 +8,6 @@

__all__ = [
"Camera",
"Geometry",
"IntrinsicParameters",
"DistortionParameters",
"RawImage",
Expand Down
12 changes: 1 addition & 11 deletions src/viam/components/camera/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from viam.resource.types import RESOURCE_NAMESPACE_RDK, RESOURCE_TYPE_COMPONENT, Subtype

from ..component_base import ComponentBase
from . import DistortionParameters, Geometry, IntrinsicParameters, RawImage
from . import DistortionParameters, IntrinsicParameters, RawImage


class Camera(ComponentBase):
Expand Down Expand Up @@ -103,13 +103,3 @@ async def get_properties(self, *, timeout: Optional[float] = None, **kwargs) ->
Properties: The properties of the camera
"""
...

@abc.abstractmethod
async def get_geometries(self) -> List[Geometry]:
"""
Get all geometries associated with the camera, in their current configuration, in the frame of the camera.

Returns:
List[Geometry]: The geometries associated with the camera.
"""
...
4 changes: 2 additions & 2 deletions src/viam/components/camera/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from PIL import Image

from viam.media.video import LIBRARY_SUPPORTED_FORMATS, CameraMimeType, NamedImage
from viam.proto.common import DoCommandRequest, DoCommandResponse, ResponseMetadata
from viam.proto.common import DoCommandRequest, DoCommandResponse, Geometry, ResponseMetadata
from viam.proto.component.camera import (
CameraServiceStub,
GetImageRequest,
Expand All @@ -20,7 +20,7 @@
from viam.resource.rpc_client_base import ReconfigurableResourceRPCClientBase
from viam.utils import ValueTypes, dict_to_struct, get_geometries, struct_to_dict

from . import Camera, Geometry, RawImage
from . import Camera, RawImage


def get_image_from_response(data: bytes, response_mime_type: str, request_mime_type: Optional[str] = None) -> Union[Image.Image, RawImage]:
Expand Down
9 changes: 8 additions & 1 deletion src/viam/components/component_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from typing_extensions import Self

from viam.errors import MethodNotImplementedError
from viam.proto.common import Geometry
from viam.resource.base import ResourceBase

Expand Down Expand Up @@ -43,4 +44,10 @@ async def do_command(self, command: Mapping[str, ValueTypes], *, timeout: Option
raise NotImplementedError()

async def get_geometries(self) -> List[Geometry]:
raise NotImplementedError()
"""
Get all geometries associated with the Component, in their current configuration, in the frame of the Component.

Returns:
List[Geometry]: The geometries associated with the Component.
"""
raise MethodNotImplementedError("get_geometries")
2 changes: 0 additions & 2 deletions src/viam/components/encoder/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from viam.proto.common import Geometry
from viam.resource.registry import Registry, ResourceRegistration

from .client import EncoderClient
Expand All @@ -7,7 +6,6 @@

__all__ = [
"Encoder",
"Geometry",
]


Expand Down
3 changes: 1 addition & 2 deletions src/viam/components/encoder/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from grpclib.client import Channel

from viam.proto.common import DoCommandRequest, DoCommandResponse
from viam.proto.common import DoCommandRequest, DoCommandResponse, Geometry
from viam.proto.component.encoder import (
EncoderServiceStub,
GetPositionRequest,
Expand All @@ -15,7 +15,6 @@
from viam.resource.rpc_client_base import ReconfigurableResourceRPCClientBase
from viam.utils import ValueTypes, dict_to_struct, get_geometries, struct_to_dict

from . import Geometry
from .encoder import Encoder


Expand Down
13 changes: 1 addition & 12 deletions src/viam/components/encoder/encoder.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import abc
from dataclasses import dataclass
from typing import Any, Dict, Final, List, Optional, Tuple
from typing import Any, Dict, Final, Optional, Tuple

from viam.proto.component.encoder import PositionType
from viam.resource.types import RESOURCE_NAMESPACE_RDK, RESOURCE_TYPE_COMPONENT, Subtype

from ..component_base import ComponentBase
from . import Geometry


class Encoder(ComponentBase):
Expand Down Expand Up @@ -78,13 +77,3 @@ async def get_properties(
Encoder.Properties: Map of position types to supported status.
"""
...

@abc.abstractmethod
async def get_geometries(self) -> List[Geometry]:
"""
Get all geometries associated with the encoder, in their current configuration, in the frame of the encoder.

Returns:
List[Geometry]: The geometries associated with the encoder.
"""
...
2 changes: 0 additions & 2 deletions src/viam/components/gantry/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import asyncio

from viam.proto.common import Geometry
from viam.proto.component.gantry import Status as GantryStatus
from viam.proto.robot import Status
from viam.resource.registry import Registry, ResourceRegistration
Expand All @@ -12,7 +11,6 @@

__all__ = [
"Gantry",
"Geometry",
]


Expand Down
Loading