Skip to content

armgit / ax

Public Imported from GitHub
0

Agent Executor (AX) is Google's open agentic orchestration runtime

Go

Rename ControllerService to ExecutionService (#242)

Jaana Dogan72b51a4893f3
diff --git a/cmd/ax/exec.go b/cmd/ax/exec.go
index bf739b6..947b6b1 100644
--- a/cmd/ax/exec.go
+++ b/cmd/ax/exec.go
@@ -325,7 +325,7 @@ func runExecServer(ctx context.Context, d *internal.Display, req *proto.ExecRequ
}
defer conn.Close()
- client := proto.NewControllerServiceClient(conn)
+ client := proto.NewExecutionServiceClient(conn)
stream, err := client.Exec(ctx, req)
if err != nil {
return nil, fmt.Errorf("error executing: %w", err)
diff --git a/internal/server/interceptors_test.go b/internal/server/interceptors_test.go
index 0dd6065..0d02e8e 100644
--- a/internal/server/interceptors_test.go
+++ b/internal/server/interceptors_test.go
@@ -44,11 +44,11 @@ func (m *mockConversationServer) DeleteConversation(ctx context.Context, req *pr
return &proto.DeleteConversationResponse{}, nil
}
-type mockControllerServer struct {
- proto.UnimplementedControllerServiceServer
+type mockExecutionServer struct {
+ proto.UnimplementedExecutionServiceServer
}
-func (m *mockControllerServer) Exec(req *proto.ExecRequest, stream proto.ControllerService_ExecServer) error {
+func (m *mockExecutionServer) Exec(req *proto.ExecRequest, stream proto.ExecutionService_ExecServer) error {
if req.ConversationId == "fail" {
return status.Error(codes.InvalidArgument, "mock error")
}
@@ -65,7 +65,7 @@ func setupTestServer(t *testing.T) (*grpc.ClientConn, func()) {
)
proto.RegisterConversationServiceServer(s, &mockConversationServer{})
- proto.RegisterControllerServiceServer(s, &mockControllerServer{})
+ proto.RegisterExecutionServiceServer(s, &mockExecutionServer{})
go func() {
if err := s.Serve(lis); err != nil && err != grpc.ErrServerStopped {
@@ -114,7 +114,7 @@ func TestLoggingInterceptors(t *testing.T) {
defer slog.SetDefault(oldLogger)
convClient := proto.NewConversationServiceClient(conn)
- controllerClient := proto.NewControllerServiceClient(conn)
+ executionClient := proto.NewExecutionServiceClient(conn)
t.Run("Unary Success", func(t *testing.T) {
logBuf.Reset()
@@ -177,7 +177,7 @@ func TestLoggingInterceptors(t *testing.T) {
t.Run("Stream Success", func(t *testing.T) {
logBuf.Reset()
ctx := context.Background()
- stream, err := controllerClient.Exec(ctx, &proto.ExecRequest{ConversationId: "conv-456"})
+ stream, err := executionClient.Exec(ctx, &proto.ExecRequest{ConversationId: "conv-456"})
if err != nil {
t.Fatalf("Exec stream init failed: %v", err)
}
@@ -202,8 +202,8 @@ func TestLoggingInterceptors(t *testing.T) {
if entries[0].Msg != "Handling stream request" {
t.Errorf("Expected start log msg 'Handling stream request', got %q", entries[0].Msg)
}
- if entries[0].Method != "/ax.ControllerService/Exec" {
- t.Errorf("Expected method '/ax.ControllerService/Exec', got %q", entries[0].Method)
+ if entries[0].Method != "/ax.ExecutionService/Exec" {
+ t.Errorf("Expected method '/ax.ExecutionService/Exec', got %q", entries[0].Method)
}
// Verify End Log
@@ -218,7 +218,7 @@ func TestLoggingInterceptors(t *testing.T) {
t.Run("Stream Failure", func(t *testing.T) {
logBuf.Reset()
ctx := context.Background()
- stream, err := controllerClient.Exec(ctx, &proto.ExecRequest{ConversationId: "fail"})
+ stream, err := executionClient.Exec(ctx, &proto.ExecRequest{ConversationId: "fail"})
if err != nil {
t.Fatalf("Exec stream init failed: %v", err)
}
diff --git a/internal/server/server.go b/internal/server/server.go
index 6da5b43..267460f 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -37,7 +37,7 @@ import (
// Server implements the AXService gRPC service.
type Server struct {
- proto.UnimplementedControllerServiceServer
+ proto.UnimplementedExecutionServiceServer
proto.UnimplementedConversationServiceServer
controller *controller.Controller
@@ -107,7 +107,7 @@ func (s *Server) Serve(address string, opts ...grpc.ServerOption) error {
)
s.grpcServer = grpc.NewServer(opts...)
- proto.RegisterControllerServiceServer(s.grpcServer, s)
+ proto.RegisterExecutionServiceServer(s.grpcServer, s)
proto.RegisterConversationServiceServer(s.grpcServer, s)
// Register standard gRPC Health Check server.
diff --git a/proto/ax.pb.go b/proto/ax.pb.go
index a1be6c5..94b1ffe 100644
--- a/proto/ax.pb.go
+++ b/proto/ax.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.36.11
-// protoc v7.34.1
+// protoc v5.28.2
// source: proto/ax.proto
package proto
@@ -1009,8 +1009,8 @@ const file_proto_ax_proto_rawDesc = "" +
"\x15CANCEL_REASON_TIMEOUT\x10\x02\x12 \n" +
"\x1cCANCEL_REASON_INTERNAL_ERROR\x10\x032H\n" +
"\x0eHarnessService\x126\n" +
- "\aConnect\x12\x12.ax.HarnessRequest\x1a\x13.ax.HarnessResponse(\x010\x012@\n" +
- "\x11ControllerService\x12+\n" +
+ "\aConnect\x12\x12.ax.HarnessRequest\x1a\x13.ax.HarnessResponse(\x010\x012?\n" +
+ "\x10ExecutionService\x12+\n" +
"\x04Exec\x12\x0f.ax.ExecRequest\x1a\x10.ax.ExecResponse0\x012j\n" +
"\x13ConversationService\x12S\n" +
"\x12DeleteConversation\x12\x1d.ax.DeleteConversationRequest\x1a\x1e.ax.DeleteConversationResponseB\x1cZ\x1agithub.com/google/ax/protob\x06proto3"
@@ -1065,10 +1065,10 @@ var file_proto_ax_proto_depIdxs = []int32{
2, // 13: ax.ExecRequest.inputs:type_name -> ax.Message
2, // 14: ax.ExecResponse.outputs:type_name -> ax.Message
6, // 15: ax.HarnessService.Connect:input_type -> ax.HarnessRequest
- 11, // 16: ax.ControllerService.Exec:input_type -> ax.ExecRequest
+ 11, // 16: ax.ExecutionService.Exec:input_type -> ax.ExecRequest
13, // 17: ax.ConversationService.DeleteConversation:input_type -> ax.DeleteConversationRequest
10, // 18: ax.HarnessService.Connect:output_type -> ax.HarnessResponse
- 12, // 19: ax.ControllerService.Exec:output_type -> ax.ExecResponse
+ 12, // 19: ax.ExecutionService.Exec:output_type -> ax.ExecResponse
14, // 20: ax.ConversationService.DeleteConversation:output_type -> ax.DeleteConversationResponse
18, // [18:21] is the sub-list for method output_type
15, // [15:18] is the sub-list for method input_type
diff --git a/proto/ax.proto b/proto/ax.proto
index ee5e5e0..675fb88 100644
--- a/proto/ax.proto
+++ b/proto/ax.proto
@@ -130,7 +130,7 @@ message ExecResponse {
int32 seq = 2; // Seq of the outputs
}
-service ControllerService {
+service ExecutionService {
// Exec executes an agentic task or resumes an existing one with streaming responses
// If the conversation_id already exists, it will be resumed.
rpc Exec(ExecRequest) returns (stream ExecResponse);
diff --git a/proto/ax_grpc.pb.go b/proto/ax_grpc.pb.go
index 36ab2a5..dc1e0b8 100644
--- a/proto/ax_grpc.pb.go
+++ b/proto/ax_grpc.pb.go
@@ -14,8 +14,8 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
-// - protoc v7.34.1
+// - protoc-gen-go-grpc v1.5.1
+// - protoc v5.28.2
// source: proto/ax.proto
package proto
@@ -88,7 +88,7 @@ type HarnessServiceServer interface {
type UnimplementedHarnessServiceServer struct{}
func (UnimplementedHarnessServiceServer) Connect(grpc.BidiStreamingServer[HarnessRequest, HarnessResponse]) error {
- return status.Error(codes.Unimplemented, "method Connect not implemented")
+ return status.Errorf(codes.Unimplemented, "method Connect not implemented")
}
func (UnimplementedHarnessServiceServer) mustEmbedUnimplementedHarnessServiceServer() {}
func (UnimplementedHarnessServiceServer) testEmbeddedByValue() {}
@@ -101,7 +101,7 @@ type UnsafeHarnessServiceServer interface {
}
func RegisterHarnessServiceServer(s grpc.ServiceRegistrar, srv HarnessServiceServer) {
- // If the following call panics, it indicates UnimplementedHarnessServiceServer was
+ // If the following call pancis, it indicates UnimplementedHarnessServiceServer was
// embedded by pointer and is nil. This will cause panics if an
// unimplemented method is ever invoked, so we test this at initialization
// time to prevent it from happening at runtime later due to I/O.
@@ -137,29 +137,29 @@ var HarnessService_ServiceDesc = grpc.ServiceDesc{
}
const (
- ControllerService_Exec_FullMethodName = "/ax.ControllerService/Exec"
+ ExecutionService_Exec_FullMethodName = "/ax.ExecutionService/Exec"
)
-// ControllerServiceClient is the client API for ControllerService service.
+// ExecutionServiceClient is the client API for ExecutionService service.
//
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type ControllerServiceClient interface {
+type ExecutionServiceClient interface {
// Exec executes an agentic task or resumes an existing one with streaming responses
// If the conversation_id already exists, it will be resumed.
Exec(ctx context.Context, in *ExecRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ExecResponse], error)
}
-type controllerServiceClient struct {
+type executionServiceClient struct {
cc grpc.ClientConnInterface
}
-func NewControllerServiceClient(cc grpc.ClientConnInterface) ControllerServiceClient {
- return &controllerServiceClient{cc}
+func NewExecutionServiceClient(cc grpc.ClientConnInterface) ExecutionServiceClient {
+ return &executionServiceClient{cc}
}
-func (c *controllerServiceClient) Exec(ctx context.Context, in *ExecRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ExecResponse], error) {
+func (c *executionServiceClient) Exec(ctx context.Context, in *ExecRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ExecResponse], error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
- stream, err := c.cc.NewStream(ctx, &ControllerService_ServiceDesc.Streams[0], ControllerService_Exec_FullMethodName, cOpts...)
+ stream, err := c.cc.NewStream(ctx, &ExecutionService_ServiceDesc.Streams[0], ExecutionService_Exec_FullMethodName, cOpts...)
if err != nil {
return nil, err
}
@@ -174,71 +174,71 @@ func (c *controllerServiceClient) Exec(ctx context.Context, in *ExecRequest, opt
}
// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type ControllerService_ExecClient = grpc.ServerStreamingClient[ExecResponse]
+type ExecutionService_ExecClient = grpc.ServerStreamingClient[ExecResponse]
-// ControllerServiceServer is the server API for ControllerService service.
-// All implementations must embed UnimplementedControllerServiceServer
+// ExecutionServiceServer is the server API for ExecutionService service.
+// All implementations must embed UnimplementedExecutionServiceServer
// for forward compatibility.
-type ControllerServiceServer interface {
+type ExecutionServiceServer interface {
// Exec executes an agentic task or resumes an existing one with streaming responses
// If the conversation_id already exists, it will be resumed.
Exec(*ExecRequest, grpc.ServerStreamingServer[ExecResponse]) error
- mustEmbedUnimplementedControllerServiceServer()
+ mustEmbedUnimplementedExecutionServiceServer()
}
-// UnimplementedControllerServiceServer must be embedded to have
+// UnimplementedExecutionServiceServer must be embedded to have
// forward compatible implementations.
//
// NOTE: this should be embedded by value instead of pointer to avoid a nil
// pointer dereference when methods are called.
-type UnimplementedControllerServiceServer struct{}
+type UnimplementedExecutionServiceServer struct{}
-func (UnimplementedControllerServiceServer) Exec(*ExecRequest, grpc.ServerStreamingServer[ExecResponse]) error {
- return status.Error(codes.Unimplemented, "method Exec not implemented")
+func (UnimplementedExecutionServiceServer) Exec(*ExecRequest, grpc.ServerStreamingServer[ExecResponse]) error {
+ return status.Errorf(codes.Unimplemented, "method Exec not implemented")
}
-func (UnimplementedControllerServiceServer) mustEmbedUnimplementedControllerServiceServer() {}
-func (UnimplementedControllerServiceServer) testEmbeddedByValue() {}
+func (UnimplementedExecutionServiceServer) mustEmbedUnimplementedExecutionServiceServer() {}
+func (UnimplementedExecutionServiceServer) testEmbeddedByValue() {}
-// UnsafeControllerServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to ControllerServiceServer will
+// UnsafeExecutionServiceServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to ExecutionServiceServer will
// result in compilation errors.
-type UnsafeControllerServiceServer interface {
- mustEmbedUnimplementedControllerServiceServer()
+type UnsafeExecutionServiceServer interface {
+ mustEmbedUnimplementedExecutionServiceServer()
}
-func RegisterControllerServiceServer(s grpc.ServiceRegistrar, srv ControllerServiceServer) {
- // If the following call panics, it indicates UnimplementedControllerServiceServer was
+func RegisterExecutionServiceServer(s grpc.ServiceRegistrar, srv ExecutionServiceServer) {
+ // If the following call pancis, it indicates UnimplementedExecutionServiceServer was
// embedded by pointer and is nil. This will cause panics if an
// unimplemented method is ever invoked, so we test this at initialization
// time to prevent it from happening at runtime later due to I/O.
if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
t.testEmbeddedByValue()
}
- s.RegisterService(&ControllerService_ServiceDesc, srv)
+ s.RegisterService(&ExecutionService_ServiceDesc, srv)
}
-func _ControllerService_Exec_Handler(srv interface{}, stream grpc.ServerStream) error {
+func _ExecutionService_Exec_Handler(srv interface{}, stream grpc.ServerStream) error {
m := new(ExecRequest)
if err := stream.RecvMsg(m); err != nil {
return err
}
- return srv.(ControllerServiceServer).Exec(m, &grpc.GenericServerStream[ExecRequest, ExecResponse]{ServerStream: stream})
+ return srv.(ExecutionServiceServer).Exec(m, &grpc.GenericServerStream[ExecRequest, ExecResponse]{ServerStream: stream})
}
// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type ControllerService_ExecServer = grpc.ServerStreamingServer[ExecResponse]
+type ExecutionService_ExecServer = grpc.ServerStreamingServer[ExecResponse]
-// ControllerService_ServiceDesc is the grpc.ServiceDesc for ControllerService service.
+// ExecutionService_ServiceDesc is the grpc.ServiceDesc for ExecutionService service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
-var ControllerService_ServiceDesc = grpc.ServiceDesc{
- ServiceName: "ax.ControllerService",
- HandlerType: (*ControllerServiceServer)(nil),
+var ExecutionService_ServiceDesc = grpc.ServiceDesc{
+ ServiceName: "ax.ExecutionService",
+ HandlerType: (*ExecutionServiceServer)(nil),
Methods: []grpc.MethodDesc{},
Streams: []grpc.StreamDesc{
{
StreamName: "Exec",
- Handler: _ControllerService_Exec_Handler,
+ Handler: _ExecutionService_Exec_Handler,
ServerStreams: true,
},
},
@@ -294,7 +294,7 @@ type ConversationServiceServer interface {
type UnimplementedConversationServiceServer struct{}
func (UnimplementedConversationServiceServer) DeleteConversation(context.Context, *DeleteConversationRequest) (*DeleteConversationResponse, error) {
- return nil, status.Error(codes.Unimplemented, "method DeleteConversation not implemented")
+ return nil, status.Errorf(codes.Unimplemented, "method DeleteConversation not implemented")
}
func (UnimplementedConversationServiceServer) mustEmbedUnimplementedConversationServiceServer() {}
func (UnimplementedConversationServiceServer) testEmbeddedByValue() {}
@@ -307,7 +307,7 @@ type UnsafeConversationServiceServer interface {
}
func RegisterConversationServiceServer(s grpc.ServiceRegistrar, srv ConversationServiceServer) {
- // If the following call panics, it indicates UnimplementedConversationServiceServer was
+ // If the following call pancis, it indicates UnimplementedConversationServiceServer was
// embedded by pointer and is nil. This will cause panics if an
// unimplemented method is ever invoked, so we test this at initialization
// time to prevent it from happening at runtime later due to I/O.
diff --git a/proto/content.pb.go b/proto/content.pb.go
index 807eb73..1cae4f6 100644
--- a/proto/content.pb.go
+++ b/proto/content.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.36.11
-// protoc v7.34.1
+// protoc v5.28.2
// source: proto/content.proto
package proto
diff --git a/python/proto/ax_pb2.py b/python/proto/ax_pb2.py
index 24c93ce..d147103 100644
--- a/python/proto/ax_pb2.py
+++ b/python/proto/ax_pb2.py
@@ -14,23 +14,13 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
# source: proto/ax.proto
-# Protobuf Python Version: 6.33.5
+# Protobuf Python Version: 4.25.1
"""Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import runtime_version as _runtime_version
from google.protobuf import symbol_database as _symbol_database
from google.protobuf.internal import builder as _builder
-_runtime_version.ValidateProtobufRuntimeVersion(
- _runtime_version.Domain.PUBLIC,
- 6,
- 33,
- 5,
- '',
- 'proto/ax.proto'
-)
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -40,13 +30,13 @@ from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
from proto import content_pb2 as proto_dot_content__pb2
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0eproto/ax.proto\x12\x02\x61x\x1a\x1cgoogle/protobuf/struct.proto\x1a\x13proto/content.proto\"5\n\x07Message\x12\x0c\n\x04role\x18\x01 \x01(\t\x12\x1c\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x0b.ax.Content\"\xc8\x01\n\x11\x43onversationEvent\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\x12\x0b\n\x03seq\x18\x02 \x01(\x05\x12\x0f\n\x07\x65xec_id\x18\x03 \x01(\t\x12\x12\n\nharness_id\x18\x04 \x01(\t\x12/\n\x0eharness_config\x18\x05 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x1d\n\x08messages\x18\x06 \x03(\x0b\x32\x0b.ax.Message\x12\x18\n\x05state\x18\x07 \x01(\x0e\x32\t.ax.State\"E\n\x0cHarnessStart\x12\x16\n\x0eharness_config\x18\x01 \x01(\x0c\x12\x1d\n\x08messages\x18\x02 \x03(\x0b\x32\x0b.ax.Message\"1\n\rHarnessCancel\x12 \n\x06reason\x18\x01 \x01(\x0e\x32\x10.ax.CancelReason\"\x8d\x01\n\x0eHarnessRequest\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\x12\x12\n\nharness_id\x18\x02 \x01(\t\x12!\n\x05start\x18\x03 \x01(\x0b\x32\x10.ax.HarnessStartH\x00\x12#\n\x06\x63\x61ncel\x18\x04 \x01(\x0b\x32\x11.ax.HarnessCancelH\x00\x42\x06\n\x04type\"/\n\x0eHarnessOutputs\x12\x1d\n\x08messages\x18\x01 \x03(\x0b\x32\x0b.ax.Message\"*\n\x05\x45rror\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\"@\n\nHarnessEnd\x12\x18\n\x05state\x18\x01 \x01(\x0e\x32\t.ax.State\x12\x18\n\x05\x65rror\x18\x02 \x01(\x0b\x32\t.ax.Error\"x\n\x0fHarnessResponse\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\x12%\n\x07outputs\x18\x02 \x01(\x0b\x32\x12.ax.HarnessOutputsH\x00\x12\x1d\n\x03\x65nd\x18\x03 \x01(\x0b\x32\x0e.ax.HarnessEndH\x00\x42\x06\n\x04type\"\x81\x01\n\x0b\x45xecRequest\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\x12\x1b\n\x06inputs\x18\x02 \x03(\x0b\x32\x0b.ax.Message\x12\x10\n\x08last_seq\x18\x03 \x01(\x05\x12\x12\n\nharness_id\x18\x04 \x01(\t\x12\x16\n\x0eharness_config\x18\x05 \x01(\x0c\"9\n\x0c\x45xecResponse\x12\x1c\n\x07outputs\x18\x01 \x03(\x0b\x32\x0b.ax.Message\x12\x0b\n\x03seq\x18\x02 \x01(\x05\"4\n\x19\x44\x65leteConversationRequest\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\"\x1c\n\x1a\x44\x65leteConversationResponse*l\n\x05State\x12\x15\n\x11STATE_UNSPECIFIED\x10\x00\x12\x11\n\rSTATE_PENDING\x10\x01\x12\x10\n\x0cSTATE_FAILED\x10\x02\x12\x13\n\x0fSTATE_COMPLETED\x10\x03\x12\x12\n\x0eSTATE_CANCELED\x10\x04*\x8c\x01\n\x0c\x43\x61ncelReason\x12\x1d\n\x19\x43\x41NCEL_REASON_UNSPECIFIED\x10\x00\x12 \n\x1c\x43\x41NCEL_REASON_USER_REQUESTED\x10\x01\x12\x19\n\x15\x43\x41NCEL_REASON_TIMEOUT\x10\x02\x12 \n\x1c\x43\x41NCEL_REASON_INTERNAL_ERROR\x10\x03\x32H\n\x0eHarnessService\x12\x36\n\x07\x43onnect\x12\x12.ax.HarnessRequest\x1a\x13.ax.HarnessResponse(\x01\x30\x01\x32@\n\x11\x43ontrollerService\x12+\n\x04\x45xec\x12\x0f.ax.ExecRequest\x1a\x10.ax.ExecResponse0\x01\x32j\n\x13\x43onversationService\x12S\n\x12\x44\x65leteConversation\x12\x1d.ax.DeleteConversationRequest\x1a\x1e.ax.DeleteConversationResponseB\x1cZ\x1agithub.com/google/ax/protob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0eproto/ax.proto\x12\x02\x61x\x1a\x1cgoogle/protobuf/struct.proto\x1a\x13proto/content.proto\"5\n\x07Message\x12\x0c\n\x04role\x18\x01 \x01(\t\x12\x1c\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x0b.ax.Content\"\xc8\x01\n\x11\x43onversationEvent\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\x12\x0b\n\x03seq\x18\x02 \x01(\x05\x12\x0f\n\x07\x65xec_id\x18\x03 \x01(\t\x12\x12\n\nharness_id\x18\x04 \x01(\t\x12/\n\x0eharness_config\x18\x05 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x1d\n\x08messages\x18\x06 \x03(\x0b\x32\x0b.ax.Message\x12\x18\n\x05state\x18\x07 \x01(\x0e\x32\t.ax.State\"E\n\x0cHarnessStart\x12\x16\n\x0eharness_config\x18\x01 \x01(\x0c\x12\x1d\n\x08messages\x18\x02 \x03(\x0b\x32\x0b.ax.Message\"1\n\rHarnessCancel\x12 \n\x06reason\x18\x01 \x01(\x0e\x32\x10.ax.CancelReason\"\x8d\x01\n\x0eHarnessRequest\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\x12\x12\n\nharness_id\x18\x02 \x01(\t\x12!\n\x05start\x18\x03 \x01(\x0b\x32\x10.ax.HarnessStartH\x00\x12#\n\x06\x63\x61ncel\x18\x04 \x01(\x0b\x32\x11.ax.HarnessCancelH\x00\x42\x06\n\x04type\"/\n\x0eHarnessOutputs\x12\x1d\n\x08messages\x18\x01 \x03(\x0b\x32\x0b.ax.Message\"*\n\x05\x45rror\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\"@\n\nHarnessEnd\x12\x18\n\x05state\x18\x01 \x01(\x0e\x32\t.ax.State\x12\x18\n\x05\x65rror\x18\x02 \x01(\x0b\x32\t.ax.Error\"x\n\x0fHarnessResponse\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\x12%\n\x07outputs\x18\x02 \x01(\x0b\x32\x12.ax.HarnessOutputsH\x00\x12\x1d\n\x03\x65nd\x18\x03 \x01(\x0b\x32\x0e.ax.HarnessEndH\x00\x42\x06\n\x04type\"\x81\x01\n\x0b\x45xecRequest\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\x12\x1b\n\x06inputs\x18\x02 \x03(\x0b\x32\x0b.ax.Message\x12\x10\n\x08last_seq\x18\x03 \x01(\x05\x12\x12\n\nharness_id\x18\x04 \x01(\t\x12\x16\n\x0eharness_config\x18\x05 \x01(\x0c\"9\n\x0c\x45xecResponse\x12\x1c\n\x07outputs\x18\x01 \x03(\x0b\x32\x0b.ax.Message\x12\x0b\n\x03seq\x18\x02 \x01(\x05\"4\n\x19\x44\x65leteConversationRequest\x12\x17\n\x0f\x63onversation_id\x18\x01 \x01(\t\"\x1c\n\x1a\x44\x65leteConversationResponse*l\n\x05State\x12\x15\n\x11STATE_UNSPECIFIED\x10\x00\x12\x11\n\rSTATE_PENDING\x10\x01\x12\x10\n\x0cSTATE_FAILED\x10\x02\x12\x13\n\x0fSTATE_COMPLETED\x10\x03\x12\x12\n\x0eSTATE_CANCELED\x10\x04*\x8c\x01\n\x0c\x43\x61ncelReason\x12\x1d\n\x19\x43\x41NCEL_REASON_UNSPECIFIED\x10\x00\x12 \n\x1c\x43\x41NCEL_REASON_USER_REQUESTED\x10\x01\x12\x19\n\x15\x43\x41NCEL_REASON_TIMEOUT\x10\x02\x12 \n\x1c\x43\x41NCEL_REASON_INTERNAL_ERROR\x10\x03\x32H\n\x0eHarnessService\x12\x36\n\x07\x43onnect\x12\x12.ax.HarnessRequest\x1a\x13.ax.HarnessResponse(\x01\x30\x01\x32?\n\x10\x45xecutionService\x12+\n\x04\x45xec\x12\x0f.ax.ExecRequest\x1a\x10.ax.ExecResponse0\x01\x32j\n\x13\x43onversationService\x12S\n\x12\x44\x65leteConversation\x12\x1d.ax.DeleteConversationRequest\x1a\x1e.ax.DeleteConversationResponseB\x1cZ\x1agithub.com/google/ax/protob\x06proto3')
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'proto.ax_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
- _globals['DESCRIPTOR']._loaded_options = None
+if _descriptor._USE_C_DESCRIPTORS == False:
+ _globals['DESCRIPTOR']._options = None
_globals['DESCRIPTOR']._serialized_options = b'Z\032github.com/google/ax/proto'
_globals['_STATE']._serialized_start=1153
_globals['_STATE']._serialized_end=1261
@@ -80,8 +70,8 @@ if not _descriptor._USE_C_DESCRIPTORS:
_globals['_DELETECONVERSATIONRESPONSE']._serialized_end=1151
_globals['_HARNESSSERVICE']._serialized_start=1406
_globals['_HARNESSSERVICE']._serialized_end=1478
- _globals['_CONTROLLERSERVICE']._serialized_start=1480
- _globals['_CONTROLLERSERVICE']._serialized_end=1544
- _globals['_CONVERSATIONSERVICE']._serialized_start=1546
- _globals['_CONVERSATIONSERVICE']._serialized_end=1652
+ _globals['_EXECUTIONSERVICE']._serialized_start=1480
+ _globals['_EXECUTIONSERVICE']._serialized_end=1543
+ _globals['_CONVERSATIONSERVICE']._serialized_start=1545
+ _globals['_CONVERSATIONSERVICE']._serialized_end=1651
# @@protoc_insertion_point(module_scope)
diff --git a/python/proto/ax_pb2_grpc.py b/python/proto/ax_pb2_grpc.py
index e67bdd8..b35d953 100644
--- a/python/proto/ax_pb2_grpc.py
+++ b/python/proto/ax_pb2_grpc.py
@@ -15,31 +15,11 @@
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-import warnings
from proto import ax_pb2 as proto_dot_ax__pb2
-GRPC_GENERATED_VERSION = '1.81.1'
-GRPC_VERSION = grpc.__version__
-_version_not_supported = False
-try:
- from grpc._utilities import first_version_is_lower
- _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
-except ImportError:
- _version_not_supported = True
-
-if _version_not_supported:
- raise RuntimeError(
- f'The grpc package installed is at version {GRPC_VERSION},'
- + ' but the generated code in proto/ax_pb2_grpc.py depends on'
- + f' grpcio>={GRPC_GENERATED_VERSION}.'
- + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
- + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
- )
-
-
-class HarnessServiceStub:
+class HarnessServiceStub(object):
"""Missing associated documentation comment in .proto file."""
def __init__(self, channel):
@@ -52,10 +32,10 @@ class HarnessServiceStub:
'/ax.HarnessService/Connect',
request_serializer=proto_dot_ax__pb2.HarnessRequest.SerializeToString,
response_deserializer=proto_dot_ax__pb2.HarnessResponse.FromString,
- _registered_method=True)
+ )
-class HarnessServiceServicer:
+class HarnessServiceServicer(object):
"""Missing associated documentation comment in .proto file."""
def Connect(self, request_iterator, context):
@@ -80,11 +60,10 @@ def add_HarnessServiceServicer_to_server(servicer, server):
generic_handler = grpc.method_handlers_generic_handler(
'ax.HarnessService', rpc_method_handlers)
server.add_generic_rpc_handlers((generic_handler,))
- server.add_registered_method_handlers('ax.HarnessService', rpc_method_handlers)
# This class is part of an EXPERIMENTAL API.
-class HarnessService:
+class HarnessService(object):
"""Missing associated documentation comment in .proto file."""
@staticmethod
@@ -98,24 +77,14 @@ class HarnessService:
wait_for_ready=None,
timeout=None,
metadata=None):
- return grpc.experimental.stream_stream(
- request_iterator,
- target,
- '/ax.HarnessService/Connect',
+ return grpc.experimental.stream_stream(request_iterator, target, '/ax.HarnessService/Connect',
proto_dot_ax__pb2.HarnessRequest.SerializeToString,
proto_dot_ax__pb2.HarnessResponse.FromString,
- options,
- channel_credentials,
- insecure,
- call_credentials,
- compression,
- wait_for_ready,
- timeout,
- metadata,
- _registered_method=True)
-
-
-class ControllerServiceStub:
+ options, channel_credentials,
+ insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+
+class ExecutionServiceStub(object):
"""Missing associated documentation comment in .proto file."""
def __init__(self, channel):
@@ -125,13 +94,13 @@ class ControllerServiceStub:
channel: A grpc.Channel.
"""
self.Exec = channel.unary_stream(
- '/ax.ControllerService/Exec',
+ '/ax.ExecutionService/Exec',
request_serializer=proto_dot_ax__pb2.ExecRequest.SerializeToString,
response_deserializer=proto_dot_ax__pb2.ExecResponse.FromString,
- _registered_method=True)
+ )
-class ControllerServiceServicer:
+class ExecutionServiceServicer(object):
"""Missing associated documentation comment in .proto file."""
def Exec(self, request, context):
@@ -143,7 +112,7 @@ class ControllerServiceServicer:
raise NotImplementedError('Method not implemented!')
-def add_ControllerServiceServicer_to_server(servicer, server):
+def add_ExecutionServiceServicer_to_server(servicer, server):
rpc_method_handlers = {
'Exec': grpc.unary_stream_rpc_method_handler(
servicer.Exec,
@@ -152,13 +121,12 @@ def add_ControllerServiceServicer_to_server(servicer, server):
),
}
generic_handler = grpc.method_handlers_generic_handler(
- 'ax.ControllerService', rpc_method_handlers)
+ 'ax.ExecutionService', rpc_method_handlers)
server.add_generic_rpc_handlers((generic_handler,))
- server.add_registered_method_handlers('ax.ControllerService', rpc_method_handlers)
# This class is part of an EXPERIMENTAL API.
-class ControllerService:
+class ExecutionService(object):
"""Missing associated documentation comment in .proto file."""
@staticmethod
@@ -172,24 +140,14 @@ class ControllerService:
wait_for_ready=None,
timeout=None,
metadata=None):
- return grpc.experimental.unary_stream(
- request,
- target,
- '/ax.ControllerService/Exec',
+ return grpc.experimental.unary_stream(request, target, '/ax.ExecutionService/Exec',
proto_dot_ax__pb2.ExecRequest.SerializeToString,
proto_dot_ax__pb2.ExecResponse.FromString,
- options,
- channel_credentials,
- insecure,
- call_credentials,
- compression,
- wait_for_ready,
- timeout,
- metadata,
- _registered_method=True)
-
-
-class ConversationServiceStub:
+ options, channel_credentials,
+ insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+
+class ConversationServiceStub(object):
"""Missing associated documentation comment in .proto file."""
def __init__(self, channel):
@@ -202,10 +160,10 @@ class ConversationServiceStub:
'/ax.ConversationService/DeleteConversation',
request_serializer=proto_dot_ax__pb2.DeleteConversationRequest.SerializeToString,
response_deserializer=proto_dot_ax__pb2.DeleteConversationResponse.FromString,
- _registered_method=True)
+ )
-class ConversationServiceServicer:
+class ConversationServiceServicer(object):
"""Missing associated documentation comment in .proto file."""
def DeleteConversation(self, request, context):
@@ -228,11 +186,10 @@ def add_ConversationServiceServicer_to_server(servicer, server):
generic_handler = grpc.method_handlers_generic_handler(
'ax.ConversationService', rpc_method_handlers)
server.add_generic_rpc_handlers((generic_handler,))
- server.add_registered_method_handlers('ax.ConversationService', rpc_method_handlers)
# This class is part of an EXPERIMENTAL API.
-class ConversationService:
+class ConversationService(object):
"""Missing associated documentation comment in .proto file."""
@staticmethod
@@ -246,18 +203,8 @@ class ConversationService:
wait_for_ready=None,
timeout=None,
metadata=None):
- return grpc.experimental.unary_unary(
- request,
- target,
- '/ax.ConversationService/DeleteConversation',
+ return grpc.experimental.unary_unary(request, target, '/ax.ConversationService/DeleteConversation',
proto_dot_ax__pb2.DeleteConversationRequest.SerializeToString,
proto_dot_ax__pb2.DeleteConversationResponse.FromString,
- options,
- channel_credentials,
- insecure,
- call_credentials,
- compression,
- wait_for_ready,
- timeout,
- metadata,
- _registered_method=True)
+ options, channel_credentials,
+ insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/python/proto/content_pb2.py b/python/proto/content_pb2.py
index 27a5937..c20ef7b 100644
--- a/python/proto/content_pb2.py
+++ b/python/proto/content_pb2.py
@@ -14,23 +14,13 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
# source: proto/content.proto
-# Protobuf Python Version: 6.33.5
+# Protobuf Python Version: 4.25.1
"""Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import runtime_version as _runtime_version
from google.protobuf import symbol_database as _symbol_database
from google.protobuf.internal import builder as _builder
-_runtime_version.ValidateProtobufRuntimeVersion(
- _runtime_version.Domain.PUBLIC,
- 6,
- 33,
- 5,
- '',
- 'proto/content.proto'
-)
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -44,8 +34,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13proto/content.
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'proto.content_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
- _globals['DESCRIPTOR']._loaded_options = None
+if _descriptor._USE_C_DESCRIPTORS == False:
+ _globals['DESCRIPTOR']._options = None
_globals['DESCRIPTOR']._serialized_options = b'Z\032github.com/google/ax/proto'
_globals['_MEDIARESOLUTION']._serialized_start=2638
_globals['_MEDIARESOLUTION']._serialized_end=2736
diff --git a/python/proto/content_pb2_grpc.py b/python/proto/content_pb2_grpc.py
index f6b95ba..fe9b2e7 100644
--- a/python/proto/content_pb2_grpc.py
+++ b/python/proto/content_pb2_grpc.py
@@ -15,24 +15,4 @@
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-import warnings
-
-GRPC_GENERATED_VERSION = '1.81.1'
-GRPC_VERSION = grpc.__version__
-_version_not_supported = False
-
-try:
- from grpc._utilities import first_version_is_lower
- _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
-except ImportError:
- _version_not_supported = True
-
-if _version_not_supported:
- raise RuntimeError(
- f'The grpc package installed is at version {GRPC_VERSION},'
- + ' but the generated code in proto/content_pb2_grpc.py depends on'
- + f' grpcio>={GRPC_GENERATED_VERSION}.'
- + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
- + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
- )