From ae74189697e07d4d540ad16c72b83dc7b09e6e84 Mon Sep 17 00:00:00 2001 From: purplenicole730 Date: Thu, 8 Jun 2023 17:27:23 +0000 Subject: [PATCH 1/8] Bump version to 0.4.0rc1 --- pyproject.toml | 2 +- src/viam/components/arm/service.py | 2 +- src/viam/resource/rpc_service_base.py | 2 +- src/viam/robot/service.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d8155a9ef..d2ff2f0d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "viam-sdk" -version = "0.3.1" +version = "0.4.0rc1" description = "Viam Robotics Python SDK" authors = [ "Naveed " ] license = "Apache-2.0" diff --git a/src/viam/components/arm/service.py b/src/viam/components/arm/service.py index 9bce8e53f..2cefb5254 100644 --- a/src/viam/components/arm/service.py +++ b/src/viam/components/arm/service.py @@ -1,6 +1,6 @@ from grpclib.server import Stream -from viam.errors import MethodNotImplementedError +from viam.errors import MethodNotImplementedError from viam.proto.common import ( DoCommandRequest, DoCommandResponse, diff --git a/src/viam/resource/rpc_service_base.py b/src/viam/resource/rpc_service_base.py index f2d8b3200..fcd555bf4 100644 --- a/src/viam/resource/rpc_service_base.py +++ b/src/viam/resource/rpc_service_base.py @@ -1,5 +1,5 @@ import abc -from typing import Type, TYPE_CHECKING +from typing import TYPE_CHECKING, Type from viam.components.component_base import ComponentBase from viam.errors import ResourceNotFoundError diff --git a/src/viam/robot/service.py b/src/viam/robot/service.py index 7268e388d..9b3fed1c6 100644 --- a/src/viam/robot/service.py +++ b/src/viam/robot/service.py @@ -4,6 +4,8 @@ from grpclib.server import Stream from viam import logging +from viam.components.movement_sensor import MovementSensor +from viam.components.sensor import Sensor from viam.errors import MethodNotImplementedError, ViamGRPCError from viam.proto.common import ResourceName from viam.proto.robot import ( @@ -43,8 +45,6 @@ from viam.resource.registry import Registry from viam.resource.rpc_service_base import ResourceRPCServiceBase from viam.utils import resource_names_for_resource, struct_to_dict -from viam.components.sensor import Sensor -from viam.components.movement_sensor import MovementSensor LOGGER = logging.getLogger(__name__) From a7f08cd2956c3830af529662d08950470663df2e Mon Sep 17 00:00:00 2001 From: benjirewis Date: Tue, 13 Jun 2023 16:44:33 +0000 Subject: [PATCH 2/8] Bump version to 0.4.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d2ff2f0d6..e8620a768 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "viam-sdk" -version = "0.4.0rc1" +version = "0.4.0" description = "Viam Robotics Python SDK" authors = [ "Naveed " ] license = "Apache-2.0" From 2624a3eaa3f376d438aa3ef61bd420f0fb490544 Mon Sep 17 00:00:00 2001 From: Maxim Pertsov Date: Tue, 13 Jun 2023 15:36:21 -0400 Subject: [PATCH 3/8] pass in loop for python versions 3.9 and earlier --- src/viam/sessions_client.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/viam/sessions_client.py b/src/viam/sessions_client.py index 67735dc0c..01f0ab313 100644 --- a/src/viam/sessions_client.py +++ b/src/viam/sessions_client.py @@ -1,4 +1,5 @@ import asyncio +import sys from datetime import timedelta from typing import Optional @@ -29,8 +30,13 @@ ) +def loop_kwargs(): + loop = asyncio.get_running_loop() + return {"loop": loop} if sys.version_info[:2] <= (3, 9) else {} + + async def delay(coro, seconds): - await asyncio.sleep(seconds) + await asyncio.sleep(seconds, **loop_kwargs()) await coro @@ -42,7 +48,7 @@ class SessionsClient: _current_id: str = "" _disabled: bool = False - _lock = asyncio.Lock() + _lock = asyncio.Lock(**loop_kwargs()) _supported: Optional[bool] = None _heartbeat_interval: Optional[timedelta] = None From 8929a29a268a0679730440ad75b25cb48e2a6172 Mon Sep 17 00:00:00 2001 From: Maxim Pertsov Date: Tue, 13 Jun 2023 16:04:23 -0400 Subject: [PATCH 4/8] do not init clock at class level --- src/viam/sessions_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viam/sessions_client.py b/src/viam/sessions_client.py index 01f0ab313..124f991fb 100644 --- a/src/viam/sessions_client.py +++ b/src/viam/sessions_client.py @@ -48,7 +48,6 @@ class SessionsClient: _current_id: str = "" _disabled: bool = False - _lock = asyncio.Lock(**loop_kwargs()) _supported: Optional[bool] = None _heartbeat_interval: Optional[timedelta] = None @@ -56,6 +55,7 @@ def __init__(self, channel: Channel, *, disabled: bool = False): self.channel = channel self.client = RobotServiceStub(channel) self._disabled = disabled + self._lock = asyncio.Lock(**loop_kwargs()) listen(self.channel, SendRequest, self._send_request) listen(self.channel, RecvTrailingMetadata, self._recv_trailers) From 7ea29e3f28eae3818624cea1121106d2cecf614f Mon Sep 17 00:00:00 2001 From: Maxim Pertsov Date: Tue, 13 Jun 2023 16:07:59 -0400 Subject: [PATCH 5/8] only call get_running_loop if <= 3.9 --- src/viam/sessions_client.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/viam/sessions_client.py b/src/viam/sessions_client.py index 124f991fb..5a05079f5 100644 --- a/src/viam/sessions_client.py +++ b/src/viam/sessions_client.py @@ -31,8 +31,9 @@ def loop_kwargs(): - loop = asyncio.get_running_loop() - return {"loop": loop} if sys.version_info[:2] <= (3, 9) else {} + if sys.version_info[:2] <= (3, 9): + return {"loop": asyncio.get_running_loop()} + return {} async def delay(coro, seconds): From 803ead039c3189d4b268dcc0df9eb7159fd7e00f Mon Sep 17 00:00:00 2001 From: Maxim Pertsov Date: Tue, 13 Jun 2023 17:29:36 -0400 Subject: [PATCH 6/8] CR@njooma --- src/viam/sessions_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viam/sessions_client.py b/src/viam/sessions_client.py index 5a05079f5..7ceef8740 100644 --- a/src/viam/sessions_client.py +++ b/src/viam/sessions_client.py @@ -31,7 +31,7 @@ def loop_kwargs(): - if sys.version_info[:2] <= (3, 9): + if sys.version_info <= (3, 9): return {"loop": asyncio.get_running_loop()} return {} From bfdc8e7851bd36bb291ed6460411d11c900ba621 Mon Sep 17 00:00:00 2001 From: maximpertsov Date: Tue, 13 Jun 2023 22:09:51 +0000 Subject: [PATCH 7/8] Bump version to 0.4.1rc1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e8620a768..b2bd3f2cb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "viam-sdk" -version = "0.4.0" +version = "0.4.1rc1" description = "Viam Robotics Python SDK" authors = [ "Naveed " ] license = "Apache-2.0" From 6e2fba3764d2415915d1cd3aa089f360baa21fd3 Mon Sep 17 00:00:00 2001 From: maximpertsov Date: Tue, 13 Jun 2023 22:32:31 +0000 Subject: [PATCH 8/8] Bump version to 0.4.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b2bd3f2cb..ee1dc2ae9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "viam-sdk" -version = "0.4.1rc1" +version = "0.4.1" description = "Viam Robotics Python SDK" authors = [ "Naveed " ] license = "Apache-2.0"