Skip to content

Commit 734646f

Browse files
njoomanjooma
authored
Update protos (viamrobotics#141)
1 parent 65f4d2d commit 734646f

File tree

311 files changed

+5898
-2405
lines changed

Some content is hidden

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

311 files changed

+5898
-2405
lines changed

‎.github/workflows/update_protos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
image: ghcr.io/viamrobotics/canon:amd64
1515
steps:
1616
- uses: actions/checkout@v3
17-
- uses: bufbuild/buf-setup-action@v1.7.0
17+
- uses: bufbuild/buf-setup-action@v1.8.0
1818
with:
1919
github_token: ${{ secrets.GITHUB_TOKEN }}
2020
- uses: arduino/setup-protoc@v1

‎Makefile

+4-6
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,20 @@ _format:
1313
format:
1414
poetry run make _format
1515

16-
_buf:
16+
_buf: clean
1717
rm -rf src/viam/gen
18+
buf generate buf.build/viamrobotics/api
1819
buf generate buf.build/viamrobotics/goutils
19-
buf generate buf.build/viamrobotics/rdk
20+
protol -e googl* --in-place -s _grpc.py -s _pb2.py -s _pb2.pyi -o src/viam/gen buf buf.build/viamrobotics/api
2021
protol -e googl* --in-place -s _grpc.py -s _pb2.py -s _pb2.pyi -o src/viam/gen buf buf.build/viamrobotics/goutils
21-
protol -e googl* --in-place -s _grpc.py -s _pb2.py -s _pb2.pyi -o src/viam/gen buf buf.build/viamrobotics/rdk
2222
find src/viam/gen -type d -exec touch {}/__init__.py \;
2323

2424
buf:
2525
poetry run make _buf
2626

2727
_better_imports:
28-
python3 -m etc.generate_proto_import
28+
python3 -m etc.generate_proto_import -v
2929
@echo Add init files for specific documented protos
30-
touch src/viam/proto/__init__.py
31-
touch src/viam/proto/api/__init__.py
3230

3331
better_imports:
3432
poetry run make _better_imports

‎buf.lock

+6-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ deps:
44
- remote: buf.build
55
owner: googleapis
66
repository: googleapis
7-
branch: main
8-
commit: a821d6d6abbe4b439907ff7970459941
9-
digest: b1-2K8F7EHYBrgGfmCQmWc1zBNyiyLoIABNm3BQVj7q8DY=
10-
create_time: 2021-10-27T15:08:18.775093Z
7+
commit: 62f35d8aed1149c291d606d958a7ce32
8+
- remote: buf.build
9+
owner: viamrobotics
10+
repository: api
11+
commit: ca0b55452786466ab26c1ca07ec6302f
1112
- remote: buf.build
1213
owner: viamrobotics
1314
repository: goutils
14-
branch: main
15-
commit: 2eac2411dcf141cfb084c1c4de2e82ab
16-
digest: b1-9aGNmy_nDp9MRRRz44j6evdjb63_mjQWLKVVovooawI=
17-
create_time: 2022-01-20T20:31:16.055241Z
15+
commit: 97870753c5dc4acc86deaa33213df626

‎buf.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ lint:
77
- DEFAULT
88
deps:
99
- buf.build/viamrobotics/goutils
10-
- buf.build/viamrobotics/rdk
10+
- buf.build/viamrobotics/api

‎etc/generate_proto_import.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def build_dirs(root: str, package: str, modules: List[str]):
7272
7373
to be available at
7474
75-
viam.proto.api.component.arm
75+
viam.proto.component.arm
7676
7777
This function will take in the directory where to store the new imports,
7878
the package name, and the modules (files) within that package.
@@ -82,8 +82,13 @@ def build_dirs(root: str, package: str, modules: List[str]):
8282
"""
8383
LOGGER.info(f"Building proto imports for package {package}")
8484

85+
IMPORT_LEVEL = 1
86+
8587
# Create new directories
8688
dir_name = os.path.sep.join(package.split(".")[:-1])
89+
if dir_name.split(os.path.sep)[0] == "proto":
90+
IMPORT_LEVEL -= 1
91+
dir_name = os.path.sep.join(dir_name.split(os.path.sep)[1:])
8792
dir_name = os.path.join(root, dir_name)
8893
os.makedirs(dir_name, exist_ok=True)
8994

@@ -129,7 +134,7 @@ def build_dirs(root: str, package: str, modules: List[str]):
129134
f.write("Do not edit manually!\n")
130135
f.write("'''\n")
131136
for (imp, cls) in classes.items():
132-
f.write(f'from {"."*len(package.split("."))}{PROTO_GEN_PACKAGE}.{package}.{imp} import (\n')
137+
f.write(f'from {"."*(len(package.split("."))+IMPORT_LEVEL)}{PROTO_GEN_PACKAGE}.{package}.{imp} import (\n')
133138
f.write(" %s\n" % (",\n ".join(cls)))
134139
f.write(")\n")
135140
f.write("\n__all__ = [\n")
@@ -152,7 +157,7 @@ def run(add_inits: bool = True):
152157
clean()
153158
packages = get_packages(GENERATED_PATH.__str__())
154159
for (package, modules) in packages.items():
155-
build_dirs(NEW_IMPORT_PATH.parent.__str__(), package, modules)
160+
build_dirs(NEW_IMPORT_PATH.__str__(), package, modules)
156161
if add_inits:
157162
add_init_files(NEW_IMPORT_PATH.__str__())
158163

‎examples/server/v1/components.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from viam.components.servo import Servo
2323
from viam.components.types import CameraMimeType
2424
from viam.errors import ComponentNotFoundError
25-
from viam.proto.api.common import (
25+
from viam.proto.common import (
2626
AnalogStatus,
2727
BoardStatus,
2828
DigitalInterruptStatus,
@@ -33,7 +33,7 @@
3333
Vector3,
3434
WorldState,
3535
)
36-
from viam.proto.api.component.arm import JointPositions
36+
from viam.proto.component.arm import JointPositions
3737

3838

3939
class ExampleArm(Arm):

‎examples/server/v1/server.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import logging
33
import sys
44

5-
from viam.proto.api.common import GeoPoint, Orientation, Vector3
5+
from viam.proto.common import GeoPoint, Orientation, Vector3
66
from viam.rpc.server import Server
77

88
from .components import (

‎poetry.lock

+16-50
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/viam/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from importlib.metadata import PackageNotFoundError, version
33
from uuid import uuid4
44

5-
from viam.proto.api.common import ResourceName as _ResourceName
5+
from viam.proto.common import ResourceName as _ResourceName
66

77
from .logging import getLogger as _getLogger
88

‎src/viam/components/arm/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from viam.proto.api.component.arm import Status as ArmStatus
2-
from viam.proto.api.robot import Status
1+
from viam.proto.component.arm import Status as ArmStatus
2+
from viam.proto.robot import Status
33
from viam.registry import ComponentRegistration, Registry
44
from viam.utils import message_to_struct
55

‎src/viam/components/arm/arm.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
from typing import Any, Dict, Optional
33

44
from viam.errors import NotSupportedError
5-
from viam.proto.api.common import Pose, WorldState
6-
from viam.proto.api.component.arm import JointPositions
5+
from viam.proto.common import Pose, WorldState
6+
from viam.proto.component.arm import JointPositions
77

88
from ..component_base import ComponentBase
99

‎src/viam/components/arm/client.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
from grpclib.client import Channel
44
from viam.components.generic.client import do_command
5-
from viam.proto.api.common import Pose, WorldState
6-
from viam.proto.api.component.arm import (
5+
from viam.proto.common import Pose, WorldState
6+
from viam.proto.component.arm import (
77
ArmServiceStub,
88
GetEndPositionRequest,
99
GetEndPositionResponse,

‎src/viam/components/arm/service.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from grpclib.server import Stream
22
from viam.components.service_base import ComponentServiceBase
33
from viam.errors import ComponentNotFoundError
4-
from viam.proto.api.component.arm import (
4+
from viam.proto.component.arm import (
55
ArmServiceBase,
66
GetEndPositionRequest,
77
GetEndPositionResponse,

‎src/viam/components/base/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from viam.registry import ComponentRegistration, Registry
2-
from viam.proto.api.common import ActuatorStatus
3-
from viam.proto.api.robot import Status
2+
from viam.proto.common import ActuatorStatus
3+
from viam.proto.robot import Status
44
from viam.utils import message_to_struct
55

66
from .base import Base, Vector3

‎src/viam/components/base/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from typing import Any, Dict, Optional
33

44
from viam.errors import NotSupportedError
5-
from viam.proto.api.common import Vector3
5+
from viam.proto.common import Vector3
66

77
from ..component_base import ComponentBase
88

‎src/viam/components/base/client.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
from grpclib.client import Channel
44
from viam.components.generic.client import do_command
5-
from viam.proto.api.common import Vector3
6-
from viam.proto.api.component.base import (
5+
from viam.proto.common import Vector3
6+
from viam.proto.component.base import (
77
BaseServiceStub,
88
MoveStraightRequest,
99
SetPowerRequest,

‎src/viam/components/base/service.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from grpclib.server import Stream
22
from viam.components.service_base import ComponentServiceBase
33
from viam.errors import ComponentNotFoundError
4-
from viam.proto.api.component.base import (
4+
from viam.proto.component.base import (
55
BaseServiceBase,
66
MoveStraightRequest,
77
MoveStraightResponse,

‎src/viam/components/board/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from viam.proto.api.robot import Status
1+
from viam.proto.robot import Status
22
from viam.registry import ComponentRegistration, Registry
33
from viam.utils import message_to_struct
44

0 commit comments

Comments
 (0)