From 4a2db414d85f29f17bc8ec6ff3462beef29585da Mon Sep 17 00:00:00 2001 From: Johnu George Date: Thu, 3 Nov 2022 16:02:04 +0530 Subject: [PATCH] Remove deprecated variable from GRPC definitions (#1994) * Update training operator image in CI * Remove deprecated GRPC var * Remove deprecated GRPC var * Remove deprecated GRPC var * Support for k8s v1.25 in CI * Revert "Support for k8s v1.25 in CI" This reverts commit 16e6fe4b16820aea30e266a5c69560a92cfb851c. --- pkg/apis/manager/v1beta1/api.pb.go | 256 +++++++++--------- pkg/apis/manager/v1beta1/api.proto | 3 - pkg/apis/manager/v1beta1/gen-doc/api.md | 1 - pkg/apis/manager/v1beta1/gen-doc/index.html | 29 -- pkg/apis/manager/v1beta1/python/api_pb2.py | 85 +++--- .../suggestionclient/suggestionclient.go | 6 +- .../suggestionclient/suggestionclient_test.go | 1 - 7 files changed, 163 insertions(+), 218 deletions(-) diff --git a/pkg/apis/manager/v1beta1/api.pb.go b/pkg/apis/manager/v1beta1/api.pb.go index 4fd81883184..b73f354974f 100644 --- a/pkg/apis/manager/v1beta1/api.pb.go +++ b/pkg/apis/manager/v1beta1/api.pb.go @@ -1006,9 +1006,6 @@ func (*DeleteObservationLogReply) Descriptor() ([]byte, []int) { return fileDesc type GetSuggestionsRequest struct { Experiment *Experiment `protobuf:"bytes,1,opt,name=experiment" json:"experiment,omitempty"` Trials []*Trial `protobuf:"bytes,2,rep,name=trials" json:"trials,omitempty"` - // Use current_request_number instead. This API will be removed in Katib 0.14. - // The number of Suggestions requested at one time. - RequestNumber int32 `protobuf:"varint,3,opt,name=request_number,json=requestNumber" json:"request_number,omitempty"` // The number of Suggestions requested at one time. // When you set 3 to current_request_number, you get three Suggestions at one time. CurrentRequestNumber int32 `protobuf:"varint,4,opt,name=current_request_number,json=currentRequestNumber" json:"current_request_number,omitempty"` @@ -1034,13 +1031,6 @@ func (m *GetSuggestionsRequest) GetTrials() []*Trial { return nil } -func (m *GetSuggestionsRequest) GetRequestNumber() int32 { - if m != nil { - return m.RequestNumber - } - return 0 -} - func (m *GetSuggestionsRequest) GetCurrentRequestNumber() int32 { if m != nil { return m.CurrentRequestNumber @@ -1734,128 +1724,128 @@ var _EarlyStopping_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("api.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1968 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xdd, 0x72, 0x1b, 0x49, - 0x15, 0xce, 0x48, 0xb2, 0x1d, 0x1d, 0x59, 0xf2, 0xa4, 0x2d, 0x67, 0x65, 0x65, 0x77, 0xe3, 0xcc, - 0x86, 0x6c, 0x36, 0x49, 0x99, 0xc4, 0x40, 0x2a, 0x4b, 0x42, 0x81, 0x2c, 0x4f, 0x5c, 0xca, 0xca, - 0x92, 0xd3, 0x92, 0x97, 0xec, 0x2e, 0x55, 0x53, 0x2d, 0xa9, 0xa3, 0x9d, 0x64, 0xfe, 0x98, 0x69, - 0xa5, 0x22, 0xb8, 0xa4, 0x72, 0x07, 0x17, 0x5b, 0xc5, 0x15, 0xd7, 0xdc, 0x71, 0xc9, 0x0b, 0x70, - 0xc5, 0x03, 0xf0, 0x04, 0xf0, 0x00, 0xbc, 0x02, 0x45, 0x75, 0xcf, 0x68, 0xfe, 0x34, 0x92, 0x7f, - 0x02, 0x7b, 0x37, 0x7d, 0xce, 0x77, 0xba, 0xcf, 0x4f, 0x9f, 0x9f, 0x96, 0xa0, 0x48, 0x1c, 0x7d, - 0xd7, 0x71, 0x6d, 0x66, 0xa3, 0x75, 0xfe, 0xf9, 0xe6, 0xc1, 0xee, 0x80, 0x32, 0xf2, 0x40, 0xc1, - 0x00, 0xea, 0x5b, 0x87, 0xba, 0xba, 0x49, 0x2d, 0x86, 0x10, 0x14, 0x2c, 0x62, 0xd2, 0x9a, 0xb4, - 0x23, 0xdd, 0x2e, 0x62, 0xf1, 0x8d, 0xee, 0x43, 0xc1, 0x73, 0xe8, 0xb0, 0x96, 0xdb, 0x91, 0x6e, - 0x97, 0xf6, 0x3e, 0xdc, 0x8d, 0x8b, 0xef, 0x46, 0xb2, 0x3d, 0x87, 0x0e, 0xb1, 0x40, 0x2a, 0xef, - 0x0a, 0x50, 0x49, 0x32, 0x50, 0x1f, 0x36, 0x1c, 0xe2, 0x12, 0x93, 0x32, 0xea, 0x6a, 0x1c, 0xe4, - 0x89, 0x33, 0x4a, 0x7b, 0x77, 0x97, 0xed, 0xb7, 0x7b, 0x3c, 0x93, 0xe1, 0x2b, 0x0f, 0x57, 0x9c, - 0xc4, 0x1a, 0x7d, 0x0e, 0x45, 0x7b, 0xf0, 0x8a, 0x0e, 0x99, 0xfe, 0x86, 0x06, 0xfa, 0x5d, 0x4b, - 0xee, 0xd7, 0x9d, 0xb1, 0x85, 0x7a, 0x11, 0x9a, 0x8b, 0x12, 0x63, 0x6c, 0xbb, 0x3a, 0xfb, 0xd6, - 0xac, 0xe5, 0xb3, 0x44, 0x1b, 0x33, 0xb6, 0x2f, 0x1a, 0xa2, 0xd1, 0x53, 0xa8, 0x50, 0xe2, 0x1a, - 0x53, 0xcd, 0x63, 0xb6, 0xe3, 0xe8, 0xd6, 0xb8, 0x56, 0x10, 0xf2, 0xd7, 0x53, 0xa6, 0x70, 0x4c, - 0x2f, 0x80, 0x88, 0x3d, 0xca, 0x34, 0x4e, 0x42, 0xf7, 0xa1, 0xca, 0xed, 0x31, 0x0c, 0x6a, 0x68, + // 1953 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4f, 0x73, 0x1b, 0x49, + 0x15, 0xcf, 0x48, 0xb2, 0x1d, 0x3d, 0x59, 0xf2, 0xa4, 0x2d, 0x67, 0x65, 0x65, 0x77, 0xe3, 0xcc, + 0x86, 0x6c, 0x48, 0x52, 0x26, 0x31, 0x90, 0xca, 0x92, 0x50, 0x20, 0xcb, 0x13, 0x97, 0xb2, 0xb2, + 0xe4, 0xb4, 0xe4, 0x25, 0xbb, 0x4b, 0xd5, 0x54, 0x4b, 0xea, 0x28, 0x93, 0xcc, 0x3f, 0x66, 0x5a, + 0xa9, 0x08, 0x8e, 0x54, 0x6e, 0x70, 0xa0, 0x8a, 0x13, 0x67, 0x6e, 0x1c, 0xf9, 0x02, 0x9c, 0xf8, + 0x00, 0x7c, 0x02, 0xb8, 0x70, 0xe3, 0x2b, 0x50, 0x54, 0xf7, 0x8c, 0xe6, 0x9f, 0x46, 0xf2, 0x9f, + 0x00, 0xb7, 0xe9, 0xf7, 0x7e, 0xef, 0xf5, 0x7b, 0xfd, 0xfa, 0xfd, 0x69, 0x09, 0x8a, 0xc4, 0xd1, + 0x77, 0x1d, 0xd7, 0x66, 0x36, 0x5a, 0xe7, 0x9f, 0x6f, 0x1f, 0xec, 0x0e, 0x28, 0x23, 0x0f, 0x14, + 0x0c, 0xa0, 0xbe, 0x73, 0xa8, 0xab, 0x9b, 0xd4, 0x62, 0x08, 0x41, 0xc1, 0x22, 0x26, 0xad, 0x49, + 0x3b, 0xd2, 0xed, 0x22, 0x16, 0xdf, 0xe8, 0x3e, 0x14, 0x3c, 0x87, 0x0e, 0x6b, 0xb9, 0x1d, 0xe9, + 0x76, 0x69, 0xef, 0xe3, 0xdd, 0xb8, 0xf8, 0x6e, 0x24, 0xdb, 0x73, 0xe8, 0x10, 0x0b, 0xa4, 0xf2, + 0xbe, 0x00, 0x95, 0x24, 0x03, 0xf5, 0x61, 0xc3, 0x21, 0x2e, 0x31, 0x29, 0xa3, 0xae, 0xc6, 0x41, + 0x9e, 0xd8, 0xa3, 0xb4, 0x77, 0x77, 0x99, 0xbe, 0xdd, 0xe3, 0x99, 0x0c, 0x5f, 0x79, 0xb8, 0xe2, + 0x24, 0xd6, 0xe8, 0x0b, 0x28, 0xda, 0x83, 0xd7, 0x74, 0xc8, 0xf4, 0xb7, 0x34, 0xb0, 0xef, 0x5a, + 0x52, 0x5f, 0x77, 0xc6, 0x16, 0xe6, 0x45, 0x68, 0x2e, 0x4a, 0x8c, 0xb1, 0xed, 0xea, 0xec, 0x95, + 0x59, 0xcb, 0x67, 0x89, 0x36, 0x66, 0x6c, 0x5f, 0x34, 0x44, 0xa3, 0xa7, 0x50, 0xa1, 0xc4, 0x35, + 0xa6, 0x9a, 0xc7, 0x6c, 0xc7, 0xd1, 0xad, 0x71, 0xad, 0x20, 0xe4, 0xaf, 0xa7, 0x5c, 0xe1, 0x98, + 0x5e, 0x00, 0x11, 0x3a, 0xca, 0x34, 0x4e, 0x42, 0xf7, 0xa1, 0xca, 0xfd, 0x31, 0x0c, 0x6a, 0x68, 0xcc, 0xd5, 0x89, 0xa1, 0x0d, 0xed, 0x89, 0xc5, 0x6a, 0x2b, 0x3b, 0xd2, 0xed, 0x15, 0x8c, 0x66, - 0xbc, 0x3e, 0x67, 0x35, 0x39, 0x07, 0xdd, 0x82, 0x0d, 0x93, 0xbc, 0x4d, 0x80, 0x57, 0x05, 0xb8, - 0x6c, 0x92, 0xb7, 0x31, 0xdc, 0x43, 0x00, 0x8b, 0x78, 0xda, 0xd0, 0xb6, 0x5e, 0xea, 0xe3, 0xda, - 0x9a, 0xd0, 0xee, 0x83, 0xa4, 0x76, 0x1d, 0xe2, 0x35, 0x05, 0x1b, 0x17, 0xad, 0xd9, 0x67, 0xfd, - 0x08, 0x2a, 0x49, 0x8f, 0xa3, 0xc7, 0x00, 0xa1, 0xcf, 0x79, 0xc8, 0xf2, 0xf3, 0x7e, 0x4a, 0x48, - 0xe0, 0x18, 0x5c, 0xf9, 0x8b, 0x04, 0xe5, 0x04, 0x37, 0xf3, 0x7e, 0xed, 0x43, 0x14, 0x56, 0x8d, - 0x4d, 0x1d, 0x3f, 0x92, 0x95, 0x85, 0xc7, 0xf4, 0xa7, 0x0e, 0xc5, 0x65, 0x27, 0xbe, 0xe4, 0x7b, - 0xbc, 0xa4, 0xc4, 0xd3, 0x07, 0x06, 0xd5, 0x3c, 0x87, 0x0c, 0x69, 0x76, 0x48, 0x9f, 0x06, 0x98, - 0x1e, 0x87, 0xe0, 0xf2, 0xcb, 0xf8, 0x52, 0xf9, 0x06, 0xca, 0x09, 0x3e, 0x92, 0x21, 0x6f, 0x92, - 0xb7, 0x81, 0xae, 0xfc, 0x53, 0x50, 0x74, 0x4b, 0xe8, 0xc7, 0x29, 0xba, 0xc5, 0x0d, 0x32, 0x74, - 0x8f, 0xd5, 0xf2, 0x3b, 0x79, 0x6e, 0x10, 0xff, 0xe6, 0x34, 0x8f, 0x51, 0x47, 0xdc, 0x8a, 0x22, - 0x16, 0xdf, 0xca, 0xdf, 0x24, 0x28, 0x27, 0xee, 0x22, 0xfa, 0x21, 0x14, 0x84, 0xb1, 0x52, 0x96, - 0xb1, 0x21, 0x54, 0x18, 0x2b, 0x80, 0x7c, 0xdb, 0xb1, 0x4d, 0x0c, 0x71, 0xba, 0x84, 0xc5, 0x37, - 0xda, 0x83, 0xad, 0xf0, 0x4a, 0x6b, 0x26, 0x65, 0xae, 0x3e, 0xd4, 0x84, 0x83, 0xf3, 0xe2, 0xec, - 0xcd, 0x90, 0x79, 0x24, 0x78, 0x1d, 0xee, 0xef, 0x87, 0xf0, 0x01, 0x19, 0x8d, 0x74, 0xa6, 0xdb, - 0x16, 0x31, 0xe2, 0x42, 0x5e, 0xad, 0x20, 0xac, 0xd8, 0x8a, 0xd8, 0x91, 0x98, 0xa7, 0xbc, 0x93, - 0xa0, 0x9c, 0xc8, 0x09, 0xf4, 0x03, 0xa8, 0x84, 0x59, 0xa1, 0xc5, 0xe2, 0x5a, 0x0e, 0xa9, 0xe2, - 0xc0, 0x23, 0x40, 0x11, 0xcc, 0xa3, 0x8c, 0xe9, 0xd6, 0xd8, 0xab, 0xe5, 0xc4, 0x5d, 0xfa, 0x78, - 0x51, 0xce, 0xf9, 0x30, 0x7c, 0x85, 0xa4, 0x28, 0x9e, 0xf2, 0x04, 0xe4, 0x34, 0x2c, 0xf3, 0x5e, - 0x55, 0x61, 0xe5, 0x0d, 0x31, 0x26, 0x34, 0x08, 0x97, 0xbf, 0x50, 0xfe, 0x20, 0xc1, 0x95, 0xb9, - 0xcc, 0x3c, 0xab, 0x25, 0xcf, 0x97, 0x58, 0xa2, 0x2c, 0xcb, 0xfe, 0xc5, 0xd6, 0xfc, 0x02, 0xaa, - 0x59, 0xd0, 0x73, 0x58, 0xf4, 0x0f, 0x09, 0x8a, 0x61, 0x36, 0xa3, 0x27, 0xb0, 0x3e, 0x76, 0x89, - 0xf3, 0xed, 0x2c, 0xf9, 0xfd, 0x2a, 0xbb, 0x9d, 0x54, 0xee, 0x90, 0x23, 0x82, 0xf4, 0x2f, 0x8d, - 0xa3, 0x05, 0xda, 0x07, 0xb0, 0x1d, 0xea, 0x12, 0x1e, 0x7d, 0x2f, 0xa8, 0xa8, 0xca, 0x82, 0xc2, - 0xb1, 0xdb, 0x0d, 0x91, 0x38, 0x26, 0x55, 0x6f, 0x02, 0x44, 0x1c, 0xf4, 0x13, 0x28, 0x86, 0xbc, - 0xa0, 0x7e, 0xa4, 0x2a, 0x51, 0x08, 0xc6, 0x11, 0x52, 0x71, 0xa0, 0x14, 0x53, 0x12, 0x7d, 0x04, - 0x60, 0x4d, 0x4c, 0xcd, 0x20, 0x53, 0xbf, 0x0c, 0xf1, 0x9a, 0x57, 0xb4, 0x26, 0x66, 0x5b, 0x10, - 0xd0, 0x75, 0x28, 0xe9, 0x96, 0x33, 0x61, 0x9a, 0xa7, 0xff, 0x86, 0xfa, 0x01, 0x59, 0xc1, 0x20, - 0x48, 0x3d, 0x4e, 0x41, 0x37, 0x60, 0xdd, 0x9e, 0xb0, 0x08, 0x91, 0x17, 0x88, 0x92, 0x4f, 0x13, - 0x10, 0xe1, 0xc6, 0x50, 0x15, 0x7e, 0x21, 0x42, 0x65, 0xb4, 0x30, 0x4f, 0x8b, 0xb8, 0x1c, 0x52, - 0x45, 0xdd, 0xe9, 0xce, 0xb7, 0x35, 0xdf, 0x69, 0xb7, 0x16, 0xd8, 0x78, 0x4a, 0x47, 0xfb, 0x5f, - 0x57, 0xe0, 0xdf, 0xc2, 0x8a, 0x68, 0x0b, 0x99, 0xd7, 0xe9, 0x6e, 0xa2, 0xb1, 0xa7, 0xa2, 0x22, - 0xc4, 0xa2, 0x9e, 0x8e, 0x1e, 0xc0, 0xaa, 0xc7, 0x08, 0x9b, 0x78, 0x41, 0x65, 0xdd, 0xce, 0x82, - 0x0b, 0x00, 0x0e, 0x80, 0xca, 0x7f, 0x72, 0x50, 0x0c, 0xb7, 0x79, 0x9f, 0x5e, 0x4d, 0x60, 0x2b, - 0xf2, 0x32, 0xf1, 0x3c, 0x7d, 0x6c, 0xf1, 0x09, 0x61, 0xa6, 0xca, 0xbd, 0x05, 0x9a, 0x47, 0x7e, - 0x69, 0x44, 0x32, 0xb8, 0xea, 0x64, 0x50, 0xd1, 0x63, 0x58, 0x35, 0xc8, 0x80, 0x1a, 0x7e, 0x0d, - 0x2c, 0xed, 0x7d, 0xb2, 0x68, 0xcf, 0xb6, 0x40, 0xa9, 0x16, 0x73, 0xa7, 0x38, 0x10, 0xa9, 0x7f, - 0x03, 0xd5, 0xac, 0xa3, 0x50, 0x13, 0x4a, 0x71, 0x6d, 0xfd, 0xd8, 0xdd, 0x58, 0x10, 0xbb, 0x48, - 0x10, 0xc7, 0xa5, 0xea, 0x9f, 0x43, 0x29, 0x76, 0x26, 0x6f, 0x41, 0xaf, 0xe9, 0x74, 0xd6, 0x94, - 0x5e, 0xd3, 0x69, 0x76, 0x55, 0xf8, 0x69, 0xee, 0x91, 0xa4, 0xfc, 0x1c, 0x36, 0x33, 0xb6, 0x3f, - 0x47, 0x69, 0xf9, 0x77, 0x0e, 0x4a, 0xb1, 0xc8, 0xf2, 0x34, 0xf4, 0x18, 0x71, 0x99, 0xc6, 0xf4, - 0x50, 0xbe, 0x28, 0x28, 0x7d, 0xdd, 0xa4, 0xe8, 0x53, 0xd8, 0x18, 0xda, 0xa6, 0x63, 0x50, 0x3f, - 0x6b, 0x38, 0xc6, 0xdf, 0xae, 0x12, 0x91, 0x05, 0xf0, 0x19, 0x14, 0x87, 0xb6, 0xe5, 0x37, 0x19, - 0x11, 0xc4, 0x4a, 0x76, 0x10, 0xc5, 0xa9, 0xbb, 0xc1, 0x60, 0x13, 0xe0, 0x45, 0x47, 0x8c, 0xc4, - 0xd1, 0x63, 0x28, 0xd9, 0x03, 0x8f, 0xba, 0x6f, 0xfc, 0x12, 0x53, 0xc8, 0xba, 0x9d, 0xdd, 0x08, - 0x80, 0xe3, 0x68, 0xe5, 0xf7, 0x12, 0xa0, 0xf9, 0xed, 0x51, 0x09, 0xd6, 0x9a, 0x58, 0x6d, 0xf4, - 0xd5, 0x03, 0xf9, 0x12, 0x5f, 0xe0, 0x93, 0x4e, 0xa7, 0xd5, 0x39, 0x94, 0x25, 0x54, 0x86, 0x62, - 0xef, 0xa4, 0xd9, 0x54, 0xd5, 0x03, 0xf5, 0x40, 0xce, 0x21, 0x80, 0xd5, 0x2f, 0x5a, 0xed, 0xb6, - 0x7a, 0x20, 0xe7, 0xf9, 0xf7, 0xd3, 0x46, 0x8b, 0x7f, 0x17, 0xd0, 0x55, 0x40, 0x47, 0x6a, 0x1f, - 0xb7, 0x9a, 0xbd, 0x93, 0x4e, 0xe3, 0xcb, 0x46, 0xab, 0xdd, 0xd8, 0x6f, 0xab, 0xf2, 0x0a, 0x92, - 0x61, 0x5d, 0x6d, 0xe0, 0xf6, 0x57, 0xbd, 0x7e, 0xf7, 0xf8, 0x58, 0x3d, 0x90, 0x57, 0xf9, 0xee, - 0x27, 0x9d, 0x2f, 0x3a, 0xdd, 0x5f, 0x76, 0xe4, 0x35, 0xe5, 0x67, 0x50, 0x8a, 0xa9, 0x8a, 0x76, - 0x61, 0xcd, 0x6f, 0xcf, 0xb3, 0xbb, 0x53, 0x4d, 0x9a, 0xe5, 0x77, 0x67, 0x3c, 0x03, 0x29, 0x7b, - 0xb0, 0xea, 0x93, 0xce, 0x11, 0xe2, 0xdf, 0x49, 0x70, 0x0d, 0x53, 0xc7, 0x76, 0x59, 0xec, 0xe4, - 0xb6, 0x3d, 0xc6, 0xf4, 0xd7, 0x13, 0xea, 0x31, 0x1e, 0x72, 0x7f, 0xdc, 0x8c, 0xed, 0x57, 0x14, - 0x14, 0xd1, 0x11, 0x55, 0xd8, 0x88, 0xf9, 0x53, 0x33, 0xec, 0x71, 0xf6, 0x3b, 0x21, 0xb5, 0x79, - 0xc5, 0x4e, 0xac, 0x95, 0x6b, 0xb0, 0x9d, 0xad, 0x84, 0x63, 0x4c, 0x95, 0x67, 0x50, 0x49, 0x92, - 0xd1, 0x23, 0x28, 0x05, 0x73, 0x8b, 0x61, 0x8f, 0xbd, 0xec, 0xb6, 0xe2, 0x7b, 0x82, 0x6f, 0x02, - 0xe6, 0xec, 0xd3, 0x53, 0x5e, 0x40, 0x31, 0x64, 0x08, 0xdb, 0x74, 0x93, 0x6a, 0x1e, 0x23, 0xa6, - 0x13, 0xda, 0xa6, 0x9b, 0xb4, 0xc7, 0x09, 0xe8, 0x1e, 0xac, 0xfa, 0x92, 0x81, 0x49, 0xd9, 0xde, - 0x0f, 0x30, 0xca, 0x1f, 0x25, 0xa8, 0x1d, 0xd2, 0x8b, 0x79, 0xf1, 0x7a, 0x68, 0x8f, 0xe0, 0xfb, - 0x01, 0x0a, 0xd4, 0x16, 0x80, 0x64, 0xe2, 0xe5, 0xd3, 0x89, 0xb7, 0x0d, 0x97, 0xa9, 0x35, 0xf2, - 0x99, 0xfe, 0xd4, 0xb9, 0x46, 0xad, 0x11, 0x67, 0x29, 0x1a, 0x5c, 0xcd, 0xd0, 0xca, 0x31, 0xa6, - 0x59, 0xa1, 0x93, 0x2e, 0x10, 0xba, 0x27, 0x70, 0xed, 0x80, 0x1a, 0x94, 0xd1, 0x8b, 0x58, 0xce, - 0x03, 0x9f, 0x2d, 0xcd, 0x03, 0xff, 0x5d, 0x0e, 0xb6, 0x0e, 0x29, 0xeb, 0x4d, 0xc6, 0x63, 0xea, - 0xf9, 0x83, 0x46, 0xb0, 0xeb, 0x23, 0x00, 0x1a, 0xbe, 0x14, 0x03, 0xb5, 0x6b, 0x8b, 0x5e, 0x92, - 0x38, 0x86, 0x45, 0x77, 0x61, 0x55, 0x9c, 0x3e, 0x1b, 0xdb, 0x36, 0x33, 0xea, 0x0e, 0x0e, 0x20, - 0xe8, 0x33, 0xa8, 0xb8, 0xfe, 0x89, 0x9a, 0x35, 0x31, 0x07, 0xd4, 0x15, 0xae, 0x5f, 0xd9, 0xcf, - 0xd5, 0x24, 0x5c, 0x0e, 0x38, 0x1d, 0xc1, 0x40, 0x3f, 0x86, 0xab, 0xc3, 0x89, 0xeb, 0x52, 0x8b, - 0x69, 0x29, 0x91, 0x82, 0x98, 0x56, 0xaa, 0x01, 0x17, 0x27, 0xa4, 0xee, 0x43, 0x95, 0xd9, 0x8c, - 0x18, 0x69, 0x99, 0xe0, 0x09, 0x28, 0x78, 0x09, 0x09, 0xe5, 0xcf, 0x05, 0xd8, 0x4c, 0xfb, 0x84, - 0x47, 0xf3, 0xf5, 0xa2, 0x1e, 0xe9, 0x27, 0xc7, 0xc3, 0xd4, 0x00, 0x38, 0xbf, 0xc3, 0x79, 0xba, - 0x65, 0xe2, 0xf1, 0x9c, 0x3b, 0xd7, 0xe3, 0xf9, 0x39, 0x54, 0x93, 0x8f, 0x67, 0xcd, 0x9d, 0x18, - 0xc1, 0x44, 0xb6, 0xfc, 0x09, 0x8d, 0x27, 0x06, 0xc5, 0x88, 0xa6, 0x49, 0x5e, 0xfd, 0xbb, 0xdc, - 0xff, 0xb1, 0xff, 0xa6, 0x2e, 0x70, 0x2e, 0x9d, 0xba, 0x5f, 0x87, 0x83, 0x83, 0x6f, 0xc1, 0xfe, - 0xc5, 0x1c, 0x9d, 0x39, 0x57, 0xbc, 0x47, 0xeb, 0xff, 0x15, 0xec, 0x7c, 0x49, 0x0c, 0x7d, 0x44, - 0x18, 0x4d, 0x3f, 0x96, 0xde, 0x3f, 0x89, 0x94, 0x1d, 0xf8, 0x78, 0xc9, 0xee, 0x3c, 0x75, 0xff, - 0x2a, 0xc1, 0x87, 0x87, 0x94, 0xcd, 0x05, 0xf0, 0xfb, 0xce, 0xe0, 0x7b, 0x80, 0x46, 0x03, 0xcd, - 0x24, 0x16, 0x19, 0xf3, 0xbc, 0x18, 0x8d, 0x5c, 0xea, 0x79, 0x41, 0x01, 0x95, 0x47, 0x83, 0x23, - 0x9f, 0xd1, 0xf0, 0xe9, 0x8a, 0x0d, 0xf5, 0x05, 0x4a, 0xf3, 0x14, 0x5b, 0x74, 0x75, 0xa5, 0x0b, - 0x5f, 0x5d, 0xe5, 0x4f, 0xe9, 0xd7, 0x28, 0x27, 0x9f, 0xbd, 0x7b, 0xa3, 0x27, 0x00, 0x7c, 0xb4, - 0x22, 0xae, 0xee, 0x85, 0x93, 0x54, 0xaa, 0x7c, 0x37, 0x43, 0xbe, 0x98, 0x9c, 0x62, 0xf8, 0xa8, - 0xab, 0x84, 0x3f, 0x57, 0xac, 0x04, 0x5d, 0xa5, 0xc7, 0xa8, 0xa3, 0x58, 0x70, 0x73, 0x16, 0xe5, - 0xac, 0x27, 0x6a, 0x18, 0xca, 0xf9, 0xdf, 0xc3, 0xa4, 0x8b, 0xfc, 0x1e, 0xa6, 0xdc, 0x04, 0xe5, - 0x94, 0xf3, 0xf8, 0xcd, 0x7a, 0x08, 0x5b, 0x3d, 0xca, 0xe2, 0xef, 0x8d, 0xb3, 0x75, 0x9a, 0x2d, - 0xd8, 0x4c, 0xcb, 0x39, 0xc6, 0xf4, 0xce, 0x49, 0xec, 0x27, 0x2a, 0x31, 0xfb, 0xc9, 0xb0, 0x1e, - 0x0c, 0x64, 0x5a, 0xff, 0xab, 0x63, 0x55, 0xbe, 0xc4, 0x07, 0xbb, 0x83, 0xee, 0x09, 0x1f, 0xe0, - 0x24, 0xb4, 0x06, 0xf9, 0x56, 0xa7, 0x2f, 0xe7, 0xd0, 0x3a, 0x5c, 0x3e, 0x68, 0xf5, 0x9a, 0x58, - 0xed, 0xab, 0x72, 0x1e, 0x6d, 0x40, 0xa9, 0xd9, 0xe8, 0xab, 0x87, 0x5d, 0xdc, 0x6a, 0x36, 0xda, - 0x72, 0xe1, 0xce, 0xa3, 0xd8, 0xcf, 0x3d, 0xb3, 0x91, 0x72, 0x36, 0xe7, 0x5d, 0xe2, 0xc2, 0x47, - 0xad, 0x4e, 0xeb, 0xa8, 0xf5, 0x35, 0xdf, 0x93, 0xaf, 0x1a, 0x2f, 0xfc, 0x55, 0xee, 0xce, 0x33, - 0xa8, 0x24, 0x43, 0xc6, 0x87, 0xc9, 0x99, 0x46, 0xcd, 0xee, 0xd1, 0x71, 0x03, 0xb7, 0x7a, 0x5d, - 0xbe, 0x4b, 0x11, 0x56, 0xd4, 0xe7, 0x27, 0x8d, 0xb6, 0x2c, 0xa1, 0xcb, 0x50, 0x68, 0xab, 0xbd, - 0x9e, 0x9c, 0xe3, 0xe7, 0x1c, 0x8a, 0xd1, 0x15, 0xcb, 0xf9, 0xbd, 0xbf, 0xe7, 0xa0, 0x78, 0xb0, - 0x1f, 0x5c, 0x72, 0xf4, 0x0a, 0xaa, 0x59, 0x43, 0x16, 0xfa, 0x2c, 0x19, 0xa7, 0x25, 0xd3, 0x60, - 0xfd, 0xd3, 0xb3, 0x40, 0x79, 0xae, 0x10, 0xb8, 0x32, 0x37, 0x76, 0xa0, 0x5b, 0x73, 0xb5, 0x31, - 0xfb, 0x94, 0x9b, 0xa7, 0xe2, 0xf8, 0x11, 0xaf, 0xa0, 0x9a, 0x35, 0x3a, 0xa4, 0xcd, 0x59, 0x32, - 0x9c, 0xa4, 0xcd, 0x59, 0x38, 0x89, 0xec, 0xfd, 0x4b, 0x02, 0x88, 0xea, 0x38, 0x7a, 0x01, 0x95, - 0x64, 0x61, 0x47, 0x9f, 0x2c, 0x2f, 0xfb, 0xfe, 0x71, 0x37, 0x4e, 0xed, 0x0d, 0x68, 0x0a, 0xdb, - 0x0b, 0x2b, 0x2b, 0xda, 0x4d, 0xca, 0x9f, 0x56, 0xe0, 0xeb, 0xf7, 0xce, 0x8c, 0xe7, 0x36, 0xfe, - 0x33, 0x07, 0xe5, 0x44, 0xde, 0x21, 0x53, 0x8c, 0x5f, 0xf3, 0xe5, 0x10, 0xdd, 0x99, 0x33, 0x64, - 0x61, 0xa1, 0xaf, 0xdf, 0x3e, 0x13, 0x96, 0xdb, 0xfe, 0x02, 0x2a, 0xc9, 0x0c, 0x4d, 0x7b, 0x35, - 0x33, 0xef, 0xd3, 0x5e, 0xcd, 0x48, 0x72, 0xf4, 0x4e, 0x82, 0x8f, 0x96, 0x96, 0x16, 0xb4, 0x97, - 0xed, 0xaa, 0x65, 0x75, 0xaf, 0x7e, 0xff, 0x5c, 0x32, 0x8e, 0x31, 0x1d, 0xac, 0x8a, 0x7f, 0x60, - 0x7e, 0xf4, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xa1, 0xa2, 0x49, 0x8e, 0x19, 0x00, 0x00, + 0xbc, 0x3e, 0x67, 0x35, 0x39, 0x07, 0xdd, 0x82, 0x0d, 0x93, 0xbc, 0x4b, 0x80, 0x57, 0x05, 0xb8, + 0x6c, 0x92, 0x77, 0x31, 0xdc, 0x43, 0x00, 0x8b, 0x78, 0xda, 0xd0, 0xb6, 0x5e, 0xea, 0xe3, 0xda, + 0x9a, 0xb0, 0xee, 0xa3, 0xa4, 0x75, 0x1d, 0xe2, 0x35, 0x05, 0x1b, 0x17, 0xad, 0xd9, 0x67, 0xfd, + 0x08, 0x2a, 0xc9, 0x13, 0x47, 0x8f, 0x01, 0xc2, 0x33, 0xe7, 0x21, 0xcb, 0xcf, 0x9f, 0x53, 0x42, + 0x02, 0xc7, 0xe0, 0xca, 0x9f, 0x24, 0x28, 0x27, 0xb8, 0x99, 0xf7, 0x6b, 0x1f, 0xa2, 0xb0, 0x6a, + 0x6c, 0xea, 0xf8, 0x91, 0xac, 0x2c, 0xdc, 0xa6, 0x3f, 0x75, 0x28, 0x2e, 0x3b, 0xf1, 0x25, 0xd7, + 0xf1, 0x92, 0x12, 0x4f, 0x1f, 0x18, 0x54, 0xf3, 0x1c, 0x32, 0xa4, 0xd9, 0x21, 0x7d, 0x1a, 0x60, + 0x7a, 0x1c, 0x82, 0xcb, 0x2f, 0xe3, 0x4b, 0xe5, 0x5b, 0x28, 0x27, 0xf8, 0x48, 0x86, 0xbc, 0x49, + 0xde, 0x05, 0xb6, 0xf2, 0x4f, 0x41, 0xd1, 0x2d, 0x61, 0x1f, 0xa7, 0xe8, 0x16, 0x77, 0xc8, 0xd0, + 0x3d, 0x56, 0xcb, 0xef, 0xe4, 0xb9, 0x43, 0xfc, 0x9b, 0xd3, 0x3c, 0x46, 0x1d, 0x71, 0x2b, 0x8a, + 0x58, 0x7c, 0x2b, 0x7f, 0x91, 0xa0, 0x9c, 0xb8, 0x8b, 0xe8, 0x7b, 0x50, 0x10, 0xce, 0x4a, 0x59, + 0xce, 0x86, 0x50, 0xe1, 0xac, 0x00, 0x72, 0xb5, 0x63, 0x9b, 0x18, 0x62, 0x77, 0x09, 0x8b, 0x6f, + 0xb4, 0x07, 0x5b, 0xe1, 0x95, 0xd6, 0x4c, 0xca, 0x5c, 0x7d, 0xa8, 0x89, 0x03, 0xce, 0x8b, 0xbd, + 0x37, 0x43, 0xe6, 0x91, 0xe0, 0x75, 0xf8, 0x79, 0x3f, 0x84, 0x8f, 0xc8, 0x68, 0xa4, 0x33, 0xdd, + 0xb6, 0x88, 0x11, 0x17, 0xf2, 0x6a, 0x05, 0xe1, 0xc5, 0x56, 0xc4, 0x8e, 0xc4, 0x3c, 0xe5, 0xbd, + 0x04, 0xe5, 0x44, 0x4e, 0xa0, 0xef, 0x40, 0x25, 0xcc, 0x0a, 0x2d, 0x16, 0xd7, 0x72, 0x48, 0x15, + 0x1b, 0x1e, 0x01, 0x8a, 0x60, 0x1e, 0x65, 0x4c, 0xb7, 0xc6, 0x5e, 0x2d, 0x27, 0xee, 0xd2, 0xa7, + 0x8b, 0x72, 0xce, 0x87, 0xe1, 0x2b, 0x24, 0x45, 0xf1, 0x94, 0x27, 0x20, 0xa7, 0x61, 0x99, 0xf7, + 0xaa, 0x0a, 0x2b, 0x6f, 0x89, 0x31, 0xa1, 0x41, 0xb8, 0xfc, 0x85, 0xf2, 0x5b, 0x09, 0xae, 0xcc, + 0x65, 0xe6, 0x59, 0x3d, 0x79, 0xbe, 0xc4, 0x13, 0x65, 0x59, 0xf6, 0x2f, 0xf6, 0xe6, 0xa7, 0x50, + 0xcd, 0x82, 0x9e, 0xc3, 0xa3, 0xbf, 0x49, 0x50, 0x0c, 0xb3, 0x19, 0x3d, 0x81, 0xf5, 0xb1, 0x4b, + 0x9c, 0x57, 0xb3, 0xe4, 0xf7, 0xab, 0xec, 0x76, 0xd2, 0xb8, 0x43, 0x8e, 0x08, 0xd2, 0xbf, 0x34, + 0x8e, 0x16, 0x68, 0x1f, 0xc0, 0x76, 0xa8, 0x4b, 0x78, 0xf4, 0xbd, 0xa0, 0xa2, 0x2a, 0x0b, 0x0a, + 0xc7, 0x6e, 0x37, 0x44, 0xe2, 0x98, 0x54, 0xbd, 0x09, 0x10, 0x71, 0xd0, 0x0f, 0xa1, 0x18, 0xf2, + 0x82, 0xfa, 0x91, 0xaa, 0x44, 0x21, 0x18, 0x47, 0x48, 0xc5, 0x81, 0x52, 0xcc, 0x48, 0xf4, 0x09, + 0x80, 0x35, 0x31, 0x35, 0x83, 0x4c, 0xfd, 0x32, 0xc4, 0x6b, 0x5e, 0xd1, 0x9a, 0x98, 0x6d, 0x41, + 0x40, 0xd7, 0xa1, 0xa4, 0x5b, 0xce, 0x84, 0x69, 0x9e, 0xfe, 0x4b, 0xea, 0x07, 0x64, 0x05, 0x83, + 0x20, 0xf5, 0x38, 0x05, 0xdd, 0x80, 0x75, 0x7b, 0xc2, 0x22, 0x44, 0x5e, 0x20, 0x4a, 0x3e, 0x4d, + 0x40, 0xc4, 0x31, 0x86, 0xa6, 0xf0, 0x0b, 0x11, 0x1a, 0xa3, 0x85, 0x79, 0x5a, 0xc4, 0xe5, 0x90, + 0x2a, 0xea, 0x4e, 0x77, 0xbe, 0xad, 0xf9, 0x87, 0x76, 0x6b, 0x81, 0x8f, 0xa7, 0x74, 0xb4, 0xff, + 0x76, 0x05, 0xfe, 0x15, 0xac, 0x88, 0xb6, 0x90, 0x79, 0x9d, 0xee, 0x26, 0x1a, 0x7b, 0x2a, 0x2a, + 0x42, 0x2c, 0xea, 0xe9, 0xe8, 0x01, 0xac, 0x7a, 0x8c, 0xb0, 0x89, 0x17, 0x54, 0xd6, 0xed, 0x2c, + 0xb8, 0x00, 0xe0, 0x00, 0xa8, 0xfc, 0x3b, 0x07, 0xc5, 0x50, 0xcd, 0x87, 0xf4, 0x6a, 0x02, 0x5b, + 0xd1, 0x29, 0x13, 0xcf, 0xd3, 0xc7, 0x16, 0x9f, 0x10, 0x66, 0xa6, 0xdc, 0x5b, 0x60, 0x79, 0x74, + 0x2e, 0x8d, 0x48, 0x06, 0x57, 0x9d, 0x0c, 0x2a, 0x7a, 0x0c, 0xab, 0x06, 0x19, 0x50, 0xc3, 0xaf, + 0x81, 0xa5, 0xbd, 0xcf, 0x16, 0xe9, 0x6c, 0x0b, 0x94, 0x6a, 0x31, 0x77, 0x8a, 0x03, 0x91, 0xfa, + 0xb7, 0x50, 0xcd, 0xda, 0x0a, 0x35, 0xa1, 0x14, 0xb7, 0xd6, 0x8f, 0xdd, 0x8d, 0x05, 0xb1, 0x8b, + 0x04, 0x71, 0x5c, 0xaa, 0xfe, 0x05, 0x94, 0x62, 0x7b, 0xf2, 0x16, 0xf4, 0x86, 0x4e, 0x67, 0x4d, + 0xe9, 0x0d, 0x9d, 0x66, 0x57, 0x85, 0x1f, 0xe5, 0x1e, 0x49, 0xca, 0x4f, 0x60, 0x33, 0x43, 0xfd, + 0x39, 0x4a, 0xcb, 0xbf, 0x72, 0x50, 0x8a, 0x45, 0x96, 0xa7, 0xa1, 0xc7, 0x88, 0xcb, 0x34, 0xa6, + 0x87, 0xf2, 0x45, 0x41, 0xe9, 0xeb, 0x26, 0x45, 0x9f, 0xc3, 0xc6, 0xd0, 0x36, 0x1d, 0x83, 0xfa, + 0x59, 0xc3, 0x31, 0xbe, 0xba, 0x4a, 0x44, 0x16, 0xc0, 0x67, 0x50, 0x1c, 0xda, 0x96, 0xdf, 0x64, + 0x44, 0x10, 0x2b, 0xd9, 0x41, 0x14, 0xbb, 0xee, 0x06, 0x83, 0x4d, 0x80, 0x17, 0x1d, 0x31, 0x12, + 0x47, 0x8f, 0xa1, 0x64, 0x0f, 0x3c, 0xea, 0xbe, 0xf5, 0x4b, 0x4c, 0x21, 0xeb, 0x76, 0x76, 0x23, + 0x00, 0x8e, 0xa3, 0x95, 0xdf, 0x48, 0x80, 0xe6, 0xd5, 0xa3, 0x12, 0xac, 0x35, 0xb1, 0xda, 0xe8, + 0xab, 0x07, 0xf2, 0x25, 0xbe, 0xc0, 0x27, 0x9d, 0x4e, 0xab, 0x73, 0x28, 0x4b, 0xa8, 0x0c, 0xc5, + 0xde, 0x49, 0xb3, 0xa9, 0xaa, 0x07, 0xea, 0x81, 0x9c, 0x43, 0x00, 0xab, 0x5f, 0xb6, 0xda, 0x6d, + 0xf5, 0x40, 0xce, 0xf3, 0xef, 0xa7, 0x8d, 0x16, 0xff, 0x2e, 0xa0, 0xab, 0x80, 0x8e, 0xd4, 0x3e, + 0x6e, 0x35, 0x7b, 0x27, 0x9d, 0xc6, 0x57, 0x8d, 0x56, 0xbb, 0xb1, 0xdf, 0x56, 0xe5, 0x15, 0x24, + 0xc3, 0xba, 0xda, 0xc0, 0xed, 0xaf, 0x7b, 0xfd, 0xee, 0xf1, 0xb1, 0x7a, 0x20, 0xaf, 0x72, 0xed, + 0x27, 0x9d, 0x2f, 0x3b, 0xdd, 0x9f, 0x75, 0xe4, 0x35, 0xe5, 0xc7, 0x50, 0x8a, 0x99, 0x8a, 0x76, + 0x61, 0xcd, 0x6f, 0xcf, 0xb3, 0xbb, 0x53, 0x4d, 0xba, 0xe5, 0x77, 0x67, 0x3c, 0x03, 0x29, 0x7b, + 0xb0, 0xea, 0x93, 0xce, 0x11, 0xe2, 0x5f, 0x4b, 0x70, 0x0d, 0x53, 0xc7, 0x76, 0x59, 0x6c, 0xe7, + 0xb6, 0x3d, 0xc6, 0xf4, 0x17, 0x13, 0xea, 0x31, 0x1e, 0x72, 0x7f, 0xdc, 0x8c, 0xe9, 0x2b, 0x0a, + 0x8a, 0xe8, 0x88, 0x2a, 0x6c, 0xc4, 0xce, 0x53, 0x33, 0xec, 0x71, 0xf6, 0x3b, 0x21, 0xa5, 0xbc, + 0x62, 0x27, 0xd6, 0xca, 0x35, 0xd8, 0xce, 0x36, 0xc2, 0x31, 0xa6, 0xca, 0x33, 0xa8, 0x24, 0xc9, + 0xe8, 0x11, 0x94, 0x82, 0xb9, 0xc5, 0xb0, 0xc7, 0x5e, 0x76, 0x5b, 0xf1, 0x4f, 0x82, 0x2b, 0x01, + 0x73, 0xf6, 0xe9, 0x29, 0x2f, 0xa0, 0x18, 0x32, 0x84, 0x6f, 0xba, 0x49, 0x35, 0x8f, 0x11, 0xd3, + 0x09, 0x7d, 0xd3, 0x4d, 0xda, 0xe3, 0x04, 0x74, 0x0f, 0x56, 0x7d, 0xc9, 0xc0, 0xa5, 0xec, 0xd3, + 0x0f, 0x30, 0xca, 0xef, 0x25, 0xa8, 0x1d, 0xd2, 0x8b, 0x9d, 0xe2, 0xf5, 0xd0, 0x1f, 0xc1, 0xf7, + 0x03, 0x14, 0x98, 0x2d, 0x00, 0xc9, 0xc4, 0xcb, 0xa7, 0x13, 0x6f, 0x1b, 0x2e, 0x53, 0x6b, 0xe4, + 0x33, 0xfd, 0xa9, 0x73, 0x8d, 0x5a, 0x23, 0xce, 0x52, 0x34, 0xb8, 0x9a, 0x61, 0x95, 0x63, 0x4c, + 0xb3, 0x42, 0x27, 0x5d, 0x20, 0x74, 0x4f, 0xe0, 0xda, 0x01, 0x35, 0x28, 0xa3, 0x17, 0xf1, 0x9c, + 0x07, 0x3e, 0x5b, 0x9a, 0x07, 0xfe, 0x9f, 0x12, 0x6c, 0x1d, 0x52, 0xd6, 0x9b, 0x8c, 0xc7, 0xd4, + 0xf3, 0x07, 0x8d, 0x40, 0xeb, 0x23, 0x00, 0x1a, 0xbe, 0x14, 0x03, 0xb3, 0x6b, 0x8b, 0x5e, 0x92, + 0x38, 0x86, 0x45, 0x77, 0x61, 0x55, 0xec, 0x3e, 0x1b, 0xdb, 0x36, 0x33, 0xea, 0x0e, 0x0e, 0x20, + 0xe8, 0x07, 0x70, 0x75, 0x38, 0x71, 0x5d, 0x6a, 0x31, 0xcd, 0xf5, 0x77, 0xd6, 0xac, 0x89, 0x39, + 0xa0, 0xae, 0x38, 0xe5, 0x15, 0x5c, 0x0d, 0xb8, 0x81, 0x59, 0x1d, 0xc1, 0xe3, 0xef, 0x3a, 0x66, + 0x33, 0x62, 0xa4, 0x65, 0x82, 0x77, 0x9d, 0xe0, 0x25, 0x24, 0x94, 0x3f, 0x16, 0x60, 0x33, 0xed, + 0x28, 0x0f, 0xd1, 0x9b, 0x45, 0x8d, 0xcf, 0xbf, 0xf1, 0x0f, 0x53, 0x53, 0xdd, 0xbc, 0x86, 0xf3, + 0xb4, 0xc0, 0xc4, 0x8b, 0x38, 0x77, 0xae, 0x17, 0xf1, 0x73, 0xa8, 0x26, 0x5f, 0xc4, 0x9a, 0x3b, + 0x31, 0x82, 0x31, 0x6b, 0xf9, 0xbb, 0x18, 0x4f, 0x0c, 0x8a, 0x11, 0x4d, 0x93, 0xbc, 0xfa, 0xef, + 0x72, 0xff, 0xc3, 0xa6, 0x9a, 0xba, 0x95, 0xb9, 0x74, 0x3e, 0x7e, 0x13, 0x4e, 0x03, 0xbe, 0x07, + 0xfb, 0x17, 0x3b, 0xe8, 0xcc, 0x61, 0xe1, 0x03, 0xfa, 0xf9, 0xcf, 0x61, 0xe7, 0x2b, 0x62, 0xe8, + 0x23, 0xc2, 0x68, 0xfa, 0x05, 0xf4, 0xe1, 0x99, 0xa1, 0xec, 0xc0, 0xa7, 0x4b, 0xb4, 0xf3, 0x7c, + 0xfc, 0xb3, 0x04, 0x1f, 0x1f, 0x52, 0x36, 0x17, 0xc0, 0xff, 0x77, 0x5a, 0xde, 0x03, 0x34, 0x1a, + 0x68, 0x26, 0xb1, 0xc8, 0x98, 0xe7, 0xc5, 0x68, 0xe4, 0x52, 0xcf, 0x0b, 0xaa, 0xa2, 0x3c, 0x1a, + 0x1c, 0xf9, 0x8c, 0x86, 0x4f, 0x57, 0x6c, 0xa8, 0x2f, 0x30, 0x9a, 0xa7, 0xd8, 0xa2, 0xab, 0x2b, + 0x5d, 0xf8, 0xea, 0x2a, 0x7f, 0x48, 0x3f, 0x31, 0x39, 0xf9, 0xec, 0x2d, 0x19, 0x3d, 0x01, 0xe0, + 0xf3, 0x12, 0x71, 0x75, 0x2f, 0x1c, 0x8f, 0x52, 0x35, 0xb9, 0x19, 0xf2, 0xc5, 0x38, 0x14, 0xc3, + 0x47, 0xad, 0x22, 0xfc, 0x0d, 0x62, 0x25, 0x68, 0x15, 0x3d, 0x46, 0x1d, 0xc5, 0x82, 0x9b, 0xb3, + 0x28, 0x67, 0xbd, 0x3b, 0xc3, 0x50, 0xce, 0xff, 0xc8, 0x25, 0x5d, 0xe4, 0x47, 0x2e, 0xe5, 0x26, + 0x28, 0xa7, 0xec, 0xc7, 0x6f, 0xd6, 0x43, 0xd8, 0xea, 0x51, 0x16, 0x7f, 0x44, 0x9c, 0xad, 0x7d, + 0x6c, 0xc1, 0x66, 0x5a, 0xce, 0x31, 0xa6, 0x77, 0x4e, 0x62, 0xbf, 0x3b, 0x89, 0x81, 0x4e, 0x86, + 0xf5, 0x60, 0xca, 0xd2, 0xfa, 0x5f, 0x1f, 0xab, 0xf2, 0x25, 0x3e, 0xad, 0x1d, 0x74, 0x4f, 0xf8, + 0x54, 0x26, 0xa1, 0x35, 0xc8, 0xb7, 0x3a, 0x7d, 0x39, 0x87, 0xd6, 0xe1, 0xf2, 0x41, 0xab, 0xd7, + 0xc4, 0x6a, 0x5f, 0x95, 0xf3, 0x68, 0x03, 0x4a, 0xcd, 0x46, 0x5f, 0x3d, 0xec, 0xe2, 0x56, 0xb3, + 0xd1, 0x96, 0x0b, 0x77, 0x1e, 0xc5, 0x7e, 0xc3, 0x99, 0xcd, 0x89, 0xb3, 0xe1, 0xed, 0x12, 0x17, + 0x3e, 0x6a, 0x75, 0x5a, 0x47, 0xad, 0x6f, 0xb8, 0x4e, 0xbe, 0x6a, 0xbc, 0xf0, 0x57, 0xb9, 0x3b, + 0xcf, 0xa0, 0x92, 0x0c, 0x19, 0x9f, 0x10, 0x67, 0x16, 0x35, 0xbb, 0x47, 0xc7, 0x0d, 0xdc, 0xea, + 0x75, 0xb9, 0x96, 0x22, 0xac, 0xa8, 0xcf, 0x4f, 0x1a, 0x6d, 0x59, 0x42, 0x97, 0xa1, 0xd0, 0x56, + 0x7b, 0x3d, 0x39, 0xc7, 0xf7, 0x39, 0x14, 0xf3, 0x28, 0x96, 0xf3, 0x7b, 0x7f, 0xcd, 0x41, 0xf1, + 0x60, 0x3f, 0xb8, 0xe4, 0xe8, 0x35, 0x54, 0xb3, 0x26, 0x27, 0xf4, 0xdd, 0x64, 0x9c, 0x96, 0x8c, + 0x78, 0xf5, 0xcf, 0xcf, 0x02, 0xe5, 0xb9, 0x42, 0xe0, 0xca, 0xdc, 0x2c, 0x81, 0x6e, 0xcd, 0xd5, + 0xc6, 0xec, 0x5d, 0x6e, 0x9e, 0x8a, 0xe3, 0x5b, 0xbc, 0x86, 0x6a, 0xd6, 0x3c, 0x90, 0x76, 0x67, + 0xc9, 0xc4, 0x91, 0x76, 0x67, 0xe1, 0x78, 0xb1, 0xf7, 0x0f, 0x09, 0x20, 0xaa, 0xe3, 0xe8, 0x05, + 0x54, 0x92, 0x85, 0x1d, 0x7d, 0xb6, 0xbc, 0xec, 0xfb, 0xdb, 0xdd, 0x38, 0xb5, 0x37, 0xa0, 0x29, + 0x6c, 0x2f, 0xac, 0xac, 0x68, 0x37, 0x29, 0x7f, 0x5a, 0x81, 0xaf, 0xdf, 0x3b, 0x33, 0x9e, 0xfb, + 0xf8, 0xf7, 0x1c, 0x94, 0x13, 0x79, 0x87, 0x4c, 0x31, 0x53, 0xcd, 0x97, 0x43, 0x74, 0x67, 0xce, + 0x91, 0x85, 0x85, 0xbe, 0x7e, 0xfb, 0x4c, 0x58, 0xee, 0xfb, 0x0b, 0xa8, 0x24, 0x33, 0x34, 0x7d, + 0xaa, 0x99, 0x79, 0x9f, 0x3e, 0xd5, 0x8c, 0x24, 0x47, 0xef, 0x25, 0xf8, 0x64, 0x69, 0x69, 0x41, + 0x7b, 0xd9, 0x47, 0xb5, 0xac, 0xee, 0xd5, 0xef, 0x9f, 0x4b, 0xc6, 0x31, 0xa6, 0x83, 0x55, 0xf1, + 0xb7, 0xca, 0xf7, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0x9d, 0xa7, 0xce, 0x0c, 0x63, 0x19, 0x00, + 0x00, } diff --git a/pkg/apis/manager/v1beta1/api.proto b/pkg/apis/manager/v1beta1/api.proto index afee6acc072..8914a23c3c2 100644 --- a/pkg/apis/manager/v1beta1/api.proto +++ b/pkg/apis/manager/v1beta1/api.proto @@ -293,9 +293,6 @@ message DeleteObservationLogReply { message GetSuggestionsRequest { Experiment experiment = 1; repeated Trial trials = 2; // All completed trials owned by the experiment. - // Use current_request_number instead. This API will be removed in Katib 0.14. - // The number of Suggestions requested at one time. - int32 request_number = 3 [deprecated=true]; // The number of Suggestions requested at one time. // When you set 3 to current_request_number, you get three Suggestions at one time. int32 current_request_number = 4; diff --git a/pkg/apis/manager/v1beta1/gen-doc/api.md b/pkg/apis/manager/v1beta1/gen-doc/api.md index 00d115599aa..14c6cd031a5 100644 --- a/pkg/apis/manager/v1beta1/gen-doc/api.md +++ b/pkg/apis/manager/v1beta1/gen-doc/api.md @@ -375,7 +375,6 @@ Discrete and Categorical type use List. | ----- | ---- | ----- | ----------- | | experiment | [Experiment](#api-v1-beta1-Experiment) | | | | trials | [Trial](#api-v1-beta1-Trial) | repeated | All completed trials owned by the experiment. | -| request_number | [int32](#int32) | | **Deprecated.** Use current_request_number instead. This API will be removed in Katib 0.14. The number of Suggestions requested at one time. | | current_request_number | [int32](#int32) | | The number of Suggestions requested at one time. When you set 3 to current_request_number, you get three Suggestions at one time. | | total_request_number | [int32](#int32) | | The number of Suggestions requested till now. | diff --git a/pkg/apis/manager/v1beta1/gen-doc/index.html b/pkg/apis/manager/v1beta1/gen-doc/index.html index f8ebb2764b5..648a9dc00f3 100644 --- a/pkg/apis/manager/v1beta1/gen-doc/index.html +++ b/pkg/apis/manager/v1beta1/gen-doc/index.html @@ -1029,14 +1029,6 @@

GetSuggestionsRequest

All completed trials owned by the experiment.

- - request_number - int32 - -

Deprecated. Use current_request_number instead. This API will be removed in Katib 0.14. -The number of Suggestions requested at one time.

- - current_request_number int32 @@ -1056,27 +1048,6 @@

GetSuggestionsRequest

- - -

Fields with deprecated option

- - - - - - - - - - - - - - - -
NameOption
request_number

true

- - diff --git a/pkg/apis/manager/v1beta1/python/api_pb2.py b/pkg/apis/manager/v1beta1/python/api_pb2.py index 9075cd3a26b..25ae1931e65 100644 --- a/pkg/apis/manager/v1beta1/python/api_pb2.py +++ b/pkg/apis/manager/v1beta1/python/api_pb2.py @@ -20,7 +20,7 @@ name='api.proto', package='api.v1.beta1', syntax='proto3', - serialized_pb=_b('\n\tapi.proto\x12\x0c\x61pi.v1.beta1\"F\n\nExperiment\x12\x0c\n\x04name\x18\x01 \x01(\t\x12*\n\x04spec\x18\x02 \x01(\x0b\x32\x1c.api.v1.beta1.ExperimentSpec\"\x96\x03\n\x0e\x45xperimentSpec\x12\x44\n\x0fparameter_specs\x18\x01 \x01(\x0b\x32+.api.v1.beta1.ExperimentSpec.ParameterSpecs\x12.\n\tobjective\x18\x02 \x01(\x0b\x32\x1b.api.v1.beta1.ObjectiveSpec\x12.\n\talgorithm\x18\x03 \x01(\x0b\x32\x1b.api.v1.beta1.AlgorithmSpec\x12\x37\n\x0e\x65\x61rly_stopping\x18\x04 \x01(\x0b\x32\x1f.api.v1.beta1.EarlyStoppingSpec\x12\x1c\n\x14parallel_trial_count\x18\x05 \x01(\x05\x12\x17\n\x0fmax_trial_count\x18\x06 \x01(\x05\x12+\n\nnas_config\x18\x07 \x01(\x0b\x32\x17.api.v1.beta1.NasConfig\x1a\x41\n\x0eParameterSpecs\x12/\n\nparameters\x18\x01 \x03(\x0b\x32\x1b.api.v1.beta1.ParameterSpec\"\x87\x01\n\rParameterSpec\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x33\n\x0eparameter_type\x18\x02 \x01(\x0e\x32\x1b.api.v1.beta1.ParameterType\x12\x33\n\x0e\x66\x65\x61sible_space\x18\x03 \x01(\x0b\x32\x1b.api.v1.beta1.FeasibleSpace\"E\n\rFeasibleSpace\x12\x0b\n\x03max\x18\x01 \x01(\t\x12\x0b\n\x03min\x18\x02 \x01(\t\x12\x0c\n\x04list\x18\x03 \x03(\t\x12\x0c\n\x04step\x18\x04 \x01(\t\"\x88\x01\n\rObjectiveSpec\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.api.v1.beta1.ObjectiveType\x12\x0c\n\x04goal\x18\x02 \x01(\x01\x12\x1d\n\x15objective_metric_name\x18\x03 \x01(\t\x12\x1f\n\x17\x61\x64\x64itional_metric_names\x18\x04 \x03(\t\"c\n\rAlgorithmSpec\x12\x16\n\x0e\x61lgorithm_name\x18\x01 \x01(\t\x12:\n\x12\x61lgorithm_settings\x18\x02 \x03(\x0b\x32\x1e.api.v1.beta1.AlgorithmSetting\"/\n\x10\x41lgorithmSetting\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"k\n\x11\x45\x61rlyStoppingSpec\x12\x16\n\x0e\x61lgorithm_name\x18\x01 \x01(\t\x12>\n\x12\x61lgorithm_settings\x18\x02 \x03(\x0b\x32\".api.v1.beta1.EarlyStoppingSetting\"3\n\x14\x45\x61rlyStoppingSetting\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"\xae\x01\n\tNasConfig\x12/\n\x0cgraph_config\x18\x01 \x01(\x0b\x32\x19.api.v1.beta1.GraphConfig\x12\x36\n\noperations\x18\x02 \x01(\x0b\x32\".api.v1.beta1.NasConfig.Operations\x1a\x38\n\nOperations\x12*\n\toperation\x18\x01 \x03(\x0b\x32\x17.api.v1.beta1.Operation\"L\n\x0bGraphConfig\x12\x12\n\nnum_layers\x18\x01 \x01(\x05\x12\x13\n\x0binput_sizes\x18\x02 \x03(\x05\x12\x14\n\x0coutput_sizes\x18\x03 \x03(\x05\"\xa7\x01\n\tOperation\x12\x16\n\x0eoperation_type\x18\x01 \x01(\t\x12?\n\x0fparameter_specs\x18\x02 \x01(\x0b\x32&.api.v1.beta1.Operation.ParameterSpecs\x1a\x41\n\x0eParameterSpecs\x12/\n\nparameters\x18\x01 \x03(\x0b\x32\x1b.api.v1.beta1.ParameterSpec\"g\n\x05Trial\x12\x0c\n\x04name\x18\x01 \x01(\t\x12%\n\x04spec\x18\x02 \x01(\x0b\x32\x17.api.v1.beta1.TrialSpec\x12)\n\x06status\x18\x03 \x01(\x0b\x32\x19.api.v1.beta1.TrialStatus\"\xbc\x02\n\tTrialSpec\x12.\n\tobjective\x18\x02 \x01(\x0b\x32\x1b.api.v1.beta1.ObjectiveSpec\x12K\n\x15parameter_assignments\x18\x03 \x01(\x0b\x32,.api.v1.beta1.TrialSpec.ParameterAssignments\x12\x33\n\x06labels\x18\x04 \x03(\x0b\x32#.api.v1.beta1.TrialSpec.LabelsEntry\x1aN\n\x14ParameterAssignments\x12\x36\n\x0b\x61ssignments\x18\x01 \x03(\x0b\x32!.api.v1.beta1.ParameterAssignment\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"2\n\x13ParameterAssignment\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"\xba\x02\n\x0bTrialStatus\x12\x12\n\nstart_time\x18\x01 \x01(\t\x12\x17\n\x0f\x63ompletion_time\x18\x02 \x01(\t\x12?\n\tcondition\x18\x03 \x01(\x0e\x32,.api.v1.beta1.TrialStatus.TrialConditionType\x12.\n\x0bobservation\x18\x04 \x01(\x0b\x32\x19.api.v1.beta1.Observation\"\x8c\x01\n\x12TrialConditionType\x12\x0b\n\x07\x43REATED\x10\x00\x12\x0b\n\x07RUNNING\x10\x01\x12\r\n\tSUCCEEDED\x10\x02\x12\n\n\x06KILLED\x10\x03\x12\n\n\x06\x46\x41ILED\x10\x04\x12\x16\n\x12METRICSUNAVAILABLE\x10\x05\x12\x10\n\x0c\x45\x41RLYSTOPPED\x10\x06\x12\x0b\n\x07UNKNOWN\x10\x07\"4\n\x0bObservation\x12%\n\x07metrics\x18\x01 \x03(\x0b\x32\x14.api.v1.beta1.Metric\"%\n\x06Metric\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"h\n\x1bReportObservationLogRequest\x12\x12\n\ntrial_name\x18\x01 \x01(\t\x12\x35\n\x0fobservation_log\x18\x02 \x01(\x0b\x32\x1c.api.v1.beta1.ObservationLog\"\x1b\n\x19ReportObservationLogReply\">\n\x0eObservationLog\x12,\n\x0bmetric_logs\x18\x01 \x03(\x0b\x32\x17.api.v1.beta1.MetricLog\"E\n\tMetricLog\x12\x12\n\ntime_stamp\x18\x01 \x01(\t\x12$\n\x06metric\x18\x02 \x01(\x0b\x32\x14.api.v1.beta1.Metric\"i\n\x18GetObservationLogRequest\x12\x12\n\ntrial_name\x18\x01 \x01(\t\x12\x13\n\x0bmetric_name\x18\x02 \x01(\t\x12\x12\n\nstart_time\x18\x03 \x01(\t\x12\x10\n\x08\x65nd_time\x18\x04 \x01(\t\"O\n\x16GetObservationLogReply\x12\x35\n\x0fobservation_log\x18\x01 \x01(\x0b\x32\x1c.api.v1.beta1.ObservationLog\"1\n\x1b\x44\x65leteObservationLogRequest\x12\x12\n\ntrial_name\x18\x01 \x01(\t\"\x1b\n\x19\x44\x65leteObservationLogReply\"\xc4\x01\n\x15GetSuggestionsRequest\x12,\n\nexperiment\x18\x01 \x01(\x0b\x32\x18.api.v1.beta1.Experiment\x12#\n\x06trials\x18\x02 \x03(\x0b\x32\x13.api.v1.beta1.Trial\x12\x1a\n\x0erequest_number\x18\x03 \x01(\x05\x42\x02\x18\x01\x12\x1e\n\x16\x63urrent_request_number\x18\x04 \x01(\x05\x12\x1c\n\x14total_request_number\x18\x05 \x01(\x05\"\xc3\x03\n\x13GetSuggestionsReply\x12U\n\x15parameter_assignments\x18\x01 \x03(\x0b\x32\x36.api.v1.beta1.GetSuggestionsReply.ParameterAssignments\x12.\n\talgorithm\x18\x02 \x01(\x0b\x32\x1b.api.v1.beta1.AlgorithmSpec\x12=\n\x14\x65\x61rly_stopping_rules\x18\x03 \x03(\x0b\x32\x1f.api.v1.beta1.EarlyStoppingRule\x1a\xe5\x01\n\x14ParameterAssignments\x12\x36\n\x0b\x61ssignments\x18\x01 \x03(\x0b\x32!.api.v1.beta1.ParameterAssignment\x12\x12\n\ntrial_name\x18\x02 \x01(\t\x12R\n\x06labels\x18\x03 \x03(\x0b\x32\x42.api.v1.beta1.GetSuggestionsReply.ParameterAssignments.LabelsEntry\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"P\n ValidateAlgorithmSettingsRequest\x12,\n\nexperiment\x18\x01 \x01(\x0b\x32\x18.api.v1.beta1.Experiment\" \n\x1eValidateAlgorithmSettingsReply\"\x8d\x01\n\x1cGetEarlyStoppingRulesRequest\x12,\n\nexperiment\x18\x01 \x01(\x0b\x32\x18.api.v1.beta1.Experiment\x12#\n\x06trials\x18\x02 \x03(\x0b\x32\x13.api.v1.beta1.Trial\x12\x1a\n\x12\x64\x62_manager_address\x18\x03 \x01(\t\"[\n\x1aGetEarlyStoppingRulesReply\x12=\n\x14\x65\x61rly_stopping_rules\x18\x01 \x03(\x0b\x32\x1f.api.v1.beta1.EarlyStoppingRule\"v\n\x11\x45\x61rlyStoppingRule\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\x30\n\ncomparison\x18\x03 \x01(\x0e\x32\x1c.api.v1.beta1.ComparisonType\x12\x12\n\nstart_step\x18\x04 \x01(\x05\"_\n$ValidateEarlyStoppingSettingsRequest\x12\x37\n\x0e\x65\x61rly_stopping\x18\x01 \x01(\x0b\x32\x1f.api.v1.beta1.EarlyStoppingSpec\"$\n\"ValidateEarlyStoppingSettingsReply\"+\n\x15SetTrialStatusRequest\x12\x12\n\ntrial_name\x18\x01 \x01(\t\"\x15\n\x13SetTrialStatusReply*U\n\rParameterType\x12\x10\n\x0cUNKNOWN_TYPE\x10\x00\x12\n\n\x06\x44OUBLE\x10\x01\x12\x07\n\x03INT\x10\x02\x12\x0c\n\x08\x44ISCRETE\x10\x03\x12\x0f\n\x0b\x43\x41TEGORICAL\x10\x04*8\n\rObjectiveType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0c\n\x08MINIMIZE\x10\x01\x12\x0c\n\x08MAXIMIZE\x10\x02*J\n\x0e\x43omparisonType\x12\x16\n\x12UNKNOWN_COMPARISON\x10\x00\x12\t\n\x05\x45QUAL\x10\x01\x12\x08\n\x04LESS\x10\x02\x12\x0b\n\x07GREATER\x10\x03\x32\xc6\x02\n\tDBManager\x12j\n\x14ReportObservationLog\x12).api.v1.beta1.ReportObservationLogRequest\x1a\'.api.v1.beta1.ReportObservationLogReply\x12\x61\n\x11GetObservationLog\x12&.api.v1.beta1.GetObservationLogRequest\x1a$.api.v1.beta1.GetObservationLogReply\x12j\n\x14\x44\x65leteObservationLog\x12).api.v1.beta1.DeleteObservationLogRequest\x1a\'.api.v1.beta1.DeleteObservationLogReply2\xe1\x01\n\nSuggestion\x12X\n\x0eGetSuggestions\x12#.api.v1.beta1.GetSuggestionsRequest\x1a!.api.v1.beta1.GetSuggestionsReply\x12y\n\x19ValidateAlgorithmSettings\x12..api.v1.beta1.ValidateAlgorithmSettingsRequest\x1a,.api.v1.beta1.ValidateAlgorithmSettingsReply2\xe0\x02\n\rEarlyStopping\x12m\n\x15GetEarlyStoppingRules\x12*.api.v1.beta1.GetEarlyStoppingRulesRequest\x1a(.api.v1.beta1.GetEarlyStoppingRulesReply\x12X\n\x0eSetTrialStatus\x12#.api.v1.beta1.SetTrialStatusRequest\x1a!.api.v1.beta1.SetTrialStatusReply\x12\x85\x01\n\x1dValidateEarlyStoppingSettings\x12\x32.api.v1.beta1.ValidateEarlyStoppingSettingsRequest\x1a\x30.api.v1.beta1.ValidateEarlyStoppingSettingsReplyb\x06proto3') + serialized_pb=_b('\n\tapi.proto\x12\x0c\x61pi.v1.beta1\"F\n\nExperiment\x12\x0c\n\x04name\x18\x01 \x01(\t\x12*\n\x04spec\x18\x02 \x01(\x0b\x32\x1c.api.v1.beta1.ExperimentSpec\"\x96\x03\n\x0e\x45xperimentSpec\x12\x44\n\x0fparameter_specs\x18\x01 \x01(\x0b\x32+.api.v1.beta1.ExperimentSpec.ParameterSpecs\x12.\n\tobjective\x18\x02 \x01(\x0b\x32\x1b.api.v1.beta1.ObjectiveSpec\x12.\n\talgorithm\x18\x03 \x01(\x0b\x32\x1b.api.v1.beta1.AlgorithmSpec\x12\x37\n\x0e\x65\x61rly_stopping\x18\x04 \x01(\x0b\x32\x1f.api.v1.beta1.EarlyStoppingSpec\x12\x1c\n\x14parallel_trial_count\x18\x05 \x01(\x05\x12\x17\n\x0fmax_trial_count\x18\x06 \x01(\x05\x12+\n\nnas_config\x18\x07 \x01(\x0b\x32\x17.api.v1.beta1.NasConfig\x1a\x41\n\x0eParameterSpecs\x12/\n\nparameters\x18\x01 \x03(\x0b\x32\x1b.api.v1.beta1.ParameterSpec\"\x87\x01\n\rParameterSpec\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x33\n\x0eparameter_type\x18\x02 \x01(\x0e\x32\x1b.api.v1.beta1.ParameterType\x12\x33\n\x0e\x66\x65\x61sible_space\x18\x03 \x01(\x0b\x32\x1b.api.v1.beta1.FeasibleSpace\"E\n\rFeasibleSpace\x12\x0b\n\x03max\x18\x01 \x01(\t\x12\x0b\n\x03min\x18\x02 \x01(\t\x12\x0c\n\x04list\x18\x03 \x03(\t\x12\x0c\n\x04step\x18\x04 \x01(\t\"\x88\x01\n\rObjectiveSpec\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.api.v1.beta1.ObjectiveType\x12\x0c\n\x04goal\x18\x02 \x01(\x01\x12\x1d\n\x15objective_metric_name\x18\x03 \x01(\t\x12\x1f\n\x17\x61\x64\x64itional_metric_names\x18\x04 \x03(\t\"c\n\rAlgorithmSpec\x12\x16\n\x0e\x61lgorithm_name\x18\x01 \x01(\t\x12:\n\x12\x61lgorithm_settings\x18\x02 \x03(\x0b\x32\x1e.api.v1.beta1.AlgorithmSetting\"/\n\x10\x41lgorithmSetting\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"k\n\x11\x45\x61rlyStoppingSpec\x12\x16\n\x0e\x61lgorithm_name\x18\x01 \x01(\t\x12>\n\x12\x61lgorithm_settings\x18\x02 \x03(\x0b\x32\".api.v1.beta1.EarlyStoppingSetting\"3\n\x14\x45\x61rlyStoppingSetting\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"\xae\x01\n\tNasConfig\x12/\n\x0cgraph_config\x18\x01 \x01(\x0b\x32\x19.api.v1.beta1.GraphConfig\x12\x36\n\noperations\x18\x02 \x01(\x0b\x32\".api.v1.beta1.NasConfig.Operations\x1a\x38\n\nOperations\x12*\n\toperation\x18\x01 \x03(\x0b\x32\x17.api.v1.beta1.Operation\"L\n\x0bGraphConfig\x12\x12\n\nnum_layers\x18\x01 \x01(\x05\x12\x13\n\x0binput_sizes\x18\x02 \x03(\x05\x12\x14\n\x0coutput_sizes\x18\x03 \x03(\x05\"\xa7\x01\n\tOperation\x12\x16\n\x0eoperation_type\x18\x01 \x01(\t\x12?\n\x0fparameter_specs\x18\x02 \x01(\x0b\x32&.api.v1.beta1.Operation.ParameterSpecs\x1a\x41\n\x0eParameterSpecs\x12/\n\nparameters\x18\x01 \x03(\x0b\x32\x1b.api.v1.beta1.ParameterSpec\"g\n\x05Trial\x12\x0c\n\x04name\x18\x01 \x01(\t\x12%\n\x04spec\x18\x02 \x01(\x0b\x32\x17.api.v1.beta1.TrialSpec\x12)\n\x06status\x18\x03 \x01(\x0b\x32\x19.api.v1.beta1.TrialStatus\"\xbc\x02\n\tTrialSpec\x12.\n\tobjective\x18\x02 \x01(\x0b\x32\x1b.api.v1.beta1.ObjectiveSpec\x12K\n\x15parameter_assignments\x18\x03 \x01(\x0b\x32,.api.v1.beta1.TrialSpec.ParameterAssignments\x12\x33\n\x06labels\x18\x04 \x03(\x0b\x32#.api.v1.beta1.TrialSpec.LabelsEntry\x1aN\n\x14ParameterAssignments\x12\x36\n\x0b\x61ssignments\x18\x01 \x03(\x0b\x32!.api.v1.beta1.ParameterAssignment\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"2\n\x13ParameterAssignment\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"\xba\x02\n\x0bTrialStatus\x12\x12\n\nstart_time\x18\x01 \x01(\t\x12\x17\n\x0f\x63ompletion_time\x18\x02 \x01(\t\x12?\n\tcondition\x18\x03 \x01(\x0e\x32,.api.v1.beta1.TrialStatus.TrialConditionType\x12.\n\x0bobservation\x18\x04 \x01(\x0b\x32\x19.api.v1.beta1.Observation\"\x8c\x01\n\x12TrialConditionType\x12\x0b\n\x07\x43REATED\x10\x00\x12\x0b\n\x07RUNNING\x10\x01\x12\r\n\tSUCCEEDED\x10\x02\x12\n\n\x06KILLED\x10\x03\x12\n\n\x06\x46\x41ILED\x10\x04\x12\x16\n\x12METRICSUNAVAILABLE\x10\x05\x12\x10\n\x0c\x45\x41RLYSTOPPED\x10\x06\x12\x0b\n\x07UNKNOWN\x10\x07\"4\n\x0bObservation\x12%\n\x07metrics\x18\x01 \x03(\x0b\x32\x14.api.v1.beta1.Metric\"%\n\x06Metric\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"h\n\x1bReportObservationLogRequest\x12\x12\n\ntrial_name\x18\x01 \x01(\t\x12\x35\n\x0fobservation_log\x18\x02 \x01(\x0b\x32\x1c.api.v1.beta1.ObservationLog\"\x1b\n\x19ReportObservationLogReply\">\n\x0eObservationLog\x12,\n\x0bmetric_logs\x18\x01 \x03(\x0b\x32\x17.api.v1.beta1.MetricLog\"E\n\tMetricLog\x12\x12\n\ntime_stamp\x18\x01 \x01(\t\x12$\n\x06metric\x18\x02 \x01(\x0b\x32\x14.api.v1.beta1.Metric\"i\n\x18GetObservationLogRequest\x12\x12\n\ntrial_name\x18\x01 \x01(\t\x12\x13\n\x0bmetric_name\x18\x02 \x01(\t\x12\x12\n\nstart_time\x18\x03 \x01(\t\x12\x10\n\x08\x65nd_time\x18\x04 \x01(\t\"O\n\x16GetObservationLogReply\x12\x35\n\x0fobservation_log\x18\x01 \x01(\x0b\x32\x1c.api.v1.beta1.ObservationLog\"1\n\x1b\x44\x65leteObservationLogRequest\x12\x12\n\ntrial_name\x18\x01 \x01(\t\"\x1b\n\x19\x44\x65leteObservationLogReply\"\xa8\x01\n\x15GetSuggestionsRequest\x12,\n\nexperiment\x18\x01 \x01(\x0b\x32\x18.api.v1.beta1.Experiment\x12#\n\x06trials\x18\x02 \x03(\x0b\x32\x13.api.v1.beta1.Trial\x12\x1e\n\x16\x63urrent_request_number\x18\x04 \x01(\x05\x12\x1c\n\x14total_request_number\x18\x05 \x01(\x05\"\xc3\x03\n\x13GetSuggestionsReply\x12U\n\x15parameter_assignments\x18\x01 \x03(\x0b\x32\x36.api.v1.beta1.GetSuggestionsReply.ParameterAssignments\x12.\n\talgorithm\x18\x02 \x01(\x0b\x32\x1b.api.v1.beta1.AlgorithmSpec\x12=\n\x14\x65\x61rly_stopping_rules\x18\x03 \x03(\x0b\x32\x1f.api.v1.beta1.EarlyStoppingRule\x1a\xe5\x01\n\x14ParameterAssignments\x12\x36\n\x0b\x61ssignments\x18\x01 \x03(\x0b\x32!.api.v1.beta1.ParameterAssignment\x12\x12\n\ntrial_name\x18\x02 \x01(\t\x12R\n\x06labels\x18\x03 \x03(\x0b\x32\x42.api.v1.beta1.GetSuggestionsReply.ParameterAssignments.LabelsEntry\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"P\n ValidateAlgorithmSettingsRequest\x12,\n\nexperiment\x18\x01 \x01(\x0b\x32\x18.api.v1.beta1.Experiment\" \n\x1eValidateAlgorithmSettingsReply\"\x8d\x01\n\x1cGetEarlyStoppingRulesRequest\x12,\n\nexperiment\x18\x01 \x01(\x0b\x32\x18.api.v1.beta1.Experiment\x12#\n\x06trials\x18\x02 \x03(\x0b\x32\x13.api.v1.beta1.Trial\x12\x1a\n\x12\x64\x62_manager_address\x18\x03 \x01(\t\"[\n\x1aGetEarlyStoppingRulesReply\x12=\n\x14\x65\x61rly_stopping_rules\x18\x01 \x03(\x0b\x32\x1f.api.v1.beta1.EarlyStoppingRule\"v\n\x11\x45\x61rlyStoppingRule\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\x30\n\ncomparison\x18\x03 \x01(\x0e\x32\x1c.api.v1.beta1.ComparisonType\x12\x12\n\nstart_step\x18\x04 \x01(\x05\"_\n$ValidateEarlyStoppingSettingsRequest\x12\x37\n\x0e\x65\x61rly_stopping\x18\x01 \x01(\x0b\x32\x1f.api.v1.beta1.EarlyStoppingSpec\"$\n\"ValidateEarlyStoppingSettingsReply\"+\n\x15SetTrialStatusRequest\x12\x12\n\ntrial_name\x18\x01 \x01(\t\"\x15\n\x13SetTrialStatusReply*U\n\rParameterType\x12\x10\n\x0cUNKNOWN_TYPE\x10\x00\x12\n\n\x06\x44OUBLE\x10\x01\x12\x07\n\x03INT\x10\x02\x12\x0c\n\x08\x44ISCRETE\x10\x03\x12\x0f\n\x0b\x43\x41TEGORICAL\x10\x04*8\n\rObjectiveType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0c\n\x08MINIMIZE\x10\x01\x12\x0c\n\x08MAXIMIZE\x10\x02*J\n\x0e\x43omparisonType\x12\x16\n\x12UNKNOWN_COMPARISON\x10\x00\x12\t\n\x05\x45QUAL\x10\x01\x12\x08\n\x04LESS\x10\x02\x12\x0b\n\x07GREATER\x10\x03\x32\xc6\x02\n\tDBManager\x12j\n\x14ReportObservationLog\x12).api.v1.beta1.ReportObservationLogRequest\x1a\'.api.v1.beta1.ReportObservationLogReply\x12\x61\n\x11GetObservationLog\x12&.api.v1.beta1.GetObservationLogRequest\x1a$.api.v1.beta1.GetObservationLogReply\x12j\n\x14\x44\x65leteObservationLog\x12).api.v1.beta1.DeleteObservationLogRequest\x1a\'.api.v1.beta1.DeleteObservationLogReply2\xe1\x01\n\nSuggestion\x12X\n\x0eGetSuggestions\x12#.api.v1.beta1.GetSuggestionsRequest\x1a!.api.v1.beta1.GetSuggestionsReply\x12y\n\x19ValidateAlgorithmSettings\x12..api.v1.beta1.ValidateAlgorithmSettingsRequest\x1a,.api.v1.beta1.ValidateAlgorithmSettingsReply2\xe0\x02\n\rEarlyStopping\x12m\n\x15GetEarlyStoppingRules\x12*.api.v1.beta1.GetEarlyStoppingRulesRequest\x1a(.api.v1.beta1.GetEarlyStoppingRulesReply\x12X\n\x0eSetTrialStatus\x12#.api.v1.beta1.SetTrialStatusRequest\x1a!.api.v1.beta1.SetTrialStatusReply\x12\x85\x01\n\x1dValidateEarlyStoppingSettings\x12\x32.api.v1.beta1.ValidateEarlyStoppingSettingsRequest\x1a\x30.api.v1.beta1.ValidateEarlyStoppingSettingsReplyb\x06proto3') ) _PARAMETERTYPE = _descriptor.EnumDescriptor( @@ -52,8 +52,8 @@ ], containing_type=None, options=None, - serialized_start=4346, - serialized_end=4431, + serialized_start=4318, + serialized_end=4403, ) _sym_db.RegisterEnumDescriptor(_PARAMETERTYPE) @@ -79,8 +79,8 @@ ], containing_type=None, options=None, - serialized_start=4433, - serialized_end=4489, + serialized_start=4405, + serialized_end=4461, ) _sym_db.RegisterEnumDescriptor(_OBJECTIVETYPE) @@ -110,8 +110,8 @@ ], containing_type=None, options=None, - serialized_start=4491, - serialized_end=4565, + serialized_start=4463, + serialized_end=4537, ) _sym_db.RegisterEnumDescriptor(_COMPARISONTYPE) @@ -1408,21 +1408,14 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='request_number', full_name='api.v1.beta1.GetSuggestionsRequest.request_number', index=2, - number=3, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001'))), - _descriptor.FieldDescriptor( - name='current_request_number', full_name='api.v1.beta1.GetSuggestionsRequest.current_request_number', index=3, + name='current_request_number', full_name='api.v1.beta1.GetSuggestionsRequest.current_request_number', index=2, number=4, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='total_request_number', full_name='api.v1.beta1.GetSuggestionsRequest.total_request_number', index=4, + name='total_request_number', full_name='api.v1.beta1.GetSuggestionsRequest.total_request_number', index=3, number=5, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -1441,7 +1434,7 @@ oneofs=[ ], serialized_start=3018, - serialized_end=3214, + serialized_end=3186, ) @@ -1522,8 +1515,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3439, - serialized_end=3668, + serialized_start=3411, + serialized_end=3640, ) _GETSUGGESTIONSREPLY = _descriptor.Descriptor( @@ -1566,8 +1559,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3217, - serialized_end=3668, + serialized_start=3189, + serialized_end=3640, ) @@ -1597,8 +1590,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3670, - serialized_end=3750, + serialized_start=3642, + serialized_end=3722, ) @@ -1621,8 +1614,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3752, - serialized_end=3784, + serialized_start=3724, + serialized_end=3756, ) @@ -1666,8 +1659,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3787, - serialized_end=3928, + serialized_start=3759, + serialized_end=3900, ) @@ -1697,8 +1690,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3930, - serialized_end=4021, + serialized_start=3902, + serialized_end=3993, ) @@ -1749,8 +1742,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4023, - serialized_end=4141, + serialized_start=3995, + serialized_end=4113, ) @@ -1780,8 +1773,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4143, - serialized_end=4238, + serialized_start=4115, + serialized_end=4210, ) @@ -1804,8 +1797,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4240, - serialized_end=4276, + serialized_start=4212, + serialized_end=4248, ) @@ -1835,8 +1828,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4278, - serialized_end=4321, + serialized_start=4250, + serialized_end=4293, ) @@ -1859,8 +1852,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4323, - serialized_end=4344, + serialized_start=4295, + serialized_end=4316, ) _EXPERIMENT.fields_by_name['spec'].message_type = _EXPERIMENTSPEC @@ -2274,8 +2267,6 @@ _TRIALSPEC_LABELSENTRY.has_options = True _TRIALSPEC_LABELSENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) -_GETSUGGESTIONSREQUEST.fields_by_name['request_number'].has_options = True -_GETSUGGESTIONSREQUEST.fields_by_name['request_number']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) _GETSUGGESTIONSREPLY_PARAMETERASSIGNMENTS_LABELSENTRY.has_options = True _GETSUGGESTIONSREPLY_PARAMETERASSIGNMENTS_LABELSENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) @@ -2285,8 +2276,8 @@ file=DESCRIPTOR, index=0, options=None, - serialized_start=4568, - serialized_end=4894, + serialized_start=4540, + serialized_end=4866, methods=[ _descriptor.MethodDescriptor( name='ReportObservationLog', @@ -2327,8 +2318,8 @@ file=DESCRIPTOR, index=1, options=None, - serialized_start=4897, - serialized_end=5122, + serialized_start=4869, + serialized_end=5094, methods=[ _descriptor.MethodDescriptor( name='GetSuggestions', @@ -2360,8 +2351,8 @@ file=DESCRIPTOR, index=2, options=None, - serialized_start=5125, - serialized_end=5477, + serialized_start=5097, + serialized_end=5449, methods=[ _descriptor.MethodDescriptor( name='GetEarlyStoppingRules', diff --git a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go index f72b27aef3b..5db2e67aca3 100644 --- a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go +++ b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go @@ -109,10 +109,8 @@ func (g *General) SyncAssignments( instance.Status.AlgorithmSettings) requestSuggestion := &suggestionapi.GetSuggestionsRequest{ - Experiment: g.ConvertExperiment(filledE), - Trials: g.ConvertTrials(ts), - // TODO (andreyvelich): Remove this once RequestNumber is deprecated. - RequestNumber: int32(currentRequestNum), + Experiment: g.ConvertExperiment(filledE), + Trials: g.ConvertTrials(ts), CurrentRequestNumber: int32(currentRequestNum), TotalRequestNumber: int32(instance.Spec.Requests), } diff --git a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go index 447205ef61a..303bc6c795a 100644 --- a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go +++ b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go @@ -994,7 +994,6 @@ func newFakeRequest() *suggestionapi.GetSuggestionsRequest { }, }, }, - RequestNumber: 2, CurrentRequestNumber: 2, TotalRequestNumber: 6, }