Skip to content

Commit 23bd1ff

Browse files
author
Michelle Sintov
committed
Update proto (#156)
1 parent 55a23a6 commit 23bd1ff

6 files changed

Lines changed: 411 additions & 276 deletions

File tree

‎anki_vector/messaging/external_interface.proto‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,6 @@ service ExternalInterface {
117117
rpc BehaviorControl(stream BehaviorControlRequest) returns (stream BehaviorControlResponse) {
118118
}
119119

120-
// Acquire control of Vector's AI system.
121-
rpc AssumeBehaviorControl(BehaviorControlRequest) returns (stream BehaviorControlResponse) {
122-
option (google.api.http) = {
123-
post: "/v1/assume_behavior_control",
124-
body: "*"
125-
};
126-
}
127-
128120
rpc CancelFaceEnrollment(CancelFaceEnrollmentRequest) returns (CancelFaceEnrollmentResponse) {
129121
option (google.api.http) = {
130122
post: "/v1/cancel_face_enrollment",
@@ -171,6 +163,14 @@ service ExternalInterface {
171163
};
172164
}
173165

166+
// Enroll a face. Must be used with SetFaceToEnroll
167+
rpc EnrollFace(EnrollFaceRequest) returns (EnrollFaceResponse) {
168+
option (google.api.http) = {
169+
post: "/v1/enroll_face",
170+
body: "*"
171+
};
172+
}
173+
174174
rpc EnableMarkerDetection(EnableMarkerDetectionRequest) returns (EnableMarkerDetectionResponse) {
175175
option (google.api.http) = {
176176
post: "/v1/enable_marker_detection",

‎anki_vector/messaging/external_interface_pb2.py‎

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎anki_vector/messaging/external_interface_pb2_grpc.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,6 @@ def __init__(self, channel):
8888
request_serializer=anki__vector_dot_messaging_dot_behavior__pb2.BehaviorControlRequest.SerializeToString,
8989
response_deserializer=anki__vector_dot_messaging_dot_behavior__pb2.BehaviorControlResponse.FromString,
9090
)
91-
self.AssumeBehaviorControl = channel.unary_stream(
92-
'/Anki.Vector.external_interface.ExternalInterface/AssumeBehaviorControl',
93-
request_serializer=anki__vector_dot_messaging_dot_behavior__pb2.BehaviorControlRequest.SerializeToString,
94-
response_deserializer=anki__vector_dot_messaging_dot_behavior__pb2.BehaviorControlResponse.FromString,
95-
)
9691
self.CancelFaceEnrollment = channel.unary_unary(
9792
'/Anki.Vector.external_interface.ExternalInterface/CancelFaceEnrollment',
9893
request_serializer=anki__vector_dot_messaging_dot_messages__pb2.CancelFaceEnrollmentRequest.SerializeToString,
@@ -123,6 +118,11 @@ def __init__(self, channel):
123118
request_serializer=anki__vector_dot_messaging_dot_messages__pb2.SetFaceToEnrollRequest.SerializeToString,
124119
response_deserializer=anki__vector_dot_messaging_dot_messages__pb2.SetFaceToEnrollResponse.FromString,
125120
)
121+
self.EnrollFace = channel.unary_unary(
122+
'/Anki.Vector.external_interface.ExternalInterface/EnrollFace',
123+
request_serializer=anki__vector_dot_messaging_dot_messages__pb2.EnrollFaceRequest.SerializeToString,
124+
response_deserializer=anki__vector_dot_messaging_dot_messages__pb2.EnrollFaceResponse.FromString,
125+
)
126126
self.EnableMarkerDetection = channel.unary_unary(
127127
'/Anki.Vector.external_interface.ExternalInterface/EnableMarkerDetection',
128128
request_serializer=anki__vector_dot_messaging_dot_messages__pb2.EnableMarkerDetectionRequest.SerializeToString,
@@ -468,13 +468,6 @@ def BehaviorControl(self, request_iterator, context):
468468
context.set_details('Method not implemented!')
469469
raise NotImplementedError('Method not implemented!')
470470

471-
def AssumeBehaviorControl(self, request, context):
472-
"""Acquire control of Vector's AI system.
473-
"""
474-
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
475-
context.set_details('Method not implemented!')
476-
raise NotImplementedError('Method not implemented!')
477-
478471
def CancelFaceEnrollment(self, request, context):
479472
# missing associated documentation comment in .proto file
480473
pass
@@ -517,6 +510,13 @@ def SetFaceToEnroll(self, request, context):
517510
context.set_details('Method not implemented!')
518511
raise NotImplementedError('Method not implemented!')
519512

513+
def EnrollFace(self, request, context):
514+
"""Enroll a face. Must be used with SetFaceToEnroll
515+
"""
516+
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
517+
context.set_details('Method not implemented!')
518+
raise NotImplementedError('Method not implemented!')
519+
520520
def EnableMarkerDetection(self, request, context):
521521
# missing associated documentation comment in .proto file
522522
pass
@@ -935,11 +935,6 @@ def add_ExternalInterfaceServicer_to_server(servicer, server):
935935
request_deserializer=anki__vector_dot_messaging_dot_behavior__pb2.BehaviorControlRequest.FromString,
936936
response_serializer=anki__vector_dot_messaging_dot_behavior__pb2.BehaviorControlResponse.SerializeToString,
937937
),
938-
'AssumeBehaviorControl': grpc.unary_stream_rpc_method_handler(
939-
servicer.AssumeBehaviorControl,
940-
request_deserializer=anki__vector_dot_messaging_dot_behavior__pb2.BehaviorControlRequest.FromString,
941-
response_serializer=anki__vector_dot_messaging_dot_behavior__pb2.BehaviorControlResponse.SerializeToString,
942-
),
943938
'CancelFaceEnrollment': grpc.unary_unary_rpc_method_handler(
944939
servicer.CancelFaceEnrollment,
945940
request_deserializer=anki__vector_dot_messaging_dot_messages__pb2.CancelFaceEnrollmentRequest.FromString,
@@ -970,6 +965,11 @@ def add_ExternalInterfaceServicer_to_server(servicer, server):
970965
request_deserializer=anki__vector_dot_messaging_dot_messages__pb2.SetFaceToEnrollRequest.FromString,
971966
response_serializer=anki__vector_dot_messaging_dot_messages__pb2.SetFaceToEnrollResponse.SerializeToString,
972967
),
968+
'EnrollFace': grpc.unary_unary_rpc_method_handler(
969+
servicer.EnrollFace,
970+
request_deserializer=anki__vector_dot_messaging_dot_messages__pb2.EnrollFaceRequest.FromString,
971+
response_serializer=anki__vector_dot_messaging_dot_messages__pb2.EnrollFaceResponse.SerializeToString,
972+
),
973973
'EnableMarkerDetection': grpc.unary_unary_rpc_method_handler(
974974
servicer.EnableMarkerDetection,
975975
request_deserializer=anki__vector_dot_messaging_dot_messages__pb2.EnableMarkerDetectionRequest.FromString,

‎anki_vector/messaging/messages.proto‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,19 @@ message SetFaceToEnrollRequest {
417417
bool say_name = 5; // Play say-name/celebration animations on success before completing
418418
bool use_music = 6; // Starts special music during say-name animations (will leave music playing!)
419419
}
420+
420421
message SetFaceToEnrollResponse {
421422
ResponseStatus status = 1;
422423
}
423424

425+
message EnrollFaceRequest {
426+
}
427+
428+
message EnrollFaceResponse {
429+
ResponseStatus status = 1;
430+
BehaviorResults result = 2;
431+
}
432+
424433
enum BehaviorResults
425434
{
426435
BEHAVIOR_INVALID_STATE = 0;

‎anki_vector/messaging/messages_pb2.py‎

Lines changed: 309 additions & 229 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/source/proto.html‎

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,14 @@ <h2>Table of Contents</h2>
584584
<a href="#Anki.Vector.external_interface.EnableMotionDetectionResponse"><span class="badge">M</span>EnableMotionDetectionResponse</a>
585585
</li>
586586

587+
<li>
588+
<a href="#Anki.Vector.external_interface.EnrollFaceRequest"><span class="badge">M</span>EnrollFaceRequest</a>
589+
</li>
590+
591+
<li>
592+
<a href="#Anki.Vector.external_interface.EnrollFaceResponse"><span class="badge">M</span>EnrollFaceResponse</a>
593+
</li>
594+
587595
<li>
588596
<a href="#Anki.Vector.external_interface.EraseAllEnrolledFacesRequest"><span class="badge">M</span>EraseAllEnrolledFacesRequest</a>
589597
</li>
@@ -3121,11 +3129,6 @@ <h3 id="Anki.Vector.external_interface.ExternalInterface">ExternalInterface</h3>
31213129
<td><p>Integrate with and acquire control of Vector's AI system.</p></td>
31223130
</tr>
31233131

3124-
<tr>
3125-
<td>AssumeBehaviorControl</td>
3126-
<td><p>Acquire control of Vector's AI system.</p></td>
3127-
</tr>
3128-
31293132
<tr>
31303133
<td>CancelFaceEnrollment</td>
31313134
<td><p></p></td>
@@ -3156,6 +3159,11 @@ <h3 id="Anki.Vector.external_interface.ExternalInterface">ExternalInterface</h3>
31563159
<td><p></p></td>
31573160
</tr>
31583161

3162+
<tr>
3163+
<td>EnrollFace</td>
3164+
<td><p>Enroll a face. Must be used with SetFaceToEnroll</p></td>
3165+
</tr>
3166+
31593167
<tr>
31603168
<td>EnableMarkerDetection</td>
31613169
<td><p></p></td>
@@ -4782,6 +4790,44 @@ <h3 id="Anki.Vector.external_interface.EnableMotionDetectionResponse">EnableMoti
47824790

47834791

47844792

4793+
<h3 id="Anki.Vector.external_interface.EnrollFaceRequest">EnrollFaceRequest</h3>
4794+
4795+
<p></p>
4796+
4797+
4798+
4799+
4800+
4801+
<h3 id="Anki.Vector.external_interface.EnrollFaceResponse">EnrollFaceResponse</h3>
4802+
4803+
<p></p>
4804+
4805+
4806+
<table class="field-table">
4807+
<thead>
4808+
<tr><td>Field</td><td>Type</td><td>Description</td></tr>
4809+
</thead>
4810+
<tbody>
4811+
4812+
<tr>
4813+
<td>status</td>
4814+
<td><a href="#Anki.Vector.external_interface.ResponseStatus">ResponseStatus</a> </td>
4815+
<td><p> </p></td>
4816+
</tr>
4817+
4818+
<tr>
4819+
<td>result</td>
4820+
<td><a href="#Anki.Vector.external_interface.BehaviorResults">BehaviorResults</a> </td>
4821+
<td><p> </p></td>
4822+
</tr>
4823+
4824+
</tbody>
4825+
</table>
4826+
<p></p>
4827+
4828+
4829+
4830+
47854831
<h3 id="Anki.Vector.external_interface.EraseAllEnrolledFacesRequest">EraseAllEnrolledFacesRequest</h3>
47864832

47874833
<p></p>

0 commit comments

Comments
 (0)