From 2692dea56d619e1355becd0ddb26d325bacc676b Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Thu, 18 May 2023 13:15:06 -0700 Subject: [PATCH] Single literal in GetDataResponse (#404) Signed-off-by: Yee Hing Tong --- .../pb-cpp/flyteidl/service/dataproxy.pb.cc | 131 +++++-- .../pb-cpp/flyteidl/service/dataproxy.pb.h | 47 +++ .../pb-go/flyteidl/service/dataproxy.pb.go | 127 ++++--- .../flyteidl/service/dataproxy.swagger.json | 6 +- .../pb-java/flyteidl/service/Dataproxy.java | 346 ++++++++++++++++-- flyteidl/gen/pb-js/flyteidl.d.ts | 8 +- flyteidl/gen/pb-js/flyteidl.js | 28 +- .../flyteidl/service/dataproxy_pb2.py | 12 +- .../flyteidl/service/dataproxy_pb2.pyi | 6 +- flyteidl/gen/pb_rust/flyteidl.service.rs | 7 +- .../protos/flyteidl/service/dataproxy.proto | 7 +- 11 files changed, 612 insertions(+), 113 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/dataproxy.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/dataproxy.pb.cc index 37c893f57..47ae1eae9 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/dataproxy.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/dataproxy.pb.cc @@ -61,6 +61,7 @@ class GetDataResponseDefaultTypeInternal { ::google::protobuf::internal::ExplicitlyConstructed _instance; const ::flyteidl::core::LiteralMap* literal_map_; const ::flyteidl::service::PreSignedURLs* pre_signed_urls_; + const ::flyteidl::core::Literal* literal_; } _GetDataResponse_default_instance_; } // namespace service } // namespace flyteidl @@ -287,6 +288,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fservice_2fdataproxy_2epr ~0u, // no _weak_field_map_ offsetof(::flyteidl::service::GetDataResponseDefaultTypeInternal, literal_map_), offsetof(::flyteidl::service::GetDataResponseDefaultTypeInternal, pre_signed_urls_), + offsetof(::flyteidl::service::GetDataResponseDefaultTypeInternal, literal_), PROTOBUF_FIELD_OFFSET(::flyteidl::service::GetDataResponse, data_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { @@ -349,34 +351,35 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fdataproxy_2eproto[] = "eidl.service.PreSignedURLs\"S\n\rPreSignedU" "RLs\022\022\n\nsigned_url\030\001 \003(\t\022.\n\nexpires_at\030\002 " "\001(\0132\032.google.protobuf.Timestamp\"#\n\016GetDa" - "taRequest\022\021\n\tflyte_url\030\001 \001(\t\"\207\001\n\017GetData" + "taRequest\022\021\n\tflyte_url\030\001 \001(\t\"\262\001\n\017GetData" "Response\0220\n\013literal_map\030\001 \001(\0132\031.flyteidl" ".core.LiteralMapH\000\022:\n\017pre_signed_urls\030\002 " - "\001(\0132\037.flyteidl.service.PreSignedURLsH\000B\006" - "\n\004data*C\n\014ArtifactType\022\033\n\027ARTIFACT_TYPE_" - "UNDEFINED\020\000\022\026\n\022ARTIFACT_TYPE_DECK\020\0012\342\004\n\020" - "DataProxyService\022\240\001\n\024CreateUploadLocatio" - "n\022-.flyteidl.service.CreateUploadLocatio" - "nRequest\032..flyteidl.service.CreateUpload" - "LocationResponse\")\202\323\344\223\002#\"\036/api/v1/datapr" - "oxy/artifact_urn:\001*\022\246\001\n\026CreateDownloadLo" - "cation\022/.flyteidl.service.CreateDownload" - "LocationRequest\0320.flyteidl.service.Creat" - "eDownloadLocationResponse\")\210\002\001\202\323\344\223\002 \022\036/a" - "pi/v1/dataproxy/artifact_urn\022\233\001\n\022CreateD" - "ownloadLink\022+.flyteidl.service.CreateDow" - "nloadLinkRequest\032,.flyteidl.service.Crea" - "teDownloadLinkResponse\"*\202\323\344\223\002$\"\037/api/v1/" - "dataproxy/artifact_link:\001*\022d\n\007GetData\022 ." - "flyteidl.service.GetDataRequest\032!.flytei" - "dl.service.GetDataResponse\"\024\202\323\344\223\002\016\022\014/api" - "/v1/dataB9Z7github.com/flyteorg/flyteidl" - "/gen/pb-go/flyteidl/serviceb\006proto3" + "\001(\0132\037.flyteidl.service.PreSignedURLsH\000\022)" + "\n\007literal\030\003 \001(\0132\026.flyteidl.core.LiteralH" + "\000B\006\n\004data*C\n\014ArtifactType\022\033\n\027ARTIFACT_TY" + "PE_UNDEFINED\020\000\022\026\n\022ARTIFACT_TYPE_DECK\020\0012\342" + "\004\n\020DataProxyService\022\240\001\n\024CreateUploadLoca" + "tion\022-.flyteidl.service.CreateUploadLoca" + "tionRequest\032..flyteidl.service.CreateUpl" + "oadLocationResponse\")\202\323\344\223\002#\"\036/api/v1/dat" + "aproxy/artifact_urn:\001*\022\246\001\n\026CreateDownloa" + "dLocation\022/.flyteidl.service.CreateDownl" + "oadLocationRequest\0320.flyteidl.service.Cr" + "eateDownloadLocationResponse\")\210\002\001\202\323\344\223\002 \022" + "\036/api/v1/dataproxy/artifact_urn\022\233\001\n\022Crea" + "teDownloadLink\022+.flyteidl.service.Create" + "DownloadLinkRequest\032,.flyteidl.service.C" + "reateDownloadLinkResponse\"*\202\323\344\223\002$\"\037/api/" + "v1/dataproxy/artifact_link:\001*\022d\n\007GetData" + "\022 .flyteidl.service.GetDataRequest\032!.fly" + "teidl.service.GetDataResponse\"\024\202\323\344\223\002\016\022\014/" + "api/v1/dataB9Z7github.com/flyteorg/flyte" + "idl/gen/pb-go/flyteidl/serviceb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fdataproxy_2eproto = { false, InitDefaults_flyteidl_2fservice_2fdataproxy_2eproto, descriptor_table_protodef_flyteidl_2fservice_2fdataproxy_2eproto, - "flyteidl/service/dataproxy.proto", &assign_descriptors_table_flyteidl_2fservice_2fdataproxy_2eproto, 2075, + "flyteidl/service/dataproxy.proto", &assign_descriptors_table_flyteidl_2fservice_2fdataproxy_2eproto, 2118, }; void AddDescriptors_flyteidl_2fservice_2fdataproxy_2eproto() { @@ -3731,11 +3734,14 @@ void GetDataResponse::InitAsDefaultInstance() { ::flyteidl::core::LiteralMap::internal_default_instance()); ::flyteidl::service::_GetDataResponse_default_instance_.pre_signed_urls_ = const_cast< ::flyteidl::service::PreSignedURLs*>( ::flyteidl::service::PreSignedURLs::internal_default_instance()); + ::flyteidl::service::_GetDataResponse_default_instance_.literal_ = const_cast< ::flyteidl::core::Literal*>( + ::flyteidl::core::Literal::internal_default_instance()); } class GetDataResponse::HasBitSetters { public: static const ::flyteidl::core::LiteralMap& literal_map(const GetDataResponse* msg); static const ::flyteidl::service::PreSignedURLs& pre_signed_urls(const GetDataResponse* msg); + static const ::flyteidl::core::Literal& literal(const GetDataResponse* msg); }; const ::flyteidl::core::LiteralMap& @@ -3746,6 +3752,10 @@ const ::flyteidl::service::PreSignedURLs& GetDataResponse::HasBitSetters::pre_signed_urls(const GetDataResponse* msg) { return *msg->data_.pre_signed_urls_; } +const ::flyteidl::core::Literal& +GetDataResponse::HasBitSetters::literal(const GetDataResponse* msg) { + return *msg->data_.literal_; +} void GetDataResponse::set_allocated_literal_map(::flyteidl::core::LiteralMap* literal_map) { ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); clear_data(); @@ -3780,9 +3790,30 @@ void GetDataResponse::set_allocated_pre_signed_urls(::flyteidl::service::PreSign } // @@protoc_insertion_point(field_set_allocated:flyteidl.service.GetDataResponse.pre_signed_urls) } +void GetDataResponse::set_allocated_literal(::flyteidl::core::Literal* literal) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + clear_data(); + if (literal) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + literal = ::google::protobuf::internal::GetOwnedMessage( + message_arena, literal, submessage_arena); + } + set_has_literal(); + data_.literal_ = literal; + } + // @@protoc_insertion_point(field_set_allocated:flyteidl.service.GetDataResponse.literal) +} +void GetDataResponse::clear_literal() { + if (has_literal()) { + delete data_.literal_; + clear_has_data(); + } +} #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GetDataResponse::kLiteralMapFieldNumber; const int GetDataResponse::kPreSignedUrlsFieldNumber; +const int GetDataResponse::kLiteralFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 GetDataResponse::GetDataResponse() @@ -3804,6 +3835,10 @@ GetDataResponse::GetDataResponse(const GetDataResponse& from) mutable_pre_signed_urls()->::flyteidl::service::PreSignedURLs::MergeFrom(from.pre_signed_urls()); break; } + case kLiteral: { + mutable_literal()->::flyteidl::core::Literal::MergeFrom(from.literal()); + break; + } case DATA_NOT_SET: { break; } @@ -3848,6 +3883,10 @@ void GetDataResponse::clear_data() { delete data_.pre_signed_urls_; break; } + case kLiteral: { + delete data_.literal_; + break; + } case DATA_NOT_SET: { break; } @@ -3905,6 +3944,19 @@ const char* GetDataResponse::_InternalParse(const char* begin, const char* end, {parser_till_end, object}, ptr - size, ptr)); break; } + // .flyteidl.core.Literal literal = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::Literal::_InternalParse; + object = msg->mutable_literal(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -3957,6 +4009,17 @@ bool GetDataResponse::MergePartialFromCodedStream( break; } + // .flyteidl.core.Literal literal = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_literal())); + } else { + goto handle_unusual; + } + break; + } + default: { handle_unusual: if (tag == 0) { @@ -3996,6 +4059,12 @@ void GetDataResponse::SerializeWithCachedSizes( 2, HasBitSetters::pre_signed_urls(this), output); } + // .flyteidl.core.Literal literal = 3; + if (has_literal()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 3, HasBitSetters::literal(this), output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -4023,6 +4092,13 @@ ::google::protobuf::uint8* GetDataResponse::InternalSerializeWithCachedSizesToAr 2, HasBitSetters::pre_signed_urls(this), target); } + // .flyteidl.core.Literal literal = 3; + if (has_literal()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 3, HasBitSetters::literal(this), target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -4059,6 +4135,13 @@ size_t GetDataResponse::ByteSizeLong() const { *data_.pre_signed_urls_); break; } + // .flyteidl.core.Literal literal = 3; + case kLiteral: { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *data_.literal_); + break; + } case DATA_NOT_SET: { break; } @@ -4099,6 +4182,10 @@ void GetDataResponse::MergeFrom(const GetDataResponse& from) { mutable_pre_signed_urls()->::flyteidl::service::PreSignedURLs::MergeFrom(from.pre_signed_urls()); break; } + case kLiteral: { + mutable_literal()->::flyteidl::core::Literal::MergeFrom(from.literal()); + break; + } case DATA_NOT_SET: { break; } diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/dataproxy.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/dataproxy.pb.h index c62937f87..cd5f8cfa3 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/dataproxy.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/dataproxy.pb.h @@ -1293,6 +1293,7 @@ class GetDataResponse final : enum DataCase { kLiteralMap = 1, kPreSignedUrls = 2, + kLiteral = 3, DATA_NOT_SET = 0, }; @@ -1377,6 +1378,15 @@ class GetDataResponse final : ::flyteidl::service::PreSignedURLs* mutable_pre_signed_urls(); void set_allocated_pre_signed_urls(::flyteidl::service::PreSignedURLs* pre_signed_urls); + // .flyteidl.core.Literal literal = 3; + bool has_literal() const; + void clear_literal(); + static const int kLiteralFieldNumber = 3; + const ::flyteidl::core::Literal& literal() const; + ::flyteidl::core::Literal* release_literal(); + ::flyteidl::core::Literal* mutable_literal(); + void set_allocated_literal(::flyteidl::core::Literal* literal); + void clear_data(); DataCase data_case() const; // @@protoc_insertion_point(class_scope:flyteidl.service.GetDataResponse) @@ -1384,6 +1394,7 @@ class GetDataResponse final : class HasBitSetters; void set_has_literal_map(); void set_has_pre_signed_urls(); + void set_has_literal(); inline bool has_data() const; inline void clear_has_data(); @@ -1393,6 +1404,7 @@ class GetDataResponse final : DataUnion() {} ::flyteidl::core::LiteralMap* literal_map_; ::flyteidl::service::PreSignedURLs* pre_signed_urls_; + ::flyteidl::core::Literal* literal_; } data_; mutable ::google::protobuf::internal::CachedSize _cached_size_; ::google::protobuf::uint32 _oneof_case_[1]; @@ -2564,6 +2576,41 @@ inline ::flyteidl::service::PreSignedURLs* GetDataResponse::mutable_pre_signed_u return data_.pre_signed_urls_; } +// .flyteidl.core.Literal literal = 3; +inline bool GetDataResponse::has_literal() const { + return data_case() == kLiteral; +} +inline void GetDataResponse::set_has_literal() { + _oneof_case_[0] = kLiteral; +} +inline ::flyteidl::core::Literal* GetDataResponse::release_literal() { + // @@protoc_insertion_point(field_release:flyteidl.service.GetDataResponse.literal) + if (has_literal()) { + clear_has_data(); + ::flyteidl::core::Literal* temp = data_.literal_; + data_.literal_ = nullptr; + return temp; + } else { + return nullptr; + } +} +inline const ::flyteidl::core::Literal& GetDataResponse::literal() const { + // @@protoc_insertion_point(field_get:flyteidl.service.GetDataResponse.literal) + return has_literal() + ? *data_.literal_ + : *reinterpret_cast< ::flyteidl::core::Literal*>(&::flyteidl::core::_Literal_default_instance_); +} +inline ::flyteidl::core::Literal* GetDataResponse::mutable_literal() { + if (!has_literal()) { + clear_data(); + set_has_literal(); + data_.literal_ = CreateMaybeMessage< ::flyteidl::core::Literal >( + GetArenaNoVirtual()); + } + // @@protoc_insertion_point(field_mutable:flyteidl.service.GetDataResponse.literal) + return data_.literal_; +} + inline bool GetDataResponse::has_data() const { return data_case() != DATA_NOT_SET; } diff --git a/flyteidl/gen/pb-go/flyteidl/service/dataproxy.pb.go b/flyteidl/gen/pb-go/flyteidl/service/dataproxy.pb.go index 0033cb5fd..6497aa469 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/dataproxy.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/service/dataproxy.pb.go @@ -506,6 +506,7 @@ type GetDataRequest struct { // backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). // e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) // flyte://v1/proj/development/execid/n2/i (for node execution input) + // flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) FlyteUrl string `protobuf:"bytes,1,opt,name=flyte_url,json=flyteUrl,proto3" json:"flyte_url,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -548,6 +549,7 @@ type GetDataResponse struct { // Types that are valid to be assigned to Data: // *GetDataResponse_LiteralMap // *GetDataResponse_PreSignedUrls + // *GetDataResponse_Literal Data isGetDataResponse_Data `protobuf_oneof:"data"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -591,10 +593,16 @@ type GetDataResponse_PreSignedUrls struct { PreSignedUrls *PreSignedURLs `protobuf:"bytes,2,opt,name=pre_signed_urls,json=preSignedUrls,proto3,oneof"` } +type GetDataResponse_Literal struct { + Literal *core.Literal `protobuf:"bytes,3,opt,name=literal,proto3,oneof"` +} + func (*GetDataResponse_LiteralMap) isGetDataResponse_Data() {} func (*GetDataResponse_PreSignedUrls) isGetDataResponse_Data() {} +func (*GetDataResponse_Literal) isGetDataResponse_Data() {} + func (m *GetDataResponse) GetData() isGetDataResponse_Data { if m != nil { return m.Data @@ -616,11 +624,19 @@ func (m *GetDataResponse) GetPreSignedUrls() *PreSignedURLs { return nil } +func (m *GetDataResponse) GetLiteral() *core.Literal { + if x, ok := m.GetData().(*GetDataResponse_Literal); ok { + return x.Literal + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*GetDataResponse) XXX_OneofWrappers() []interface{} { return []interface{}{ (*GetDataResponse_LiteralMap)(nil), (*GetDataResponse_PreSignedUrls)(nil), + (*GetDataResponse_Literal)(nil), } } @@ -640,62 +656,63 @@ func init() { func init() { proto.RegisterFile("flyteidl/service/dataproxy.proto", fileDescriptor_bffb71366d75dab0) } var fileDescriptor_bffb71366d75dab0 = []byte{ - // 872 bytes of a gzipped FileDescriptorProto + // 887 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x6f, 0xe3, 0x44, - 0x14, 0xef, 0xa4, 0xa5, 0xdb, 0xbc, 0xfe, 0x65, 0xb4, 0x2a, 0x59, 0xb7, 0xdb, 0x66, 0x0d, 0x42, - 0xa5, 0x50, 0x1b, 0x8a, 0x56, 0xb0, 0x2b, 0x38, 0xb4, 0x49, 0x76, 0x1b, 0xd1, 0xad, 0x2a, 0x6f, - 0x7a, 0x80, 0x8b, 0x35, 0xb5, 0x27, 0x61, 0x58, 0x67, 0xc6, 0x8c, 0x27, 0xa5, 0x91, 0x10, 0x07, - 0x4e, 0xdc, 0x39, 0x70, 0xe0, 0x82, 0x38, 0xf0, 0x51, 0xe0, 0x03, 0xf0, 0x0d, 0x10, 0x9f, 0x82, - 0x13, 0xf2, 0x78, 0xe2, 0xc4, 0x49, 0xda, 0xcd, 0x22, 0x8e, 0x6f, 0x7e, 0x6f, 0xfc, 0xfb, 0xbd, - 0xdf, 0xbc, 0x37, 0x63, 0xa8, 0xb6, 0xa3, 0xbe, 0xa2, 0x2c, 0x8c, 0xdc, 0x84, 0xca, 0x2b, 0x16, - 0x50, 0x37, 0x24, 0x8a, 0xc4, 0x52, 0x5c, 0xf7, 0x9d, 0x58, 0x0a, 0x25, 0xf0, 0xc6, 0x20, 0xc3, - 0x31, 0x19, 0xd6, 0x76, 0x47, 0x88, 0x4e, 0x44, 0x5d, 0x12, 0x33, 0x97, 0x70, 0x2e, 0x14, 0x51, - 0x4c, 0xf0, 0x24, 0xcb, 0xb7, 0x76, 0x0c, 0xaa, 0xa3, 0xcb, 0x5e, 0xdb, 0x0d, 0x7b, 0x52, 0x27, - 0x18, 0x7c, 0x77, 0x1c, 0x57, 0xac, 0x4b, 0x13, 0x45, 0xba, 0xf1, 0xe0, 0x03, 0xb9, 0xa4, 0x40, - 0x48, 0xea, 0xb2, 0x90, 0x72, 0xc5, 0xda, 0x8c, 0x4a, 0x83, 0x6f, 0x17, 0xf1, 0x88, 0x29, 0x2a, - 0x49, 0x64, 0xe8, 0xed, 0x9f, 0x10, 0x6c, 0xd7, 0x24, 0x25, 0x8a, 0x5e, 0xc4, 0x91, 0x20, 0xe1, - 0xa9, 0x08, 0x34, 0xbb, 0x47, 0x93, 0x58, 0xf0, 0x84, 0xe2, 0xfb, 0x00, 0x09, 0xeb, 0x70, 0x1a, - 0xfa, 0x3d, 0x19, 0x55, 0x50, 0x15, 0xed, 0x95, 0xbd, 0x72, 0xb6, 0x72, 0x21, 0xa3, 0x14, 0xe6, - 0x44, 0xb1, 0x2b, 0xaa, 0xe1, 0x52, 0x06, 0x67, 0x2b, 0x29, 0xfc, 0x08, 0x80, 0x5e, 0xc7, 0x4c, - 0xd2, 0xc4, 0x27, 0xaa, 0x32, 0x5f, 0x45, 0x7b, 0xcb, 0x87, 0x96, 0x93, 0x95, 0xe4, 0x0c, 0x4a, - 0x72, 0x5a, 0x83, 0x92, 0xbc, 0xb2, 0xc9, 0x3e, 0x52, 0xf6, 0xef, 0x08, 0xb6, 0xa6, 0x2b, 0xfb, - 0xba, 0x47, 0x13, 0x85, 0x2b, 0x70, 0x27, 0x96, 0xe2, 0x2b, 0x1a, 0x28, 0xa3, 0x6a, 0x10, 0xe2, - 0x4d, 0x58, 0x0c, 0x45, 0x97, 0x30, 0x6e, 0xf4, 0x98, 0x08, 0x5b, 0xb0, 0xd4, 0x66, 0x11, 0xe5, - 0xa4, 0x4b, 0xb5, 0x94, 0xb2, 0x97, 0xc7, 0xf8, 0xe3, 0xa1, 0x50, 0xc6, 0x2b, 0x0b, 0x5a, 0xe8, - 0xbd, 0x09, 0xa1, 0x75, 0x73, 0x36, 0xb9, 0xce, 0x26, 0xc7, 0xbb, 0xb0, 0x1c, 0x08, 0xae, 0x28, - 0x57, 0x7e, 0x37, 0x7c, 0x58, 0x79, 0xad, 0x8a, 0xf6, 0x56, 0x3c, 0x30, 0x4b, 0xcf, 0xc2, 0x87, - 0xf6, 0xb7, 0x70, 0x3f, 0xab, 0xa3, 0x2e, 0xbe, 0xe1, 0xd3, 0x2a, 0x29, 0x7a, 0x88, 0xc6, 0x3d, - 0x2c, 0x4a, 0x2b, 0xcd, 0x2e, 0xed, 0x71, 0xa9, 0x82, 0xec, 0xef, 0x60, 0xe7, 0x26, 0xf6, 0xd9, - 0x4e, 0xb8, 0x78, 0x84, 0xa5, 0x57, 0x38, 0x42, 0xcd, 0xff, 0x0f, 0x82, 0x7b, 0x63, 0x02, 0x18, - 0x7f, 0x31, 0x28, 0xbd, 0x06, 0xab, 0x44, 0x2a, 0xd6, 0x26, 0x81, 0xf2, 0x55, 0x3f, 0xa6, 0x9a, - 0x7e, 0xed, 0x70, 0xc7, 0x19, 0x9f, 0x22, 0xe7, 0xc8, 0xa4, 0xb5, 0xfa, 0x31, 0xf5, 0x56, 0xc8, - 0x48, 0xf4, 0xdf, 0x0d, 0xc2, 0x2d, 0x78, 0x9d, 0x8b, 0x90, 0xfa, 0xf4, 0x9a, 0x06, 0xbd, 0x14, - 0xf4, 0x59, 0x68, 0xba, 0xf4, 0xed, 0xa1, 0x84, 0x74, 0x6e, 0x9c, 0x33, 0x11, 0xd2, 0xc6, 0x20, - 0xad, 0x99, 0x0f, 0xd9, 0xc9, 0x9c, 0xb7, 0xce, 0x8b, 0xd0, 0xf1, 0x12, 0x2c, 0x26, 0xa2, 0x27, - 0x03, 0x6a, 0xff, 0x81, 0xc0, 0x9a, 0x56, 0xbc, 0x71, 0xfe, 0xc1, 0x98, 0xf3, 0xf3, 0x7b, 0xe5, - 0xe3, 0x52, 0x05, 0x8d, 0xba, 0xff, 0xe9, 0xab, 0xb9, 0x9f, 0x6d, 0xcf, 0x4f, 0x00, 0x3f, 0x85, - 0xf5, 0x58, 0x52, 0x7f, 0xc8, 0x92, 0x98, 0xf2, 0x76, 0x27, 0x1d, 0x3e, 0x97, 0xf4, 0x79, 0xc6, - 0xeb, 0x9d, 0x26, 0xde, 0x6a, 0x9c, 0x87, 0x32, 0x4a, 0x6c, 0x06, 0xab, 0x05, 0x7c, 0xa2, 0x6b, - 0xe6, 0xff, 0xaf, 0xae, 0xb1, 0x0f, 0x60, 0xed, 0x29, 0x55, 0x75, 0xa2, 0xc8, 0xa0, 0x4b, 0xb6, - 0xa0, 0xac, 0xd5, 0x8e, 0x34, 0xe8, 0x92, 0x5e, 0xb8, 0x90, 0x91, 0xfd, 0x2b, 0x82, 0xf5, 0x3c, - 0xdf, 0x18, 0xfb, 0x09, 0x2c, 0x9b, 0x7b, 0xce, 0xef, 0x92, 0x58, 0x6f, 0x49, 0x5b, 0xa2, 0x78, - 0xa2, 0xa7, 0x59, 0xc6, 0x33, 0x12, 0x9f, 0xcc, 0x79, 0x10, 0xe5, 0x11, 0x6e, 0x4e, 0x9a, 0x56, - 0x9a, 0xc9, 0xb4, 0x93, 0xb9, 0x31, 0xdb, 0x8e, 0x17, 0x61, 0x21, 0x7d, 0x20, 0xf6, 0x6b, 0xb0, - 0x32, 0xda, 0xc0, 0x78, 0x0b, 0xde, 0x38, 0xf2, 0x5a, 0xcd, 0x27, 0x47, 0xb5, 0x96, 0xdf, 0xfa, - 0xfc, 0xbc, 0xe1, 0x5f, 0x9c, 0xd5, 0x1b, 0x4f, 0x9a, 0x67, 0x8d, 0xfa, 0xc6, 0x1c, 0xde, 0x04, - 0x5c, 0x04, 0xeb, 0x8d, 0xda, 0x67, 0x1b, 0xe8, 0xf0, 0xaf, 0x05, 0xd8, 0x48, 0xcb, 0x3c, 0x4f, - 0x9f, 0x9b, 0xe7, 0x99, 0x00, 0xfc, 0x0b, 0x82, 0xbb, 0xd3, 0xae, 0x49, 0x7c, 0x30, 0x29, 0xf6, - 0x96, 0xeb, 0xd4, 0x72, 0x66, 0x4d, 0xcf, 0x2c, 0xb6, 0xdf, 0xf9, 0xfe, 0xcf, 0xbf, 0x7f, 0x2c, - 0xbd, 0x69, 0xef, 0xe8, 0x77, 0xed, 0xea, 0x83, 0xe1, 0x43, 0xe8, 0xe6, 0x13, 0xdd, 0x93, 0xfc, - 0x31, 0xda, 0xc7, 0xbf, 0x21, 0xd8, 0x9c, 0x7e, 0x07, 0x61, 0xf7, 0x26, 0xd6, 0x1b, 0xee, 0x4a, - 0xeb, 0xfd, 0xd9, 0x37, 0x14, 0x84, 0x56, 0xf1, 0x4b, 0x84, 0xfe, 0x50, 0x42, 0xf8, 0x67, 0x04, - 0x78, 0x72, 0x5c, 0xf1, 0xbb, 0x2f, 0xe5, 0x1c, 0xde, 0x68, 0xd6, 0x7b, 0xb3, 0x25, 0x1b, 0x71, - 0xfb, 0x5a, 0xdc, 0x5b, 0xf6, 0xee, 0x2d, 0xe2, 0x22, 0xc6, 0x5f, 0xa4, 0x36, 0x86, 0x70, 0xc7, - 0xf4, 0x39, 0xae, 0x4e, 0x92, 0x14, 0x47, 0xc6, 0x7a, 0x70, 0x4b, 0x86, 0xe1, 0xbe, 0xab, 0xb9, - 0xd7, 0xf0, 0xca, 0x28, 0xf7, 0xf1, 0xa3, 0x2f, 0x3e, 0xea, 0x30, 0xf5, 0x65, 0xef, 0xd2, 0x09, - 0x44, 0xd7, 0xd5, 0x1f, 0x11, 0xb2, 0xe3, 0xe6, 0x3f, 0x11, 0x1d, 0xca, 0xdd, 0xf8, 0xf2, 0xa0, - 0x23, 0xdc, 0xf1, 0x5f, 0xa1, 0xcb, 0x45, 0x3d, 0xd7, 0x1f, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, - 0xd7, 0x01, 0x0d, 0xde, 0x25, 0x09, 0x00, 0x00, + 0x14, 0xcf, 0xa4, 0xa5, 0x6d, 0x5e, 0xff, 0x32, 0x5a, 0x95, 0xac, 0xdb, 0x6d, 0xb3, 0x06, 0xa1, + 0x52, 0xa8, 0x0d, 0x45, 0x2b, 0xd8, 0x15, 0x1c, 0xda, 0x24, 0xbb, 0x8d, 0xe8, 0x56, 0x95, 0x37, + 0x3d, 0xc0, 0xc5, 0x9a, 0xda, 0x93, 0x30, 0xac, 0x33, 0x63, 0xc6, 0x93, 0xd2, 0x48, 0x88, 0x03, + 0x27, 0xee, 0x1c, 0x38, 0x70, 0xe1, 0xc4, 0x47, 0x81, 0x0f, 0x80, 0xc4, 0x07, 0x40, 0x7c, 0x0a, + 0x4e, 0xc8, 0xf6, 0xd8, 0x89, 0x93, 0xb4, 0x9b, 0x22, 0x8e, 0xcf, 0xef, 0x67, 0xff, 0x7e, 0xef, + 0xf7, 0xde, 0xbc, 0x31, 0xd4, 0x3a, 0xc1, 0x40, 0x51, 0xe6, 0x07, 0x76, 0x44, 0xe5, 0x15, 0xf3, + 0xa8, 0xed, 0x13, 0x45, 0x42, 0x29, 0xae, 0x07, 0x56, 0x28, 0x85, 0x12, 0x78, 0x23, 0x43, 0x58, + 0x1a, 0x61, 0x6c, 0x77, 0x85, 0xe8, 0x06, 0xd4, 0x26, 0x21, 0xb3, 0x09, 0xe7, 0x42, 0x11, 0xc5, + 0x04, 0x8f, 0x52, 0xbc, 0xb1, 0xa3, 0xb3, 0x49, 0x74, 0xd9, 0xef, 0xd8, 0x7e, 0x5f, 0x26, 0x00, + 0x9d, 0xdf, 0x1d, 0xcf, 0x2b, 0xd6, 0xa3, 0x91, 0x22, 0xbd, 0x30, 0xfb, 0x40, 0x2e, 0xc9, 0x13, + 0x92, 0xda, 0xcc, 0xa7, 0x5c, 0xb1, 0x0e, 0xa3, 0x52, 0xe7, 0xb7, 0x8b, 0xf9, 0x80, 0x29, 0x2a, + 0x49, 0xa0, 0xe9, 0xcd, 0x9f, 0x10, 0x6c, 0xd7, 0x25, 0x25, 0x8a, 0x5e, 0x84, 0x81, 0x20, 0xfe, + 0xa9, 0xf0, 0x12, 0x76, 0x87, 0x46, 0xa1, 0xe0, 0x11, 0xc5, 0x0f, 0x00, 0x22, 0xd6, 0xe5, 0xd4, + 0x77, 0xfb, 0x32, 0xa8, 0xa2, 0x1a, 0xda, 0xab, 0x38, 0x95, 0xf4, 0xc9, 0x85, 0x0c, 0xe2, 0x34, + 0x27, 0x8a, 0x5d, 0xd1, 0x24, 0x5d, 0x4e, 0xd3, 0xe9, 0x93, 0x38, 0xfd, 0x18, 0x80, 0x5e, 0x87, + 0x4c, 0xd2, 0xc8, 0x25, 0xaa, 0x3a, 0x57, 0x43, 0x7b, 0xcb, 0x87, 0x86, 0x95, 0x96, 0x64, 0x65, + 0x25, 0x59, 0xed, 0xac, 0x24, 0xa7, 0xa2, 0xd1, 0x47, 0xca, 0xfc, 0x0d, 0xc1, 0xd6, 0x74, 0x65, + 0x5f, 0xf7, 0x69, 0xa4, 0x70, 0x15, 0x16, 0x43, 0x29, 0xbe, 0xa2, 0x9e, 0xd2, 0xaa, 0xb2, 0x10, + 0x6f, 0xc2, 0x82, 0x2f, 0x7a, 0x84, 0x71, 0xad, 0x47, 0x47, 0xd8, 0x80, 0xa5, 0x0e, 0x0b, 0x28, + 0x27, 0x3d, 0x9a, 0x48, 0xa9, 0x38, 0x79, 0x8c, 0x3f, 0x1e, 0x0a, 0x65, 0xbc, 0x3a, 0x9f, 0x08, + 0xbd, 0x3f, 0x21, 0xb4, 0xa1, 0x7b, 0x93, 0xeb, 0x6c, 0x71, 0xbc, 0x0b, 0xcb, 0x9e, 0xe0, 0x8a, + 0x72, 0xe5, 0xf6, 0xfc, 0x47, 0xd5, 0xd7, 0x6a, 0x68, 0x6f, 0xc5, 0x01, 0xfd, 0xe8, 0xb9, 0xff, + 0xc8, 0xfc, 0x16, 0x1e, 0xa4, 0x75, 0x34, 0xc4, 0x37, 0x7c, 0x5a, 0x25, 0x45, 0x0f, 0xd1, 0xb8, + 0x87, 0x45, 0x69, 0xe5, 0xd9, 0xa5, 0x3d, 0x29, 0x57, 0x91, 0xf9, 0x1d, 0xec, 0xdc, 0xc4, 0x3e, + 0x5b, 0x87, 0x8b, 0x2d, 0x2c, 0xdf, 0xa1, 0x85, 0x09, 0xff, 0x3f, 0x08, 0xee, 0x8f, 0x09, 0x60, + 0xfc, 0x65, 0x56, 0x7a, 0x1d, 0x56, 0x89, 0x54, 0xac, 0x43, 0x3c, 0xe5, 0xaa, 0x41, 0x48, 0x13, + 0xfa, 0xb5, 0xc3, 0x1d, 0x6b, 0xfc, 0x14, 0x59, 0x47, 0x1a, 0xd6, 0x1e, 0x84, 0xd4, 0x59, 0x21, + 0x23, 0xd1, 0x7f, 0x37, 0x08, 0xb7, 0xe1, 0x75, 0x2e, 0x7c, 0xea, 0xd2, 0x6b, 0xea, 0xf5, 0xe3, + 0xa4, 0xcb, 0x7c, 0x3d, 0xa5, 0x6f, 0x0f, 0x25, 0xc4, 0xe7, 0xc6, 0x3a, 0x13, 0x3e, 0x6d, 0x66, + 0xb0, 0x56, 0x7e, 0xc8, 0x4e, 0x4a, 0xce, 0x3a, 0x2f, 0xa6, 0x8e, 0x97, 0x60, 0x21, 0x12, 0x7d, + 0xe9, 0x51, 0xf3, 0x77, 0x04, 0xc6, 0xb4, 0xe2, 0xb5, 0xf3, 0x0f, 0xc7, 0x9c, 0x9f, 0xdb, 0xab, + 0x1c, 0x97, 0xab, 0x68, 0xd4, 0xfd, 0x4f, 0xef, 0xe6, 0x7e, 0xfa, 0x7a, 0xde, 0x01, 0xfc, 0x0c, + 0xd6, 0x43, 0x49, 0xdd, 0x21, 0x4b, 0xa4, 0xcb, 0xdb, 0x9d, 0x74, 0xf8, 0x5c, 0xd2, 0x17, 0x29, + 0xaf, 0x73, 0x1a, 0x39, 0xab, 0x61, 0x1e, 0xca, 0x20, 0x32, 0x19, 0xac, 0x16, 0xf2, 0x13, 0x53, + 0x33, 0xf7, 0x7f, 0x4d, 0x8d, 0x79, 0x00, 0x6b, 0xcf, 0xa8, 0x6a, 0x10, 0x45, 0xb2, 0x29, 0xd9, + 0x82, 0x4a, 0xa2, 0x76, 0x64, 0x40, 0x97, 0x92, 0x07, 0x17, 0x32, 0x30, 0xff, 0x44, 0xb0, 0x9e, + 0xe3, 0xb5, 0xb1, 0x9f, 0xc0, 0xb2, 0xde, 0x73, 0x6e, 0x8f, 0x84, 0xc9, 0x2b, 0xf1, 0x48, 0x14, + 0x3b, 0x7a, 0x9a, 0x22, 0x9e, 0x93, 0xf0, 0xa4, 0xe4, 0x40, 0x90, 0x47, 0xb8, 0x35, 0x69, 0x5a, + 0x79, 0x26, 0xd3, 0x4e, 0x4a, 0x63, 0xb6, 0xe1, 0x43, 0x58, 0xd4, 0x1f, 0xd6, 0xbe, 0x6f, 0x4e, + 0x17, 0x71, 0x52, 0x72, 0x32, 0xe0, 0xf1, 0x02, 0xcc, 0xc7, 0x97, 0xca, 0x7e, 0x1d, 0x56, 0x46, + 0x87, 0x1e, 0x6f, 0xc1, 0x1b, 0x47, 0x4e, 0xbb, 0xf5, 0xf4, 0xa8, 0xde, 0x76, 0xdb, 0x9f, 0x9f, + 0x37, 0xdd, 0x8b, 0xb3, 0x46, 0xf3, 0x69, 0xeb, 0xac, 0xd9, 0xd8, 0x28, 0xe1, 0x4d, 0xc0, 0xc5, + 0x64, 0xa3, 0x59, 0xff, 0x6c, 0x03, 0x1d, 0xfe, 0x35, 0x0f, 0x1b, 0xb1, 0x35, 0xe7, 0xf1, 0x15, + 0xf5, 0x22, 0x15, 0x8d, 0x7f, 0x41, 0x70, 0x6f, 0xda, 0x6a, 0xc5, 0x07, 0x93, 0x05, 0xde, 0xb2, + 0x82, 0x0d, 0x6b, 0x56, 0x78, 0xda, 0x16, 0xf3, 0x9d, 0xef, 0xff, 0xf8, 0xfb, 0xc7, 0xf2, 0x9b, + 0xe6, 0x4e, 0x72, 0x17, 0x5e, 0x7d, 0x30, 0xbc, 0x3c, 0xed, 0x7c, 0x0b, 0xf4, 0x25, 0x7f, 0x82, + 0xf6, 0xf1, 0xaf, 0x08, 0x36, 0xa7, 0xef, 0x2d, 0x6c, 0xdf, 0xc4, 0x7a, 0xc3, 0x7e, 0x35, 0xde, + 0x9f, 0xfd, 0x85, 0x82, 0xd0, 0x1a, 0x7e, 0x85, 0xd0, 0x1f, 0xca, 0x08, 0xff, 0x8c, 0x00, 0x4f, + 0x1e, 0x71, 0xfc, 0xee, 0x2b, 0x39, 0x87, 0x5b, 0xd0, 0x78, 0x6f, 0x36, 0xb0, 0x16, 0xb7, 0x9f, + 0x88, 0x7b, 0xcb, 0xdc, 0xbd, 0x45, 0x5c, 0xc0, 0xf8, 0xcb, 0xd8, 0x46, 0x1f, 0x16, 0xf5, 0xd9, + 0xc0, 0xb5, 0x49, 0x92, 0xe2, 0x31, 0x33, 0x1e, 0xde, 0x82, 0xd0, 0xdc, 0xf7, 0x12, 0xee, 0x35, + 0xbc, 0x32, 0xca, 0x7d, 0xfc, 0xf8, 0x8b, 0x8f, 0xba, 0x4c, 0x7d, 0xd9, 0xbf, 0xb4, 0x3c, 0xd1, + 0xb3, 0x93, 0x8f, 0x08, 0xd9, 0xb5, 0xf3, 0x1f, 0x8f, 0x2e, 0xe5, 0x76, 0x78, 0x79, 0xd0, 0x15, + 0xf6, 0xf8, 0xef, 0xd3, 0xe5, 0x42, 0xb2, 0x0b, 0x3e, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0x0e, + 0x26, 0x30, 0xb8, 0x59, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/flyteidl/gen/pb-go/flyteidl/service/dataproxy.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/dataproxy.swagger.json index e0177556d..3afff352e 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/dataproxy.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/dataproxy.swagger.json @@ -29,7 +29,7 @@ "parameters": [ { "name": "flyte_url", - "description": "A unique identifier in the form of flyte://\u003csomething\u003e that uniquely, for a given Flyte\nbackend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.).\ne.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input)\n flyte://v1/proj/development/execid/n2/i (for node execution input).", + "description": "A unique identifier in the form of flyte://\u003csomething\u003e that uniquely, for a given Flyte\nbackend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.).\ne.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input)\n flyte://v1/proj/development/execid/n2/i (for node execution input)\n flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node).", "in": "query", "required": false, "type": "string" @@ -754,6 +754,10 @@ "pre_signed_urls": { "$ref": "#/definitions/servicePreSignedURLs", "title": "Flyte deck html will be returned as a signed url users can download" + }, + "literal": { + "$ref": "#/definitions/coreLiteral", + "description": "Single literal will be returned. This is returned when the user/url requests a specific output or input\nby name. See the o3 example above." } } }, diff --git a/flyteidl/gen/pb-java/flyteidl/service/Dataproxy.java b/flyteidl/gen/pb-java/flyteidl/service/Dataproxy.java index a97f26777..0b9b5d853 100644 --- a/flyteidl/gen/pb-java/flyteidl/service/Dataproxy.java +++ b/flyteidl/gen/pb-java/flyteidl/service/Dataproxy.java @@ -7538,6 +7538,7 @@ public interface GetDataRequestOrBuilder extends * backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). * e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) * flyte://v1/proj/development/execid/n2/i (for node execution input) + * flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) * * * string flyte_url = 1; @@ -7549,6 +7550,7 @@ public interface GetDataRequestOrBuilder extends * backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). * e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) * flyte://v1/proj/development/execid/n2/i (for node execution input) + * flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) * * * string flyte_url = 1; @@ -7646,6 +7648,7 @@ private GetDataRequest( * backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). * e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) * flyte://v1/proj/development/execid/n2/i (for node execution input) + * flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) * * * string flyte_url = 1; @@ -7668,6 +7671,7 @@ public java.lang.String getFlyteUrl() { * backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). * e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) * flyte://v1/proj/development/execid/n2/i (for node execution input) + * flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) * * * string flyte_url = 1; @@ -7999,6 +8003,7 @@ public Builder mergeFrom( * backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). * e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) * flyte://v1/proj/development/execid/n2/i (for node execution input) + * flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) * * * string flyte_url = 1; @@ -8021,6 +8026,7 @@ public java.lang.String getFlyteUrl() { * backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). * e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) * flyte://v1/proj/development/execid/n2/i (for node execution input) + * flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) * * * string flyte_url = 1; @@ -8044,6 +8050,7 @@ public java.lang.String getFlyteUrl() { * backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). * e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) * flyte://v1/proj/development/execid/n2/i (for node execution input) + * flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) * * * string flyte_url = 1; @@ -8064,6 +8071,7 @@ public Builder setFlyteUrl( * backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). * e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) * flyte://v1/proj/development/execid/n2/i (for node execution input) + * flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) * * * string flyte_url = 1; @@ -8080,6 +8088,7 @@ public Builder clearFlyteUrl() { * backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). * e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) * flyte://v1/proj/development/execid/n2/i (for node execution input) + * flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) * * * string flyte_url = 1; @@ -8202,6 +8211,34 @@ public interface GetDataResponseOrBuilder extends */ flyteidl.service.Dataproxy.PreSignedURLsOrBuilder getPreSignedUrlsOrBuilder(); + /** + * 
+     * Single literal will be returned. This is returned when the user/url requests a specific output or input
+     * by name. See the o3 example above.
+     *
+ * + * .flyteidl.core.Literal literal = 3; + */ + boolean hasLiteral(); + /** + * 
+     * Single literal will be returned. This is returned when the user/url requests a specific output or input
+     * by name. See the o3 example above.
+     *
+ * + * .flyteidl.core.Literal literal = 3; + */ + flyteidl.core.Literals.Literal getLiteral(); + /** + * 
+     * Single literal will be returned. This is returned when the user/url requests a specific output or input
+     * by name. See the o3 example above.
+     *
+ * + * .flyteidl.core.Literal literal = 3; + */ + flyteidl.core.Literals.LiteralOrBuilder getLiteralOrBuilder(); + public flyteidl.service.Dataproxy.GetDataResponse.DataCase getDataCase(); } /** @@ -8271,6 +8308,20 @@ private GetDataResponse( dataCase_ = 2; break; } + case 26: { + flyteidl.core.Literals.Literal.Builder subBuilder = null; + if (dataCase_ == 3) { + subBuilder = ((flyteidl.core.Literals.Literal) data_).toBuilder(); + } + data_ = + input.readMessage(flyteidl.core.Literals.Literal.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((flyteidl.core.Literals.Literal) data_); + data_ = subBuilder.buildPartial(); + } + dataCase_ = 3; + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -8309,6 +8360,7 @@ public enum DataCase implements com.google.protobuf.Internal.EnumLite { LITERAL_MAP(1), PRE_SIGNED_URLS(2), + LITERAL(3), DATA_NOT_SET(0); private final int value; private DataCase(int value) { @@ -8326,6 +8378,7 @@ public static DataCase forNumber(int value) { switch (value) { case 1: return LITERAL_MAP; case 2: return PRE_SIGNED_URLS; + case 3: return LITERAL; case 0: return DATA_NOT_SET; default: return null; } @@ -8417,6 +8470,47 @@ public flyteidl.service.Dataproxy.PreSignedURLsOrBuilder getPreSignedUrlsOrBuild return flyteidl.service.Dataproxy.PreSignedURLs.getDefaultInstance(); } + public static final int LITERAL_FIELD_NUMBER = 3; + /** + * 
+     * Single literal will be returned. This is returned when the user/url requests a specific output or input
+     * by name. See the o3 example above.
+     *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public boolean hasLiteral() { + return dataCase_ == 3; + } + /** + * 
+     * Single literal will be returned. This is returned when the user/url requests a specific output or input
+     * by name. See the o3 example above.
+     *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public flyteidl.core.Literals.Literal getLiteral() { + if (dataCase_ == 3) { + return (flyteidl.core.Literals.Literal) data_; + } + return flyteidl.core.Literals.Literal.getDefaultInstance(); + } + /** + * 
+     * Single literal will be returned. This is returned when the user/url requests a specific output or input
+     * by name. See the o3 example above.
+     *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public flyteidl.core.Literals.LiteralOrBuilder getLiteralOrBuilder() { + if (dataCase_ == 3) { + return (flyteidl.core.Literals.Literal) data_; + } + return flyteidl.core.Literals.Literal.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -8437,6 +8531,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (dataCase_ == 2) { output.writeMessage(2, (flyteidl.service.Dataproxy.PreSignedURLs) data_); } + if (dataCase_ == 3) { + output.writeMessage(3, (flyteidl.core.Literals.Literal) data_); + } unknownFields.writeTo(output); } @@ -8454,6 +8551,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, (flyteidl.service.Dataproxy.PreSignedURLs) data_); } + if (dataCase_ == 3) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, (flyteidl.core.Literals.Literal) data_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -8479,6 +8580,10 @@ public boolean equals(final java.lang.Object obj) { if (!getPreSignedUrls() .equals(other.getPreSignedUrls())) return false; break; + case 3: + if (!getLiteral() + .equals(other.getLiteral())) return false; + break; case 0: default: } @@ -8502,6 +8607,10 @@ public int hashCode() { hash = (37 * hash) + PRE_SIGNED_URLS_FIELD_NUMBER; hash = (53 * hash) + getPreSignedUrls().hashCode(); break; + case 3: + hash = (37 * hash) + LITERAL_FIELD_NUMBER; + hash = (53 * hash) + getLiteral().hashCode(); + break; case 0: default: } @@ -8680,6 +8789,13 @@ public flyteidl.service.Dataproxy.GetDataResponse buildPartial() { result.data_ = preSignedUrlsBuilder_.build(); } } + if (dataCase_ == 3) { + if (literalBuilder_ == null) { + result.data_ = data_; + } else { + result.data_ = literalBuilder_.build(); + } + } result.dataCase_ = dataCase_; onBuilt(); return result; @@ -8738,6 +8854,10 @@ public Builder mergeFrom(flyteidl.service.Dataproxy.GetDataResponse other) { mergePreSignedUrls(other.getPreSignedUrls()); break; } + case LITERAL: { + mergeLiteral(other.getLiteral()); + break; + } case DATA_NOT_SET: { break; } @@ -9129,6 +9249,187 @@ public flyteidl.service.Dataproxy.PreSignedURLsOrBuilder getPreSignedUrlsOrBuild onChanged();; return preSignedUrlsBuilder_; } + + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Literals.Literal, flyteidl.core.Literals.Literal.Builder, flyteidl.core.Literals.LiteralOrBuilder> literalBuilder_; + /** + * 
+       * Single literal will be returned. This is returned when the user/url requests a specific output or input
+       * by name. See the o3 example above.
+       *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public boolean hasLiteral() { + return dataCase_ == 3; + } + /** + * 
+       * Single literal will be returned. This is returned when the user/url requests a specific output or input
+       * by name. See the o3 example above.
+       *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public flyteidl.core.Literals.Literal getLiteral() { + if (literalBuilder_ == null) { + if (dataCase_ == 3) { + return (flyteidl.core.Literals.Literal) data_; + } + return flyteidl.core.Literals.Literal.getDefaultInstance(); + } else { + if (dataCase_ == 3) { + return literalBuilder_.getMessage(); + } + return flyteidl.core.Literals.Literal.getDefaultInstance(); + } + } + /** + * 
+       * Single literal will be returned. This is returned when the user/url requests a specific output or input
+       * by name. See the o3 example above.
+       *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public Builder setLiteral(flyteidl.core.Literals.Literal value) { + if (literalBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + data_ = value; + onChanged(); + } else { + literalBuilder_.setMessage(value); + } + dataCase_ = 3; + return this; + } + /** + * 
+       * Single literal will be returned. This is returned when the user/url requests a specific output or input
+       * by name. See the o3 example above.
+       *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public Builder setLiteral( + flyteidl.core.Literals.Literal.Builder builderForValue) { + if (literalBuilder_ == null) { + data_ = builderForValue.build(); + onChanged(); + } else { + literalBuilder_.setMessage(builderForValue.build()); + } + dataCase_ = 3; + return this; + } + /** + * 
+       * Single literal will be returned. This is returned when the user/url requests a specific output or input
+       * by name. See the o3 example above.
+       *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public Builder mergeLiteral(flyteidl.core.Literals.Literal value) { + if (literalBuilder_ == null) { + if (dataCase_ == 3 && + data_ != flyteidl.core.Literals.Literal.getDefaultInstance()) { + data_ = flyteidl.core.Literals.Literal.newBuilder((flyteidl.core.Literals.Literal) data_) + .mergeFrom(value).buildPartial(); + } else { + data_ = value; + } + onChanged(); + } else { + if (dataCase_ == 3) { + literalBuilder_.mergeFrom(value); + } + literalBuilder_.setMessage(value); + } + dataCase_ = 3; + return this; + } + /** + * 
+       * Single literal will be returned. This is returned when the user/url requests a specific output or input
+       * by name. See the o3 example above.
+       *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public Builder clearLiteral() { + if (literalBuilder_ == null) { + if (dataCase_ == 3) { + dataCase_ = 0; + data_ = null; + onChanged(); + } + } else { + if (dataCase_ == 3) { + dataCase_ = 0; + data_ = null; + } + literalBuilder_.clear(); + } + return this; + } + /** + * 
+       * Single literal will be returned. This is returned when the user/url requests a specific output or input
+       * by name. See the o3 example above.
+       *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public flyteidl.core.Literals.Literal.Builder getLiteralBuilder() { + return getLiteralFieldBuilder().getBuilder(); + } + /** + * 
+       * Single literal will be returned. This is returned when the user/url requests a specific output or input
+       * by name. See the o3 example above.
+       *
+ * + * .flyteidl.core.Literal literal = 3; + */ + public flyteidl.core.Literals.LiteralOrBuilder getLiteralOrBuilder() { + if ((dataCase_ == 3) && (literalBuilder_ != null)) { + return literalBuilder_.getMessageOrBuilder(); + } else { + if (dataCase_ == 3) { + return (flyteidl.core.Literals.Literal) data_; + } + return flyteidl.core.Literals.Literal.getDefaultInstance(); + } + } + /** + * 
+       * Single literal will be returned. This is returned when the user/url requests a specific output or input
+       * by name. See the o3 example above.
+       *
+ * + * .flyteidl.core.Literal literal = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Literals.Literal, flyteidl.core.Literals.Literal.Builder, flyteidl.core.Literals.LiteralOrBuilder> + getLiteralFieldBuilder() { + if (literalBuilder_ == null) { + if (!(dataCase_ == 3)) { + data_ = flyteidl.core.Literals.Literal.getDefaultInstance(); + } + literalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.core.Literals.Literal, flyteidl.core.Literals.Literal.Builder, flyteidl.core.Literals.LiteralOrBuilder>( + (flyteidl.core.Literals.Literal) data_, + getParentForChildren(), + isClean()); + data_ = null; + } + dataCase_ = 3; + onChanged();; + return literalBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -9265,29 +9566,30 @@ public flyteidl.service.Dataproxy.GetDataResponse getDefaultInstanceForType() { "eidl.service.PreSignedURLs\"S\n\rPreSignedU" + "RLs\022\022\n\nsigned_url\030\001 \003(\t\022.\n\nexpires_at\030\002 " + "\001(\0132\032.google.protobuf.Timestamp\"#\n\016GetDa" + - "taRequest\022\021\n\tflyte_url\030\001 \001(\t\"\207\001\n\017GetData" + + "taRequest\022\021\n\tflyte_url\030\001 \001(\t\"\262\001\n\017GetData" + "Response\0220\n\013literal_map\030\001 \001(\0132\031.flyteidl" + ".core.LiteralMapH\000\022:\n\017pre_signed_urls\030\002 " + - "\001(\0132\037.flyteidl.service.PreSignedURLsH\000B\006" + - "\n\004data*C\n\014ArtifactType\022\033\n\027ARTIFACT_TYPE_" + - "UNDEFINED\020\000\022\026\n\022ARTIFACT_TYPE_DECK\020\0012\342\004\n\020" + - "DataProxyService\022\240\001\n\024CreateUploadLocatio" + - "n\022-.flyteidl.service.CreateUploadLocatio" + - "nRequest\032..flyteidl.service.CreateUpload" + - "LocationResponse\")\202\323\344\223\002#\"\036/api/v1/datapr" + - "oxy/artifact_urn:\001*\022\246\001\n\026CreateDownloadLo" + - "cation\022/.flyteidl.service.CreateDownload" + - "LocationRequest\0320.flyteidl.service.Creat" + - "eDownloadLocationResponse\")\210\002\001\202\323\344\223\002 \022\036/a" + - "pi/v1/dataproxy/artifact_urn\022\233\001\n\022CreateD" + - "ownloadLink\022+.flyteidl.service.CreateDow" + - "nloadLinkRequest\032,.flyteidl.service.Crea" + - "teDownloadLinkResponse\"*\202\323\344\223\002$\"\037/api/v1/" + - "dataproxy/artifact_link:\001*\022d\n\007GetData\022 ." + - "flyteidl.service.GetDataRequest\032!.flytei" + - "dl.service.GetDataResponse\"\024\202\323\344\223\002\016\022\014/api" + - "/v1/dataB9Z7github.com/flyteorg/flyteidl" + - "/gen/pb-go/flyteidl/serviceb\006proto3" + "\001(\0132\037.flyteidl.service.PreSignedURLsH\000\022)" + + "\n\007literal\030\003 \001(\0132\026.flyteidl.core.LiteralH" + + "\000B\006\n\004data*C\n\014ArtifactType\022\033\n\027ARTIFACT_TY" + + "PE_UNDEFINED\020\000\022\026\n\022ARTIFACT_TYPE_DECK\020\0012\342" + + "\004\n\020DataProxyService\022\240\001\n\024CreateUploadLoca" + + "tion\022-.flyteidl.service.CreateUploadLoca" + + "tionRequest\032..flyteidl.service.CreateUpl" + + "oadLocationResponse\")\202\323\344\223\002#\"\036/api/v1/dat" + + "aproxy/artifact_urn:\001*\022\246\001\n\026CreateDownloa" + + "dLocation\022/.flyteidl.service.CreateDownl" + + "oadLocationRequest\0320.flyteidl.service.Cr" + + "eateDownloadLocationResponse\")\210\002\001\202\323\344\223\002 \022" + + "\036/api/v1/dataproxy/artifact_urn\022\233\001\n\022Crea" + + "teDownloadLink\022+.flyteidl.service.Create" + + "DownloadLinkRequest\032,.flyteidl.service.C" + + "reateDownloadLinkResponse\"*\202\323\344\223\002$\"\037/api/" + + "v1/dataproxy/artifact_link:\001*\022d\n\007GetData" + + "\022 .flyteidl.service.GetDataRequest\032!.fly" + + "teidl.service.GetDataResponse\"\024\202\323\344\223\002\016\022\014/" + + "api/v1/dataB9Z7github.com/flyteorg/flyte" + + "idl/gen/pb-go/flyteidl/serviceb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -9359,7 +9661,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_service_GetDataResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_service_GetDataResponse_descriptor, - new java.lang.String[] { "LiteralMap", "PreSignedUrls", "Data", }); + new java.lang.String[] { "LiteralMap", "PreSignedUrls", "Literal", "Data", }); com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); registry.add(com.google.api.AnnotationsProto.http); diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 1ccfa80c2..267f944a5 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -19626,6 +19626,9 @@ export namespace flyteidl { /** GetDataResponse preSignedUrls */ preSignedUrls?: (flyteidl.service.IPreSignedURLs|null); + + /** GetDataResponse literal */ + literal?: (flyteidl.core.ILiteral|null); } /** Represents a GetDataResponse. */ @@ -19643,8 +19646,11 @@ export namespace flyteidl { /** GetDataResponse preSignedUrls. */ public preSignedUrls?: (flyteidl.service.IPreSignedURLs|null); + /** GetDataResponse literal. */ + public literal?: (flyteidl.core.ILiteral|null); + /** GetDataResponse data. */ - public data?: ("literalMap"|"preSignedUrls"); + public data?: ("literalMap"|"preSignedUrls"|"literal"); /** * Creates a new GetDataResponse instance using the specified properties. diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 8ba73b8db..e27728e44 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -45831,6 +45831,7 @@ * @interface IGetDataResponse * @property {flyteidl.core.ILiteralMap|null} [literalMap] GetDataResponse literalMap * @property {flyteidl.service.IPreSignedURLs|null} [preSignedUrls] GetDataResponse preSignedUrls + * @property {flyteidl.core.ILiteral|null} [literal] GetDataResponse literal */ /** @@ -45864,17 +45865,25 @@ */ GetDataResponse.prototype.preSignedUrls = null; + /** + * GetDataResponse literal. + * @member {flyteidl.core.ILiteral|null|undefined} literal + * @memberof flyteidl.service.GetDataResponse + * @instance + */ + GetDataResponse.prototype.literal = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * GetDataResponse data. - * @member {"literalMap"|"preSignedUrls"|undefined} data + * @member {"literalMap"|"preSignedUrls"|"literal"|undefined} data * @memberof flyteidl.service.GetDataResponse * @instance */ Object.defineProperty(GetDataResponse.prototype, "data", { - get: $util.oneOfGetter($oneOfFields = ["literalMap", "preSignedUrls"]), + get: $util.oneOfGetter($oneOfFields = ["literalMap", "preSignedUrls", "literal"]), set: $util.oneOfSetter($oneOfFields) }); @@ -45906,6 +45915,8 @@ $root.flyteidl.core.LiteralMap.encode(message.literalMap, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); if (message.preSignedUrls != null && message.hasOwnProperty("preSignedUrls")) $root.flyteidl.service.PreSignedURLs.encode(message.preSignedUrls, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.literal != null && message.hasOwnProperty("literal")) + $root.flyteidl.core.Literal.encode(message.literal, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; @@ -45933,6 +45944,9 @@ case 2: message.preSignedUrls = $root.flyteidl.service.PreSignedURLs.decode(reader, reader.uint32()); break; + case 3: + message.literal = $root.flyteidl.core.Literal.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -45971,6 +45985,16 @@ return "preSignedUrls." + error; } } + if (message.literal != null && message.hasOwnProperty("literal")) { + if (properties.data === 1) + return "data: multiple values"; + properties.data = 1; + { + var error = $root.flyteidl.core.Literal.verify(message.literal); + if (error) + return "literal." + error; + } + } return null; }; diff --git a/flyteidl/gen/pb_python/flyteidl/service/dataproxy_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/dataproxy_pb2.py index b33ed4d1c..6ab9391e6 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/dataproxy_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/service/dataproxy_pb2.py @@ -18,7 +18,7 @@ from flyteidl.core import literals_pb2 as flyteidl_dot_core_dot_literals__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n flyteidl/service/dataproxy.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/literals.proto\"\x97\x01\n\x1c\x43reateUploadLocationResponse\x12\x1d\n\nsigned_url\x18\x01 \x01(\tR\tsignedUrl\x12\x1d\n\nnative_url\x18\x02 \x01(\tR\tnativeUrl\x12\x39\n\nexpires_at\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\"\xc6\x01\n\x1b\x43reateUploadLocationRequest\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x16\n\x06\x64omain\x18\x02 \x01(\tR\x06\x64omain\x12\x1a\n\x08\x66ilename\x18\x03 \x01(\tR\x08\x66ilename\x12\x38\n\nexpires_in\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationR\texpiresIn\x12\x1f\n\x0b\x63ontent_md5\x18\x05 \x01(\x0cR\ncontentMd5\"|\n\x1d\x43reateDownloadLocationRequest\x12\x1d\n\nnative_url\x18\x01 \x01(\tR\tnativeUrl\x12\x38\n\nexpires_in\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\texpiresIn:\x02\x18\x01\"~\n\x1e\x43reateDownloadLocationResponse\x12\x1d\n\nsigned_url\x18\x01 \x01(\tR\tsignedUrl\x12\x39\n\nexpires_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt:\x02\x18\x01\"\xfa\x01\n\x19\x43reateDownloadLinkRequest\x12\x43\n\rartifact_type\x18\x01 \x01(\x0e\x32\x1e.flyteidl.service.ArtifactTypeR\x0c\x61rtifactType\x12\x38\n\nexpires_in\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\texpiresIn\x12T\n\x11node_execution_id\x18\x03 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierH\x00R\x0fnodeExecutionIdB\x08\n\x06source\"\xc7\x01\n\x1a\x43reateDownloadLinkResponse\x12!\n\nsigned_url\x18\x01 \x03(\tB\x02\x18\x01R\tsignedUrl\x12=\n\nexpires_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x02\x18\x01R\texpiresAt\x12G\n\x0fpre_signed_urls\x18\x03 \x01(\x0b\x32\x1f.flyteidl.service.PreSignedURLsR\rpreSignedUrls\"i\n\rPreSignedURLs\x12\x1d\n\nsigned_url\x18\x01 \x03(\tR\tsignedUrl\x12\x39\n\nexpires_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\"-\n\x0eGetDataRequest\x12\x1b\n\tflyte_url\x18\x01 \x01(\tR\x08\x66lyteUrl\"\xa2\x01\n\x0fGetDataResponse\x12<\n\x0bliteral_map\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapH\x00R\nliteralMap\x12I\n\x0fpre_signed_urls\x18\x02 \x01(\x0b\x32\x1f.flyteidl.service.PreSignedURLsH\x00R\rpreSignedUrlsB\x06\n\x04\x64\x61ta*C\n\x0c\x41rtifactType\x12\x1b\n\x17\x41RTIFACT_TYPE_UNDEFINED\x10\x00\x12\x16\n\x12\x41RTIFACT_TYPE_DECK\x10\x01\x32\xe2\x04\n\x10\x44\x61taProxyService\x12\xa0\x01\n\x14\x43reateUploadLocation\x12-.flyteidl.service.CreateUploadLocationRequest\x1a..flyteidl.service.CreateUploadLocationResponse\")\x82\xd3\xe4\x93\x02#:\x01*\"\x1e/api/v1/dataproxy/artifact_urn\x12\xa6\x01\n\x16\x43reateDownloadLocation\x12/.flyteidl.service.CreateDownloadLocationRequest\x1a\x30.flyteidl.service.CreateDownloadLocationResponse\")\x88\x02\x01\x82\xd3\xe4\x93\x02 \x12\x1e/api/v1/dataproxy/artifact_urn\x12\x9b\x01\n\x12\x43reateDownloadLink\x12+.flyteidl.service.CreateDownloadLinkRequest\x1a,.flyteidl.service.CreateDownloadLinkResponse\"*\x82\xd3\xe4\x93\x02$:\x01*\"\x1f/api/v1/dataproxy/artifact_link\x12\x64\n\x07GetData\x12 .flyteidl.service.GetDataRequest\x1a!.flyteidl.service.GetDataResponse\"\x14\x82\xd3\xe4\x93\x02\x0e\x12\x0c/api/v1/dataB\xc0\x01\n\x14\x63om.flyteidl.serviceB\x0e\x44\x61taproxyProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n flyteidl/service/dataproxy.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1c\x66lyteidl/core/literals.proto\"\x97\x01\n\x1c\x43reateUploadLocationResponse\x12\x1d\n\nsigned_url\x18\x01 \x01(\tR\tsignedUrl\x12\x1d\n\nnative_url\x18\x02 \x01(\tR\tnativeUrl\x12\x39\n\nexpires_at\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\"\xc6\x01\n\x1b\x43reateUploadLocationRequest\x12\x18\n\x07project\x18\x01 \x01(\tR\x07project\x12\x16\n\x06\x64omain\x18\x02 \x01(\tR\x06\x64omain\x12\x1a\n\x08\x66ilename\x18\x03 \x01(\tR\x08\x66ilename\x12\x38\n\nexpires_in\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationR\texpiresIn\x12\x1f\n\x0b\x63ontent_md5\x18\x05 \x01(\x0cR\ncontentMd5\"|\n\x1d\x43reateDownloadLocationRequest\x12\x1d\n\nnative_url\x18\x01 \x01(\tR\tnativeUrl\x12\x38\n\nexpires_in\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\texpiresIn:\x02\x18\x01\"~\n\x1e\x43reateDownloadLocationResponse\x12\x1d\n\nsigned_url\x18\x01 \x01(\tR\tsignedUrl\x12\x39\n\nexpires_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt:\x02\x18\x01\"\xfa\x01\n\x19\x43reateDownloadLinkRequest\x12\x43\n\rartifact_type\x18\x01 \x01(\x0e\x32\x1e.flyteidl.service.ArtifactTypeR\x0c\x61rtifactType\x12\x38\n\nexpires_in\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\texpiresIn\x12T\n\x11node_execution_id\x18\x03 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierH\x00R\x0fnodeExecutionIdB\x08\n\x06source\"\xc7\x01\n\x1a\x43reateDownloadLinkResponse\x12!\n\nsigned_url\x18\x01 \x03(\tB\x02\x18\x01R\tsignedUrl\x12=\n\nexpires_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x02\x18\x01R\texpiresAt\x12G\n\x0fpre_signed_urls\x18\x03 \x01(\x0b\x32\x1f.flyteidl.service.PreSignedURLsR\rpreSignedUrls\"i\n\rPreSignedURLs\x12\x1d\n\nsigned_url\x18\x01 \x03(\tR\tsignedUrl\x12\x39\n\nexpires_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\texpiresAt\"-\n\x0eGetDataRequest\x12\x1b\n\tflyte_url\x18\x01 \x01(\tR\x08\x66lyteUrl\"\xd6\x01\n\x0fGetDataResponse\x12<\n\x0bliteral_map\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapH\x00R\nliteralMap\x12I\n\x0fpre_signed_urls\x18\x02 \x01(\x0b\x32\x1f.flyteidl.service.PreSignedURLsH\x00R\rpreSignedUrls\x12\x32\n\x07literal\x18\x03 \x01(\x0b\x32\x16.flyteidl.core.LiteralH\x00R\x07literalB\x06\n\x04\x64\x61ta*C\n\x0c\x41rtifactType\x12\x1b\n\x17\x41RTIFACT_TYPE_UNDEFINED\x10\x00\x12\x16\n\x12\x41RTIFACT_TYPE_DECK\x10\x01\x32\xe2\x04\n\x10\x44\x61taProxyService\x12\xa0\x01\n\x14\x43reateUploadLocation\x12-.flyteidl.service.CreateUploadLocationRequest\x1a..flyteidl.service.CreateUploadLocationResponse\")\x82\xd3\xe4\x93\x02#:\x01*\"\x1e/api/v1/dataproxy/artifact_urn\x12\xa6\x01\n\x16\x43reateDownloadLocation\x12/.flyteidl.service.CreateDownloadLocationRequest\x1a\x30.flyteidl.service.CreateDownloadLocationResponse\")\x88\x02\x01\x82\xd3\xe4\x93\x02 \x12\x1e/api/v1/dataproxy/artifact_urn\x12\x9b\x01\n\x12\x43reateDownloadLink\x12+.flyteidl.service.CreateDownloadLinkRequest\x1a,.flyteidl.service.CreateDownloadLinkResponse\"*\x82\xd3\xe4\x93\x02$:\x01*\"\x1f/api/v1/dataproxy/artifact_link\x12\x64\n\x07GetData\x12 .flyteidl.service.GetDataRequest\x1a!.flyteidl.service.GetDataResponse\"\x14\x82\xd3\xe4\x93\x02\x0e\x12\x0c/api/v1/dataB\xc0\x01\n\x14\x63om.flyteidl.serviceB\x0e\x44\x61taproxyProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -43,8 +43,8 @@ _DATAPROXYSERVICE.methods_by_name['CreateDownloadLink']._serialized_options = b'\202\323\344\223\002$:\001*\"\037/api/v1/dataproxy/artifact_link' _DATAPROXYSERVICE.methods_by_name['GetData']._options = None _DATAPROXYSERVICE.methods_by_name['GetData']._serialized_options = b'\202\323\344\223\002\016\022\014/api/v1/data' - _globals['_ARTIFACTTYPE']._serialized_start=1594 - _globals['_ARTIFACTTYPE']._serialized_end=1661 + _globals['_ARTIFACTTYPE']._serialized_start=1646 + _globals['_ARTIFACTTYPE']._serialized_end=1713 _globals['_CREATEUPLOADLOCATIONRESPONSE']._serialized_start=212 _globals['_CREATEUPLOADLOCATIONRESPONSE']._serialized_end=363 _globals['_CREATEUPLOADLOCATIONREQUEST']._serialized_start=366 @@ -62,7 +62,7 @@ _globals['_GETDATAREQUEST']._serialized_start=1382 _globals['_GETDATAREQUEST']._serialized_end=1427 _globals['_GETDATARESPONSE']._serialized_start=1430 - _globals['_GETDATARESPONSE']._serialized_end=1592 - _globals['_DATAPROXYSERVICE']._serialized_start=1664 - _globals['_DATAPROXYSERVICE']._serialized_end=2274 + _globals['_GETDATARESPONSE']._serialized_end=1644 + _globals['_DATAPROXYSERVICE']._serialized_start=1716 + _globals['_DATAPROXYSERVICE']._serialized_end=2326 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/service/dataproxy_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/service/dataproxy_pb2.pyi index 869524be0..badf93316 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/dataproxy_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/service/dataproxy_pb2.pyi @@ -93,9 +93,11 @@ class GetDataRequest(_message.Message): def __init__(self, flyte_url: _Optional[str] = ...) -> None: ... class GetDataResponse(_message.Message): - __slots__ = ["literal_map", "pre_signed_urls"] + __slots__ = ["literal_map", "pre_signed_urls", "literal"] LITERAL_MAP_FIELD_NUMBER: _ClassVar[int] PRE_SIGNED_URLS_FIELD_NUMBER: _ClassVar[int] + LITERAL_FIELD_NUMBER: _ClassVar[int] literal_map: _literals_pb2.LiteralMap pre_signed_urls: PreSignedURLs - def __init__(self, literal_map: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., pre_signed_urls: _Optional[_Union[PreSignedURLs, _Mapping]] = ...) -> None: ... + literal: _literals_pb2.Literal + def __init__(self, literal_map: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., pre_signed_urls: _Optional[_Union[PreSignedURLs, _Mapping]] = ..., literal: _Optional[_Union[_literals_pb2.Literal, _Mapping]] = ...) -> None: ... diff --git a/flyteidl/gen/pb_rust/flyteidl.service.rs b/flyteidl/gen/pb_rust/flyteidl.service.rs index 0fee4ddf5..d7b7ee83a 100644 --- a/flyteidl/gen/pb_rust/flyteidl.service.rs +++ b/flyteidl/gen/pb_rust/flyteidl.service.rs @@ -197,13 +197,14 @@ pub struct GetDataRequest { /// backend, identifies a Flyte artifact (\[i\]nput, \[o\]utput, flyte \[d\]eck, etc.). /// e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) /// flyte://v1/proj/development/execid/n2/i (for node execution input) + /// flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) #[prost(string, tag="1")] pub flyte_url: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct GetDataResponse { - #[prost(oneof="get_data_response::Data", tags="1, 2")] + #[prost(oneof="get_data_response::Data", tags="1, 2, 3")] pub data: ::core::option::Option, } /// Nested message and enum types in `GetDataResponse`. @@ -217,6 +218,10 @@ pub mod get_data_response { /// Flyte deck html will be returned as a signed url users can download #[prost(message, tag="2")] PreSignedUrls(super::PreSignedUrLs), + /// Single literal will be returned. This is returned when the user/url requests a specific output or input + /// by name. See the o3 example above. + #[prost(message, tag="3")] + Literal(super::super::core::Literal), } } /// ArtifactType diff --git a/flyteidl/protos/flyteidl/service/dataproxy.proto b/flyteidl/protos/flyteidl/service/dataproxy.proto index 1c9dc27bb..eac82aa5a 100644 --- a/flyteidl/protos/flyteidl/service/dataproxy.proto +++ b/flyteidl/protos/flyteidl/service/dataproxy.proto @@ -122,16 +122,21 @@ message GetDataRequest { // backend, identifies a Flyte artifact ([i]nput, [o]utput, flyte [d]eck, etc.). // e.g. flyte://v1/proj/development/execid/n2/0/i (for 0th task execution attempt input) // flyte://v1/proj/development/execid/n2/i (for node execution input) + // flyte://v1/proj/development/execid/n2/o/o3 (the o3 output of the second node) string flyte_url = 1; } message GetDataResponse { oneof data { // literal map data will be returned - core.LiteralMap literal_map = 1; + core.LiteralMap literal_map = 1; // Flyte deck html will be returned as a signed url users can download PreSignedURLs pre_signed_urls = 2; + + // Single literal will be returned. This is returned when the user/url requests a specific output or input + // by name. See the o3 example above. + core.Literal literal = 3; } }