Skip to content

Commit 76c258d

Browse files
RSDK-7436: remove analog and digital statuses from python sdk (#597)
1 parent 913e42b commit 76c258d

File tree

58 files changed

+2939
-2728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2939
-2728
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ typecheck:
2222

2323
_buf: clean
2424
rm -rf src/viam/gen
25-
chmod +x plugins/main.py
25+
chmod +x plugin/main.py
2626
buf generate buf.build/viamrobotics/api
2727
buf generate buf.build/viamrobotics/goutils
2828
protol -e googl* --in-place -s _grpc.py -s _pb2.py -s _pb2.pyi -o src/viam/gen buf buf.build/viamrobotics/api

src/viam/components/board/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import asyncio
22

3-
from viam.proto.common import AnalogStatus, DigitalInterruptStatus
43
from viam.proto.component.board import Status as BoardStatus
54
from viam.proto.robot import Status
65
from viam.resource.registry import Registry, ResourceRegistration
@@ -19,12 +18,12 @@ async def create_status(component: Board) -> Status:
1918
for x in analog_names:
2019
analog = await component.analog_reader_by_name(x)
2120
read = await analog.read()
22-
analogs[x] = AnalogStatus(value=read)
21+
analogs[x] = read
2322

2423
for y in digital_interrupt_names:
2524
digital_interrupt = await component.digital_interrupt_by_name(y)
2625
val = await digital_interrupt.value()
27-
digital_interrupts[y] = DigitalInterruptStatus(value=val)
26+
digital_interrupts[y] = val
2827

2928
s = BoardStatus(analogs=analogs, digital_interrupts=digital_interrupts)
3029
return Status(name=Board.get_resource_name(component.name), status=message_to_struct(s))
Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,67 @@
11
"""Generated protocol buffer code."""
2+
from google.protobuf.internal import builder as _builder
23
from google.protobuf import descriptor as _descriptor
34
from google.protobuf import descriptor_pool as _descriptor_pool
45
from google.protobuf import symbol_database as _symbol_database
5-
from google.protobuf.internal import builder as _builder
66
_sym_db = _symbol_database.Default()
77
from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2
88
from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
99
from ....tagger.v1 import tagger_pb2 as tagger_dot_v1_dot_tagger__pb2
1010
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18app/agent/v1/agent.proto\x12\x11viam.app.agent.v1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\x1a\x16tagger/v1/tagger.proto"\'\n\x15GetAgentConfigRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id"^\n\x16GetAgentConfigResponse\x12D\n\x0cagent_config\x18\x01 \x01(\x0b2!.viam.app.agent.v1.AppAgentConfigR\x0bagentConfig"p\n\x18UpdateAgentConfigRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12D\n\x0cagent_config\x18\x02 \x01(\x0b2!.viam.app.agent.v1.AppAgentConfigR\x0bagentConfig"a\n\x19UpdateAgentConfigResponse\x12D\n\x0cagent_config\x18\x01 \x01(\x0b2!.viam.app.agent.v1.AppAgentConfigR\x0bagentConfig"\x9b\x02\n\x0eAppAgentConfig\x12\x9c\x01\n\x11subsystem_configs\x18\x01 \x03(\x0b27.viam.app.agent.v1.AppAgentConfig.SubsystemConfigsEntryB6\x9a\x84\x9e\x031bson:"subsystem_configs" json:"subsystem_configs"R\x10subsystemConfigs\x1aj\n\x15SubsystemConfigsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12;\n\x05value\x18\x02 \x01(\x0b2%.viam.app.agent.v1.AppSubsystemConfigR\x05value:\x028\x01"\xc3\x03\n\x12AppSubsystemConfig\x12[\n\x0frelease_channel\x18\x01 \x01(\tB2\x9a\x84\x9e\x03-bson:"release_channel" json:"release_channel"R\x0ereleaseChannel\x12K\n\x0bpin_version\x18\x02 \x01(\tB*\x9a\x84\x9e\x03%bson:"pin_version" json:"pin_version"R\npinVersion\x12;\n\x07pin_url\x18\x03 \x01(\tB"\x9a\x84\x9e\x03\x1dbson:"pin_url" json:"pin_url"R\x06pinUrl\x12c\n\x11disable_subsystem\x18\x04 \x01(\x08B6\x9a\x84\x9e\x031bson:"disable_subsystem" json:"disable_subsystem"R\x10disableSubsystem\x12a\n\nattributes\x18\x05 \x01(\x0b2\x17.google.protobuf.StructB(\x9a\x84\x9e\x03#bson:"attributes" json:"attributes"R\nattributes"\x9d\x02\n\x18DeviceAgentConfigRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x128\n\thost_info\x18\x02 \x01(\x0b2\x1b.viam.app.agent.v1.HostInfoR\x08hostInfo\x12q\n\x12subsystem_versions\x18\x03 \x03(\x0b2B.viam.app.agent.v1.DeviceAgentConfigRequest.SubsystemVersionsEntryR\x11subsystemVersions\x1aD\n\x16SubsystemVersionsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x028\x01"\xbd\x02\n\x19DeviceAgentConfigResponse\x12o\n\x11subsystem_configs\x18\x01 \x03(\x0b2B.viam.app.agent.v1.DeviceAgentConfigResponse.SubsystemConfigsEntryR\x10subsystemConfigs\x12@\n\x0echeck_interval\x18\x02 \x01(\x0b2\x19.google.protobuf.DurationR\rcheckInterval\x1am\n\x15SubsystemConfigsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12>\n\x05value\x18\x02 \x01(\x0b2(.viam.app.agent.v1.DeviceSubsystemConfigR\x05value:\x028\x01"\xd8\x01\n\x15DeviceSubsystemConfig\x12G\n\x0bupdate_info\x18\x01 \x01(\x0b2&.viam.app.agent.v1.SubsystemUpdateInfoR\nupdateInfo\x12\x18\n\x07disable\x18\x02 \x01(\x08R\x07disable\x12#\n\rforce_restart\x18\x03 \x01(\x08R\x0cforceRestart\x127\n\nattributes\x18\x04 \x01(\x0b2\x17.google.protobuf.StructR\nattributes"R\n\x08HostInfo\x12\x1a\n\x08platform\x18\x01 \x01(\tR\x08platform\x12\x16\n\x06distro\x18\x02 \x01(\tR\x06distro\x12\x12\n\x04tags\x18\x03 \x03(\tR\x04tags"\xaf\x01\n\x13SubsystemUpdateInfo\x12\x1a\n\x08filename\x18\x01 \x01(\tR\x08filename\x12\x10\n\x03url\x18\x02 \x01(\tR\x03url\x12\x18\n\x07version\x18\x03 \x01(\tR\x07version\x12\x16\n\x06sha256\x18\x04 \x01(\x0cR\x06sha256\x128\n\x06format\x18\x05 \x01(\x0e2 .viam.app.agent.v1.PackageFormatR\x06format*\x9f\x01\n\rPackageFormat\x12\x1e\n\x1aPACKAGE_FORMAT_UNSPECIFIED\x10\x00\x12\x16\n\x12PACKAGE_FORMAT_RAW\x10\x01\x12\x15\n\x11PACKAGE_FORMAT_XZ\x10\x02\x12\x1d\n\x19PACKAGE_FORMAT_EXECUTABLE\x10\x03\x12 \n\x1cPACKAGE_FORMAT_XZ_EXECUTABLE\x10\x042\xe8\x01\n\x0fAgentAppService\x12e\n\x0eGetAgentConfig\x12(.viam.app.agent.v1.GetAgentConfigRequest\x1a).viam.app.agent.v1.GetAgentConfigResponse\x12n\n\x11UpdateAgentConfig\x12+.viam.app.agent.v1.UpdateAgentConfigRequest\x1a,.viam.app.agent.v1.UpdateAgentConfigResponse2\x84\x01\n\x12AgentDeviceService\x12n\n\x11DeviceAgentConfig\x12+.viam.app.agent.v1.DeviceAgentConfigRequest\x1a,.viam.app.agent.v1.DeviceAgentConfigResponseB\x1eZ\x1cgo.viam.com/api/app/agent/v1b\x06proto3')
11-
_globals = globals()
12-
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
13-
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'app.agent.v1.agent_pb2', _globals)
14-
if not _descriptor._USE_C_DESCRIPTORS:
15-
_globals['DESCRIPTOR']._loaded_options = None
16-
_globals['DESCRIPTOR']._serialized_options = b'Z\x1cgo.viam.com/api/app/agent/v1'
17-
_globals['_APPAGENTCONFIG_SUBSYSTEMCONFIGSENTRY']._loaded_options = None
18-
_globals['_APPAGENTCONFIG_SUBSYSTEMCONFIGSENTRY']._serialized_options = b'8\x01'
19-
_globals['_APPAGENTCONFIG'].fields_by_name['subsystem_configs']._loaded_options = None
20-
_globals['_APPAGENTCONFIG'].fields_by_name['subsystem_configs']._serialized_options = b'\x9a\x84\x9e\x031bson:"subsystem_configs" json:"subsystem_configs"'
21-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['release_channel']._loaded_options = None
22-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['release_channel']._serialized_options = b'\x9a\x84\x9e\x03-bson:"release_channel" json:"release_channel"'
23-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['pin_version']._loaded_options = None
24-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['pin_version']._serialized_options = b'\x9a\x84\x9e\x03%bson:"pin_version" json:"pin_version"'
25-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['pin_url']._loaded_options = None
26-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['pin_url']._serialized_options = b'\x9a\x84\x9e\x03\x1dbson:"pin_url" json:"pin_url"'
27-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['disable_subsystem']._loaded_options = None
28-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['disable_subsystem']._serialized_options = b'\x9a\x84\x9e\x031bson:"disable_subsystem" json:"disable_subsystem"'
29-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['attributes']._loaded_options = None
30-
_globals['_APPSUBSYSTEMCONFIG'].fields_by_name['attributes']._serialized_options = b'\x9a\x84\x9e\x03#bson:"attributes" json:"attributes"'
31-
_globals['_DEVICEAGENTCONFIGREQUEST_SUBSYSTEMVERSIONSENTRY']._loaded_options = None
32-
_globals['_DEVICEAGENTCONFIGREQUEST_SUBSYSTEMVERSIONSENTRY']._serialized_options = b'8\x01'
33-
_globals['_DEVICEAGENTCONFIGRESPONSE_SUBSYSTEMCONFIGSENTRY']._loaded_options = None
34-
_globals['_DEVICEAGENTCONFIGRESPONSE_SUBSYSTEMCONFIGSENTRY']._serialized_options = b'8\x01'
35-
_globals['_PACKAGEFORMAT']._serialized_start = 2313
36-
_globals['_PACKAGEFORMAT']._serialized_end = 2472
37-
_globals['_GETAGENTCONFIGREQUEST']._serialized_start = 133
38-
_globals['_GETAGENTCONFIGREQUEST']._serialized_end = 172
39-
_globals['_GETAGENTCONFIGRESPONSE']._serialized_start = 174
40-
_globals['_GETAGENTCONFIGRESPONSE']._serialized_end = 268
41-
_globals['_UPDATEAGENTCONFIGREQUEST']._serialized_start = 270
42-
_globals['_UPDATEAGENTCONFIGREQUEST']._serialized_end = 382
43-
_globals['_UPDATEAGENTCONFIGRESPONSE']._serialized_start = 384
44-
_globals['_UPDATEAGENTCONFIGRESPONSE']._serialized_end = 481
45-
_globals['_APPAGENTCONFIG']._serialized_start = 484
46-
_globals['_APPAGENTCONFIG']._serialized_end = 767
47-
_globals['_APPAGENTCONFIG_SUBSYSTEMCONFIGSENTRY']._serialized_start = 661
48-
_globals['_APPAGENTCONFIG_SUBSYSTEMCONFIGSENTRY']._serialized_end = 767
49-
_globals['_APPSUBSYSTEMCONFIG']._serialized_start = 770
50-
_globals['_APPSUBSYSTEMCONFIG']._serialized_end = 1221
51-
_globals['_DEVICEAGENTCONFIGREQUEST']._serialized_start = 1224
52-
_globals['_DEVICEAGENTCONFIGREQUEST']._serialized_end = 1509
53-
_globals['_DEVICEAGENTCONFIGREQUEST_SUBSYSTEMVERSIONSENTRY']._serialized_start = 1441
54-
_globals['_DEVICEAGENTCONFIGREQUEST_SUBSYSTEMVERSIONSENTRY']._serialized_end = 1509
55-
_globals['_DEVICEAGENTCONFIGRESPONSE']._serialized_start = 1512
56-
_globals['_DEVICEAGENTCONFIGRESPONSE']._serialized_end = 1829
57-
_globals['_DEVICEAGENTCONFIGRESPONSE_SUBSYSTEMCONFIGSENTRY']._serialized_start = 1720
58-
_globals['_DEVICEAGENTCONFIGRESPONSE_SUBSYSTEMCONFIGSENTRY']._serialized_end = 1829
59-
_globals['_DEVICESUBSYSTEMCONFIG']._serialized_start = 1832
60-
_globals['_DEVICESUBSYSTEMCONFIG']._serialized_end = 2048
61-
_globals['_HOSTINFO']._serialized_start = 2050
62-
_globals['_HOSTINFO']._serialized_end = 2132
63-
_globals['_SUBSYSTEMUPDATEINFO']._serialized_start = 2135
64-
_globals['_SUBSYSTEMUPDATEINFO']._serialized_end = 2310
65-
_globals['_AGENTAPPSERVICE']._serialized_start = 2475
66-
_globals['_AGENTAPPSERVICE']._serialized_end = 2707
67-
_globals['_AGENTDEVICESERVICE']._serialized_start = 2710
68-
_globals['_AGENTDEVICESERVICE']._serialized_end = 2842
11+
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
12+
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'app.agent.v1.agent_pb2', globals())
13+
if _descriptor._USE_C_DESCRIPTORS == False:
14+
DESCRIPTOR._options = None
15+
DESCRIPTOR._serialized_options = b'Z\x1cgo.viam.com/api/app/agent/v1'
16+
_APPAGENTCONFIG_SUBSYSTEMCONFIGSENTRY._options = None
17+
_APPAGENTCONFIG_SUBSYSTEMCONFIGSENTRY._serialized_options = b'8\x01'
18+
_APPAGENTCONFIG.fields_by_name['subsystem_configs']._options = None
19+
_APPAGENTCONFIG.fields_by_name['subsystem_configs']._serialized_options = b'\x9a\x84\x9e\x031bson:"subsystem_configs" json:"subsystem_configs"'
20+
_APPSUBSYSTEMCONFIG.fields_by_name['release_channel']._options = None
21+
_APPSUBSYSTEMCONFIG.fields_by_name['release_channel']._serialized_options = b'\x9a\x84\x9e\x03-bson:"release_channel" json:"release_channel"'
22+
_APPSUBSYSTEMCONFIG.fields_by_name['pin_version']._options = None
23+
_APPSUBSYSTEMCONFIG.fields_by_name['pin_version']._serialized_options = b'\x9a\x84\x9e\x03%bson:"pin_version" json:"pin_version"'
24+
_APPSUBSYSTEMCONFIG.fields_by_name['pin_url']._options = None
25+
_APPSUBSYSTEMCONFIG.fields_by_name['pin_url']._serialized_options = b'\x9a\x84\x9e\x03\x1dbson:"pin_url" json:"pin_url"'
26+
_APPSUBSYSTEMCONFIG.fields_by_name['disable_subsystem']._options = None
27+
_APPSUBSYSTEMCONFIG.fields_by_name['disable_subsystem']._serialized_options = b'\x9a\x84\x9e\x031bson:"disable_subsystem" json:"disable_subsystem"'
28+
_APPSUBSYSTEMCONFIG.fields_by_name['attributes']._options = None
29+
_APPSUBSYSTEMCONFIG.fields_by_name['attributes']._serialized_options = b'\x9a\x84\x9e\x03#bson:"attributes" json:"attributes"'
30+
_DEVICEAGENTCONFIGREQUEST_SUBSYSTEMVERSIONSENTRY._options = None
31+
_DEVICEAGENTCONFIGREQUEST_SUBSYSTEMVERSIONSENTRY._serialized_options = b'8\x01'
32+
_DEVICEAGENTCONFIGRESPONSE_SUBSYSTEMCONFIGSENTRY._options = None
33+
_DEVICEAGENTCONFIGRESPONSE_SUBSYSTEMCONFIGSENTRY._serialized_options = b'8\x01'
34+
_PACKAGEFORMAT._serialized_start = 2313
35+
_PACKAGEFORMAT._serialized_end = 2472
36+
_GETAGENTCONFIGREQUEST._serialized_start = 133
37+
_GETAGENTCONFIGREQUEST._serialized_end = 172
38+
_GETAGENTCONFIGRESPONSE._serialized_start = 174
39+
_GETAGENTCONFIGRESPONSE._serialized_end = 268
40+
_UPDATEAGENTCONFIGREQUEST._serialized_start = 270
41+
_UPDATEAGENTCONFIGREQUEST._serialized_end = 382
42+
_UPDATEAGENTCONFIGRESPONSE._serialized_start = 384
43+
_UPDATEAGENTCONFIGRESPONSE._serialized_end = 481
44+
_APPAGENTCONFIG._serialized_start = 484
45+
_APPAGENTCONFIG._serialized_end = 767
46+
_APPAGENTCONFIG_SUBSYSTEMCONFIGSENTRY._serialized_start = 661
47+
_APPAGENTCONFIG_SUBSYSTEMCONFIGSENTRY._serialized_end = 767
48+
_APPSUBSYSTEMCONFIG._serialized_start = 770
49+
_APPSUBSYSTEMCONFIG._serialized_end = 1221
50+
_DEVICEAGENTCONFIGREQUEST._serialized_start = 1224
51+
_DEVICEAGENTCONFIGREQUEST._serialized_end = 1509
52+
_DEVICEAGENTCONFIGREQUEST_SUBSYSTEMVERSIONSENTRY._serialized_start = 1441
53+
_DEVICEAGENTCONFIGREQUEST_SUBSYSTEMVERSIONSENTRY._serialized_end = 1509
54+
_DEVICEAGENTCONFIGRESPONSE._serialized_start = 1512
55+
_DEVICEAGENTCONFIGRESPONSE._serialized_end = 1829
56+
_DEVICEAGENTCONFIGRESPONSE_SUBSYSTEMCONFIGSENTRY._serialized_start = 1720
57+
_DEVICEAGENTCONFIGRESPONSE_SUBSYSTEMCONFIGSENTRY._serialized_end = 1829
58+
_DEVICESUBSYSTEMCONFIG._serialized_start = 1832
59+
_DEVICESUBSYSTEMCONFIG._serialized_end = 2048
60+
_HOSTINFO._serialized_start = 2050
61+
_HOSTINFO._serialized_end = 2132
62+
_SUBSYSTEMUPDATEINFO._serialized_start = 2135
63+
_SUBSYSTEMUPDATEINFO._serialized_end = 2310
64+
_AGENTAPPSERVICE._serialized_start = 2475
65+
_AGENTAPPSERVICE._serialized_end = 2707
66+
_AGENTDEVICESERVICE._serialized_start = 2710
67+
_AGENTDEVICESERVICE._serialized_end = 2842

0 commit comments

Comments
 (0)