From e830971c78b51310022ccfcd5956c844108195ee Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Thu, 18 Jan 2024 14:23:01 +0800 Subject: [PATCH 1/8] deprecated agent state to agent phase in webapi Signed-off-by: Future-Outlier --- flyteidl/protos/flyteidl/admin/agent.proto | 2 ++ flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index 778fcc99d0..31eeb5f4ab 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -85,6 +85,8 @@ message Resource { string message = 3; // log information for the task execution. repeated core.TaskLog log_links = 4; + // The phase of the execution is used to determine the phase of the plugin's execution. + core.TaskExecution.Phase phase = 5; } // A message used to delete a task. diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index b20bd62d7a..8d7527bb46 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -189,6 +189,10 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase core.PhaseInfo, err error) { resource := taskCtx.Resource().(ResourceWrapper) taskInfo := &core.TaskInfo{Logs: resource.LogLinks} + logger.Infof(ctx, "@@@ resource.State [%v]", resource.State) + // switch resource.Phase { + // if it is undefined, default is 0 in the protobuf, then we will use resource.State to determine the phase + // } switch resource.State { case admin.State_PENDING: From ced87c0d235fc6db3a7321b07d29c399d6c1be94 Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Fri, 19 Jan 2024 16:39:20 +0800 Subject: [PATCH 2/8] gen proto and add DEPRECATED Message Annotation Signed-off-by: Future-Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 103 +++++++--- flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 21 ++ flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 136 +++++++------ .../pb-go/flyteidl/service/agent.swagger.json | 21 +- .../flyteidl/admin/AgentOuterClass.java | 179 +++++++++++++++--- flyteidl/gen/pb-js/flyteidl.d.ts | 6 + flyteidl/gen/pb-js/flyteidl.js | 28 +++ .../gen/pb_python/flyteidl/admin/agent_pb2.py | 36 ++-- .../pb_python/flyteidl/admin/agent_pb2.pyi | 6 +- flyteidl/gen/pb_rust/flyteidl.admin.rs | 5 +- flyteidl/protos/flyteidl/admin/agent.proto | 4 +- 11 files changed, 408 insertions(+), 137 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index 61aebda83d..ed25324cc0 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -433,6 +433,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, outputs_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, message_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, log_links_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, phase_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::DeleteTaskRequest, _internal_metadata_), ~0u, // no _extensions_ @@ -486,13 +487,13 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 55, -1, sizeof(::flyteidl::admin::GetTaskRequest)}, { 62, -1, sizeof(::flyteidl::admin::GetTaskResponse)}, { 69, -1, sizeof(::flyteidl::admin::Resource)}, - { 78, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, - { 85, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, - { 90, -1, sizeof(::flyteidl::admin::Agent)}, - { 97, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, - { 103, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, - { 109, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, - { 114, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, + { 79, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, + { 86, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, + { 91, -1, sizeof(::flyteidl::admin::Agent)}, + { 98, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, + { 104, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, + { 110, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, + { 115, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -551,28 +552,29 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "\022\025\n\rresource_meta\030\002 \001(\014\"h\n\017GetTaskRespon" "se\022*\n\010resource\030\001 \001(\0132\030.flyteidl.admin.Re" "source\022)\n\tlog_links\030\002 \003(\0132\026.flyteidl.cor" - "e.TaskLog\"\230\001\n\010Resource\022$\n\005state\030\001 \001(\0162\025." + "e.TaskLog\"\313\001\n\010Resource\022$\n\005state\030\001 \001(\0162\025." "flyteidl.admin.State\022*\n\007outputs\030\002 \001(\0132\031." "flyteidl.core.LiteralMap\022\017\n\007message\030\003 \001(" "\t\022)\n\tlog_links\030\004 \003(\0132\026.flyteidl.core.Tas" - "kLog\"=\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001" - " \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTas" - "kResponse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024supp" - "orted_task_types\030\002 \003(\t\"\037\n\017GetAgentReques" - "t\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005a" - "gent\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021Lis" - "tAgentsRequest\";\n\022ListAgentsResponse\022%\n\006" - "agents\030\001 \003(\0132\025.flyteidl.admin.Agent*^\n\005S" - "tate\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT" - "_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\t" - "SUCCEEDED\020\004B=Z;github.com/flyteorg/flyte" - "/flyteidl/gen/pb-go/flyteidl/adminb\006prot" - "o3" + "kLog\0221\n\005phase\030\005 \001(\0162\".flyteidl.core.Task" + "Execution.Phase\"=\n\021DeleteTaskRequest\022\021\n\t" + "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024" + "\n\022DeleteTaskResponse\"3\n\005Agent\022\014\n\004name\030\001 " + "\001(\t\022\034\n\024supported_task_types\030\002 \003(\t\"\037\n\017Get" + "AgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentRe" + "sponse\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin.A" + "gent\"\023\n\021ListAgentsRequest\";\n\022ListAgentsR" + "esponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.admin" + ".Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025" + "\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RU" + "NNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fly" + "teorg/flyte/flyteidl/gen/pb-go/flyteidl/" + "adminb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1842, + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1893, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { @@ -3304,6 +3306,7 @@ const int Resource::kStateFieldNumber; const int Resource::kOutputsFieldNumber; const int Resource::kMessageFieldNumber; const int Resource::kLogLinksFieldNumber; +const int Resource::kPhaseFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 Resource::Resource() @@ -3325,7 +3328,9 @@ Resource::Resource(const Resource& from) } else { outputs_ = nullptr; } - state_ = from.state_; + ::memcpy(&state_, &from.state_, + static_cast(reinterpret_cast(&phase_) - + reinterpret_cast(&state_)) + sizeof(phase_)); // @@protoc_insertion_point(copy_constructor:flyteidl.admin.Resource) } @@ -3334,8 +3339,8 @@ void Resource::SharedCtor() { &scc_info_Resource_flyteidl_2fadmin_2fagent_2eproto.base); message_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); ::memset(&outputs_, 0, static_cast( - reinterpret_cast(&state_) - - reinterpret_cast(&outputs_)) + sizeof(state_)); + reinterpret_cast(&phase_) - + reinterpret_cast(&outputs_)) + sizeof(phase_)); } Resource::~Resource() { @@ -3369,7 +3374,9 @@ void Resource::Clear() { delete outputs_; } outputs_ = nullptr; - state_ = 0; + ::memset(&state_, 0, static_cast( + reinterpret_cast(&phase_) - + reinterpret_cast(&state_)) + sizeof(phase_)); _internal_metadata_.Clear(); } @@ -3439,6 +3446,14 @@ const char* Resource::_InternalParse(const char* begin, const char* end, void* o } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 34 && (ptr += 1)); break; } + // .flyteidl.core.TaskExecution.Phase phase = 5; + case 5: { + if (static_cast<::google::protobuf::uint8>(tag) != 40) goto handle_unusual; + ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr); + msg->set_phase(static_cast<::flyteidl::core::TaskExecution_Phase>(val)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -3524,6 +3539,20 @@ bool Resource::MergePartialFromCodedStream( break; } + // .flyteidl.core.TaskExecution.Phase phase = 5; + case 5: { + if (static_cast< ::google::protobuf::uint8>(tag) == (40 & 0xFF)) { + int value = 0; + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( + input, &value))); + set_phase(static_cast< ::flyteidl::core::TaskExecution_Phase >(value)); + } else { + goto handle_unusual; + } + break; + } + default: { handle_unusual: if (tag == 0) { @@ -3582,6 +3611,12 @@ void Resource::SerializeWithCachedSizes( output); } + // .flyteidl.core.TaskExecution.Phase phase = 5; + if (this->phase() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteEnum( + 5, this->phase(), output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -3627,6 +3662,12 @@ ::google::protobuf::uint8* Resource::InternalSerializeWithCachedSizesToArray( 4, this->log_links(static_cast(i)), target); } + // .flyteidl.core.TaskExecution.Phase phase = 5; + if (this->phase() != 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( + 5, this->phase(), target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -3679,6 +3720,12 @@ size_t Resource::ByteSizeLong() const { ::google::protobuf::internal::WireFormatLite::EnumSize(this->state()); } + // .flyteidl.core.TaskExecution.Phase phase = 5; + if (this->phase() != 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->phase()); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; @@ -3717,6 +3764,9 @@ void Resource::MergeFrom(const Resource& from) { if (from.state() != 0) { set_state(from.state()); } + if (from.phase() != 0) { + set_phase(from.phase()); + } } void Resource::CopyFrom(const ::google::protobuf::Message& from) { @@ -3749,6 +3799,7 @@ void Resource::InternalSwap(Resource* other) { GetArenaNoVirtual()); swap(outputs_, other->outputs_); swap(state_, other->state_); + swap(phase_, other->phase_); } ::google::protobuf::Metadata Resource::GetMetadata() const { diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h index 86aeccc4b2..42269b90ed 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h @@ -1121,6 +1121,12 @@ class Resource final : ::flyteidl::admin::State state() const; void set_state(::flyteidl::admin::State value); + // .flyteidl.core.TaskExecution.Phase phase = 5; + void clear_phase(); + static const int kPhaseFieldNumber = 5; + ::flyteidl::core::TaskExecution_Phase phase() const; + void set_phase(::flyteidl::core::TaskExecution_Phase value); + // @@protoc_insertion_point(class_scope:flyteidl.admin.Resource) private: class HasBitSetters; @@ -1130,6 +1136,7 @@ class Resource final : ::google::protobuf::internal::ArenaStringPtr message_; ::flyteidl::core::LiteralMap* outputs_; int state_; + int phase_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; }; @@ -2875,6 +2882,20 @@ Resource::log_links() const { return log_links_; } +// .flyteidl.core.TaskExecution.Phase phase = 5; +inline void Resource::clear_phase() { + phase_ = 0; +} +inline ::flyteidl::core::TaskExecution_Phase Resource::phase() const { + // @@protoc_insertion_point(field_get:flyteidl.admin.Resource.phase) + return static_cast< ::flyteidl::core::TaskExecution_Phase >(phase_); +} +inline void Resource::set_phase(::flyteidl::core::TaskExecution_Phase value) { + + phase_ = value; + // @@protoc_insertion_point(field_set:flyteidl.admin.Resource.phase) +} + // ------------------------------------------------------------------- // DeleteTaskRequest diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 2e255f5c88..c4909fd254 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -396,7 +396,7 @@ func (m *GetTaskResponse) GetLogLinks() []*core.TaskLog { } type Resource struct { - // The state of the execution is used to control its visibility in the UI/CLI. + // DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. State State `protobuf:"varint,1,opt,name=state,proto3,enum=flyteidl.admin.State" json:"state,omitempty"` // The outputs of the execution. It's typically used by sql task. Agent service will create a // Structured dataset pointing to the query result table. @@ -405,10 +405,12 @@ type Resource struct { // A descriptive message for the current state. e.g. waiting for cluster. Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` // log information for the task execution. - LogLinks []*core.TaskLog `protobuf:"bytes,4,rep,name=log_links,json=logLinks,proto3" json:"log_links,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + LogLinks []*core.TaskLog `protobuf:"bytes,4,rep,name=log_links,json=logLinks,proto3" json:"log_links,omitempty"` + // The phase of the execution is used to determine the phase of the plugin's execution. + Phase core.TaskExecution_Phase `protobuf:"varint,5,opt,name=phase,proto3,enum=flyteidl.core.TaskExecution_Phase" json:"phase,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Resource) Reset() { *m = Resource{} } @@ -464,6 +466,13 @@ func (m *Resource) GetLogLinks() []*core.TaskLog { return nil } +func (m *Resource) GetPhase() core.TaskExecution_Phase { + if m != nil { + return m.Phase + } + return core.TaskExecution_UNDEFINED +} + // A message used to delete a task. type DeleteTaskRequest struct { // A predefined yet extensible Task type identifier. @@ -772,62 +781,63 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ - // 901 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x7f, 0x6f, 0xe3, 0x44, - 0x10, 0x6d, 0x7e, 0x36, 0x99, 0xb4, 0xbd, 0x64, 0xaf, 0x01, 0x37, 0x77, 0xa0, 0xca, 0xa8, 0xa8, - 0xe2, 0x74, 0x09, 0xd7, 0xa2, 0xa3, 0x80, 0xe0, 0x94, 0xb6, 0xa6, 0x57, 0x29, 0x8d, 0xaa, 0x6d, - 0x8a, 0x00, 0x09, 0xa2, 0x4d, 0x32, 0x35, 0x56, 0x1c, 0xdb, 0x78, 0xd7, 0xd5, 0x05, 0xf1, 0x1f, - 0x5f, 0x82, 0xef, 0xc2, 0x97, 0x43, 0xde, 0x5d, 0x3b, 0x71, 0xc8, 0x9d, 0x7a, 0xe2, 0x3f, 0xef, - 0xbc, 0xb7, 0x6f, 0xde, 0xce, 0xcc, 0x66, 0x03, 0xad, 0x3b, 0x77, 0x2e, 0xd0, 0x99, 0xb8, 0x1d, - 0x36, 0x99, 0x39, 0x5e, 0x87, 0xd9, 0xe8, 0x89, 0x76, 0x10, 0xfa, 0xc2, 0x27, 0x3b, 0x09, 0xd6, - 0x96, 0x58, 0xeb, 0x69, 0xca, 0x1d, 0xfb, 0x21, 0x76, 0x5c, 0x47, 0x60, 0xc8, 0x5c, 0xae, 0xd8, - 0xad, 0xbd, 0x2c, 0x2a, 0x18, 0x9f, 0x26, 0xd0, 0x47, 0x59, 0xc8, 0xf1, 0x04, 0x86, 0x77, 0x6c, - 0x8c, 0x1a, 0xfe, 0x78, 0x05, 0x9e, 0xa0, 0x27, 0x9c, 0x3b, 0x07, 0xc3, 0xf5, 0xdb, 0xf1, 0x0d, - 0x8e, 0x23, 0xe1, 0xf8, 0x9e, 0x82, 0xcd, 0xbf, 0x4b, 0xd0, 0x1c, 0x30, 0x3e, 0xb5, 0x92, 0xf8, - 0x15, 0x0a, 0x36, 0x61, 0x82, 0x11, 0x0a, 0x8d, 0xd8, 0xc6, 0x30, 0xdd, 0x31, 0x74, 0x26, 0x46, - 0x6e, 0x3f, 0x77, 0x58, 0x3b, 0xfa, 0xb4, 0x9d, 0x1e, 0x2e, 0x16, 0x6d, 0x67, 0x04, 0x2e, 0x53, - 0x07, 0xf4, 0x91, 0xc8, 0x02, 0xe4, 0x29, 0x54, 0x3d, 0x36, 0x43, 0x1e, 0xb0, 0x31, 0x1a, 0xf9, - 0xfd, 0xdc, 0x61, 0x95, 0x2e, 0x02, 0xe4, 0x12, 0xca, 0x2e, 0x1b, 0xa1, 0xcb, 0x8d, 0xc2, 0x7e, - 0xe1, 0xb0, 0x76, 0xf4, 0xa2, 0x9d, 0xad, 0x61, 0x7b, 0xad, 0xd1, 0x76, 0x4f, 0xee, 0xb1, 0x3c, - 0x11, 0xce, 0xa9, 0x16, 0x20, 0x3f, 0x42, 0x8d, 0x79, 0x9e, 0x2f, 0x58, 0xcc, 0xe4, 0x46, 0x51, - 0xea, 0xbd, 0x7c, 0x98, 0x5e, 0x77, 0xb1, 0x51, 0x89, 0x2e, 0x4b, 0x91, 0x36, 0x3c, 0x9e, 0x9e, - 0xf0, 0x21, 0xc7, 0xf0, 0xde, 0x19, 0xe3, 0x90, 0x8d, 0xc7, 0x7e, 0xe4, 0x09, 0xa3, 0x24, 0x0f, - 0xd3, 0x98, 0x9e, 0xf0, 0x1b, 0x85, 0x74, 0x15, 0x40, 0x04, 0x34, 0xd1, 0xbb, 0x77, 0x42, 0xdf, - 0x9b, 0xa1, 0x27, 0x86, 0xf7, 0x2c, 0x74, 0xd8, 0xc8, 0x45, 0x6e, 0x94, 0xa5, 0xa7, 0x57, 0x0f, - 0xf3, 0x64, 0x2d, 0x24, 0x7e, 0x48, 0x14, 0x94, 0xb9, 0x5d, 0x5c, 0x03, 0xb5, 0xbe, 0x82, 0xda, - 0x52, 0x59, 0x48, 0x1d, 0x0a, 0x53, 0x9c, 0xcb, 0xee, 0x55, 0x69, 0xfc, 0x49, 0x76, 0xa1, 0x74, - 0xcf, 0xdc, 0x28, 0xe9, 0x82, 0x5a, 0x7c, 0x9d, 0x3f, 0xc9, 0xb5, 0xbe, 0x83, 0xfa, 0x6a, 0x05, - 0xde, 0x6b, 0xff, 0x05, 0xec, 0xbd, 0xd5, 0xed, 0xfb, 0x08, 0x99, 0x7f, 0xe5, 0xa1, 0x71, 0x16, - 0x22, 0x13, 0x18, 0xd7, 0x84, 0xe2, 0xef, 0x11, 0x72, 0x41, 0x5e, 0x40, 0xd9, 0xf1, 0x82, 0x48, - 0x70, 0x3d, 0x8b, 0x7b, 0x2b, 0xb3, 0xd8, 0x53, 0x17, 0xeb, 0x8a, 0x05, 0x54, 0x13, 0xc9, 0x97, - 0x50, 0x11, 0x38, 0x0b, 0x5c, 0x26, 0x54, 0x96, 0xda, 0xd1, 0x93, 0x35, 0x03, 0x3c, 0xd0, 0x14, - 0x9a, 0x92, 0xc9, 0x27, 0xb0, 0xed, 0x47, 0x22, 0x88, 0xc4, 0x30, 0x08, 0xf1, 0xce, 0x79, 0x63, - 0x14, 0xa4, 0xc7, 0x2d, 0x15, 0xbc, 0x96, 0x31, 0xf2, 0x0b, 0x7c, 0xb8, 0x72, 0x4f, 0x66, 0xba, - 0x6b, 0x46, 0x51, 0x26, 0x3b, 0x78, 0x50, 0x8b, 0x69, 0x53, 0xac, 0x0b, 0x9b, 0x7f, 0x00, 0x59, - 0x2e, 0x02, 0x0f, 0x7c, 0x8f, 0x23, 0x39, 0x80, 0xed, 0x10, 0xb9, 0x1f, 0x85, 0x63, 0x94, 0xe9, - 0x64, 0x31, 0xb6, 0x5e, 0x6f, 0xd0, 0xad, 0x24, 0x1c, 0x0b, 0x90, 0x97, 0x50, 0x49, 0xd6, 0xfa, - 0xe4, 0xc6, 0xaa, 0x19, 0xaa, 0xf1, 0xd7, 0x1b, 0x34, 0xe5, 0x9e, 0x96, 0xa0, 0x10, 0x22, 0x37, - 0x29, 0xec, 0x5c, 0xa0, 0x58, 0xae, 0xfe, 0x13, 0xa8, 0xca, 0xc3, 0x8a, 0x79, 0x80, 0xba, 0x8b, - 0x95, 0x38, 0x30, 0x98, 0x07, 0xb2, 0x5c, 0x59, 0x53, 0x71, 0xca, 0xad, 0xac, 0x25, 0xf3, 0x4f, - 0x78, 0x94, 0x6a, 0xea, 0xc3, 0x7c, 0xb1, 0xe4, 0x32, 0xf7, 0x6e, 0x97, 0x0b, 0x8f, 0xe4, 0x18, - 0xaa, 0xae, 0x6f, 0x0f, 0x5d, 0xc7, 0x9b, 0x72, 0x23, 0x2f, 0x2f, 0xd3, 0x07, 0x6b, 0xda, 0xda, - 0xf3, 0x6d, 0x5a, 0x71, 0x7d, 0xbb, 0x17, 0xf3, 0xcc, 0x7f, 0x72, 0x50, 0x49, 0xb4, 0xc8, 0x33, - 0x28, 0x71, 0x11, 0x0f, 0x45, 0x9c, 0x74, 0xe7, 0xa8, 0xb9, 0x9a, 0xf4, 0x26, 0x06, 0xa9, 0xe2, - 0x90, 0x63, 0xd8, 0x54, 0x6d, 0xe7, 0xba, 0x92, 0xef, 0x18, 0xbc, 0x84, 0x49, 0x0c, 0xd8, 0x9c, - 0x21, 0xe7, 0xcc, 0x46, 0x3d, 0x3a, 0xc9, 0x32, 0xeb, 0xbe, 0xf8, 0x40, 0xf7, 0xb7, 0xd0, 0x38, - 0x47, 0x17, 0xb3, 0x17, 0xe2, 0xff, 0xb7, 0x64, 0x17, 0xc8, 0xb2, 0xac, 0xea, 0x8a, 0x79, 0x05, - 0xa5, 0x6e, 0xfc, 0x9e, 0x11, 0x02, 0xc5, 0xf8, 0x37, 0x5a, 0x6b, 0xcb, 0x6f, 0xf2, 0x39, 0xec, - 0xf2, 0x28, 0x08, 0xfc, 0x50, 0xe0, 0x64, 0x98, 0xa6, 0x57, 0x7d, 0xa8, 0x52, 0x92, 0x62, 0x03, - 0x6d, 0x84, 0x9b, 0x07, 0xb2, 0xef, 0x52, 0x31, 0x71, 0xbe, 0x46, 0xd8, 0x7c, 0x05, 0xf5, 0x05, - 0x4d, 0xcf, 0xc7, 0x33, 0x28, 0xc9, 0x97, 0x55, 0x0f, 0xc7, 0x7f, 0xfa, 0xa4, 0xd8, 0x8a, 0x63, - 0x3e, 0x86, 0x46, 0xcf, 0xe1, 0x4a, 0x81, 0xeb, 0x4c, 0xe6, 0x19, 0x90, 0xe5, 0xa0, 0xd6, 0x7d, - 0x0e, 0x65, 0xb9, 0x27, 0xfe, 0x29, 0x29, 0xbc, 0x5d, 0x58, 0x93, 0x3e, 0xfb, 0x15, 0x4a, 0x72, - 0x22, 0x48, 0x13, 0x1a, 0xd4, 0x1a, 0xd0, 0x9f, 0xba, 0xa7, 0x3d, 0x6b, 0xf8, 0x7d, 0xf7, 0xb2, - 0x77, 0x4b, 0xad, 0xfa, 0x46, 0x1c, 0xbe, 0xb6, 0xe8, 0x55, 0xb7, 0x6f, 0xf5, 0x07, 0x69, 0x38, - 0x47, 0x6a, 0xb0, 0x79, 0x6d, 0xf5, 0xcf, 0x2f, 0xfb, 0x17, 0xf5, 0x7c, 0xbc, 0xa0, 0xb7, 0xfd, - 0x7e, 0xbc, 0x28, 0x90, 0x6d, 0xa8, 0xde, 0xdc, 0x9e, 0x9d, 0x59, 0xd6, 0xb9, 0x75, 0x5e, 0x2f, - 0x9e, 0x7e, 0xfb, 0xf3, 0x37, 0xb6, 0x23, 0x7e, 0x8b, 0x46, 0xed, 0xb1, 0x3f, 0xeb, 0x48, 0x2b, - 0x7e, 0x68, 0xab, 0x8f, 0x4e, 0xfa, 0x8a, 0xdb, 0xe8, 0x75, 0x82, 0xd1, 0x73, 0xdb, 0xef, 0x64, - 0xff, 0x7c, 0x8c, 0xca, 0xf2, 0x41, 0x3f, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x11, 0x18, - 0x7d, 0x95, 0x08, 0x00, 0x00, + // 924 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x61, 0x6f, 0xe3, 0x44, + 0x10, 0x6d, 0x9a, 0x26, 0x4d, 0x26, 0x6d, 0x2f, 0xd9, 0x6b, 0xc0, 0xcd, 0x1d, 0xa8, 0x32, 0x2a, + 0xaa, 0x38, 0x9d, 0xc3, 0xa5, 0xe8, 0x28, 0x20, 0x38, 0xa5, 0xad, 0xe9, 0x55, 0x4a, 0xa3, 0x6a, + 0x9b, 0x22, 0x40, 0x82, 0x68, 0x93, 0x4c, 0x73, 0x56, 0x1c, 0xdb, 0x78, 0xd7, 0xd5, 0x05, 0xf1, + 0x8d, 0x3f, 0xc1, 0x1f, 0xe5, 0x3b, 0xf2, 0xee, 0xda, 0x89, 0x43, 0xae, 0xea, 0xe9, 0xbe, 0x79, + 0xe7, 0xbd, 0x7d, 0xf3, 0x76, 0x66, 0xbc, 0x36, 0x34, 0x6e, 0xdd, 0x99, 0x40, 0x67, 0xe4, 0x36, + 0xd9, 0x68, 0xea, 0x78, 0x4d, 0x36, 0x46, 0x4f, 0x58, 0x41, 0xe8, 0x0b, 0x9f, 0xec, 0x24, 0x98, + 0x25, 0xb1, 0xc6, 0xd3, 0x94, 0x3b, 0xf4, 0x43, 0x6c, 0xba, 0x8e, 0xc0, 0x90, 0xb9, 0x5c, 0xb1, + 0x1b, 0x7b, 0x59, 0x54, 0x30, 0x3e, 0x49, 0xa0, 0x4f, 0xb2, 0x90, 0xe3, 0x09, 0x0c, 0x6f, 0xd9, + 0x10, 0x35, 0xfc, 0xe9, 0x12, 0x3c, 0x42, 0x4f, 0x38, 0xb7, 0x0e, 0x86, 0xab, 0xb7, 0xe3, 0x5b, + 0x1c, 0x46, 0xc2, 0xf1, 0x3d, 0x05, 0x9b, 0xff, 0x14, 0xa0, 0xde, 0x63, 0x7c, 0x62, 0x27, 0xf1, + 0x4b, 0x14, 0x6c, 0xc4, 0x04, 0x23, 0x14, 0x6a, 0xb1, 0x8d, 0x7e, 0xba, 0xa3, 0xef, 0x8c, 0x8c, + 0xdc, 0x7e, 0xee, 0xb0, 0xd2, 0xfa, 0xdc, 0x4a, 0x0f, 0x17, 0x8b, 0x5a, 0x19, 0x81, 0x8b, 0xd4, + 0x01, 0x7d, 0x24, 0xb2, 0x00, 0x79, 0x0a, 0x65, 0x8f, 0x4d, 0x91, 0x07, 0x6c, 0x88, 0xc6, 0xfa, + 0x7e, 0xee, 0xb0, 0x4c, 0xe7, 0x01, 0x72, 0x01, 0x45, 0x97, 0x0d, 0xd0, 0xe5, 0x46, 0x7e, 0x3f, + 0x7f, 0x58, 0x69, 0xbd, 0xb0, 0xb2, 0x35, 0xb4, 0x56, 0x1a, 0xb5, 0x3a, 0x72, 0x8f, 0xed, 0x89, + 0x70, 0x46, 0xb5, 0x00, 0xf9, 0x19, 0x2a, 0xcc, 0xf3, 0x7c, 0xc1, 0x62, 0x26, 0x37, 0x36, 0xa4, + 0xde, 0xcb, 0x87, 0xe9, 0xb5, 0xe7, 0x1b, 0x95, 0xe8, 0xa2, 0x14, 0xb1, 0xe0, 0xf1, 0xe4, 0x98, + 0xf7, 0x39, 0x86, 0x77, 0xce, 0x10, 0xfb, 0x6c, 0x38, 0xf4, 0x23, 0x4f, 0x18, 0x05, 0x79, 0x98, + 0xda, 0xe4, 0x98, 0x5f, 0x2b, 0xa4, 0xad, 0x00, 0x22, 0xa0, 0x8e, 0xde, 0x9d, 0x13, 0xfa, 0xde, + 0x14, 0x3d, 0xd1, 0xbf, 0x63, 0xa1, 0xc3, 0x06, 0x2e, 0x72, 0xa3, 0x28, 0x3d, 0xbd, 0x7a, 0x98, + 0x27, 0x7b, 0x2e, 0xf1, 0x53, 0xa2, 0xa0, 0xcc, 0xed, 0xe2, 0x0a, 0xa8, 0xf1, 0x0d, 0x54, 0x16, + 0xca, 0x42, 0xaa, 0x90, 0x9f, 0xe0, 0x4c, 0x76, 0xaf, 0x4c, 0xe3, 0x47, 0xb2, 0x0b, 0x85, 0x3b, + 0xe6, 0x46, 0x49, 0x17, 0xd4, 0xe2, 0xdb, 0xf5, 0xe3, 0x5c, 0xe3, 0x07, 0xa8, 0x2e, 0x57, 0xe0, + 0xbd, 0xf6, 0x9f, 0xc3, 0xde, 0x3b, 0xdd, 0xbe, 0x8f, 0x90, 0xf9, 0xf7, 0x3a, 0xd4, 0x4e, 0x43, + 0x64, 0x02, 0xe3, 0x9a, 0x50, 0xfc, 0x23, 0x42, 0x2e, 0xc8, 0x0b, 0x28, 0x3a, 0x5e, 0x10, 0x09, + 0xae, 0x67, 0x71, 0x6f, 0x69, 0x16, 0x3b, 0xea, 0xc5, 0xba, 0x64, 0x01, 0xd5, 0x44, 0xf2, 0x35, + 0x94, 0x04, 0x4e, 0x03, 0x97, 0x09, 0x95, 0xa5, 0xd2, 0x7a, 0xb2, 0x62, 0x80, 0x7b, 0x9a, 0x42, + 0x53, 0x32, 0xf9, 0x0c, 0xb6, 0xfd, 0x48, 0x04, 0x91, 0xe8, 0x07, 0x21, 0xde, 0x3a, 0x6f, 0x8d, + 0xbc, 0xf4, 0xb8, 0xa5, 0x82, 0x57, 0x32, 0x46, 0x7e, 0x83, 0x8f, 0x97, 0xde, 0x93, 0xa9, 0xee, + 0x9a, 0xb1, 0x21, 0x93, 0x1d, 0x3c, 0xa8, 0xc5, 0xb4, 0x2e, 0x56, 0x85, 0xcd, 0x3f, 0x81, 0x2c, + 0x16, 0x81, 0x07, 0xbe, 0xc7, 0x91, 0x1c, 0xc0, 0x76, 0x88, 0xdc, 0x8f, 0xc2, 0x21, 0xca, 0x74, + 0xb2, 0x18, 0x5b, 0xaf, 0xd7, 0xe8, 0x56, 0x12, 0x8e, 0x05, 0xc8, 0x4b, 0x28, 0x25, 0x6b, 0x7d, + 0x72, 0x63, 0xd9, 0x0c, 0xd5, 0xf8, 0xeb, 0x35, 0x9a, 0x72, 0x4f, 0x0a, 0x90, 0x0f, 0x91, 0x9b, + 0x14, 0x76, 0xce, 0x51, 0x2c, 0x56, 0xff, 0x09, 0x94, 0xe5, 0x61, 0xc5, 0x2c, 0x40, 0xdd, 0xc5, + 0x52, 0x1c, 0xe8, 0xcd, 0x02, 0x59, 0xae, 0xac, 0xa9, 0x38, 0xe5, 0x56, 0xd6, 0x92, 0xf9, 0x17, + 0x3c, 0x4a, 0x35, 0xf5, 0x61, 0xbe, 0x5a, 0x70, 0x99, 0xbb, 0xdf, 0xe5, 0xdc, 0x23, 0x39, 0x82, + 0xb2, 0xeb, 0x8f, 0xfb, 0xae, 0xe3, 0x4d, 0xb8, 0xb1, 0x2e, 0x5f, 0xa6, 0x8f, 0x56, 0xb4, 0xb5, + 0xe3, 0x8f, 0x69, 0xc9, 0xf5, 0xc7, 0x9d, 0x98, 0x67, 0xfe, 0x9b, 0x83, 0x52, 0xa2, 0x45, 0x9e, + 0x41, 0x81, 0x8b, 0x78, 0x28, 0xe2, 0xa4, 0x3b, 0xad, 0xfa, 0x72, 0xd2, 0xeb, 0x18, 0xa4, 0x8a, + 0x43, 0x8e, 0x60, 0x53, 0xb5, 0x9d, 0xeb, 0x4a, 0xde, 0x33, 0x78, 0x09, 0x93, 0x18, 0xb0, 0x39, + 0x45, 0xce, 0xd9, 0x18, 0xf5, 0xe8, 0x24, 0xcb, 0xac, 0xfb, 0x8d, 0x87, 0xb9, 0x27, 0xc7, 0x50, + 0x08, 0xde, 0x30, 0x8e, 0xf2, 0xb6, 0xd9, 0x69, 0x99, 0xf7, 0x5d, 0xc3, 0xd6, 0x55, 0xcc, 0xa4, + 0x6a, 0x83, 0x79, 0x03, 0xb5, 0x33, 0x74, 0x31, 0xfb, 0x2a, 0x7d, 0x78, 0x33, 0x77, 0x81, 0x2c, + 0xca, 0xaa, 0x7e, 0x9a, 0x97, 0x50, 0x68, 0xc7, 0x5f, 0x42, 0x42, 0x60, 0x23, 0xbe, 0xdd, 0xb5, + 0xb6, 0x7c, 0x26, 0x5f, 0xc2, 0x2e, 0x8f, 0x82, 0xc0, 0x0f, 0x05, 0x8e, 0xfa, 0x69, 0x7a, 0xd5, + 0xc1, 0x32, 0x25, 0x29, 0xd6, 0xd3, 0x46, 0xb8, 0x79, 0x20, 0x27, 0x46, 0x2a, 0x26, 0xce, 0x57, + 0x08, 0x9b, 0xaf, 0xa0, 0x3a, 0xa7, 0xe9, 0xc9, 0x7a, 0x06, 0x05, 0xf9, 0x4d, 0xd6, 0x63, 0xf5, + 0xbf, 0x0e, 0x2b, 0xb6, 0xe2, 0x98, 0x8f, 0xa1, 0xd6, 0x71, 0xb8, 0x52, 0xe0, 0x3a, 0x93, 0x79, + 0x0a, 0x64, 0x31, 0xa8, 0x75, 0x9f, 0x43, 0x51, 0xee, 0x89, 0x2f, 0xa1, 0xfc, 0xbb, 0x85, 0x35, + 0xe9, 0x8b, 0xdf, 0xa1, 0x20, 0x67, 0x89, 0xd4, 0xa1, 0x46, 0xed, 0x1e, 0xfd, 0xa5, 0x7d, 0xd2, + 0xb1, 0xfb, 0x3f, 0xb6, 0x2f, 0x3a, 0x37, 0xd4, 0xae, 0xae, 0xc5, 0xe1, 0x2b, 0x9b, 0x5e, 0xb6, + 0xbb, 0x76, 0xb7, 0x97, 0x86, 0x73, 0xa4, 0x02, 0x9b, 0x57, 0x76, 0xf7, 0xec, 0xa2, 0x7b, 0x5e, + 0x5d, 0x8f, 0x17, 0xf4, 0xa6, 0xdb, 0x8d, 0x17, 0x79, 0xb2, 0x0d, 0xe5, 0xeb, 0x9b, 0xd3, 0x53, + 0xdb, 0x3e, 0xb3, 0xcf, 0xaa, 0x1b, 0x27, 0xdf, 0xff, 0xfa, 0xdd, 0xd8, 0x11, 0x6f, 0xa2, 0x81, + 0x35, 0xf4, 0xa7, 0x4d, 0x69, 0xc5, 0x0f, 0xc7, 0xea, 0xa1, 0x99, 0x7e, 0xff, 0xc7, 0xe8, 0x35, + 0x83, 0xc1, 0xf3, 0xb1, 0xdf, 0xcc, 0xfe, 0xb6, 0x0c, 0x8a, 0xf2, 0x57, 0xe0, 0xe8, 0xbf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x55, 0xc5, 0xef, 0x41, 0xcf, 0x08, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index b7eacff5f7..c790aa822f 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -292,7 +292,7 @@ "properties": { "state": { "$ref": "#/definitions/flyteidladminState", - "description": "The state of the execution is used to control its visibility in the UI/CLI." + "description": "DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI." }, "outputs": { "$ref": "#/definitions/coreLiteralMap", @@ -308,6 +308,10 @@ "$ref": "#/definitions/coreTaskLog" }, "description": "log information for the task execution." + }, + "phase": { + "$ref": "#/definitions/coreTaskExecutionPhase", + "description": "The phase of the execution is used to determine the phase of the plugin's execution." } } }, @@ -1155,6 +1159,21 @@ }, "description": "Encapsulation of fields that identify a Flyte task execution entity." }, + "coreTaskExecutionPhase": { + "type": "string", + "enum": [ + "UNDEFINED", + "QUEUED", + "RUNNING", + "SUCCEEDED", + "ABORTED", + "FAILED", + "INITIALIZING", + "WAITING_FOR_RESOURCES" + ], + "default": "UNDEFINED", + "title": "- INITIALIZING: To indicate cases where task is initializing, like: ErrImagePull, ContainerCreating, PodInitializing\n - WAITING_FOR_RESOURCES: To address cases, where underlying resource is not available: Backoff error, Resource quota exceeded" + }, "coreTaskLog": { "type": "object", "properties": { diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index f71d1743ff..36e373584a 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -6178,7 +6178,7 @@ public interface ResourceOrBuilder extends /** * 
-     * The state of the execution is used to control its visibility in the UI/CLI.
+     * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      *
* * .flyteidl.admin.State state = 1; @@ -6186,7 +6186,7 @@ public interface ResourceOrBuilder extends int getStateValue(); /** * 
-     * The state of the execution is used to control its visibility in the UI/CLI.
+     * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      *
* * .flyteidl.admin.State state = 1; @@ -6285,6 +6285,23 @@ public interface ResourceOrBuilder extends */ flyteidl.core.Execution.TaskLogOrBuilder getLogLinksOrBuilder( int index); + + /** + * 
+     * The phase of the execution is used to determine the phase of the plugin's execution.
+     *
+ * + * .flyteidl.core.TaskExecution.Phase phase = 5; + */ + int getPhaseValue(); + /** + * 
+     * The phase of the execution is used to determine the phase of the plugin's execution.
+     *
+ * + * .flyteidl.core.TaskExecution.Phase phase = 5; + */ + flyteidl.core.Execution.TaskExecution.Phase getPhase(); } /** * Protobuf type {@code flyteidl.admin.Resource} @@ -6302,6 +6319,7 @@ private Resource() { state_ = 0; message_ = ""; logLinks_ = java.util.Collections.emptyList(); + phase_ = 0; } @java.lang.Override @@ -6362,6 +6380,12 @@ private Resource( input.readMessage(flyteidl.core.Execution.TaskLog.parser(), extensionRegistry)); break; } + case 40: { + int rawValue = input.readEnum(); + + phase_ = rawValue; + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -6402,7 +6426,7 @@ private Resource( private int state_; /** * 
-     * The state of the execution is used to control its visibility in the UI/CLI.
+     * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      *
* * .flyteidl.admin.State state = 1; @@ -6412,7 +6436,7 @@ public int getStateValue() { } /** * 
-     * The state of the execution is used to control its visibility in the UI/CLI.
+     * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      *
* * .flyteidl.admin.State state = 1; @@ -6559,6 +6583,31 @@ public flyteidl.core.Execution.TaskLogOrBuilder getLogLinksOrBuilder( return logLinks_.get(index); } + public static final int PHASE_FIELD_NUMBER = 5; + private int phase_; + /** + * 
+     * The phase of the execution is used to determine the phase of the plugin's execution.
+     *
+ * + * .flyteidl.core.TaskExecution.Phase phase = 5; + */ + public int getPhaseValue() { + return phase_; + } + /** + * 
+     * The phase of the execution is used to determine the phase of the plugin's execution.
+     *
+ * + * .flyteidl.core.TaskExecution.Phase phase = 5; + */ + public flyteidl.core.Execution.TaskExecution.Phase getPhase() { + @SuppressWarnings("deprecation") + flyteidl.core.Execution.TaskExecution.Phase result = flyteidl.core.Execution.TaskExecution.Phase.valueOf(phase_); + return result == null ? flyteidl.core.Execution.TaskExecution.Phase.UNRECOGNIZED : result; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -6585,6 +6634,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < logLinks_.size(); i++) { output.writeMessage(4, logLinks_.get(i)); } + if (phase_ != flyteidl.core.Execution.TaskExecution.Phase.UNDEFINED.getNumber()) { + output.writeEnum(5, phase_); + } unknownFields.writeTo(output); } @@ -6609,6 +6661,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(4, logLinks_.get(i)); } + if (phase_ != flyteidl.core.Execution.TaskExecution.Phase.UNDEFINED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(5, phase_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -6634,6 +6690,7 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getMessage())) return false; if (!getLogLinksList() .equals(other.getLogLinksList())) return false; + if (phase_ != other.phase_) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -6657,6 +6714,8 @@ public int hashCode() { hash = (37 * hash) + LOG_LINKS_FIELD_NUMBER; hash = (53 * hash) + getLogLinksList().hashCode(); } + hash = (37 * hash) + PHASE_FIELD_NUMBER; + hash = (53 * hash) + phase_; hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -6807,6 +6866,8 @@ public Builder clear() { } else { logLinksBuilder_.clear(); } + phase_ = 0; + return this; } @@ -6851,6 +6912,7 @@ public flyteidl.admin.AgentOuterClass.Resource buildPartial() { } else { result.logLinks_ = logLinksBuilder_.build(); } + result.phase_ = phase_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -6936,6 +6998,9 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.Resource other) { } } } + if (other.phase_ != 0) { + setPhaseValue(other.getPhaseValue()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -6969,7 +7034,7 @@ public Builder mergeFrom( private int state_ = 0; /** * 
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        *
* * .flyteidl.admin.State state = 1; @@ -6979,7 +7044,7 @@ public int getStateValue() { } /** * 
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        *
* * .flyteidl.admin.State state = 1; @@ -6991,7 +7056,7 @@ public Builder setStateValue(int value) { } /** * 
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        *
* * .flyteidl.admin.State state = 1; @@ -7003,7 +7068,7 @@ public flyteidl.admin.AgentOuterClass.State getState() { } /** * 
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        *
* * .flyteidl.admin.State state = 1; @@ -7019,7 +7084,7 @@ public Builder setState(flyteidl.admin.AgentOuterClass.State value) { } /** * 
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        *
* * .flyteidl.admin.State state = 1; @@ -7602,6 +7667,71 @@ public flyteidl.core.Execution.TaskLog.Builder addLogLinksBuilder( } return logLinksBuilder_; } + + private int phase_ = 0; + /** + * 
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       *
+ * + * .flyteidl.core.TaskExecution.Phase phase = 5; + */ + public int getPhaseValue() { + return phase_; + } + /** + * 
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       *
+ * + * .flyteidl.core.TaskExecution.Phase phase = 5; + */ + public Builder setPhaseValue(int value) { + phase_ = value; + onChanged(); + return this; + } + /** + * 
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       *
+ * + * .flyteidl.core.TaskExecution.Phase phase = 5; + */ + public flyteidl.core.Execution.TaskExecution.Phase getPhase() { + @SuppressWarnings("deprecation") + flyteidl.core.Execution.TaskExecution.Phase result = flyteidl.core.Execution.TaskExecution.Phase.valueOf(phase_); + return result == null ? flyteidl.core.Execution.TaskExecution.Phase.UNRECOGNIZED : result; + } + /** + * 
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       *
+ * + * .flyteidl.core.TaskExecution.Phase phase = 5; + */ + public Builder setPhase(flyteidl.core.Execution.TaskExecution.Phase value) { + if (value == null) { + throw new NullPointerException(); + } + + phase_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       *
+ * + * .flyteidl.core.TaskExecution.Phase phase = 5; + */ + public Builder clearPhase() { + + phase_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -12142,23 +12272,24 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy "\022\025\n\rresource_meta\030\002 \001(\014\"h\n\017GetTaskRespon" + "se\022*\n\010resource\030\001 \001(\0132\030.flyteidl.admin.Re" + "source\022)\n\tlog_links\030\002 \003(\0132\026.flyteidl.cor" + - "e.TaskLog\"\230\001\n\010Resource\022$\n\005state\030\001 \001(\0162\025." + + "e.TaskLog\"\313\001\n\010Resource\022$\n\005state\030\001 \001(\0162\025." + "flyteidl.admin.State\022*\n\007outputs\030\002 \001(\0132\031." + "flyteidl.core.LiteralMap\022\017\n\007message\030\003 \001(" + "\t\022)\n\tlog_links\030\004 \003(\0132\026.flyteidl.core.Tas" + - "kLog\"=\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001" + - " \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTas" + - "kResponse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024supp" + - "orted_task_types\030\002 \003(\t\"\037\n\017GetAgentReques" + - "t\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005a" + - "gent\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021Lis" + - "tAgentsRequest\";\n\022ListAgentsResponse\022%\n\006" + - "agents\030\001 \003(\0132\025.flyteidl.admin.Agent*^\n\005S" + - "tate\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT" + - "_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\t" + - "SUCCEEDED\020\004B=Z;github.com/flyteorg/flyte" + - "/flyteidl/gen/pb-go/flyteidl/adminb\006prot" + - "o3" + "kLog\0221\n\005phase\030\005 \001(\0162\".flyteidl.core.Task" + + "Execution.Phase\"=\n\021DeleteTaskRequest\022\021\n\t" + + "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024" + + "\n\022DeleteTaskResponse\"3\n\005Agent\022\014\n\004name\030\001 " + + "\001(\t\022\034\n\024supported_task_types\030\002 \003(\t\"\037\n\017Get" + + "AgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentRe" + + "sponse\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin.A" + + "gent\"\023\n\021ListAgentsRequest\";\n\022ListAgentsR" + + "esponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.admin" + + ".Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025" + + "\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RU" + + "NNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fly" + + "teorg/flyte/flyteidl/gen/pb-go/flyteidl/" + + "adminb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -12230,7 +12361,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_Resource_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_Resource_descriptor, - new java.lang.String[] { "State", "Outputs", "Message", "LogLinks", }); + new java.lang.String[] { "State", "Outputs", "Message", "LogLinks", "Phase", }); internal_static_flyteidl_admin_DeleteTaskRequest_descriptor = getDescriptor().getMessageTypes().get(6); internal_static_flyteidl_admin_DeleteTaskRequest_fieldAccessorTable = new diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 44c8f52a04..345492c4c9 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -9097,6 +9097,9 @@ export namespace flyteidl { /** Resource logLinks */ logLinks?: (flyteidl.core.ITaskLog[]|null); + + /** Resource phase */ + phase?: (flyteidl.core.TaskExecution.Phase|null); } /** Represents a Resource. */ @@ -9120,6 +9123,9 @@ export namespace flyteidl { /** Resource logLinks. */ public logLinks: flyteidl.core.ITaskLog[]; + /** Resource phase. */ + public phase: flyteidl.core.TaskExecution.Phase; + /** * Creates a new Resource instance using the specified properties. * @param [properties] Properties to set diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 3bd5e9bd3d..cba0f3f41c 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -22289,6 +22289,7 @@ * @property {flyteidl.core.ILiteralMap|null} [outputs] Resource outputs * @property {string|null} [message] Resource message * @property {Array.|null} [logLinks] Resource logLinks + * @property {flyteidl.core.TaskExecution.Phase|null} [phase] Resource phase */ /** @@ -22339,6 +22340,14 @@ */ Resource.prototype.logLinks = $util.emptyArray; + /** + * Resource phase. + * @member {flyteidl.core.TaskExecution.Phase} phase + * @memberof flyteidl.admin.Resource + * @instance + */ + Resource.prototype.phase = 0; + /** * Creates a new Resource instance using the specified properties. * @function create @@ -22372,6 +22381,8 @@ if (message.logLinks != null && message.logLinks.length) for (var i = 0; i < message.logLinks.length; ++i) $root.flyteidl.core.TaskLog.encode(message.logLinks[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.phase != null && message.hasOwnProperty("phase")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.phase); return writer; }; @@ -22407,6 +22418,9 @@ message.logLinks = []; message.logLinks.push($root.flyteidl.core.TaskLog.decode(reader, reader.uint32())); break; + case 5: + message.phase = reader.int32(); + break; default: reader.skipType(tag & 7); break; @@ -22454,6 +22468,20 @@ return "logLinks." + error; } } + if (message.phase != null && message.hasOwnProperty("phase")) + switch (message.phase) { + default: + return "phase: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + break; + } return null; }; diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index 5d515cb0c4..8105a70e94 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -18,7 +18,7 @@ from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xbb\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xf5\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\x12\x38\n\x05phase\x18\x05 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -33,8 +33,8 @@ _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001' _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' - _globals['_STATE']._serialized_start=2032 - _globals['_STATE']._serialized_end=2126 + _globals['_STATE']._serialized_start=2090 + _globals['_STATE']._serialized_end=2184 _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 @@ -52,19 +52,19 @@ _globals['_GETTASKRESPONSE']._serialized_start=1334 _globals['_GETTASKRESPONSE']._serialized_end=1458 _globals['_RESOURCE']._serialized_start=1461 - _globals['_RESOURCE']._serialized_end=1648 - _globals['_DELETETASKREQUEST']._serialized_start=1650 - _globals['_DELETETASKREQUEST']._serialized_end=1735 - _globals['_DELETETASKRESPONSE']._serialized_start=1737 - _globals['_DELETETASKRESPONSE']._serialized_end=1757 - _globals['_AGENT']._serialized_start=1759 - _globals['_AGENT']._serialized_end=1836 - _globals['_GETAGENTREQUEST']._serialized_start=1838 - _globals['_GETAGENTREQUEST']._serialized_end=1875 - _globals['_GETAGENTRESPONSE']._serialized_start=1877 - _globals['_GETAGENTRESPONSE']._serialized_end=1940 - _globals['_LISTAGENTSREQUEST']._serialized_start=1942 - _globals['_LISTAGENTSREQUEST']._serialized_end=1961 - _globals['_LISTAGENTSRESPONSE']._serialized_start=1963 - _globals['_LISTAGENTSRESPONSE']._serialized_end=2030 + _globals['_RESOURCE']._serialized_end=1706 + _globals['_DELETETASKREQUEST']._serialized_start=1708 + _globals['_DELETETASKREQUEST']._serialized_end=1793 + _globals['_DELETETASKRESPONSE']._serialized_start=1795 + _globals['_DELETETASKRESPONSE']._serialized_end=1815 + _globals['_AGENT']._serialized_start=1817 + _globals['_AGENT']._serialized_end=1894 + _globals['_GETAGENTREQUEST']._serialized_start=1896 + _globals['_GETAGENTREQUEST']._serialized_end=1933 + _globals['_GETAGENTRESPONSE']._serialized_start=1935 + _globals['_GETAGENTRESPONSE']._serialized_end=1998 + _globals['_LISTAGENTSREQUEST']._serialized_start=2000 + _globals['_LISTAGENTSREQUEST']._serialized_end=2019 + _globals['_LISTAGENTSRESPONSE']._serialized_start=2021 + _globals['_LISTAGENTSRESPONSE']._serialized_end=2088 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi index 3b80e41b58..352f8b67b6 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi @@ -98,16 +98,18 @@ class GetTaskResponse(_message.Message): def __init__(self, resource: _Optional[_Union[Resource, _Mapping]] = ..., log_links: _Optional[_Iterable[_Union[_execution_pb2.TaskLog, _Mapping]]] = ...) -> None: ... class Resource(_message.Message): - __slots__ = ["state", "outputs", "message", "log_links"] + __slots__ = ["state", "outputs", "message", "log_links", "phase"] STATE_FIELD_NUMBER: _ClassVar[int] OUTPUTS_FIELD_NUMBER: _ClassVar[int] MESSAGE_FIELD_NUMBER: _ClassVar[int] LOG_LINKS_FIELD_NUMBER: _ClassVar[int] + PHASE_FIELD_NUMBER: _ClassVar[int] state: State outputs: _literals_pb2.LiteralMap message: str log_links: _containers.RepeatedCompositeFieldContainer[_execution_pb2.TaskLog] - def __init__(self, state: _Optional[_Union[State, str]] = ..., outputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., message: _Optional[str] = ..., log_links: _Optional[_Iterable[_Union[_execution_pb2.TaskLog, _Mapping]]] = ...) -> None: ... + phase: _execution_pb2.TaskExecution.Phase + def __init__(self, state: _Optional[_Union[State, str]] = ..., outputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., message: _Optional[str] = ..., log_links: _Optional[_Iterable[_Union[_execution_pb2.TaskLog, _Mapping]]] = ..., phase: _Optional[_Union[_execution_pb2.TaskExecution.Phase, str]] = ...) -> None: ... class DeleteTaskRequest(_message.Message): __slots__ = ["task_type", "resource_meta"] diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index dc1b065bfa..6c44bf9ff2 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -87,7 +87,7 @@ pub struct GetTaskResponse { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Resource { - /// The state of the execution is used to control its visibility in the UI/CLI. + /// DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. #[prost(enumeration="State", tag="1")] pub state: i32, /// The outputs of the execution. It's typically used by sql task. Agent service will create a @@ -101,6 +101,9 @@ pub struct Resource { /// log information for the task execution. #[prost(message, repeated, tag="4")] pub log_links: ::prost::alloc::vec::Vec, + /// The phase of the execution is used to determine the phase of the plugin's execution. + #[prost(enumeration="super::core::task_execution::Phase", tag="5")] + pub phase: i32, } /// A message used to delete a task. #[allow(clippy::derive_partial_eq_without_eq)] diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index 31eeb5f4ab..674208aeb4 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -75,13 +75,13 @@ message GetTaskResponse { } message Resource { - // The state of the execution is used to control its visibility in the UI/CLI. + // DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. State state = 1; // The outputs of the execution. It's typically used by sql task. Agent service will create a // Structured dataset pointing to the query result table. // +optional core.LiteralMap outputs = 2; - // A descriptive message for the current state. e.g. waiting for cluster. + // A descriptive message for the currnt state. e.g. waiting for cluster. string message = 3; // log information for the task execution. repeated core.TaskLog log_links = 4; From a95ed7d535497ff12a49b67ef8b41dd416852838 Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Sun, 21 Jan 2024 13:38:35 +0800 Subject: [PATCH 3/8] add proto and Phase in agent Status function Signed-off-by: Future-Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 125 +++-------- flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 205 ++++++------------ .../pb-go/flyteidl/service/agent.swagger.json | 2 +- .../flyteidl/admin/AgentOuterClass.java | 119 +++------- .../gen/pb_python/flyteidl/admin/agent_pb2.py | 93 +++----- flyteidl/gen/pb_rust/flyteidl.admin.rs | 2 +- .../go/tasks/plugins/webapi/agent/plugin.go | 29 ++- 7 files changed, 192 insertions(+), 383 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index 6ab0e4c70f..e528fe7c14 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -602,7 +602,6 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 55, -1, sizeof(::flyteidl::admin::GetTaskRequest)}, { 62, -1, sizeof(::flyteidl::admin::GetTaskResponse)}, { 69, -1, sizeof(::flyteidl::admin::Resource)}, -<<<<<<< HEAD { 79, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, { 86, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, { 91, -1, sizeof(::flyteidl::admin::Agent)}, @@ -610,19 +609,10 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 104, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, { 110, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, { 115, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, -======= - { 78, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, - { 85, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, - { 90, -1, sizeof(::flyteidl::admin::Agent)}, - { 97, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, - { 103, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, - { 109, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, - { 114, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, - { 120, -1, sizeof(::flyteidl::admin::GetTaskMetricsRequest)}, - { 131, -1, sizeof(::flyteidl::admin::GetTaskMetricsResponse)}, - { 137, -1, sizeof(::flyteidl::admin::GetTaskLogsRequest)}, - { 146, -1, sizeof(::flyteidl::admin::GetTaskLogsResponse)}, ->>>>>>> 6f5c47154549dd9f697f4a44547eda5197d40a52 + { 121, -1, sizeof(::flyteidl::admin::GetTaskMetricsRequest)}, + { 132, -1, sizeof(::flyteidl::admin::GetTaskMetricsResponse)}, + { 138, -1, sizeof(::flyteidl::admin::GetTaskLogsRequest)}, + { 147, -1, sizeof(::flyteidl::admin::GetTaskLogsResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -657,54 +647,6 @@ ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_fl const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "\n\032flyteidl/admin/agent.proto\022\016flyteidl.a" "dmin\032\034flyteidl/core/literals.proto\032\031flyt" -<<<<<<< HEAD - "eidl/core/tasks.proto\032\035flyteidl/core/int" - "erface.proto\032\036flyteidl/core/identifier.p" - "roto\032\035flyteidl/core/execution.proto\"\232\004\n\025" - "TaskExecutionMetadata\022A\n\021task_execution_" - "id\030\001 \001(\0132&.flyteidl.core.TaskExecutionId" - "entifier\022\021\n\tnamespace\030\002 \001(\t\022A\n\006labels\030\003 " - "\003(\01321.flyteidl.admin.TaskExecutionMetada" - "ta.LabelsEntry\022K\n\013annotations\030\004 \003(\01326.fl" - "yteidl.admin.TaskExecutionMetadata.Annot" - "ationsEntry\022\033\n\023k8s_service_account\030\005 \001(\t" - "\022^\n\025environment_variables\030\006 \003(\0132\?.flytei" - "dl.admin.TaskExecutionMetadata.Environme" - "ntVariablesEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001" - " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" - "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" - "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" - "\005value\030\002 \001(\t:\0028\001\"\314\001\n\021CreateTaskRequest\022)" - "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" - "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" - "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" - "execution_metadata\030\004 \001(\0132%.flyteidl.admi" - "n.TaskExecutionMetadata\"b\n\022CreateTaskRes" - "ponse\022\027\n\rresource_meta\030\001 \001(\014H\000\022,\n\010resour" - "ce\030\002 \001(\0132\030.flyteidl.admin.ResourceH\000B\005\n\003" - "res\":\n\016GetTaskRequest\022\021\n\ttask_type\030\001 \001(\t" - "\022\025\n\rresource_meta\030\002 \001(\014\"h\n\017GetTaskRespon" - "se\022*\n\010resource\030\001 \001(\0132\030.flyteidl.admin.Re" - "source\022)\n\tlog_links\030\002 \003(\0132\026.flyteidl.cor" - "e.TaskLog\"\313\001\n\010Resource\022$\n\005state\030\001 \001(\0162\025." - "flyteidl.admin.State\022*\n\007outputs\030\002 \001(\0132\031." - "flyteidl.core.LiteralMap\022\017\n\007message\030\003 \001(" - "\t\022)\n\tlog_links\030\004 \003(\0132\026.flyteidl.core.Tas" - "kLog\0221\n\005phase\030\005 \001(\0162\".flyteidl.core.Task" - "Execution.Phase\"=\n\021DeleteTaskRequest\022\021\n\t" - "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024" - "\n\022DeleteTaskResponse\"3\n\005Agent\022\014\n\004name\030\001 " - "\001(\t\022\034\n\024supported_task_types\030\002 \003(\t\"\037\n\017Get" - "AgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentRe" - "sponse\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin.A" - "gent\"\023\n\021ListAgentsRequest\";\n\022ListAgentsR" - "esponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.admin" - ".Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025" - "\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RU" - "NNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fly" - "teorg/flyte/flyteidl/gen/pb-go/flyteidl/" - "adminb\006proto3" -======= "eidl/core/tasks.proto\032\036flyteidl/core/ide" "ntifier.proto\032\035flyteidl/core/execution.p" "roto\032\033flyteidl/core/metrics.proto\032\036googl" @@ -734,44 +676,41 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta" "\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 " "\001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_lin" - "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\230\001\n\010Res" + "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\313\001\n\010Res" "ource\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.St" "ate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Lit" "eralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_links\030\004 " - "\003(\0132\026.flyteidl.core.TaskLog\"=\n\021DeleteTas" - "kRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_" - "meta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"3\n\005Agen" - "t\022\014\n\004name\030\001 \001(\t\022\034\n\024supported_task_types\030" - "\002 \003(\t\"\037\n\017GetAgentRequest\022\014\n\004name\030\001 \001(\t\"8" - "\n\020GetAgentResponse\022$\n\005agent\030\001 \001(\0132\025.flyt" - "eidl.admin.Agent\"\023\n\021ListAgentsRequest\";\n" - "\022ListAgentsResponse\022%\n\006agents\030\001 \003(\0132\025.fl" - "yteidl.admin.Agent\"\331\001\n\025GetTaskMetricsReq" - "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta" - "\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nstart_time\030\004 " - "\001(\0132\032.google.protobuf.Timestamp\022,\n\010end_t" - "ime\030\005 \001(\0132\032.google.protobuf.Timestamp\022\'\n" - "\004step\030\006 \001(\0132\031.google.protobuf.Duration\"O" - "\n\026GetTaskMetricsResponse\0225\n\007results\030\001 \003(" - "\0132$.flyteidl.core.ExecutionMetricResult\"" - "\\\n\022GetTaskLogsRequest\022\021\n\ttask_type\030\001 \001(\t" - "\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005lines\030\003 \001(\004\022\r" - "\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsResponse\022\017\n\007" - "results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*^\n\005State\022\025\n" - "\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILUR" - "E\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEED" - "ED\020\004B=Z;github.com/flyteorg/flyte/flytei" - "dl/gen/pb-go/flyteidl/adminb\006proto3" ->>>>>>> 6f5c47154549dd9f697f4a44547eda5197d40a52 + "\003(\0132\026.flyteidl.core.TaskLog\0221\n\005phase\030\005 \001" + "(\0162\".flyteidl.core.TaskExecution.Phase\"=" + "\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001 \001(\t\022\025" + "\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTaskRespo" + "nse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024supported_" + "task_types\030\002 \003(\t\"\037\n\017GetAgentRequest\022\014\n\004n" + "ame\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005agent\030\001" + " \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListAgent" + "sRequest\";\n\022ListAgentsResponse\022%\n\006agents" + "\030\001 \003(\0132\025.flyteidl.admin.Agent\"\331\001\n\025GetTas" + "kMetricsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rre" + "source_meta\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nst" + "art_time\030\004 \001(\0132\032.google.protobuf.Timesta" + "mp\022,\n\010end_time\030\005 \001(\0132\032.google.protobuf.T" + "imestamp\022\'\n\004step\030\006 \001(\0132\031.google.protobuf" + ".Duration\"O\n\026GetTaskMetricsResponse\0225\n\007r" + "esults\030\001 \003(\0132$.flyteidl.core.ExecutionMe" + "tricResult\"\\\n\022GetTaskLogsRequest\022\021\n\ttask" + "_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005li" + "nes\030\003 \001(\004\022\r\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsR" + "esponse\022\017\n\007results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*" + "^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMA" + "NENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003" + "\022\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteorg/f" + "lyte/flyteidl/gen/pb-go/flyteidl/adminb\006" + "proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, -<<<<<<< HEAD - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1893, -======= - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 2355, ->>>>>>> 6f5c47154549dd9f697f4a44547eda5197d40a52 + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 2406, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 74ec9c510c..51e83e4fcc 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -404,7 +404,7 @@ type Resource struct { // Structured dataset pointing to the query result table. // +optional Outputs *core.LiteralMap `protobuf:"bytes,2,opt,name=outputs,proto3" json:"outputs,omitempty"` - // A descriptive message for the current state. e.g. waiting for cluster. + // A descriptive message for the currnt state. e.g. waiting for cluster. Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` // log information for the task execution. LogLinks []*core.TaskLog `protobuf:"bytes,4,rep,name=log_links,json=logLinks,proto3" json:"log_links,omitempty"` @@ -1035,136 +1035,75 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ -<<<<<<< HEAD - // 924 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x61, 0x6f, 0xe3, 0x44, - 0x10, 0x6d, 0x9a, 0x26, 0x4d, 0x26, 0x6d, 0x2f, 0xd9, 0x6b, 0xc0, 0xcd, 0x1d, 0xa8, 0x32, 0x2a, - 0xaa, 0x38, 0x9d, 0xc3, 0xa5, 0xe8, 0x28, 0x20, 0x38, 0xa5, 0xad, 0xe9, 0x55, 0x4a, 0xa3, 0x6a, - 0x9b, 0x22, 0x40, 0x82, 0x68, 0x93, 0x4c, 0x73, 0x56, 0x1c, 0xdb, 0x78, 0xd7, 0xd5, 0x05, 0xf1, - 0x8d, 0x3f, 0xc1, 0x1f, 0xe5, 0x3b, 0xf2, 0xee, 0xda, 0x89, 0x43, 0xae, 0xea, 0xe9, 0xbe, 0x79, - 0xe7, 0xbd, 0x7d, 0xf3, 0x76, 0x66, 0xbc, 0x36, 0x34, 0x6e, 0xdd, 0x99, 0x40, 0x67, 0xe4, 0x36, - 0xd9, 0x68, 0xea, 0x78, 0x4d, 0x36, 0x46, 0x4f, 0x58, 0x41, 0xe8, 0x0b, 0x9f, 0xec, 0x24, 0x98, - 0x25, 0xb1, 0xc6, 0xd3, 0x94, 0x3b, 0xf4, 0x43, 0x6c, 0xba, 0x8e, 0xc0, 0x90, 0xb9, 0x5c, 0xb1, - 0x1b, 0x7b, 0x59, 0x54, 0x30, 0x3e, 0x49, 0xa0, 0x4f, 0xb2, 0x90, 0xe3, 0x09, 0x0c, 0x6f, 0xd9, - 0x10, 0x35, 0xfc, 0xe9, 0x12, 0x3c, 0x42, 0x4f, 0x38, 0xb7, 0x0e, 0x86, 0xab, 0xb7, 0xe3, 0x5b, - 0x1c, 0x46, 0xc2, 0xf1, 0x3d, 0x05, 0x9b, 0xff, 0x14, 0xa0, 0xde, 0x63, 0x7c, 0x62, 0x27, 0xf1, - 0x4b, 0x14, 0x6c, 0xc4, 0x04, 0x23, 0x14, 0x6a, 0xb1, 0x8d, 0x7e, 0xba, 0xa3, 0xef, 0x8c, 0x8c, - 0xdc, 0x7e, 0xee, 0xb0, 0xd2, 0xfa, 0xdc, 0x4a, 0x0f, 0x17, 0x8b, 0x5a, 0x19, 0x81, 0x8b, 0xd4, - 0x01, 0x7d, 0x24, 0xb2, 0x00, 0x79, 0x0a, 0x65, 0x8f, 0x4d, 0x91, 0x07, 0x6c, 0x88, 0xc6, 0xfa, - 0x7e, 0xee, 0xb0, 0x4c, 0xe7, 0x01, 0x72, 0x01, 0x45, 0x97, 0x0d, 0xd0, 0xe5, 0x46, 0x7e, 0x3f, - 0x7f, 0x58, 0x69, 0xbd, 0xb0, 0xb2, 0x35, 0xb4, 0x56, 0x1a, 0xb5, 0x3a, 0x72, 0x8f, 0xed, 0x89, - 0x70, 0x46, 0xb5, 0x00, 0xf9, 0x19, 0x2a, 0xcc, 0xf3, 0x7c, 0xc1, 0x62, 0x26, 0x37, 0x36, 0xa4, - 0xde, 0xcb, 0x87, 0xe9, 0xb5, 0xe7, 0x1b, 0x95, 0xe8, 0xa2, 0x14, 0xb1, 0xe0, 0xf1, 0xe4, 0x98, - 0xf7, 0x39, 0x86, 0x77, 0xce, 0x10, 0xfb, 0x6c, 0x38, 0xf4, 0x23, 0x4f, 0x18, 0x05, 0x79, 0x98, - 0xda, 0xe4, 0x98, 0x5f, 0x2b, 0xa4, 0xad, 0x00, 0x22, 0xa0, 0x8e, 0xde, 0x9d, 0x13, 0xfa, 0xde, - 0x14, 0x3d, 0xd1, 0xbf, 0x63, 0xa1, 0xc3, 0x06, 0x2e, 0x72, 0xa3, 0x28, 0x3d, 0xbd, 0x7a, 0x98, - 0x27, 0x7b, 0x2e, 0xf1, 0x53, 0xa2, 0xa0, 0xcc, 0xed, 0xe2, 0x0a, 0xa8, 0xf1, 0x0d, 0x54, 0x16, - 0xca, 0x42, 0xaa, 0x90, 0x9f, 0xe0, 0x4c, 0x76, 0xaf, 0x4c, 0xe3, 0x47, 0xb2, 0x0b, 0x85, 0x3b, - 0xe6, 0x46, 0x49, 0x17, 0xd4, 0xe2, 0xdb, 0xf5, 0xe3, 0x5c, 0xe3, 0x07, 0xa8, 0x2e, 0x57, 0xe0, - 0xbd, 0xf6, 0x9f, 0xc3, 0xde, 0x3b, 0xdd, 0xbe, 0x8f, 0x90, 0xf9, 0xf7, 0x3a, 0xd4, 0x4e, 0x43, - 0x64, 0x02, 0xe3, 0x9a, 0x50, 0xfc, 0x23, 0x42, 0x2e, 0xc8, 0x0b, 0x28, 0x3a, 0x5e, 0x10, 0x09, - 0xae, 0x67, 0x71, 0x6f, 0x69, 0x16, 0x3b, 0xea, 0xc5, 0xba, 0x64, 0x01, 0xd5, 0x44, 0xf2, 0x35, - 0x94, 0x04, 0x4e, 0x03, 0x97, 0x09, 0x95, 0xa5, 0xd2, 0x7a, 0xb2, 0x62, 0x80, 0x7b, 0x9a, 0x42, - 0x53, 0x32, 0xf9, 0x0c, 0xb6, 0xfd, 0x48, 0x04, 0x91, 0xe8, 0x07, 0x21, 0xde, 0x3a, 0x6f, 0x8d, - 0xbc, 0xf4, 0xb8, 0xa5, 0x82, 0x57, 0x32, 0x46, 0x7e, 0x83, 0x8f, 0x97, 0xde, 0x93, 0xa9, 0xee, - 0x9a, 0xb1, 0x21, 0x93, 0x1d, 0x3c, 0xa8, 0xc5, 0xb4, 0x2e, 0x56, 0x85, 0xcd, 0x3f, 0x81, 0x2c, - 0x16, 0x81, 0x07, 0xbe, 0xc7, 0x91, 0x1c, 0xc0, 0x76, 0x88, 0xdc, 0x8f, 0xc2, 0x21, 0xca, 0x74, - 0xb2, 0x18, 0x5b, 0xaf, 0xd7, 0xe8, 0x56, 0x12, 0x8e, 0x05, 0xc8, 0x4b, 0x28, 0x25, 0x6b, 0x7d, - 0x72, 0x63, 0xd9, 0x0c, 0xd5, 0xf8, 0xeb, 0x35, 0x9a, 0x72, 0x4f, 0x0a, 0x90, 0x0f, 0x91, 0x9b, - 0x14, 0x76, 0xce, 0x51, 0x2c, 0x56, 0xff, 0x09, 0x94, 0xe5, 0x61, 0xc5, 0x2c, 0x40, 0xdd, 0xc5, - 0x52, 0x1c, 0xe8, 0xcd, 0x02, 0x59, 0xae, 0xac, 0xa9, 0x38, 0xe5, 0x56, 0xd6, 0x92, 0xf9, 0x17, - 0x3c, 0x4a, 0x35, 0xf5, 0x61, 0xbe, 0x5a, 0x70, 0x99, 0xbb, 0xdf, 0xe5, 0xdc, 0x23, 0x39, 0x82, - 0xb2, 0xeb, 0x8f, 0xfb, 0xae, 0xe3, 0x4d, 0xb8, 0xb1, 0x2e, 0x5f, 0xa6, 0x8f, 0x56, 0xb4, 0xb5, - 0xe3, 0x8f, 0x69, 0xc9, 0xf5, 0xc7, 0x9d, 0x98, 0x67, 0xfe, 0x9b, 0x83, 0x52, 0xa2, 0x45, 0x9e, - 0x41, 0x81, 0x8b, 0x78, 0x28, 0xe2, 0xa4, 0x3b, 0xad, 0xfa, 0x72, 0xd2, 0xeb, 0x18, 0xa4, 0x8a, - 0x43, 0x8e, 0x60, 0x53, 0xb5, 0x9d, 0xeb, 0x4a, 0xde, 0x33, 0x78, 0x09, 0x93, 0x18, 0xb0, 0x39, - 0x45, 0xce, 0xd9, 0x18, 0xf5, 0xe8, 0x24, 0xcb, 0xac, 0xfb, 0x8d, 0x87, 0xb9, 0x27, 0xc7, 0x50, - 0x08, 0xde, 0x30, 0x8e, 0xf2, 0xb6, 0xd9, 0x69, 0x99, 0xf7, 0x5d, 0xc3, 0xd6, 0x55, 0xcc, 0xa4, - 0x6a, 0x83, 0x79, 0x03, 0xb5, 0x33, 0x74, 0x31, 0xfb, 0x2a, 0x7d, 0x78, 0x33, 0x77, 0x81, 0x2c, - 0xca, 0xaa, 0x7e, 0x9a, 0x97, 0x50, 0x68, 0xc7, 0x5f, 0x42, 0x42, 0x60, 0x23, 0xbe, 0xdd, 0xb5, - 0xb6, 0x7c, 0x26, 0x5f, 0xc2, 0x2e, 0x8f, 0x82, 0xc0, 0x0f, 0x05, 0x8e, 0xfa, 0x69, 0x7a, 0xd5, - 0xc1, 0x32, 0x25, 0x29, 0xd6, 0xd3, 0x46, 0xb8, 0x79, 0x20, 0x27, 0x46, 0x2a, 0x26, 0xce, 0x57, - 0x08, 0x9b, 0xaf, 0xa0, 0x3a, 0xa7, 0xe9, 0xc9, 0x7a, 0x06, 0x05, 0xf9, 0x4d, 0xd6, 0x63, 0xf5, - 0xbf, 0x0e, 0x2b, 0xb6, 0xe2, 0x98, 0x8f, 0xa1, 0xd6, 0x71, 0xb8, 0x52, 0xe0, 0x3a, 0x93, 0x79, - 0x0a, 0x64, 0x31, 0xa8, 0x75, 0x9f, 0x43, 0x51, 0xee, 0x89, 0x2f, 0xa1, 0xfc, 0xbb, 0x85, 0x35, - 0xe9, 0x8b, 0xdf, 0xa1, 0x20, 0x67, 0x89, 0xd4, 0xa1, 0x46, 0xed, 0x1e, 0xfd, 0xa5, 0x7d, 0xd2, - 0xb1, 0xfb, 0x3f, 0xb6, 0x2f, 0x3a, 0x37, 0xd4, 0xae, 0xae, 0xc5, 0xe1, 0x2b, 0x9b, 0x5e, 0xb6, - 0xbb, 0x76, 0xb7, 0x97, 0x86, 0x73, 0xa4, 0x02, 0x9b, 0x57, 0x76, 0xf7, 0xec, 0xa2, 0x7b, 0x5e, - 0x5d, 0x8f, 0x17, 0xf4, 0xa6, 0xdb, 0x8d, 0x17, 0x79, 0xb2, 0x0d, 0xe5, 0xeb, 0x9b, 0xd3, 0x53, - 0xdb, 0x3e, 0xb3, 0xcf, 0xaa, 0x1b, 0x27, 0xdf, 0xff, 0xfa, 0xdd, 0xd8, 0x11, 0x6f, 0xa2, 0x81, - 0x35, 0xf4, 0xa7, 0x4d, 0x69, 0xc5, 0x0f, 0xc7, 0xea, 0xa1, 0x99, 0x7e, 0xff, 0xc7, 0xe8, 0x35, - 0x83, 0xc1, 0xf3, 0xb1, 0xdf, 0xcc, 0xfe, 0xb6, 0x0c, 0x8a, 0xf2, 0x57, 0xe0, 0xe8, 0xbf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x55, 0xc5, 0xef, 0x41, 0xcf, 0x08, 0x00, 0x00, -======= - // 1098 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x6f, 0x6f, 0xdb, 0xd4, - 0x17, 0x5e, 0xfe, 0x36, 0x39, 0xe9, 0xb6, 0xe4, 0xb6, 0xd9, 0xcf, 0x4d, 0xf7, 0x83, 0xca, 0x50, - 0x54, 0x31, 0xd5, 0x61, 0x2d, 0x8c, 0x0e, 0xc4, 0xa6, 0xb4, 0x35, 0x5d, 0xa5, 0x34, 0xaa, 0x6e, - 0x53, 0x34, 0x90, 0x20, 0x72, 0x92, 0x53, 0x63, 0xc5, 0xb1, 0x3d, 0xdf, 0xeb, 0x6a, 0x45, 0xbc, - 0x82, 0xaf, 0xc0, 0x0b, 0xbe, 0x0b, 0x5f, 0x0e, 0xf9, 0xde, 0x6b, 0x27, 0x0e, 0xd9, 0xe8, 0xc4, - 0xde, 0xf9, 0xfc, 0x7b, 0xce, 0x73, 0x9f, 0x73, 0xec, 0x6b, 0x68, 0x5d, 0xb9, 0x37, 0x1c, 0x9d, - 0xb1, 0xdb, 0xb6, 0xc6, 0x53, 0xc7, 0x6b, 0x5b, 0x36, 0x7a, 0xdc, 0x08, 0x42, 0x9f, 0xfb, 0xe4, - 0x5e, 0x12, 0x33, 0x44, 0xac, 0xf5, 0x30, 0xcd, 0x1d, 0xf9, 0x21, 0xb6, 0x5d, 0x87, 0x63, 0x68, - 0xb9, 0x4c, 0x66, 0xb7, 0x36, 0xb2, 0x51, 0x6e, 0xb1, 0x49, 0x12, 0xfa, 0x20, 0x1b, 0x72, 0xc6, - 0xe8, 0x71, 0xe7, 0xca, 0xc1, 0x50, 0xc5, 0xff, 0x9f, 0x8d, 0xe3, 0x6b, 0x1c, 0x45, 0xdc, 0xf1, - 0x3d, 0x15, 0xde, 0xcc, 0x86, 0xa7, 0xc8, 0x43, 0x67, 0x94, 0x62, 0xdb, 0xbe, 0x6f, 0xbb, 0xd8, - 0x16, 0xd6, 0x30, 0xba, 0x6a, 0x8f, 0xa3, 0xd0, 0x9a, 0x2b, 0xfe, 0x70, 0x31, 0xce, 0x9d, 0x29, - 0x32, 0x6e, 0x4d, 0x03, 0x99, 0xa0, 0xff, 0x59, 0x82, 0x66, 0xdf, 0x62, 0x13, 0x33, 0xe9, 0x7a, - 0x86, 0xdc, 0x1a, 0x5b, 0xdc, 0x22, 0x14, 0x1a, 0xf1, 0x29, 0x06, 0x29, 0x9f, 0x81, 0x33, 0xd6, - 0x72, 0x5b, 0xb9, 0x9d, 0xda, 0xde, 0x27, 0x46, 0xaa, 0x4d, 0xcc, 0xc9, 0xc8, 0x00, 0x9c, 0xa6, - 0xe7, 0xa3, 0xf7, 0x79, 0x36, 0x40, 0x1e, 0x42, 0xd5, 0xb3, 0xa6, 0xc8, 0x02, 0x6b, 0x84, 0x5a, - 0x7e, 0x2b, 0xb7, 0x53, 0xa5, 0x33, 0x07, 0x39, 0x85, 0xb2, 0x6b, 0x0d, 0xd1, 0x65, 0x5a, 0x61, - 0xab, 0xb0, 0x53, 0xdb, 0x7b, 0x6c, 0x64, 0x47, 0x60, 0x2c, 0x25, 0x6a, 0x74, 0x45, 0x8d, 0xe9, - 0xf1, 0xf0, 0x86, 0x2a, 0x00, 0xf2, 0x12, 0x6a, 0x96, 0xe7, 0xf9, 0x5c, 0x68, 0xc1, 0xb4, 0xa2, - 0xc0, 0x7b, 0x72, 0x3b, 0xbc, 0xce, 0xac, 0x50, 0x82, 0xce, 0x43, 0x11, 0x03, 0xd6, 0x26, 0x07, - 0x6c, 0xc0, 0x30, 0xbc, 0x76, 0x46, 0x38, 0xb0, 0x46, 0x23, 0x3f, 0xf2, 0xb8, 0x56, 0x12, 0x87, - 0x69, 0x4c, 0x0e, 0xd8, 0x85, 0x8c, 0x74, 0x64, 0x80, 0x70, 0x68, 0xa2, 0x77, 0xed, 0x84, 0xbe, - 0x37, 0x45, 0x8f, 0x0f, 0xae, 0xad, 0xd0, 0xb1, 0x86, 0x2e, 0x32, 0xad, 0x2c, 0x38, 0x3d, 0xbf, - 0x1d, 0x27, 0x73, 0x06, 0xf1, 0x5d, 0x82, 0x20, 0xc9, 0xad, 0xe3, 0x92, 0x50, 0xeb, 0x29, 0xd4, - 0xe6, 0x64, 0x21, 0x75, 0x28, 0x4c, 0xf0, 0x46, 0x4c, 0xaf, 0x4a, 0xe3, 0x47, 0xb2, 0x0e, 0xa5, - 0x6b, 0xcb, 0x8d, 0x92, 0x29, 0x48, 0xe3, 0xab, 0xfc, 0x41, 0xae, 0xf5, 0x0c, 0xea, 0x8b, 0x0a, - 0xbc, 0x53, 0xfd, 0x09, 0x6c, 0xbc, 0x91, 0xed, 0xbb, 0x00, 0xe9, 0xbf, 0xe7, 0xa1, 0x71, 0x14, - 0xa2, 0xc5, 0x31, 0xd6, 0x84, 0xe2, 0xab, 0x08, 0x19, 0x27, 0x8f, 0xa1, 0xec, 0x78, 0x41, 0xc4, - 0x99, 0xda, 0xc5, 0x8d, 0x85, 0x5d, 0xec, 0xca, 0xf7, 0xf2, 0xcc, 0x0a, 0xa8, 0x4a, 0x24, 0x5f, - 0x42, 0x85, 0xe3, 0x34, 0x70, 0x2d, 0x2e, 0xbb, 0xd4, 0xf6, 0x36, 0x97, 0x2c, 0x70, 0x5f, 0xa5, - 0xd0, 0x34, 0x99, 0x7c, 0x04, 0x77, 0xfd, 0x88, 0x07, 0x11, 0x1f, 0x04, 0x21, 0x5e, 0x39, 0xaf, - 0xb5, 0x82, 0xe0, 0xb8, 0x2a, 0x9d, 0xe7, 0xc2, 0x47, 0x7e, 0x84, 0xff, 0x2d, 0xbc, 0x27, 0x53, - 0x35, 0x35, 0xad, 0x28, 0x9a, 0x6d, 0xdf, 0x6a, 0xc4, 0xb4, 0xc9, 0x97, 0xb9, 0xf5, 0x5f, 0x80, - 0xcc, 0x8b, 0xc0, 0x02, 0xdf, 0x63, 0x48, 0xb6, 0xe1, 0x6e, 0x88, 0xcc, 0x8f, 0xc2, 0x11, 0x8a, - 0x76, 0x42, 0x8c, 0xd5, 0x17, 0x77, 0xe8, 0x6a, 0xe2, 0x8e, 0x01, 0xc8, 0x13, 0xa8, 0x24, 0xb6, - 0x3a, 0xb9, 0xb6, 0x48, 0x86, 0xaa, 0xf8, 0x8b, 0x3b, 0x34, 0xcd, 0x3d, 0x2c, 0x41, 0x21, 0x44, - 0xa6, 0x53, 0xb8, 0x77, 0x82, 0x7c, 0x5e, 0xfd, 0x4d, 0xa8, 0x8a, 0xc3, 0xf2, 0x9b, 0x00, 0xd5, - 0x14, 0x2b, 0xb1, 0xa3, 0x7f, 0x13, 0x08, 0xb9, 0xb2, 0xa4, 0xe2, 0x96, 0xab, 0x59, 0x4a, 0xfa, - 0xaf, 0x70, 0x3f, 0xc5, 0x54, 0x87, 0xf9, 0x7c, 0x8e, 0x65, 0xee, 0xed, 0x2c, 0x67, 0x1c, 0xc9, - 0x3e, 0x54, 0x5d, 0xdf, 0x1e, 0xb8, 0x8e, 0x37, 0x61, 0x5a, 0x5e, 0xbc, 0x4c, 0x0f, 0x96, 0x8c, - 0xb5, 0xeb, 0xdb, 0xb4, 0xe2, 0xfa, 0x76, 0x37, 0xce, 0xd3, 0xff, 0xca, 0x41, 0x25, 0xc1, 0x22, - 0x8f, 0xa0, 0xc4, 0x78, 0xbc, 0x14, 0x71, 0xd3, 0x7b, 0x7b, 0xcd, 0xc5, 0xa6, 0x17, 0x71, 0x90, - 0xca, 0x1c, 0xb2, 0x0f, 0x2b, 0x72, 0xec, 0x4c, 0x29, 0xf9, 0x96, 0xc5, 0x4b, 0x32, 0x89, 0x06, - 0x2b, 0x53, 0x64, 0xcc, 0xb2, 0x51, 0xad, 0x4e, 0x62, 0x66, 0xd9, 0x17, 0x6f, 0xc9, 0xfe, 0x12, - 0x1a, 0xc7, 0xe8, 0x62, 0xf6, 0x85, 0xf8, 0xef, 0x23, 0x59, 0x07, 0x32, 0x0f, 0x2b, 0xa7, 0xa2, - 0x9f, 0x41, 0xa9, 0x13, 0x5f, 0x87, 0x84, 0x40, 0x31, 0xfe, 0x46, 0x2b, 0x6c, 0xf1, 0x4c, 0x3e, - 0x83, 0x75, 0x16, 0x05, 0x81, 0x1f, 0x72, 0x1c, 0x0f, 0xd2, 0xf6, 0x72, 0x0e, 0x55, 0x4a, 0xd2, - 0x58, 0x5f, 0x11, 0x61, 0xfa, 0xb6, 0x98, 0xbb, 0x40, 0x4c, 0x98, 0x2f, 0x01, 0xd6, 0x9f, 0x43, - 0x7d, 0x96, 0xa6, 0xf6, 0xe3, 0x11, 0x94, 0xc4, 0xc5, 0xac, 0x96, 0xe3, 0x1f, 0x73, 0x92, 0xd9, - 0x32, 0x47, 0x5f, 0x83, 0x46, 0xd7, 0x61, 0x12, 0x81, 0xa9, 0x4e, 0xfa, 0x11, 0x90, 0x79, 0xa7, - 0xc2, 0xdd, 0x85, 0xb2, 0xa8, 0x89, 0x3f, 0x25, 0x85, 0x37, 0x03, 0xab, 0x24, 0xfd, 0x8f, 0x3c, - 0x34, 0xd5, 0xea, 0x9e, 0xc9, 0x4b, 0xf8, 0xbd, 0x8d, 0x20, 0x5e, 0x94, 0x57, 0x11, 0x86, 0x0e, - 0xca, 0xbb, 0xaf, 0x4a, 0x13, 0x93, 0x3c, 0x05, 0x60, 0xdc, 0x0a, 0xf9, 0x20, 0xbe, 0xb9, 0xd5, - 0x17, 0xa5, 0x65, 0xc8, 0x6b, 0xdd, 0x48, 0xae, 0x75, 0xa3, 0x9f, 0x5c, 0xeb, 0xb4, 0x2a, 0xb2, - 0x63, 0x9b, 0x7c, 0x01, 0x15, 0xf4, 0xc6, 0xb2, 0xb0, 0xf4, 0xaf, 0x85, 0x2b, 0xe8, 0x8d, 0x45, - 0xd9, 0x2e, 0x14, 0x19, 0xc7, 0x40, 0x2b, 0xab, 0x35, 0x5f, 0x2c, 0x39, 0x56, 0xbf, 0x18, 0x54, - 0xa4, 0xe9, 0x2f, 0xe1, 0xc1, 0xa2, 0x2a, 0x4a, 0xdf, 0x67, 0xb0, 0x12, 0x22, 0x8b, 0xdc, 0x54, - 0xe0, 0x8f, 0x17, 0x36, 0x7c, 0xfe, 0x6b, 0x17, 0x3a, 0x23, 0x2a, 0x92, 0x69, 0x52, 0xa4, 0xff, - 0x96, 0x03, 0xa2, 0xa0, 0xbb, 0xbe, 0xfd, 0x1e, 0xd5, 0x5e, 0x87, 0x92, 0xeb, 0x78, 0x42, 0xeb, - 0xdc, 0x4e, 0x91, 0x4a, 0x23, 0xf6, 0x72, 0x7f, 0x82, 0x9e, 0x10, 0xb9, 0x4a, 0xa5, 0xa1, 0x9b, - 0xb0, 0x96, 0xe1, 0xa0, 0xce, 0xa6, 0x65, 0xcf, 0x56, 0x4d, 0x59, 0xcf, 0x60, 0xf2, 0x73, 0x30, - 0x9f, 0xfe, 0x04, 0x25, 0xf1, 0x39, 0x21, 0x4d, 0x68, 0x50, 0xb3, 0x4f, 0xbf, 0xef, 0x1c, 0x76, - 0xcd, 0xc1, 0xb7, 0x9d, 0xd3, 0xee, 0x25, 0x35, 0xeb, 0x77, 0x62, 0xf7, 0xb9, 0x49, 0xcf, 0x3a, - 0x3d, 0xb3, 0xd7, 0x4f, 0xdd, 0x39, 0x52, 0x83, 0x95, 0x73, 0xb3, 0x77, 0x7c, 0xda, 0x3b, 0xa9, - 0xe7, 0x63, 0x83, 0x5e, 0xf6, 0x7a, 0xb1, 0x51, 0x20, 0x77, 0xa1, 0x7a, 0x71, 0x79, 0x74, 0x64, - 0x9a, 0xc7, 0xe6, 0x71, 0xbd, 0x78, 0xf8, 0xcd, 0x0f, 0x5f, 0xdb, 0x0e, 0xff, 0x39, 0x1a, 0x1a, - 0x23, 0x7f, 0xda, 0x16, 0x32, 0xfb, 0xa1, 0x2d, 0x1f, 0xda, 0xe9, 0x1f, 0xa4, 0x8d, 0x5e, 0x3b, - 0x18, 0xee, 0xda, 0x7e, 0x3b, 0xfb, 0xe3, 0x3b, 0x2c, 0x8b, 0xe9, 0xee, 0xff, 0x1d, 0x00, 0x00, - 0xff, 0xff, 0xaf, 0x08, 0xa3, 0x3f, 0x11, 0x0b, 0x00, 0x00, ->>>>>>> 6f5c47154549dd9f697f4a44547eda5197d40a52 + // 1120 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x8f, 0xdb, 0x44, + 0x10, 0x6e, 0x7e, 0x5e, 0x32, 0xb9, 0x5e, 0x93, 0xed, 0xa5, 0xb8, 0x69, 0x81, 0xca, 0x50, 0x74, + 0xa2, 0xaa, 0x43, 0xaf, 0x50, 0xae, 0x20, 0x5a, 0xa5, 0x77, 0xa6, 0x3d, 0x29, 0x17, 0x9d, 0xb6, + 0x39, 0x54, 0x90, 0x20, 0xda, 0x24, 0x73, 0xae, 0x15, 0xc7, 0x76, 0xbd, 0xeb, 0x53, 0x0f, 0xf1, + 0x04, 0xff, 0x02, 0x0f, 0xfc, 0xa3, 0xbc, 0x23, 0xef, 0xae, 0x9d, 0x38, 0xa4, 0xe5, 0x2a, 0xfa, + 0xe6, 0x99, 0xf9, 0xe6, 0xdb, 0x6f, 0x67, 0xc6, 0xbb, 0x0b, 0x9d, 0x53, 0xef, 0x5c, 0xa0, 0x3b, + 0xf5, 0xba, 0x6c, 0x3a, 0x77, 0xfd, 0x2e, 0x73, 0xd0, 0x17, 0x56, 0x18, 0x05, 0x22, 0x20, 0x5b, + 0x69, 0xcc, 0x92, 0xb1, 0xce, 0xcd, 0x0c, 0x3b, 0x09, 0x22, 0xec, 0x7a, 0xae, 0xc0, 0x88, 0x79, + 0x5c, 0xa1, 0x3b, 0xd7, 0xf3, 0x51, 0xc1, 0xf8, 0x2c, 0x0d, 0x7d, 0x94, 0x0f, 0xb9, 0x53, 0xf4, + 0x85, 0x7b, 0xea, 0x62, 0xa4, 0xe3, 0x1f, 0xe6, 0xe3, 0xf8, 0x1a, 0x27, 0xb1, 0x70, 0x03, 0x5f, + 0x87, 0x6f, 0xe4, 0xc3, 0x73, 0x14, 0x91, 0x3b, 0xc9, 0xb8, 0x9d, 0x20, 0x70, 0x3c, 0xec, 0x4a, + 0x6b, 0x1c, 0x9f, 0x76, 0xa7, 0x71, 0xc4, 0x96, 0x92, 0x3f, 0x5e, 0x8d, 0x0b, 0x77, 0x8e, 0x5c, + 0xb0, 0x79, 0xa8, 0x00, 0xe6, 0x5f, 0x15, 0x68, 0x0f, 0x19, 0x9f, 0xd9, 0xe9, 0xaa, 0x47, 0x28, + 0xd8, 0x94, 0x09, 0x46, 0x28, 0xb4, 0x92, 0x5d, 0x8c, 0x32, 0x3d, 0x23, 0x77, 0x6a, 0x14, 0x6e, + 0x15, 0x76, 0x1a, 0xbb, 0x9f, 0x59, 0x59, 0x6d, 0x12, 0x4d, 0x56, 0x8e, 0xe0, 0x30, 0xdb, 0x1f, + 0xbd, 0x22, 0xf2, 0x01, 0x72, 0x13, 0xea, 0x3e, 0x9b, 0x23, 0x0f, 0xd9, 0x04, 0x8d, 0xe2, 0xad, + 0xc2, 0x4e, 0x9d, 0x2e, 0x1c, 0xe4, 0x10, 0xaa, 0x1e, 0x1b, 0xa3, 0xc7, 0x8d, 0xd2, 0xad, 0xd2, + 0x4e, 0x63, 0xf7, 0x9e, 0x95, 0x6f, 0x81, 0xb5, 0x56, 0xa8, 0xd5, 0x97, 0x39, 0xb6, 0x2f, 0xa2, + 0x73, 0xaa, 0x09, 0xc8, 0x0b, 0x68, 0x30, 0xdf, 0x0f, 0x84, 0xac, 0x05, 0x37, 0xca, 0x92, 0xef, + 0xc1, 0xc5, 0xf8, 0x7a, 0x8b, 0x44, 0x45, 0xba, 0x4c, 0x45, 0x2c, 0xb8, 0x3a, 0xdb, 0xe3, 0x23, + 0x8e, 0xd1, 0x99, 0x3b, 0xc1, 0x11, 0x9b, 0x4c, 0x82, 0xd8, 0x17, 0x46, 0x45, 0x6e, 0xa6, 0x35, + 0xdb, 0xe3, 0xcf, 0x55, 0xa4, 0xa7, 0x02, 0x44, 0x40, 0x1b, 0xfd, 0x33, 0x37, 0x0a, 0xfc, 0x39, + 0xfa, 0x62, 0x74, 0xc6, 0x22, 0x97, 0x8d, 0x3d, 0xe4, 0x46, 0x55, 0x6a, 0x7a, 0x7c, 0x31, 0x4d, + 0xf6, 0x82, 0xe2, 0x87, 0x94, 0x41, 0x89, 0xdb, 0xc6, 0x35, 0xa1, 0xce, 0x43, 0x68, 0x2c, 0x95, + 0x85, 0x34, 0xa1, 0x34, 0xc3, 0x73, 0xd9, 0xbd, 0x3a, 0x4d, 0x3e, 0xc9, 0x36, 0x54, 0xce, 0x98, + 0x17, 0xa7, 0x5d, 0x50, 0xc6, 0x37, 0xc5, 0xbd, 0x42, 0xe7, 0x11, 0x34, 0x57, 0x2b, 0xf0, 0x4e, + 0xf9, 0x4f, 0xe1, 0xfa, 0x1b, 0xd5, 0xbe, 0x0b, 0x91, 0xf9, 0x47, 0x11, 0x5a, 0xfb, 0x11, 0x32, + 0x81, 0x49, 0x4d, 0x28, 0xbe, 0x8a, 0x91, 0x0b, 0x72, 0x0f, 0xaa, 0xae, 0x1f, 0xc6, 0x82, 0xeb, + 0x59, 0xbc, 0xbe, 0x32, 0x8b, 0x7d, 0xf5, 0x5f, 0x1e, 0xb1, 0x90, 0x6a, 0x20, 0xf9, 0x1a, 0x6a, + 0x02, 0xe7, 0xa1, 0xc7, 0x84, 0x5a, 0xa5, 0xb1, 0x7b, 0x63, 0xcd, 0x00, 0x0f, 0x35, 0x84, 0x66, + 0x60, 0xf2, 0x09, 0x5c, 0x0e, 0x62, 0x11, 0xc6, 0x62, 0x14, 0x46, 0x78, 0xea, 0xbe, 0x36, 0x4a, + 0x52, 0xe3, 0xa6, 0x72, 0x1e, 0x4b, 0x1f, 0xf9, 0x19, 0x3e, 0x58, 0xf9, 0x4f, 0xe6, 0xba, 0x6b, + 0x46, 0x59, 0x2e, 0x76, 0xfb, 0x42, 0x2d, 0xa6, 0x6d, 0xb1, 0xce, 0x6d, 0xfe, 0x0a, 0x64, 0xb9, + 0x08, 0x3c, 0x0c, 0x7c, 0x8e, 0xe4, 0x36, 0x5c, 0x8e, 0x90, 0x07, 0x71, 0x34, 0x41, 0xb9, 0x9c, + 0x2c, 0xc6, 0xe6, 0xb3, 0x4b, 0x74, 0x33, 0x75, 0x27, 0x04, 0xe4, 0x01, 0xd4, 0x52, 0x5b, 0xef, + 0xdc, 0x58, 0x15, 0x43, 0x75, 0xfc, 0xd9, 0x25, 0x9a, 0x61, 0x9f, 0x54, 0xa0, 0x14, 0x21, 0x37, + 0x29, 0x6c, 0x3d, 0x45, 0xb1, 0x5c, 0xfd, 0x1b, 0x50, 0x97, 0x9b, 0x15, 0xe7, 0x21, 0xea, 0x2e, + 0xd6, 0x12, 0xc7, 0xf0, 0x3c, 0x94, 0xe5, 0xca, 0x8b, 0x4a, 0x96, 0xdc, 0xcc, 0x4b, 0x32, 0x7f, + 0x83, 0x2b, 0x19, 0xa7, 0xde, 0xcc, 0x97, 0x4b, 0x2a, 0x0b, 0x6f, 0x57, 0xb9, 0xd0, 0x48, 0xee, + 0x43, 0xdd, 0x0b, 0x9c, 0x91, 0xe7, 0xfa, 0x33, 0x6e, 0x14, 0xe5, 0xcf, 0x74, 0x6d, 0x4d, 0x5b, + 0xfb, 0x81, 0x43, 0x6b, 0x5e, 0xe0, 0xf4, 0x13, 0x9c, 0xf9, 0x77, 0x01, 0x6a, 0x29, 0x17, 0xb9, + 0x03, 0x15, 0x2e, 0x92, 0xa1, 0x48, 0x16, 0xdd, 0xda, 0x6d, 0xaf, 0x2e, 0xfa, 0x3c, 0x09, 0x52, + 0x85, 0x21, 0xf7, 0x61, 0x43, 0xb5, 0x9d, 0xeb, 0x4a, 0xbe, 0x65, 0xf0, 0x52, 0x24, 0x31, 0x60, + 0x63, 0x8e, 0x9c, 0x33, 0x07, 0xf5, 0xe8, 0xa4, 0x66, 0x5e, 0x7d, 0xf9, 0x62, 0xea, 0xc9, 0x1e, + 0x54, 0xc2, 0x97, 0x8c, 0xa3, 0x3c, 0x6d, 0xb6, 0x76, 0xcd, 0xb7, 0x1d, 0xc3, 0xd6, 0x71, 0x82, + 0xa4, 0x2a, 0xc1, 0x3c, 0x81, 0xd6, 0x01, 0x7a, 0x98, 0xff, 0x95, 0xfe, 0x7f, 0x33, 0xb7, 0x81, + 0x2c, 0xd3, 0xaa, 0x7e, 0x9a, 0x47, 0x50, 0xe9, 0x25, 0x17, 0x29, 0x21, 0x50, 0x4e, 0x4e, 0x77, + 0xcd, 0x2d, 0xbf, 0xc9, 0x17, 0xb0, 0xcd, 0xe3, 0x30, 0x0c, 0x22, 0x81, 0xd3, 0x51, 0xb6, 0xbc, + 0xea, 0x60, 0x9d, 0x92, 0x2c, 0x36, 0xd4, 0x42, 0xb8, 0x79, 0x5b, 0x4e, 0x8c, 0x64, 0x4c, 0x95, + 0xaf, 0x21, 0x36, 0x1f, 0x43, 0x73, 0x01, 0xd3, 0x93, 0x75, 0x07, 0x2a, 0xf2, 0x4a, 0xd7, 0x63, + 0xf5, 0xaf, 0x0e, 0x2b, 0xb4, 0xc2, 0x98, 0x57, 0xa1, 0xd5, 0x77, 0xb9, 0x62, 0xe0, 0x7a, 0x25, + 0x73, 0x1f, 0xc8, 0xb2, 0x53, 0xf3, 0xde, 0x85, 0xaa, 0xcc, 0x49, 0x0e, 0xa1, 0xd2, 0x9b, 0x89, + 0x35, 0xc8, 0xfc, 0xb3, 0x08, 0x6d, 0x3d, 0xf4, 0x47, 0xea, 0xfa, 0x7e, 0x6f, 0x2d, 0x48, 0x46, + 0xec, 0x55, 0x8c, 0x91, 0x8b, 0xea, 0xd6, 0xac, 0xd3, 0xd4, 0x24, 0x0f, 0x01, 0xb8, 0x60, 0x91, + 0x18, 0x25, 0x77, 0xbe, 0x3e, 0x8b, 0x3a, 0x96, 0x7a, 0x10, 0x58, 0xe9, 0x83, 0xc0, 0x1a, 0xa6, + 0x0f, 0x02, 0x5a, 0x97, 0xe8, 0xc4, 0x26, 0x5f, 0x41, 0x0d, 0xfd, 0xa9, 0x4a, 0xac, 0xfc, 0x67, + 0xe2, 0x06, 0xfa, 0x53, 0x99, 0x76, 0x17, 0xca, 0x5c, 0x60, 0x68, 0x54, 0xf5, 0x0f, 0xb2, 0x9a, + 0x72, 0xa0, 0x1f, 0x27, 0x54, 0xc2, 0xcc, 0x17, 0x70, 0x6d, 0xb5, 0x2a, 0xba, 0xbe, 0x8f, 0x60, + 0x23, 0x42, 0x1e, 0x7b, 0x59, 0x81, 0x3f, 0x5d, 0x19, 0xf5, 0xe5, 0x73, 0x32, 0x72, 0x27, 0x54, + 0x82, 0x69, 0x9a, 0x64, 0xfe, 0x5e, 0x00, 0xa2, 0xa9, 0xfb, 0x81, 0xf3, 0x1e, 0xab, 0xbd, 0x0d, + 0x15, 0xcf, 0xf5, 0x65, 0xad, 0x0b, 0x3b, 0x65, 0xaa, 0x8c, 0xc4, 0x2b, 0x82, 0x19, 0xfa, 0xb2, + 0xc8, 0x75, 0xaa, 0x0c, 0xd3, 0x86, 0xab, 0x39, 0x0d, 0x7a, 0x6f, 0x46, 0x7e, 0x6f, 0xf5, 0x4c, + 0xf5, 0x82, 0xa6, 0xb8, 0x44, 0xf3, 0xf9, 0x2f, 0x50, 0x91, 0x07, 0x11, 0x69, 0x43, 0x8b, 0xda, + 0x43, 0xfa, 0x63, 0xef, 0x49, 0xdf, 0x1e, 0x7d, 0xdf, 0x3b, 0xec, 0x9f, 0x50, 0xbb, 0x79, 0x29, + 0x71, 0x1f, 0xdb, 0xf4, 0xa8, 0x37, 0xb0, 0x07, 0xc3, 0xcc, 0x5d, 0x20, 0x0d, 0xd8, 0x38, 0xb6, + 0x07, 0x07, 0x87, 0x83, 0xa7, 0xcd, 0x62, 0x62, 0xd0, 0x93, 0xc1, 0x20, 0x31, 0x4a, 0xe4, 0x32, + 0xd4, 0x9f, 0x9f, 0xec, 0xef, 0xdb, 0xf6, 0x81, 0x7d, 0xd0, 0x2c, 0x3f, 0xf9, 0xee, 0xa7, 0x6f, + 0x1d, 0x57, 0xbc, 0x8c, 0xc7, 0xd6, 0x24, 0x98, 0x77, 0x65, 0x99, 0x83, 0xc8, 0x51, 0x1f, 0xdd, + 0xec, 0xed, 0xe9, 0xa0, 0xdf, 0x0d, 0xc7, 0x77, 0x9d, 0xa0, 0x9b, 0x7f, 0x32, 0x8f, 0xab, 0xb2, + 0xbb, 0xf7, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x27, 0x1f, 0x64, 0x1a, 0x4b, 0x0b, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index 8567fe5f09..285954b945 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -330,7 +330,7 @@ }, "message": { "type": "string", - "description": "A descriptive message for the current state. e.g. waiting for cluster." + "description": "A descriptive message for the currnt state. e.g. waiting for cluster." }, "log_links": { "type": "array", diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index 98b4d1248b..105831dce3 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -6226,7 +6226,7 @@ public interface ResourceOrBuilder extends /** * 
-     * A descriptive message for the current state. e.g. waiting for cluster.
+     * A descriptive message for the currnt state. e.g. waiting for cluster.
      *
* * string message = 3; @@ -6234,7 +6234,7 @@ public interface ResourceOrBuilder extends java.lang.String getMessage(); /** * 
-     * A descriptive message for the current state. e.g. waiting for cluster.
+     * A descriptive message for the currnt state. e.g. waiting for cluster.
      *
* * string message = 3; @@ -6490,7 +6490,7 @@ public flyteidl.core.Literals.LiteralMapOrBuilder getOutputsOrBuilder() { private volatile java.lang.Object message_; /** * 
-     * A descriptive message for the current state. e.g. waiting for cluster.
+     * A descriptive message for the currnt state. e.g. waiting for cluster.
      *
* * string message = 3; @@ -6509,7 +6509,7 @@ public java.lang.String getMessage() { } /** * 
-     * A descriptive message for the current state. e.g. waiting for cluster.
+     * A descriptive message for the currnt state. e.g. waiting for cluster.
      *
* * string message = 3; @@ -7270,7 +7270,7 @@ public flyteidl.core.Literals.LiteralMapOrBuilder getOutputsOrBuilder() { private java.lang.Object message_ = ""; /** * 
-       * A descriptive message for the current state. e.g. waiting for cluster.
+       * A descriptive message for the currnt state. e.g. waiting for cluster.
        *
* * string message = 3; @@ -7289,7 +7289,7 @@ public java.lang.String getMessage() { } /** * 
-       * A descriptive message for the current state. e.g. waiting for cluster.
+       * A descriptive message for the currnt state. e.g. waiting for cluster.
        *
* * string message = 3; @@ -7309,7 +7309,7 @@ public java.lang.String getMessage() { } /** * 
-       * A descriptive message for the current state. e.g. waiting for cluster.
+       * A descriptive message for the currnt state. e.g. waiting for cluster.
        *
* * string message = 3; @@ -7326,7 +7326,7 @@ public Builder setMessage( } /** * 
-       * A descriptive message for the current state. e.g. waiting for cluster.
+       * A descriptive message for the currnt state. e.g. waiting for cluster.
        *
* * string message = 3; @@ -7339,7 +7339,7 @@ public Builder clearMessage() { } /** * 
-       * A descriptive message for the current state. e.g. waiting for cluster.
+       * A descriptive message for the currnt state. e.g. waiting for cluster.
        *
* * string message = 3; @@ -16693,54 +16693,6 @@ public flyteidl.admin.AgentOuterClass.GetTaskLogsResponse getDefaultInstanceForT java.lang.String[] descriptorData = { "\n\032flyteidl/admin/agent.proto\022\016flyteidl.a" + "dmin\032\034flyteidl/core/literals.proto\032\031flyt" + -<<<<<<< HEAD - "eidl/core/tasks.proto\032\035flyteidl/core/int" + - "erface.proto\032\036flyteidl/core/identifier.p" + - "roto\032\035flyteidl/core/execution.proto\"\232\004\n\025" + - "TaskExecutionMetadata\022A\n\021task_execution_" + - "id\030\001 \001(\0132&.flyteidl.core.TaskExecutionId" + - "entifier\022\021\n\tnamespace\030\002 \001(\t\022A\n\006labels\030\003 " + - "\003(\01321.flyteidl.admin.TaskExecutionMetada" + - "ta.LabelsEntry\022K\n\013annotations\030\004 \003(\01326.fl" + - "yteidl.admin.TaskExecutionMetadata.Annot" + - "ationsEntry\022\033\n\023k8s_service_account\030\005 \001(\t" + - "\022^\n\025environment_variables\030\006 \003(\0132?.flytei" + - "dl.admin.TaskExecutionMetadata.Environme" + - "ntVariablesEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001" + - " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" + - "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" + - "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + - "\005value\030\002 \001(\t:\0028\001\"\314\001\n\021CreateTaskRequest\022)" + - "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" + - "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" + - "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" + - "execution_metadata\030\004 \001(\0132%.flyteidl.admi" + - "n.TaskExecutionMetadata\"b\n\022CreateTaskRes" + - "ponse\022\027\n\rresource_meta\030\001 \001(\014H\000\022,\n\010resour" + - "ce\030\002 \001(\0132\030.flyteidl.admin.ResourceH\000B\005\n\003" + - "res\":\n\016GetTaskRequest\022\021\n\ttask_type\030\001 \001(\t" + - "\022\025\n\rresource_meta\030\002 \001(\014\"h\n\017GetTaskRespon" + - "se\022*\n\010resource\030\001 \001(\0132\030.flyteidl.admin.Re" + - "source\022)\n\tlog_links\030\002 \003(\0132\026.flyteidl.cor" + - "e.TaskLog\"\313\001\n\010Resource\022$\n\005state\030\001 \001(\0162\025." + - "flyteidl.admin.State\022*\n\007outputs\030\002 \001(\0132\031." + - "flyteidl.core.LiteralMap\022\017\n\007message\030\003 \001(" + - "\t\022)\n\tlog_links\030\004 \003(\0132\026.flyteidl.core.Tas" + - "kLog\0221\n\005phase\030\005 \001(\0162\".flyteidl.core.Task" + - "Execution.Phase\"=\n\021DeleteTaskRequest\022\021\n\t" + - "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024" + - "\n\022DeleteTaskResponse\"3\n\005Agent\022\014\n\004name\030\001 " + - "\001(\t\022\034\n\024supported_task_types\030\002 \003(\t\"\037\n\017Get" + - "AgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentRe" + - "sponse\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin.A" + - "gent\"\023\n\021ListAgentsRequest\";\n\022ListAgentsR" + - "esponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.admin" + - ".Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025" + - "\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RU" + - "NNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fly" + - "teorg/flyte/flyteidl/gen/pb-go/flyteidl/" + - "adminb\006proto3" -======= "eidl/core/tasks.proto\032\036flyteidl/core/ide" + "ntifier.proto\032\035flyteidl/core/execution.p" + "roto\032\033flyteidl/core/metrics.proto\032\036googl" + @@ -16770,35 +16722,36 @@ public flyteidl.admin.AgentOuterClass.GetTaskLogsResponse getDefaultInstanceForT "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta" + "\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 " + "\001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_lin" + - "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\230\001\n\010Res" + + "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\313\001\n\010Res" + "ource\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.St" + "ate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Lit" + "eralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_links\030\004 " + - "\003(\0132\026.flyteidl.core.TaskLog\"=\n\021DeleteTas" + - "kRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_" + - "meta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"3\n\005Agen" + - "t\022\014\n\004name\030\001 \001(\t\022\034\n\024supported_task_types\030" + - "\002 \003(\t\"\037\n\017GetAgentRequest\022\014\n\004name\030\001 \001(\t\"8" + - "\n\020GetAgentResponse\022$\n\005agent\030\001 \001(\0132\025.flyt" + - "eidl.admin.Agent\"\023\n\021ListAgentsRequest\";\n" + - "\022ListAgentsResponse\022%\n\006agents\030\001 \003(\0132\025.fl" + - "yteidl.admin.Agent\"\331\001\n\025GetTaskMetricsReq" + - "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta" + - "\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nstart_time\030\004 " + - "\001(\0132\032.google.protobuf.Timestamp\022,\n\010end_t" + - "ime\030\005 \001(\0132\032.google.protobuf.Timestamp\022\'\n" + - "\004step\030\006 \001(\0132\031.google.protobuf.Duration\"O" + - "\n\026GetTaskMetricsResponse\0225\n\007results\030\001 \003(" + - "\0132$.flyteidl.core.ExecutionMetricResult\"" + - "\\\n\022GetTaskLogsRequest\022\021\n\ttask_type\030\001 \001(\t" + - "\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005lines\030\003 \001(\004\022\r" + - "\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsResponse\022\017\n\007" + - "results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*^\n\005State\022\025\n" + - "\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILUR" + - "E\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEED" + - "ED\020\004B=Z;github.com/flyteorg/flyte/flytei" + - "dl/gen/pb-go/flyteidl/adminb\006proto3" ->>>>>>> 6f5c47154549dd9f697f4a44547eda5197d40a52 + "\003(\0132\026.flyteidl.core.TaskLog\0221\n\005phase\030\005 \001" + + "(\0162\".flyteidl.core.TaskExecution.Phase\"=" + + "\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001 \001(\t\022\025" + + "\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTaskRespo" + + "nse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024supported_" + + "task_types\030\002 \003(\t\"\037\n\017GetAgentRequest\022\014\n\004n" + + "ame\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005agent\030\001" + + " \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListAgent" + + "sRequest\";\n\022ListAgentsResponse\022%\n\006agents" + + "\030\001 \003(\0132\025.flyteidl.admin.Agent\"\331\001\n\025GetTas" + + "kMetricsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rre" + + "source_meta\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nst" + + "art_time\030\004 \001(\0132\032.google.protobuf.Timesta" + + "mp\022,\n\010end_time\030\005 \001(\0132\032.google.protobuf.T" + + "imestamp\022\'\n\004step\030\006 \001(\0132\031.google.protobuf" + + ".Duration\"O\n\026GetTaskMetricsResponse\0225\n\007r" + + "esults\030\001 \003(\0132$.flyteidl.core.ExecutionMe" + + "tricResult\"\\\n\022GetTaskLogsRequest\022\021\n\ttask" + + "_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005li" + + "nes\030\003 \001(\004\022\r\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsR" + + "esponse\022\017\n\007results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*" + + "^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMA" + + "NENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003" + + "\022\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteorg/f" + + "lyte/flyteidl/gen/pb-go/flyteidl/adminb\006" + + "proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index 8338d39149..81e254399e 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -20,11 +20,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -<<<<<<< HEAD -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xf5\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\x12\x38\n\x05phase\x18\x05 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') -======= -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1b\x66lyteidl/core/metrics.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xbb\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents\"\x94\x02\n\x15GetTaskMetricsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x18\n\x07queries\x18\x03 \x03(\tR\x07queries\x12\x39\n\nstart_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12-\n\x04step\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04step\"X\n\x16GetTaskMetricsResponse\x12>\n\x07results\x18\x01 \x03(\x0b\x32$.flyteidl.core.ExecutionMetricResultR\x07results\"\x82\x01\n\x12GetTaskLogsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x14\n\x05lines\x18\x03 \x01(\x04R\x05lines\x12\x14\n\x05token\x18\x04 \x01(\tR\x05token\"E\n\x13GetTaskLogsResponse\x12\x18\n\x07results\x18\x01 \x03(\tR\x07results\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') ->>>>>>> 6f5c47154549dd9f697f4a44547eda5197d40a52 +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1b\x66lyteidl/core/metrics.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xf5\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\x12\x38\n\x05phase\x18\x05 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents\"\x94\x02\n\x15GetTaskMetricsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x18\n\x07queries\x18\x03 \x03(\tR\x07queries\x12\x39\n\nstart_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12-\n\x04step\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04step\"X\n\x16GetTaskMetricsResponse\x12>\n\x07results\x18\x01 \x03(\x0b\x32$.flyteidl.core.ExecutionMetricResultR\x07results\"\x82\x01\n\x12GetTaskLogsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x14\n\x05lines\x18\x03 \x01(\x04R\x05lines\x12\x14\n\x05token\x18\x04 \x01(\tR\x05token\"E\n\x13GetTaskLogsResponse\x12\x18\n\x07results\x18\x01 \x03(\tR\x07results\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -39,44 +35,8 @@ _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001' _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' -<<<<<<< HEAD - _globals['_STATE']._serialized_start=2090 - _globals['_STATE']._serialized_end=2184 - _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 - _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 - _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 - _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_end=725 - _globals['_TASKEXECUTIONMETADATA_ANNOTATIONSENTRY']._serialized_start=727 - _globals['_TASKEXECUTIONMETADATA_ANNOTATIONSENTRY']._serialized_end=789 - _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_start=791 - _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_end=862 - _globals['_CREATETASKREQUEST']._serialized_start=865 - _globals['_CREATETASKREQUEST']._serialized_end=1124 - _globals['_CREATETASKRESPONSE']._serialized_start=1126 - _globals['_CREATETASKRESPONSE']._serialized_end=1248 - _globals['_GETTASKREQUEST']._serialized_start=1250 - _globals['_GETTASKREQUEST']._serialized_end=1332 - _globals['_GETTASKRESPONSE']._serialized_start=1334 - _globals['_GETTASKRESPONSE']._serialized_end=1458 - _globals['_RESOURCE']._serialized_start=1461 - _globals['_RESOURCE']._serialized_end=1706 - _globals['_DELETETASKREQUEST']._serialized_start=1708 - _globals['_DELETETASKREQUEST']._serialized_end=1793 - _globals['_DELETETASKRESPONSE']._serialized_start=1795 - _globals['_DELETETASKRESPONSE']._serialized_end=1815 - _globals['_AGENT']._serialized_start=1817 - _globals['_AGENT']._serialized_end=1894 - _globals['_GETAGENTREQUEST']._serialized_start=1896 - _globals['_GETAGENTREQUEST']._serialized_end=1933 - _globals['_GETAGENTRESPONSE']._serialized_start=1935 - _globals['_GETAGENTRESPONSE']._serialized_end=1998 - _globals['_LISTAGENTSREQUEST']._serialized_start=2000 - _globals['_LISTAGENTSREQUEST']._serialized_end=2019 - _globals['_LISTAGENTSRESPONSE']._serialized_start=2021 - _globals['_LISTAGENTSRESPONSE']._serialized_end=2088 -======= - _globals['_STATE']._serialized_start=2668 - _globals['_STATE']._serialized_end=2762 + _globals['_STATE']._serialized_start=2726 + _globals['_STATE']._serialized_end=2820 _globals['_TASKEXECUTIONMETADATA']._serialized_start=261 _globals['_TASKEXECUTIONMETADATA']._serialized_end=925 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=731 @@ -94,28 +54,27 @@ _globals['_GETTASKRESPONSE']._serialized_start=1397 _globals['_GETTASKRESPONSE']._serialized_end=1521 _globals['_RESOURCE']._serialized_start=1524 - _globals['_RESOURCE']._serialized_end=1711 - _globals['_DELETETASKREQUEST']._serialized_start=1713 - _globals['_DELETETASKREQUEST']._serialized_end=1798 - _globals['_DELETETASKRESPONSE']._serialized_start=1800 - _globals['_DELETETASKRESPONSE']._serialized_end=1820 - _globals['_AGENT']._serialized_start=1822 - _globals['_AGENT']._serialized_end=1899 - _globals['_GETAGENTREQUEST']._serialized_start=1901 - _globals['_GETAGENTREQUEST']._serialized_end=1938 - _globals['_GETAGENTRESPONSE']._serialized_start=1940 - _globals['_GETAGENTRESPONSE']._serialized_end=2003 - _globals['_LISTAGENTSREQUEST']._serialized_start=2005 - _globals['_LISTAGENTSREQUEST']._serialized_end=2024 - _globals['_LISTAGENTSRESPONSE']._serialized_start=2026 - _globals['_LISTAGENTSRESPONSE']._serialized_end=2093 - _globals['_GETTASKMETRICSREQUEST']._serialized_start=2096 - _globals['_GETTASKMETRICSREQUEST']._serialized_end=2372 - _globals['_GETTASKMETRICSRESPONSE']._serialized_start=2374 - _globals['_GETTASKMETRICSRESPONSE']._serialized_end=2462 - _globals['_GETTASKLOGSREQUEST']._serialized_start=2465 - _globals['_GETTASKLOGSREQUEST']._serialized_end=2595 - _globals['_GETTASKLOGSRESPONSE']._serialized_start=2597 - _globals['_GETTASKLOGSRESPONSE']._serialized_end=2666 ->>>>>>> 6f5c47154549dd9f697f4a44547eda5197d40a52 + _globals['_RESOURCE']._serialized_end=1769 + _globals['_DELETETASKREQUEST']._serialized_start=1771 + _globals['_DELETETASKREQUEST']._serialized_end=1856 + _globals['_DELETETASKRESPONSE']._serialized_start=1858 + _globals['_DELETETASKRESPONSE']._serialized_end=1878 + _globals['_AGENT']._serialized_start=1880 + _globals['_AGENT']._serialized_end=1957 + _globals['_GETAGENTREQUEST']._serialized_start=1959 + _globals['_GETAGENTREQUEST']._serialized_end=1996 + _globals['_GETAGENTRESPONSE']._serialized_start=1998 + _globals['_GETAGENTRESPONSE']._serialized_end=2061 + _globals['_LISTAGENTSREQUEST']._serialized_start=2063 + _globals['_LISTAGENTSREQUEST']._serialized_end=2082 + _globals['_LISTAGENTSRESPONSE']._serialized_start=2084 + _globals['_LISTAGENTSRESPONSE']._serialized_end=2151 + _globals['_GETTASKMETRICSREQUEST']._serialized_start=2154 + _globals['_GETTASKMETRICSREQUEST']._serialized_end=2430 + _globals['_GETTASKMETRICSRESPONSE']._serialized_start=2432 + _globals['_GETTASKMETRICSRESPONSE']._serialized_end=2520 + _globals['_GETTASKLOGSREQUEST']._serialized_start=2523 + _globals['_GETTASKLOGSREQUEST']._serialized_end=2653 + _globals['_GETTASKLOGSRESPONSE']._serialized_start=2655 + _globals['_GETTASKLOGSRESPONSE']._serialized_end=2724 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index f52aed14a4..c4a1fb6e71 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -95,7 +95,7 @@ pub struct Resource { /// +optional #[prost(message, optional, tag="2")] pub outputs: ::core::option::Option, - /// A descriptive message for the current state. e.g. waiting for cluster. + /// A descriptive message for the currnt state. e.g. waiting for cluster. #[prost(string, tag="3")] pub message: ::prost::alloc::string::String, /// log information for the task execution. diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 8d7527bb46..2ca5474fbe 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -42,7 +42,8 @@ type Plugin struct { } type ResourceWrapper struct { - State admin.State + Phase flyteIdl.TaskExecution_Phase + State admin.State // This is deprecated. Outputs *flyteIdl.LiteralMap Message string LogLinks []*flyteIdl.TaskLog @@ -121,6 +122,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR logger.Infof(ctx, "Agent is executing a synchronous task.") return nil, ResourceWrapper{ + Phase: res.GetResource().Phase, State: res.GetResource().State, Outputs: res.GetResource().Outputs, Message: res.GetResource().Message, @@ -159,6 +161,7 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba } return ResourceWrapper{ + Phase: res.Resource.Phase, State: res.Resource.State, Outputs: res.Resource.Outputs, Message: res.Resource.Message, @@ -189,10 +192,26 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase core.PhaseInfo, err error) { resource := taskCtx.Resource().(ResourceWrapper) taskInfo := &core.TaskInfo{Logs: resource.LogLinks} - logger.Infof(ctx, "@@@ resource.State [%v]", resource.State) - // switch resource.Phase { - // if it is undefined, default is 0 in the protobuf, then we will use resource.State to determine the phase - // } + + // If the phase is undefined, we will use state to determine the phase + switch resource.Phase { + case flyteIdl.TaskExecution_QUEUED: + case flyteIdl.TaskExecution_INITIALIZING: + case flyteIdl.TaskExecution_WAITING_FOR_RESOURCES: + return core.PhaseInfoInitializing(time.Now(), core.DefaultPhaseVersion, resource.Message, taskInfo), nil + case flyteIdl.TaskExecution_RUNNING: + return core.PhaseInfoRunning(core.DefaultPhaseVersion, taskInfo), nil + case flyteIdl.TaskExecution_SUCCEEDED: + err = writeOutput(ctx, taskCtx, resource) + if err != nil { + logger.Errorf(ctx, "Failed to write output with err %s", err.Error()) + return core.PhaseInfoUndefined, err + } + return core.PhaseInfoSuccess(taskInfo), nil + case flyteIdl.TaskExecution_ABORTED: + case flyteIdl.TaskExecution_FAILED: + return core.PhaseInfoFailure(pluginErrors.TaskFailedWithError, "failed to run the job", taskInfo), nil + } switch resource.State { case admin.State_PENDING: From 52358bc938dce91182408ec6ffedb107cb0ddf2b Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Sun, 21 Jan 2024 14:17:46 +0800 Subject: [PATCH 4/8] lint and make phase have more cases Signed-off-by: Future-Outlier --- flyteidl/protos/flyteidl/admin/agent.proto | 2 +- flyteplugins/go/tasks/pluginmachinery/k8s/client.go | 2 +- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index 95b96532ca..3aa3abe829 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -84,7 +84,7 @@ message Resource { // Structured dataset pointing to the query result table. // +optional core.LiteralMap outputs = 2; - // A descriptive message for the currnt state. e.g. waiting for cluster. + // A descriptive message for the current state. e.g. waiting for cluster. string message = 3; // log information for the task execution. repeated core.TaskLog log_links = 4; diff --git a/flyteplugins/go/tasks/pluginmachinery/k8s/client.go b/flyteplugins/go/tasks/pluginmachinery/k8s/client.go index f14ae2c8a0..0ab46081e9 100644 --- a/flyteplugins/go/tasks/pluginmachinery/k8s/client.go +++ b/flyteplugins/go/tasks/pluginmachinery/k8s/client.go @@ -69,7 +69,7 @@ func NewKubeClient(config *rest.Config, options Options) (core.KubeClient, error if options.ClientOptions == nil { options.ClientOptions = &client.Options{ HTTPClient: httpClient, - Mapper: mapper, + Mapper: mapper, } } diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 2ca5474fbe..0482723ec4 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -193,11 +193,13 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase resource := taskCtx.Resource().(ResourceWrapper) taskInfo := &core.TaskInfo{Logs: resource.LogLinks} - // If the phase is undefined, we will use state to determine the phase + // If the phase is undefined, we will use state to determine the phase. switch resource.Phase { case flyteIdl.TaskExecution_QUEUED: - case flyteIdl.TaskExecution_INITIALIZING: + return core.PhaseInfoQueuedWithTaskInfo(core.DefaultPhaseVersion, resource.Message, taskInfo), nil case flyteIdl.TaskExecution_WAITING_FOR_RESOURCES: + return core.PhaseInfoWaitingForResourcesInfo(time.Now(), core.DefaultPhaseVersion, resource.Message, taskInfo), nil + case flyteIdl.TaskExecution_INITIALIZING: return core.PhaseInfoInitializing(time.Now(), core.DefaultPhaseVersion, resource.Message, taskInfo), nil case flyteIdl.TaskExecution_RUNNING: return core.PhaseInfoRunning(core.DefaultPhaseVersion, taskInfo), nil @@ -208,8 +210,7 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase return core.PhaseInfoUndefined, err } return core.PhaseInfoSuccess(taskInfo), nil - case flyteIdl.TaskExecution_ABORTED: - case flyteIdl.TaskExecution_FAILED: + case flyteIdl.TaskExecution_ABORTED, flyteIdl.TaskExecution_FAILED: return core.PhaseInfoFailure(pluginErrors.TaskFailedWithError, "failed to run the job", taskInfo), nil } From e7bf06a3bb6884336c7266d364d9d2f07425f020 Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Sun, 21 Jan 2024 14:33:11 +0800 Subject: [PATCH 5/8] add tests Signed-off-by: Future-Outlier --- .../go/tasks/plugins/webapi/agent/plugin.go | 4 +- .../tasks/plugins/webapi/agent/plugin_test.go | 99 +++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 0482723ec4..518193810a 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -210,7 +210,9 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase return core.PhaseInfoUndefined, err } return core.PhaseInfoSuccess(taskInfo), nil - case flyteIdl.TaskExecution_ABORTED, flyteIdl.TaskExecution_FAILED: + case flyteIdl.TaskExecution_ABORTED: + return core.PhaseInfoFailure(pluginErrors.TaskFailedWithError, "failed to run the job with aborted phase", taskInfo), nil + case flyteIdl.TaskExecution_FAILED: return core.PhaseInfoFailure(pluginErrors.TaskFailedWithError, "failed to run the job", taskInfo), nil } diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index b9fd7e1b35..7d9e03e778 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -13,6 +13,7 @@ import ( "github.com/flyteorg/flyte/flyteidl/clients/go/coreutils" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + flyteIdl "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" flyteIdlCore "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service" "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" @@ -219,6 +220,104 @@ func TestPlugin(t *testing.T) { assert.Error(t, err) assert.Equal(t, pluginsCore.PhaseUndefined, phase.Phase()) }) + + t.Run("test TaskExecution_UNDEFINED Status", func(t *testing.T) { + taskContext := new(webapiPlugin.StatusContext) + taskContext.On("Resource").Return(ResourceWrapper{ + Phase: flyteIdl.TaskExecution_UNDEFINED, + Outputs: nil, + Message: "", + LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}}, + }) + + phase, err := plugin.Status(context.Background(), taskContext) + assert.NoError(t, err) + assert.Equal(t, pluginsCore.PhaseRetryableFailure, phase.Phase()) + }) + + t.Run("test TaskExecution_QUEUED Status", func(t *testing.T) { + taskContext := new(webapiPlugin.StatusContext) + taskContext.On("Resource").Return(ResourceWrapper{ + Phase: flyteIdl.TaskExecution_QUEUED, + Outputs: nil, + Message: "", + LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}}, + }) + + phase, err := plugin.Status(context.Background(), taskContext) + assert.NoError(t, err) + assert.Equal(t, pluginsCore.PhaseQueued, phase.Phase()) + }) + + t.Run("test TaskExecution_WAITING_FOR_RESOURCES Status", func(t *testing.T) { + taskContext := new(webapiPlugin.StatusContext) + taskContext.On("Resource").Return(ResourceWrapper{ + Phase: flyteIdl.TaskExecution_WAITING_FOR_RESOURCES, + Outputs: nil, + Message: "", + LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}}, + }) + + phase, err := plugin.Status(context.Background(), taskContext) + assert.NoError(t, err) + assert.Equal(t, pluginsCore.PhaseWaitingForResources, phase.Phase()) + }) + + t.Run("test TaskExecution_INITIALIZING Status", func(t *testing.T) { + taskContext := new(webapiPlugin.StatusContext) + taskContext.On("Resource").Return(ResourceWrapper{ + Phase: flyteIdl.TaskExecution_INITIALIZING, + Outputs: nil, + Message: "", + LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}}, + }) + + phase, err := plugin.Status(context.Background(), taskContext) + assert.NoError(t, err) + assert.Equal(t, pluginsCore.PhaseInitializing, phase.Phase()) + }) + + t.Run("test TaskExecution_RUNNING Status", func(t *testing.T) { + taskContext := new(webapiPlugin.StatusContext) + taskContext.On("Resource").Return(ResourceWrapper{ + Phase: flyteIdl.TaskExecution_RUNNING, + Outputs: nil, + Message: "", + LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}}, + }) + + phase, err := plugin.Status(context.Background(), taskContext) + assert.NoError(t, err) + assert.Equal(t, pluginsCore.PhaseRunning, phase.Phase()) + }) + + t.Run("test TaskExecution_ABORTED Status", func(t *testing.T) { + taskContext := new(webapiPlugin.StatusContext) + taskContext.On("Resource").Return(ResourceWrapper{ + Phase: flyteIdl.TaskExecution_ABORTED, + Outputs: nil, + Message: "", + LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}}, + }) + + phase, err := plugin.Status(context.Background(), taskContext) + assert.NoError(t, err) + assert.Equal(t, pluginsCore.PhasePermanentFailure, phase.Phase()) + }) + + t.Run("test TaskExecution_FAILED Status", func(t *testing.T) { + taskContext := new(webapiPlugin.StatusContext) + taskContext.On("Resource").Return(ResourceWrapper{ + Phase: flyteIdl.TaskExecution_FAILED, + Outputs: nil, + Message: "", + LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}}, + }) + + phase, err := plugin.Status(context.Background(), taskContext) + assert.NoError(t, err) + assert.Equal(t, pluginsCore.PhasePermanentFailure, phase.Phase()) + }) } func TestInitializeAgentRegistry(t *testing.T) { From b927a22c367d4910d1f26c7d9598ed433cfc3373 Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Sun, 21 Jan 2024 14:43:22 +0800 Subject: [PATCH 6/8] change annotation Signed-off-by: Future-Outlier --- flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 2 +- .../pb-go/flyteidl/service/agent.swagger.json | 2 +- .../flyteidl/admin/AgentOuterClass.java | 18 +++++++++--------- flyteidl/gen/pb_rust/flyteidl.admin.rs | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 51e83e4fcc..73eb5e5390 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -404,7 +404,7 @@ type Resource struct { // Structured dataset pointing to the query result table. // +optional Outputs *core.LiteralMap `protobuf:"bytes,2,opt,name=outputs,proto3" json:"outputs,omitempty"` - // A descriptive message for the currnt state. e.g. waiting for cluster. + // A descriptive message for the current state. e.g. waiting for cluster. Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` // log information for the task execution. LogLinks []*core.TaskLog `protobuf:"bytes,4,rep,name=log_links,json=logLinks,proto3" json:"log_links,omitempty"` diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index 285954b945..8567fe5f09 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -330,7 +330,7 @@ }, "message": { "type": "string", - "description": "A descriptive message for the currnt state. e.g. waiting for cluster." + "description": "A descriptive message for the current state. e.g. waiting for cluster." }, "log_links": { "type": "array", diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index 105831dce3..154ebfc418 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -6226,7 +6226,7 @@ public interface ResourceOrBuilder extends /** * 
-     * A descriptive message for the currnt state. e.g. waiting for cluster.
+     * A descriptive message for the current state. e.g. waiting for cluster.
      *
* * string message = 3; @@ -6234,7 +6234,7 @@ public interface ResourceOrBuilder extends java.lang.String getMessage(); /** * 
-     * A descriptive message for the currnt state. e.g. waiting for cluster.
+     * A descriptive message for the current state. e.g. waiting for cluster.
      *
* * string message = 3; @@ -6490,7 +6490,7 @@ public flyteidl.core.Literals.LiteralMapOrBuilder getOutputsOrBuilder() { private volatile java.lang.Object message_; /** * 
-     * A descriptive message for the currnt state. e.g. waiting for cluster.
+     * A descriptive message for the current state. e.g. waiting for cluster.
      *
* * string message = 3; @@ -6509,7 +6509,7 @@ public java.lang.String getMessage() { } /** * 
-     * A descriptive message for the currnt state. e.g. waiting for cluster.
+     * A descriptive message for the current state. e.g. waiting for cluster.
      *
* * string message = 3; @@ -7270,7 +7270,7 @@ public flyteidl.core.Literals.LiteralMapOrBuilder getOutputsOrBuilder() { private java.lang.Object message_ = ""; /** * 
-       * A descriptive message for the currnt state. e.g. waiting for cluster.
+       * A descriptive message for the current state. e.g. waiting for cluster.
        *
* * string message = 3; @@ -7289,7 +7289,7 @@ public java.lang.String getMessage() { } /** * 
-       * A descriptive message for the currnt state. e.g. waiting for cluster.
+       * A descriptive message for the current state. e.g. waiting for cluster.
        *
* * string message = 3; @@ -7309,7 +7309,7 @@ public java.lang.String getMessage() { } /** * 
-       * A descriptive message for the currnt state. e.g. waiting for cluster.
+       * A descriptive message for the current state. e.g. waiting for cluster.
        *
* * string message = 3; @@ -7326,7 +7326,7 @@ public Builder setMessage( } /** * 
-       * A descriptive message for the currnt state. e.g. waiting for cluster.
+       * A descriptive message for the current state. e.g. waiting for cluster.
        *
* * string message = 3; @@ -7339,7 +7339,7 @@ public Builder clearMessage() { } /** * 
-       * A descriptive message for the currnt state. e.g. waiting for cluster.
+       * A descriptive message for the current state. e.g. waiting for cluster.
        *
* * string message = 3; diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index c4a1fb6e71..f52aed14a4 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -95,7 +95,7 @@ pub struct Resource { /// +optional #[prost(message, optional, tag="2")] pub outputs: ::core::option::Option, - /// A descriptive message for the currnt state. e.g. waiting for cluster. + /// A descriptive message for the current state. e.g. waiting for cluster. #[prost(string, tag="3")] pub message: ::prost::alloc::string::String, /// log information for the task execution. From fe600599c5677ff614848292fb9c1a02f3bb4bde Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Sun, 21 Jan 2024 14:57:38 +0800 Subject: [PATCH 7/8] add more log for more information Signed-off-by: Future-Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 518193810a..93da6aa3ee 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -216,6 +216,8 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase return core.PhaseInfoFailure(pluginErrors.TaskFailedWithError, "failed to run the job", taskInfo), nil } + logger.Infof(ctx, "Agent returned an undefined phase [%v]. Checking state.", resource.Phase) + switch resource.State { case admin.State_PENDING: return core.PhaseInfoInitializing(time.Now(), core.DefaultPhaseVersion, resource.Message, taskInfo), nil From a8ab04e6d3c2ab0828b06ed5508d389e90c2d234 Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Mon, 22 Jan 2024 19:59:45 +0800 Subject: [PATCH 8/8] add [deprecated = true] to proto and change agent plugin Status function logic Signed-off-by: Future-Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 72 ++++----- flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 12 +- flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 146 +++++++++--------- .../flyteidl/admin/AgentOuterClass.java | 96 ++++++------ .../gen/pb_python/flyteidl/admin/agent_pb2.py | 54 +++---- flyteidl/gen/pb_rust/flyteidl.admin.rs | 1 + flyteidl/protos/flyteidl/admin/agent.proto | 2 +- .../go/tasks/plugins/webapi/agent/plugin.go | 9 +- .../tasks/plugins/webapi/agent/plugin_test.go | 14 ++ 9 files changed, 214 insertions(+), 192 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index e528fe7c14..acb4b787d0 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -676,41 +676,41 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta" "\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 " "\001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_lin" - "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\313\001\n\010Res" - "ource\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.St" - "ate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Lit" - "eralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_links\030\004 " - "\003(\0132\026.flyteidl.core.TaskLog\0221\n\005phase\030\005 \001" - "(\0162\".flyteidl.core.TaskExecution.Phase\"=" - "\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001 \001(\t\022\025" - "\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTaskRespo" - "nse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024supported_" - "task_types\030\002 \003(\t\"\037\n\017GetAgentRequest\022\014\n\004n" - "ame\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005agent\030\001" - " \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListAgent" - "sRequest\";\n\022ListAgentsResponse\022%\n\006agents" - "\030\001 \003(\0132\025.flyteidl.admin.Agent\"\331\001\n\025GetTas" - "kMetricsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rre" - "source_meta\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nst" - "art_time\030\004 \001(\0132\032.google.protobuf.Timesta" - "mp\022,\n\010end_time\030\005 \001(\0132\032.google.protobuf.T" - "imestamp\022\'\n\004step\030\006 \001(\0132\031.google.protobuf" - ".Duration\"O\n\026GetTaskMetricsResponse\0225\n\007r" - "esults\030\001 \003(\0132$.flyteidl.core.ExecutionMe" - "tricResult\"\\\n\022GetTaskLogsRequest\022\021\n\ttask" - "_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005li" - "nes\030\003 \001(\004\022\r\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsR" - "esponse\022\017\n\007results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*" - "^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMA" - "NENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003" - "\022\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteorg/f" - "lyte/flyteidl/gen/pb-go/flyteidl/adminb\006" - "proto3" + "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\317\001\n\010Res" + "ource\022(\n\005state\030\001 \001(\0162\025.flyteidl.admin.St" + "ateB\002\030\001\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core" + ".LiteralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_link" + "s\030\004 \003(\0132\026.flyteidl.core.TaskLog\0221\n\005phase" + "\030\005 \001(\0162\".flyteidl.core.TaskExecution.Pha" + "se\"=\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001 \001" + "(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTaskR" + "esponse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024suppor" + "ted_task_types\030\002 \003(\t\"\037\n\017GetAgentRequest\022" + "\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005age" + "nt\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListA" + "gentsRequest\";\n\022ListAgentsResponse\022%\n\006ag" + "ents\030\001 \003(\0132\025.flyteidl.admin.Agent\"\331\001\n\025Ge" + "tTaskMetricsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025" + "\n\rresource_meta\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022." + "\n\nstart_time\030\004 \001(\0132\032.google.protobuf.Tim" + "estamp\022,\n\010end_time\030\005 \001(\0132\032.google.protob" + "uf.Timestamp\022\'\n\004step\030\006 \001(\0132\031.google.prot" + "obuf.Duration\"O\n\026GetTaskMetricsResponse\022" + "5\n\007results\030\001 \003(\0132$.flyteidl.core.Executi" + "onMetricResult\"\\\n\022GetTaskLogsRequest\022\021\n\t" + "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\022\r" + "\n\005lines\030\003 \001(\004\022\r\n\005token\030\004 \001(\t\"5\n\023GetTaskL" + "ogsResponse\022\017\n\007results\030\001 \003(\t\022\r\n\005token\030\002 " + "\001(\t*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021P" + "ERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNI" + "NG\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteo" + "rg/flyte/flyteidl/gen/pb-go/flyteidl/adm" + "inb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 2406, + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 2410, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { @@ -3531,7 +3531,7 @@ const char* Resource::_InternalParse(const char* begin, const char* end, void* o ptr = ::google::protobuf::io::Parse32(ptr, &tag); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { - // .flyteidl.admin.State state = 1; + // .flyteidl.admin.State state = 1 [deprecated = true]; case 1: { if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual; ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr); @@ -3626,7 +3626,7 @@ bool Resource::MergePartialFromCodedStream( tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .flyteidl.admin.State state = 1; + // .flyteidl.admin.State state = 1 [deprecated = true]; case 1: { if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) { int value = 0; @@ -3718,7 +3718,7 @@ void Resource::SerializeWithCachedSizes( ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.admin.State state = 1; + // .flyteidl.admin.State state = 1 [deprecated = true]; if (this->state() != 0) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->state(), output); @@ -3768,7 +3768,7 @@ ::google::protobuf::uint8* Resource::InternalSerializeWithCachedSizesToArray( ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.admin.State state = 1; + // .flyteidl.admin.State state = 1 [deprecated = true]; if (this->state() != 0) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->state(), target); @@ -3852,7 +3852,7 @@ size_t Resource::ByteSizeLong() const { *outputs_); } - // .flyteidl.admin.State state = 1; + // .flyteidl.admin.State state = 1 [deprecated = true]; if (this->state() != 0) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->state()); diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h index 9116b3743c..4912d899c8 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h @@ -1133,11 +1133,11 @@ class Resource final : ::flyteidl::core::LiteralMap* mutable_outputs(); void set_allocated_outputs(::flyteidl::core::LiteralMap* outputs); - // .flyteidl.admin.State state = 1; - void clear_state(); - static const int kStateFieldNumber = 1; - ::flyteidl::admin::State state() const; - void set_state(::flyteidl::admin::State value); + // .flyteidl.admin.State state = 1 [deprecated = true]; + PROTOBUF_DEPRECATED void clear_state(); + PROTOBUF_DEPRECATED static const int kStateFieldNumber = 1; + PROTOBUF_DEPRECATED ::flyteidl::admin::State state() const; + PROTOBUF_DEPRECATED void set_state(::flyteidl::admin::State value); // .flyteidl.core.TaskExecution.Phase phase = 5; void clear_phase(); @@ -3367,7 +3367,7 @@ GetTaskResponse::log_links() const { // Resource -// .flyteidl.admin.State state = 1; +// .flyteidl.admin.State state = 1 [deprecated = true]; inline void Resource::clear_state() { state_ = 0; } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 73eb5e5390..a3f2e327d9 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -399,7 +399,7 @@ func (m *GetTaskResponse) GetLogLinks() []*core.TaskLog { type Resource struct { // DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. - State State `protobuf:"varint,1,opt,name=state,proto3,enum=flyteidl.admin.State" json:"state,omitempty"` + State State `protobuf:"varint,1,opt,name=state,proto3,enum=flyteidl.admin.State" json:"state,omitempty"` // Deprecated: Do not use. // The outputs of the execution. It's typically used by sql task. Agent service will create a // Structured dataset pointing to the query result table. // +optional @@ -440,6 +440,7 @@ func (m *Resource) XXX_DiscardUnknown() { var xxx_messageInfo_Resource proto.InternalMessageInfo +// Deprecated: Do not use. func (m *Resource) GetState() State { if m != nil { return m.State @@ -1035,75 +1036,76 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ - // 1120 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x8f, 0xdb, 0x44, - 0x10, 0x6e, 0x7e, 0x5e, 0x32, 0xb9, 0x5e, 0x93, 0xed, 0xa5, 0xb8, 0x69, 0x81, 0xca, 0x50, 0x74, - 0xa2, 0xaa, 0x43, 0xaf, 0x50, 0xae, 0x20, 0x5a, 0xa5, 0x77, 0xa6, 0x3d, 0x29, 0x17, 0x9d, 0xb6, - 0x39, 0x54, 0x90, 0x20, 0xda, 0x24, 0x73, 0xae, 0x15, 0xc7, 0x76, 0xbd, 0xeb, 0x53, 0x0f, 0xf1, - 0x04, 0xff, 0x02, 0x0f, 0xfc, 0xa3, 0xbc, 0x23, 0xef, 0xae, 0x9d, 0x38, 0xa4, 0xe5, 0x2a, 0xfa, - 0xe6, 0x99, 0xf9, 0xe6, 0xdb, 0x6f, 0x67, 0xc6, 0xbb, 0x0b, 0x9d, 0x53, 0xef, 0x5c, 0xa0, 0x3b, - 0xf5, 0xba, 0x6c, 0x3a, 0x77, 0xfd, 0x2e, 0x73, 0xd0, 0x17, 0x56, 0x18, 0x05, 0x22, 0x20, 0x5b, - 0x69, 0xcc, 0x92, 0xb1, 0xce, 0xcd, 0x0c, 0x3b, 0x09, 0x22, 0xec, 0x7a, 0xae, 0xc0, 0x88, 0x79, - 0x5c, 0xa1, 0x3b, 0xd7, 0xf3, 0x51, 0xc1, 0xf8, 0x2c, 0x0d, 0x7d, 0x94, 0x0f, 0xb9, 0x53, 0xf4, - 0x85, 0x7b, 0xea, 0x62, 0xa4, 0xe3, 0x1f, 0xe6, 0xe3, 0xf8, 0x1a, 0x27, 0xb1, 0x70, 0x03, 0x5f, - 0x87, 0x6f, 0xe4, 0xc3, 0x73, 0x14, 0x91, 0x3b, 0xc9, 0xb8, 0x9d, 0x20, 0x70, 0x3c, 0xec, 0x4a, - 0x6b, 0x1c, 0x9f, 0x76, 0xa7, 0x71, 0xc4, 0x96, 0x92, 0x3f, 0x5e, 0x8d, 0x0b, 0x77, 0x8e, 0x5c, - 0xb0, 0x79, 0xa8, 0x00, 0xe6, 0x5f, 0x15, 0x68, 0x0f, 0x19, 0x9f, 0xd9, 0xe9, 0xaa, 0x47, 0x28, - 0xd8, 0x94, 0x09, 0x46, 0x28, 0xb4, 0x92, 0x5d, 0x8c, 0x32, 0x3d, 0x23, 0x77, 0x6a, 0x14, 0x6e, - 0x15, 0x76, 0x1a, 0xbb, 0x9f, 0x59, 0x59, 0x6d, 0x12, 0x4d, 0x56, 0x8e, 0xe0, 0x30, 0xdb, 0x1f, - 0xbd, 0x22, 0xf2, 0x01, 0x72, 0x13, 0xea, 0x3e, 0x9b, 0x23, 0x0f, 0xd9, 0x04, 0x8d, 0xe2, 0xad, - 0xc2, 0x4e, 0x9d, 0x2e, 0x1c, 0xe4, 0x10, 0xaa, 0x1e, 0x1b, 0xa3, 0xc7, 0x8d, 0xd2, 0xad, 0xd2, - 0x4e, 0x63, 0xf7, 0x9e, 0x95, 0x6f, 0x81, 0xb5, 0x56, 0xa8, 0xd5, 0x97, 0x39, 0xb6, 0x2f, 0xa2, - 0x73, 0xaa, 0x09, 0xc8, 0x0b, 0x68, 0x30, 0xdf, 0x0f, 0x84, 0xac, 0x05, 0x37, 0xca, 0x92, 0xef, - 0xc1, 0xc5, 0xf8, 0x7a, 0x8b, 0x44, 0x45, 0xba, 0x4c, 0x45, 0x2c, 0xb8, 0x3a, 0xdb, 0xe3, 0x23, - 0x8e, 0xd1, 0x99, 0x3b, 0xc1, 0x11, 0x9b, 0x4c, 0x82, 0xd8, 0x17, 0x46, 0x45, 0x6e, 0xa6, 0x35, - 0xdb, 0xe3, 0xcf, 0x55, 0xa4, 0xa7, 0x02, 0x44, 0x40, 0x1b, 0xfd, 0x33, 0x37, 0x0a, 0xfc, 0x39, - 0xfa, 0x62, 0x74, 0xc6, 0x22, 0x97, 0x8d, 0x3d, 0xe4, 0x46, 0x55, 0x6a, 0x7a, 0x7c, 0x31, 0x4d, - 0xf6, 0x82, 0xe2, 0x87, 0x94, 0x41, 0x89, 0xdb, 0xc6, 0x35, 0xa1, 0xce, 0x43, 0x68, 0x2c, 0x95, - 0x85, 0x34, 0xa1, 0x34, 0xc3, 0x73, 0xd9, 0xbd, 0x3a, 0x4d, 0x3e, 0xc9, 0x36, 0x54, 0xce, 0x98, - 0x17, 0xa7, 0x5d, 0x50, 0xc6, 0x37, 0xc5, 0xbd, 0x42, 0xe7, 0x11, 0x34, 0x57, 0x2b, 0xf0, 0x4e, - 0xf9, 0x4f, 0xe1, 0xfa, 0x1b, 0xd5, 0xbe, 0x0b, 0x91, 0xf9, 0x47, 0x11, 0x5a, 0xfb, 0x11, 0x32, - 0x81, 0x49, 0x4d, 0x28, 0xbe, 0x8a, 0x91, 0x0b, 0x72, 0x0f, 0xaa, 0xae, 0x1f, 0xc6, 0x82, 0xeb, - 0x59, 0xbc, 0xbe, 0x32, 0x8b, 0x7d, 0xf5, 0x5f, 0x1e, 0xb1, 0x90, 0x6a, 0x20, 0xf9, 0x1a, 0x6a, - 0x02, 0xe7, 0xa1, 0xc7, 0x84, 0x5a, 0xa5, 0xb1, 0x7b, 0x63, 0xcd, 0x00, 0x0f, 0x35, 0x84, 0x66, - 0x60, 0xf2, 0x09, 0x5c, 0x0e, 0x62, 0x11, 0xc6, 0x62, 0x14, 0x46, 0x78, 0xea, 0xbe, 0x36, 0x4a, - 0x52, 0xe3, 0xa6, 0x72, 0x1e, 0x4b, 0x1f, 0xf9, 0x19, 0x3e, 0x58, 0xf9, 0x4f, 0xe6, 0xba, 0x6b, - 0x46, 0x59, 0x2e, 0x76, 0xfb, 0x42, 0x2d, 0xa6, 0x6d, 0xb1, 0xce, 0x6d, 0xfe, 0x0a, 0x64, 0xb9, - 0x08, 0x3c, 0x0c, 0x7c, 0x8e, 0xe4, 0x36, 0x5c, 0x8e, 0x90, 0x07, 0x71, 0x34, 0x41, 0xb9, 0x9c, - 0x2c, 0xc6, 0xe6, 0xb3, 0x4b, 0x74, 0x33, 0x75, 0x27, 0x04, 0xe4, 0x01, 0xd4, 0x52, 0x5b, 0xef, - 0xdc, 0x58, 0x15, 0x43, 0x75, 0xfc, 0xd9, 0x25, 0x9a, 0x61, 0x9f, 0x54, 0xa0, 0x14, 0x21, 0x37, - 0x29, 0x6c, 0x3d, 0x45, 0xb1, 0x5c, 0xfd, 0x1b, 0x50, 0x97, 0x9b, 0x15, 0xe7, 0x21, 0xea, 0x2e, - 0xd6, 0x12, 0xc7, 0xf0, 0x3c, 0x94, 0xe5, 0xca, 0x8b, 0x4a, 0x96, 0xdc, 0xcc, 0x4b, 0x32, 0x7f, - 0x83, 0x2b, 0x19, 0xa7, 0xde, 0xcc, 0x97, 0x4b, 0x2a, 0x0b, 0x6f, 0x57, 0xb9, 0xd0, 0x48, 0xee, - 0x43, 0xdd, 0x0b, 0x9c, 0x91, 0xe7, 0xfa, 0x33, 0x6e, 0x14, 0xe5, 0xcf, 0x74, 0x6d, 0x4d, 0x5b, - 0xfb, 0x81, 0x43, 0x6b, 0x5e, 0xe0, 0xf4, 0x13, 0x9c, 0xf9, 0x77, 0x01, 0x6a, 0x29, 0x17, 0xb9, - 0x03, 0x15, 0x2e, 0x92, 0xa1, 0x48, 0x16, 0xdd, 0xda, 0x6d, 0xaf, 0x2e, 0xfa, 0x3c, 0x09, 0x52, - 0x85, 0x21, 0xf7, 0x61, 0x43, 0xb5, 0x9d, 0xeb, 0x4a, 0xbe, 0x65, 0xf0, 0x52, 0x24, 0x31, 0x60, - 0x63, 0x8e, 0x9c, 0x33, 0x07, 0xf5, 0xe8, 0xa4, 0x66, 0x5e, 0x7d, 0xf9, 0x62, 0xea, 0xc9, 0x1e, - 0x54, 0xc2, 0x97, 0x8c, 0xa3, 0x3c, 0x6d, 0xb6, 0x76, 0xcd, 0xb7, 0x1d, 0xc3, 0xd6, 0x71, 0x82, - 0xa4, 0x2a, 0xc1, 0x3c, 0x81, 0xd6, 0x01, 0x7a, 0x98, 0xff, 0x95, 0xfe, 0x7f, 0x33, 0xb7, 0x81, - 0x2c, 0xd3, 0xaa, 0x7e, 0x9a, 0x47, 0x50, 0xe9, 0x25, 0x17, 0x29, 0x21, 0x50, 0x4e, 0x4e, 0x77, - 0xcd, 0x2d, 0xbf, 0xc9, 0x17, 0xb0, 0xcd, 0xe3, 0x30, 0x0c, 0x22, 0x81, 0xd3, 0x51, 0xb6, 0xbc, - 0xea, 0x60, 0x9d, 0x92, 0x2c, 0x36, 0xd4, 0x42, 0xb8, 0x79, 0x5b, 0x4e, 0x8c, 0x64, 0x4c, 0x95, - 0xaf, 0x21, 0x36, 0x1f, 0x43, 0x73, 0x01, 0xd3, 0x93, 0x75, 0x07, 0x2a, 0xf2, 0x4a, 0xd7, 0x63, - 0xf5, 0xaf, 0x0e, 0x2b, 0xb4, 0xc2, 0x98, 0x57, 0xa1, 0xd5, 0x77, 0xb9, 0x62, 0xe0, 0x7a, 0x25, - 0x73, 0x1f, 0xc8, 0xb2, 0x53, 0xf3, 0xde, 0x85, 0xaa, 0xcc, 0x49, 0x0e, 0xa1, 0xd2, 0x9b, 0x89, - 0x35, 0xc8, 0xfc, 0xb3, 0x08, 0x6d, 0x3d, 0xf4, 0x47, 0xea, 0xfa, 0x7e, 0x6f, 0x2d, 0x48, 0x46, - 0xec, 0x55, 0x8c, 0x91, 0x8b, 0xea, 0xd6, 0xac, 0xd3, 0xd4, 0x24, 0x0f, 0x01, 0xb8, 0x60, 0x91, - 0x18, 0x25, 0x77, 0xbe, 0x3e, 0x8b, 0x3a, 0x96, 0x7a, 0x10, 0x58, 0xe9, 0x83, 0xc0, 0x1a, 0xa6, - 0x0f, 0x02, 0x5a, 0x97, 0xe8, 0xc4, 0x26, 0x5f, 0x41, 0x0d, 0xfd, 0xa9, 0x4a, 0xac, 0xfc, 0x67, - 0xe2, 0x06, 0xfa, 0x53, 0x99, 0x76, 0x17, 0xca, 0x5c, 0x60, 0x68, 0x54, 0xf5, 0x0f, 0xb2, 0x9a, - 0x72, 0xa0, 0x1f, 0x27, 0x54, 0xc2, 0xcc, 0x17, 0x70, 0x6d, 0xb5, 0x2a, 0xba, 0xbe, 0x8f, 0x60, - 0x23, 0x42, 0x1e, 0x7b, 0x59, 0x81, 0x3f, 0x5d, 0x19, 0xf5, 0xe5, 0x73, 0x32, 0x72, 0x27, 0x54, - 0x82, 0x69, 0x9a, 0x64, 0xfe, 0x5e, 0x00, 0xa2, 0xa9, 0xfb, 0x81, 0xf3, 0x1e, 0xab, 0xbd, 0x0d, - 0x15, 0xcf, 0xf5, 0x65, 0xad, 0x0b, 0x3b, 0x65, 0xaa, 0x8c, 0xc4, 0x2b, 0x82, 0x19, 0xfa, 0xb2, - 0xc8, 0x75, 0xaa, 0x0c, 0xd3, 0x86, 0xab, 0x39, 0x0d, 0x7a, 0x6f, 0x46, 0x7e, 0x6f, 0xf5, 0x4c, - 0xf5, 0x82, 0xa6, 0xb8, 0x44, 0xf3, 0xf9, 0x2f, 0x50, 0x91, 0x07, 0x11, 0x69, 0x43, 0x8b, 0xda, - 0x43, 0xfa, 0x63, 0xef, 0x49, 0xdf, 0x1e, 0x7d, 0xdf, 0x3b, 0xec, 0x9f, 0x50, 0xbb, 0x79, 0x29, - 0x71, 0x1f, 0xdb, 0xf4, 0xa8, 0x37, 0xb0, 0x07, 0xc3, 0xcc, 0x5d, 0x20, 0x0d, 0xd8, 0x38, 0xb6, - 0x07, 0x07, 0x87, 0x83, 0xa7, 0xcd, 0x62, 0x62, 0xd0, 0x93, 0xc1, 0x20, 0x31, 0x4a, 0xe4, 0x32, - 0xd4, 0x9f, 0x9f, 0xec, 0xef, 0xdb, 0xf6, 0x81, 0x7d, 0xd0, 0x2c, 0x3f, 0xf9, 0xee, 0xa7, 0x6f, - 0x1d, 0x57, 0xbc, 0x8c, 0xc7, 0xd6, 0x24, 0x98, 0x77, 0x65, 0x99, 0x83, 0xc8, 0x51, 0x1f, 0xdd, - 0xec, 0xed, 0xe9, 0xa0, 0xdf, 0x0d, 0xc7, 0x77, 0x9d, 0xa0, 0x9b, 0x7f, 0x32, 0x8f, 0xab, 0xb2, - 0xbb, 0xf7, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x27, 0x1f, 0x64, 0x1a, 0x4b, 0x0b, 0x00, 0x00, + // 1123 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xef, 0x6f, 0xdb, 0xc4, + 0x1b, 0x5f, 0x7e, 0x36, 0x79, 0xd2, 0x75, 0xc9, 0xad, 0xd9, 0xd7, 0xcb, 0xf6, 0x85, 0xc9, 0x30, + 0x54, 0x81, 0xe6, 0xb0, 0x0e, 0x46, 0x07, 0x62, 0x53, 0xda, 0x9a, 0xad, 0x52, 0x1a, 0x55, 0xb7, + 0x14, 0x0d, 0x24, 0x88, 0x2e, 0xc9, 0x53, 0xcf, 0x8a, 0x63, 0x7b, 0xbe, 0x73, 0xb5, 0x22, 0x5e, + 0xc1, 0xbf, 0xc0, 0x0b, 0xfe, 0x55, 0xde, 0x21, 0xdf, 0x9d, 0x9d, 0x38, 0x64, 0xa3, 0x13, 0x7b, + 0xe7, 0xe7, 0xd7, 0xe7, 0xf9, 0x3c, 0x3f, 0x7c, 0x77, 0xd0, 0x39, 0xf3, 0x2e, 0x04, 0xba, 0x53, + 0xaf, 0xcb, 0xa6, 0x73, 0xd7, 0xef, 0x32, 0x07, 0x7d, 0x61, 0x85, 0x51, 0x20, 0x02, 0xb2, 0x95, + 0xda, 0x2c, 0x69, 0xeb, 0xdc, 0xce, 0x7c, 0x27, 0x41, 0x84, 0x5d, 0xcf, 0x15, 0x18, 0x31, 0x8f, + 0x2b, 0xef, 0xce, 0xcd, 0xbc, 0x55, 0x30, 0x3e, 0x4b, 0x4d, 0x1f, 0xe4, 0x4d, 0xee, 0x14, 0x7d, + 0xe1, 0x9e, 0xb9, 0x18, 0x69, 0xfb, 0xff, 0xf3, 0x76, 0x7c, 0x8d, 0x93, 0x58, 0xb8, 0x81, 0xaf, + 0xcd, 0xb7, 0xf2, 0xe6, 0x39, 0x8a, 0xc8, 0x9d, 0x64, 0xd8, 0x4e, 0x10, 0x38, 0x1e, 0x76, 0xa5, + 0x34, 0x8e, 0xcf, 0xba, 0xd3, 0x38, 0x62, 0x4b, 0xc1, 0x1f, 0xae, 0xda, 0x85, 0x3b, 0x47, 0x2e, + 0xd8, 0x3c, 0x54, 0x0e, 0xe6, 0x9f, 0x15, 0x68, 0x0f, 0x19, 0x9f, 0xd9, 0x69, 0xd6, 0x63, 0x14, + 0x6c, 0xca, 0x04, 0x23, 0x14, 0x5a, 0x49, 0x15, 0xa3, 0x8c, 0xcf, 0xc8, 0x9d, 0x1a, 0x85, 0x3b, + 0x85, 0x9d, 0xc6, 0xee, 0x27, 0x56, 0xd6, 0x9b, 0x84, 0x93, 0x95, 0x03, 0x38, 0xca, 0xea, 0xa3, + 0xd7, 0x44, 0xde, 0x40, 0x6e, 0x43, 0xdd, 0x67, 0x73, 0xe4, 0x21, 0x9b, 0xa0, 0x51, 0xbc, 0x53, + 0xd8, 0xa9, 0xd3, 0x85, 0x82, 0x1c, 0x41, 0xd5, 0x63, 0x63, 0xf4, 0xb8, 0x51, 0xba, 0x53, 0xda, + 0x69, 0xec, 0xde, 0xb7, 0xf2, 0x23, 0xb0, 0xd6, 0x12, 0xb5, 0xfa, 0x32, 0xc6, 0xf6, 0x45, 0x74, + 0x41, 0x35, 0x00, 0x79, 0x01, 0x0d, 0xe6, 0xfb, 0x81, 0x90, 0xbd, 0xe0, 0x46, 0x59, 0xe2, 0x3d, + 0xbc, 0x1c, 0x5e, 0x6f, 0x11, 0xa8, 0x40, 0x97, 0xa1, 0x88, 0x05, 0xd7, 0x67, 0x7b, 0x7c, 0xc4, + 0x31, 0x3a, 0x77, 0x27, 0x38, 0x62, 0x93, 0x49, 0x10, 0xfb, 0xc2, 0xa8, 0xc8, 0x62, 0x5a, 0xb3, + 0x3d, 0xfe, 0x5c, 0x59, 0x7a, 0xca, 0x40, 0x04, 0xb4, 0xd1, 0x3f, 0x77, 0xa3, 0xc0, 0x9f, 0xa3, + 0x2f, 0x46, 0xe7, 0x2c, 0x72, 0xd9, 0xd8, 0x43, 0x6e, 0x54, 0x25, 0xa7, 0x27, 0x97, 0xe3, 0x64, + 0x2f, 0x20, 0xbe, 0x4f, 0x11, 0x14, 0xb9, 0x6d, 0x5c, 0x63, 0xea, 0x3c, 0x82, 0xc6, 0x52, 0x5b, + 0x48, 0x13, 0x4a, 0x33, 0xbc, 0x90, 0xd3, 0xab, 0xd3, 0xe4, 0x93, 0x6c, 0x43, 0xe5, 0x9c, 0x79, + 0x71, 0x3a, 0x05, 0x25, 0x7c, 0x5d, 0xdc, 0x2b, 0x74, 0x1e, 0x43, 0x73, 0xb5, 0x03, 0xef, 0x14, + 0xff, 0x14, 0x6e, 0xbe, 0x91, 0xed, 0xbb, 0x00, 0x99, 0xbf, 0x17, 0xa1, 0x75, 0x10, 0x21, 0x13, + 0x98, 0xf4, 0x84, 0xe2, 0xab, 0x18, 0xb9, 0x20, 0xf7, 0xa1, 0xea, 0xfa, 0x61, 0x2c, 0xb8, 0xde, + 0xc5, 0x9b, 0x2b, 0xbb, 0xd8, 0x57, 0xff, 0xe5, 0x31, 0x0b, 0xa9, 0x76, 0x24, 0x5f, 0x41, 0x4d, + 0xe0, 0x3c, 0xf4, 0x98, 0x50, 0x59, 0x1a, 0xbb, 0xb7, 0xd6, 0x2c, 0xf0, 0x50, 0xbb, 0xd0, 0xcc, + 0x99, 0x7c, 0x04, 0x57, 0x83, 0x58, 0x84, 0xb1, 0x18, 0x85, 0x11, 0x9e, 0xb9, 0xaf, 0x8d, 0x92, + 0xe4, 0xb8, 0xa9, 0x94, 0x27, 0x52, 0x47, 0x7e, 0x82, 0xff, 0xad, 0xfc, 0x27, 0x73, 0x3d, 0x35, + 0xa3, 0x2c, 0x93, 0xdd, 0xbd, 0xd4, 0x88, 0x69, 0x5b, 0xac, 0x53, 0x9b, 0xbf, 0x00, 0x59, 0x6e, + 0x02, 0x0f, 0x03, 0x9f, 0x23, 0xb9, 0x0b, 0x57, 0x23, 0xe4, 0x41, 0x1c, 0x4d, 0x50, 0xa6, 0x93, + 0xcd, 0xd8, 0x7c, 0x76, 0x85, 0x6e, 0xa6, 0xea, 0x04, 0x80, 0x3c, 0x84, 0x5a, 0x2a, 0xeb, 0xca, + 0x8d, 0x55, 0x32, 0x54, 0xdb, 0x9f, 0x5d, 0xa1, 0x99, 0xef, 0x7e, 0x05, 0x4a, 0x11, 0x72, 0x93, + 0xc2, 0xd6, 0x53, 0x14, 0xcb, 0xdd, 0xbf, 0x05, 0x75, 0x59, 0xac, 0xb8, 0x08, 0x51, 0x4f, 0xb1, + 0x96, 0x28, 0x86, 0x17, 0xa1, 0x6c, 0x57, 0x9e, 0x54, 0x92, 0x72, 0x33, 0x4f, 0xc9, 0xfc, 0x15, + 0xae, 0x65, 0x98, 0xba, 0x98, 0x2f, 0x96, 0x58, 0x16, 0xde, 0xce, 0x72, 0xc1, 0x91, 0x3c, 0x80, + 0xba, 0x17, 0x38, 0x23, 0xcf, 0xf5, 0x67, 0xdc, 0x28, 0xca, 0x9f, 0xe9, 0xc6, 0x9a, 0xb1, 0xf6, + 0x03, 0x87, 0xd6, 0xbc, 0xc0, 0xe9, 0x27, 0x7e, 0xe6, 0x5f, 0x05, 0xa8, 0xa5, 0x58, 0xa4, 0x0b, + 0x15, 0x2e, 0x92, 0xa5, 0x48, 0x92, 0x6e, 0xed, 0xb6, 0x57, 0x93, 0x3e, 0x4f, 0x8c, 0xfb, 0x45, + 0xa3, 0x40, 0x95, 0x1f, 0x79, 0x00, 0x1b, 0x6a, 0xf4, 0x5c, 0x77, 0xf3, 0x2d, 0xcb, 0x97, 0x7a, + 0x12, 0x03, 0x36, 0xe6, 0xc8, 0x39, 0x73, 0x50, 0xaf, 0x4f, 0x2a, 0xe6, 0x2b, 0x28, 0x5f, 0xae, + 0x02, 0xb2, 0x07, 0x95, 0xf0, 0x25, 0xe3, 0x28, 0x4f, 0x9c, 0xad, 0x5d, 0xf3, 0x6d, 0x47, 0xb1, + 0x75, 0x92, 0x78, 0x52, 0x15, 0x60, 0x9e, 0x42, 0xeb, 0x10, 0x3d, 0xcc, 0xff, 0x4e, 0xff, 0x7d, + 0xa0, 0xdb, 0x40, 0x96, 0x61, 0xd5, 0x4c, 0xcd, 0x63, 0xa8, 0xf4, 0x92, 0xcb, 0x94, 0x10, 0x28, + 0x27, 0x27, 0xbc, 0xc6, 0x96, 0xdf, 0xe4, 0x73, 0xd8, 0xe6, 0x71, 0x18, 0x06, 0x91, 0xc0, 0xe9, + 0x28, 0x4b, 0xaf, 0xa6, 0x58, 0xa7, 0x24, 0xb3, 0x0d, 0x35, 0x11, 0x6e, 0xde, 0x95, 0x5b, 0x23, + 0x11, 0x53, 0xe6, 0x6b, 0x80, 0xcd, 0x27, 0xd0, 0x5c, 0xb8, 0xe9, 0xed, 0xfa, 0x0c, 0x2a, 0xf2, + 0x5a, 0xd7, 0xab, 0xf5, 0x8f, 0x29, 0x2b, 0x6f, 0xe5, 0x63, 0x5e, 0x87, 0x56, 0xdf, 0xe5, 0x0a, + 0x81, 0xeb, 0x4c, 0xe6, 0x01, 0x90, 0x65, 0xa5, 0xc6, 0xbd, 0x07, 0x55, 0x19, 0x93, 0x1c, 0x44, + 0xa5, 0x37, 0x03, 0x6b, 0x27, 0xf3, 0x8f, 0x22, 0xb4, 0xf5, 0xe2, 0x1f, 0xab, 0x2b, 0xfc, 0xbd, + 0x8d, 0x20, 0x59, 0xb1, 0x57, 0x31, 0x46, 0x2e, 0xaa, 0x9b, 0xb3, 0x4e, 0x53, 0x91, 0x3c, 0x02, + 0xe0, 0x82, 0x45, 0x62, 0x94, 0xdc, 0xfb, 0xfa, 0x3c, 0xea, 0x58, 0xea, 0x51, 0x60, 0xa5, 0x8f, + 0x02, 0x6b, 0x98, 0x3e, 0x0a, 0x68, 0x5d, 0x7a, 0x27, 0x32, 0xf9, 0x12, 0x6a, 0xe8, 0x4f, 0x55, + 0x60, 0xe5, 0x5f, 0x03, 0x37, 0xd0, 0x9f, 0xca, 0xb0, 0x7b, 0x50, 0xe6, 0x02, 0x43, 0xa3, 0xaa, + 0x7f, 0x90, 0xd5, 0x90, 0x43, 0xfd, 0x40, 0xa1, 0xd2, 0xcd, 0x7c, 0x01, 0x37, 0x56, 0xbb, 0xa2, + 0xfb, 0xfb, 0x18, 0x36, 0x22, 0xe4, 0xb1, 0x97, 0x35, 0xf8, 0xe3, 0x95, 0x55, 0x5f, 0x3e, 0x2b, + 0x23, 0x77, 0x42, 0xa5, 0x33, 0x4d, 0x83, 0xcc, 0xdf, 0x0a, 0x40, 0x34, 0x74, 0x3f, 0x70, 0xde, + 0x63, 0xb7, 0xb7, 0xa1, 0xe2, 0xb9, 0xbe, 0xec, 0x75, 0x61, 0xa7, 0x4c, 0x95, 0x90, 0x68, 0x45, + 0x30, 0x43, 0x5f, 0x36, 0xb9, 0x4e, 0x95, 0x60, 0xda, 0x70, 0x3d, 0xc7, 0x41, 0xd7, 0x66, 0xe4, + 0x6b, 0xab, 0x67, 0xac, 0x17, 0x30, 0xc5, 0x25, 0x98, 0x4f, 0x7f, 0x86, 0x8a, 0x3c, 0x8c, 0x48, + 0x1b, 0x5a, 0xd4, 0x1e, 0xd2, 0x1f, 0x7a, 0xfb, 0x7d, 0x7b, 0xf4, 0x5d, 0xef, 0xa8, 0x7f, 0x4a, + 0xed, 0xe6, 0x95, 0x44, 0x7d, 0x62, 0xd3, 0xe3, 0xde, 0xc0, 0x1e, 0x0c, 0x33, 0x75, 0x81, 0x34, + 0x60, 0xe3, 0xc4, 0x1e, 0x1c, 0x1e, 0x0d, 0x9e, 0x36, 0x8b, 0x89, 0x40, 0x4f, 0x07, 0x83, 0x44, + 0x28, 0x91, 0xab, 0x50, 0x7f, 0x7e, 0x7a, 0x70, 0x60, 0xdb, 0x87, 0xf6, 0x61, 0xb3, 0xbc, 0xff, + 0xed, 0x8f, 0xdf, 0x38, 0xae, 0x78, 0x19, 0x8f, 0xad, 0x49, 0x30, 0xef, 0xca, 0x36, 0x07, 0x91, + 0xa3, 0x3e, 0xba, 0xd9, 0xfb, 0xd3, 0x41, 0xbf, 0x1b, 0x8e, 0xef, 0x39, 0x41, 0x37, 0xff, 0x6c, + 0x1e, 0x57, 0xe5, 0x74, 0x1f, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xf2, 0xd1, 0x03, 0x06, 0x4f, + 0x0b, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index 154ebfc418..e5422d0656 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -6181,17 +6181,17 @@ public interface ResourceOrBuilder extends * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. * * - * .flyteidl.admin.State state = 1; + * .flyteidl.admin.State state = 1 [deprecated = true]; */ - int getStateValue(); + @java.lang.Deprecated int getStateValue(); /** * 
      * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      *
* - * .flyteidl.admin.State state = 1; + * .flyteidl.admin.State state = 1 [deprecated = true]; */ - flyteidl.admin.AgentOuterClass.State getState(); + @java.lang.Deprecated flyteidl.admin.AgentOuterClass.State getState(); /** * 
@@ -6429,9 +6429,9 @@ private Resource(
      * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      *
* - * .flyteidl.admin.State state = 1; + * .flyteidl.admin.State state = 1 [deprecated = true]; */ - public int getStateValue() { + @java.lang.Deprecated public int getStateValue() { return state_; } /** @@ -6439,9 +6439,9 @@ public int getStateValue() { * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. * * - * .flyteidl.admin.State state = 1; + * .flyteidl.admin.State state = 1 [deprecated = true]; */ - public flyteidl.admin.AgentOuterClass.State getState() { + @java.lang.Deprecated public flyteidl.admin.AgentOuterClass.State getState() { @SuppressWarnings("deprecation") flyteidl.admin.AgentOuterClass.State result = flyteidl.admin.AgentOuterClass.State.valueOf(state_); return result == null ? flyteidl.admin.AgentOuterClass.State.UNRECOGNIZED : result; @@ -7037,9 +7037,9 @@ public Builder mergeFrom( * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. * * - * .flyteidl.admin.State state = 1; + * .flyteidl.admin.State state = 1 [deprecated = true]; */ - public int getStateValue() { + @java.lang.Deprecated public int getStateValue() { return state_; } /** @@ -7047,9 +7047,9 @@ public int getStateValue() { * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. * * - * .flyteidl.admin.State state = 1; + * .flyteidl.admin.State state = 1 [deprecated = true]; */ - public Builder setStateValue(int value) { + @java.lang.Deprecated public Builder setStateValue(int value) { state_ = value; onChanged(); return this; @@ -7059,9 +7059,9 @@ public Builder setStateValue(int value) { * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. * * - * .flyteidl.admin.State state = 1; + * .flyteidl.admin.State state = 1 [deprecated = true]; */ - public flyteidl.admin.AgentOuterClass.State getState() { + @java.lang.Deprecated public flyteidl.admin.AgentOuterClass.State getState() { @SuppressWarnings("deprecation") flyteidl.admin.AgentOuterClass.State result = flyteidl.admin.AgentOuterClass.State.valueOf(state_); return result == null ? flyteidl.admin.AgentOuterClass.State.UNRECOGNIZED : result; @@ -7071,9 +7071,9 @@ public flyteidl.admin.AgentOuterClass.State getState() { * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. * * - * .flyteidl.admin.State state = 1; + * .flyteidl.admin.State state = 1 [deprecated = true]; */ - public Builder setState(flyteidl.admin.AgentOuterClass.State value) { + @java.lang.Deprecated public Builder setState(flyteidl.admin.AgentOuterClass.State value) { if (value == null) { throw new NullPointerException(); } @@ -7087,9 +7087,9 @@ public Builder setState(flyteidl.admin.AgentOuterClass.State value) { * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. * * - * .flyteidl.admin.State state = 1; + * .flyteidl.admin.State state = 1 [deprecated = true]; */ - public Builder clearState() { + @java.lang.Deprecated public Builder clearState() { state_ = 0; onChanged(); @@ -16722,36 +16722,36 @@ public flyteidl.admin.AgentOuterClass.GetTaskLogsResponse getDefaultInstanceForT "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta" + "\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 " + "\001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_lin" + - "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\313\001\n\010Res" + - "ource\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.St" + - "ate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Lit" + - "eralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_links\030\004 " + - "\003(\0132\026.flyteidl.core.TaskLog\0221\n\005phase\030\005 \001" + - "(\0162\".flyteidl.core.TaskExecution.Phase\"=" + - "\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001 \001(\t\022\025" + - "\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTaskRespo" + - "nse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024supported_" + - "task_types\030\002 \003(\t\"\037\n\017GetAgentRequest\022\014\n\004n" + - "ame\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005agent\030\001" + - " \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListAgent" + - "sRequest\";\n\022ListAgentsResponse\022%\n\006agents" + - "\030\001 \003(\0132\025.flyteidl.admin.Agent\"\331\001\n\025GetTas" + - "kMetricsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rre" + - "source_meta\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nst" + - "art_time\030\004 \001(\0132\032.google.protobuf.Timesta" + - "mp\022,\n\010end_time\030\005 \001(\0132\032.google.protobuf.T" + - "imestamp\022\'\n\004step\030\006 \001(\0132\031.google.protobuf" + - ".Duration\"O\n\026GetTaskMetricsResponse\0225\n\007r" + - "esults\030\001 \003(\0132$.flyteidl.core.ExecutionMe" + - "tricResult\"\\\n\022GetTaskLogsRequest\022\021\n\ttask" + - "_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005li" + - "nes\030\003 \001(\004\022\r\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsR" + - "esponse\022\017\n\007results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*" + - "^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMA" + - "NENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003" + - "\022\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteorg/f" + - "lyte/flyteidl/gen/pb-go/flyteidl/adminb\006" + - "proto3" + "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\317\001\n\010Res" + + "ource\022(\n\005state\030\001 \001(\0162\025.flyteidl.admin.St" + + "ateB\002\030\001\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core" + + ".LiteralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_link" + + "s\030\004 \003(\0132\026.flyteidl.core.TaskLog\0221\n\005phase" + + "\030\005 \001(\0162\".flyteidl.core.TaskExecution.Pha" + + "se\"=\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001 \001" + + "(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTaskR" + + "esponse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024suppor" + + "ted_task_types\030\002 \003(\t\"\037\n\017GetAgentRequest\022" + + "\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005age" + + "nt\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListA" + + "gentsRequest\";\n\022ListAgentsResponse\022%\n\006ag" + + "ents\030\001 \003(\0132\025.flyteidl.admin.Agent\"\331\001\n\025Ge" + + "tTaskMetricsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025" + + "\n\rresource_meta\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022." + + "\n\nstart_time\030\004 \001(\0132\032.google.protobuf.Tim" + + "estamp\022,\n\010end_time\030\005 \001(\0132\032.google.protob" + + "uf.Timestamp\022\'\n\004step\030\006 \001(\0132\031.google.prot" + + "obuf.Duration\"O\n\026GetTaskMetricsResponse\022" + + "5\n\007results\030\001 \003(\0132$.flyteidl.core.Executi" + + "onMetricResult\"\\\n\022GetTaskLogsRequest\022\021\n\t" + + "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\022\r" + + "\n\005lines\030\003 \001(\004\022\r\n\005token\030\004 \001(\t\"5\n\023GetTaskL" + + "ogsResponse\022\017\n\007results\030\001 \003(\t\022\r\n\005token\030\002 " + + "\001(\t*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021P" + + "ERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNI" + + "NG\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteo" + + "rg/flyte/flyteidl/gen/pb-go/flyteidl/adm" + + "inb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index 81e254399e..f23ad50819 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -20,7 +20,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1b\x66lyteidl/core/metrics.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xf5\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\x12\x38\n\x05phase\x18\x05 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents\"\x94\x02\n\x15GetTaskMetricsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x18\n\x07queries\x18\x03 \x03(\tR\x07queries\x12\x39\n\nstart_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12-\n\x04step\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04step\"X\n\x16GetTaskMetricsResponse\x12>\n\x07results\x18\x01 \x03(\x0b\x32$.flyteidl.core.ExecutionMetricResultR\x07results\"\x82\x01\n\x12GetTaskLogsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x14\n\x05lines\x18\x03 \x01(\x04R\x05lines\x12\x14\n\x05token\x18\x04 \x01(\tR\x05token\"E\n\x13GetTaskLogsResponse\x12\x18\n\x07results\x18\x01 \x03(\tR\x07results\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1b\x66lyteidl/core/metrics.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xf9\x01\n\x08Resource\x12/\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateB\x02\x18\x01R\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\x12\x38\n\x05phase\x18\x05 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents\"\x94\x02\n\x15GetTaskMetricsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x18\n\x07queries\x18\x03 \x03(\tR\x07queries\x12\x39\n\nstart_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12-\n\x04step\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04step\"X\n\x16GetTaskMetricsResponse\x12>\n\x07results\x18\x01 \x03(\x0b\x32$.flyteidl.core.ExecutionMetricResultR\x07results\"\x82\x01\n\x12GetTaskLogsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x14\n\x05lines\x18\x03 \x01(\x04R\x05lines\x12\x14\n\x05token\x18\x04 \x01(\tR\x05token\"E\n\x13GetTaskLogsResponse\x12\x18\n\x07results\x18\x01 \x03(\tR\x07results\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -35,8 +35,10 @@ _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001' _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' - _globals['_STATE']._serialized_start=2726 - _globals['_STATE']._serialized_end=2820 + _RESOURCE.fields_by_name['state']._options = None + _RESOURCE.fields_by_name['state']._serialized_options = b'\030\001' + _globals['_STATE']._serialized_start=2730 + _globals['_STATE']._serialized_end=2824 _globals['_TASKEXECUTIONMETADATA']._serialized_start=261 _globals['_TASKEXECUTIONMETADATA']._serialized_end=925 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=731 @@ -54,27 +56,27 @@ _globals['_GETTASKRESPONSE']._serialized_start=1397 _globals['_GETTASKRESPONSE']._serialized_end=1521 _globals['_RESOURCE']._serialized_start=1524 - _globals['_RESOURCE']._serialized_end=1769 - _globals['_DELETETASKREQUEST']._serialized_start=1771 - _globals['_DELETETASKREQUEST']._serialized_end=1856 - _globals['_DELETETASKRESPONSE']._serialized_start=1858 - _globals['_DELETETASKRESPONSE']._serialized_end=1878 - _globals['_AGENT']._serialized_start=1880 - _globals['_AGENT']._serialized_end=1957 - _globals['_GETAGENTREQUEST']._serialized_start=1959 - _globals['_GETAGENTREQUEST']._serialized_end=1996 - _globals['_GETAGENTRESPONSE']._serialized_start=1998 - _globals['_GETAGENTRESPONSE']._serialized_end=2061 - _globals['_LISTAGENTSREQUEST']._serialized_start=2063 - _globals['_LISTAGENTSREQUEST']._serialized_end=2082 - _globals['_LISTAGENTSRESPONSE']._serialized_start=2084 - _globals['_LISTAGENTSRESPONSE']._serialized_end=2151 - _globals['_GETTASKMETRICSREQUEST']._serialized_start=2154 - _globals['_GETTASKMETRICSREQUEST']._serialized_end=2430 - _globals['_GETTASKMETRICSRESPONSE']._serialized_start=2432 - _globals['_GETTASKMETRICSRESPONSE']._serialized_end=2520 - _globals['_GETTASKLOGSREQUEST']._serialized_start=2523 - _globals['_GETTASKLOGSREQUEST']._serialized_end=2653 - _globals['_GETTASKLOGSRESPONSE']._serialized_start=2655 - _globals['_GETTASKLOGSRESPONSE']._serialized_end=2724 + _globals['_RESOURCE']._serialized_end=1773 + _globals['_DELETETASKREQUEST']._serialized_start=1775 + _globals['_DELETETASKREQUEST']._serialized_end=1860 + _globals['_DELETETASKRESPONSE']._serialized_start=1862 + _globals['_DELETETASKRESPONSE']._serialized_end=1882 + _globals['_AGENT']._serialized_start=1884 + _globals['_AGENT']._serialized_end=1961 + _globals['_GETAGENTREQUEST']._serialized_start=1963 + _globals['_GETAGENTREQUEST']._serialized_end=2000 + _globals['_GETAGENTRESPONSE']._serialized_start=2002 + _globals['_GETAGENTRESPONSE']._serialized_end=2065 + _globals['_LISTAGENTSREQUEST']._serialized_start=2067 + _globals['_LISTAGENTSREQUEST']._serialized_end=2086 + _globals['_LISTAGENTSRESPONSE']._serialized_start=2088 + _globals['_LISTAGENTSRESPONSE']._serialized_end=2155 + _globals['_GETTASKMETRICSREQUEST']._serialized_start=2158 + _globals['_GETTASKMETRICSREQUEST']._serialized_end=2434 + _globals['_GETTASKMETRICSRESPONSE']._serialized_start=2436 + _globals['_GETTASKMETRICSRESPONSE']._serialized_end=2524 + _globals['_GETTASKLOGSREQUEST']._serialized_start=2527 + _globals['_GETTASKLOGSREQUEST']._serialized_end=2657 + _globals['_GETTASKLOGSRESPONSE']._serialized_start=2659 + _globals['_GETTASKLOGSRESPONSE']._serialized_end=2728 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index f52aed14a4..56d2426597 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -88,6 +88,7 @@ pub struct GetTaskResponse { #[derive(Clone, PartialEq, ::prost::Message)] pub struct Resource { /// DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. + #[deprecated] #[prost(enumeration="State", tag="1")] pub state: i32, /// The outputs of the execution. It's typically used by sql task. Agent service will create a diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index 3aa3abe829..5b7043e86f 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -79,7 +79,7 @@ message GetTaskResponse { message Resource { // DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI. - State state = 1; + State state = 1 [deprecated = true]; // The outputs of the execution. It's typically used by sql task. Agent service will create a // Structured dataset pointing to the query result table. // +optional diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 93da6aa3ee..7a9f92caaa 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -193,7 +193,6 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase resource := taskCtx.Resource().(ResourceWrapper) taskInfo := &core.TaskInfo{Logs: resource.LogLinks} - // If the phase is undefined, we will use state to determine the phase. switch resource.Phase { case flyteIdl.TaskExecution_QUEUED: return core.PhaseInfoQueuedWithTaskInfo(core.DefaultPhaseVersion, resource.Message, taskInfo), nil @@ -216,8 +215,12 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase return core.PhaseInfoFailure(pluginErrors.TaskFailedWithError, "failed to run the job", taskInfo), nil } - logger.Infof(ctx, "Agent returned an undefined phase [%v]. Checking state.", resource.Phase) + // The default phase is undefined. + if resource.Phase != flyteIdl.TaskExecution_UNDEFINED { + return core.PhaseInfoUndefined, pluginErrors.Errorf(core.SystemErrorCode, "unknown execution phase [%v].", resource.Phase) + } + // If the phase is undefined, we will use state to determine the phase. switch resource.State { case admin.State_PENDING: return core.PhaseInfoInitializing(time.Now(), core.DefaultPhaseVersion, resource.Message, taskInfo), nil @@ -235,7 +238,7 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase } return core.PhaseInfoSuccess(taskInfo), nil } - return core.PhaseInfoUndefined, pluginErrors.Errorf(core.SystemErrorCode, "unknown execution phase [%v].", resource.State) + return core.PhaseInfoUndefined, pluginErrors.Errorf(core.SystemErrorCode, "unknown execution state [%v].", resource.State) } func writeOutput(ctx context.Context, taskCtx webapi.StatusContext, resource ResourceWrapper) error { diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index 7d9e03e778..d5b5fae5fe 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -318,6 +318,20 @@ func TestPlugin(t *testing.T) { assert.NoError(t, err) assert.Equal(t, pluginsCore.PhasePermanentFailure, phase.Phase()) }) + + t.Run("test UNDEFINED Phase", func(t *testing.T) { + taskContext := new(webapiPlugin.StatusContext) + taskContext.On("Resource").Return(ResourceWrapper{ + State: 8, + Outputs: nil, + Message: "", + LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}}, + }) + + phase, err := plugin.Status(context.Background(), taskContext) + assert.Error(t, err) + assert.Equal(t, pluginsCore.PhaseUndefined, phase.Phase()) + }) } func TestInitializeAgentRegistry(t *testing.T) {