From df64e9e521eabd75255950d4e6ab95b878a39f79 Mon Sep 17 00:00:00 2001 From: AmanuelAaron Date: Mon, 29 Jul 2024 13:16:36 -0400 Subject: [PATCH 1/3] fix: change external_run_id to string type in FlatRun proto --- harness/determined/common/api/bindings.py | 4 ++-- proto/pkg/runv1/run.pb.go | 8 ++++---- proto/src/determined/run/v1/run.proto | 2 +- webui/react/src/services/api-ts-sdk/api.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/harness/determined/common/api/bindings.py b/harness/determined/common/api/bindings.py index 94c81b1e1dc..7785c9d0dd9 100644 --- a/harness/determined/common/api/bindings.py +++ b/harness/determined/common/api/bindings.py @@ -4343,7 +4343,7 @@ class v1FlatRun(Printable): duration: "typing.Optional[int]" = None endTime: "typing.Optional[str]" = None experiment: "typing.Optional[v1FlatRunExperiment]" = None - externalRunId: "typing.Optional[int]" = None + externalRunId: "typing.Optional[str]" = None hyperparameters: "typing.Optional[typing.Dict[str, typing.Any]]" = None labels: "typing.Optional[typing.Sequence[str]]" = None localId: "typing.Optional[str]" = None @@ -4369,7 +4369,7 @@ def __init__( duration: "typing.Union[int, None, Unset]" = _unset, endTime: "typing.Union[str, None, Unset]" = _unset, experiment: "typing.Union[v1FlatRunExperiment, None, Unset]" = _unset, - externalRunId: "typing.Union[int, None, Unset]" = _unset, + externalRunId: "typing.Union[str, None, Unset]" = _unset, hyperparameters: "typing.Union[typing.Dict[str, typing.Any], None, Unset]" = _unset, labels: "typing.Union[typing.Sequence[str], None, Unset]" = _unset, localId: "typing.Union[str, None, Unset]" = _unset, diff --git a/proto/pkg/runv1/run.pb.go b/proto/pkg/runv1/run.pb.go index 1d7417555c2..7523a2c38d4 100644 --- a/proto/pkg/runv1/run.pb.go +++ b/proto/pkg/runv1/run.pb.go @@ -194,7 +194,7 @@ type FlatRun struct { // Signed searcher metrics value. SearcherMetricValue *float64 `protobuf:"fixed64,8,opt,name=searcher_metric_value,json=searcherMetricValue,proto3,oneof" json:"searcher_metric_value,omitempty"` // The id of external run - ExternalRunId *int32 `protobuf:"varint,9,opt,name=external_run_id,json=externalRunId,proto3,oneof" json:"external_run_id,omitempty"` + ExternalRunId *string `protobuf:"bytes,9,opt,name=external_run_id,json=externalRunId,proto3,oneof" json:"external_run_id,omitempty"` // Trial hyperparameters. Hyperparameters *_struct.Struct `protobuf:"bytes,10,opt,name=hyperparameters,proto3,oneof" json:"hyperparameters,omitempty"` // summary metrics. @@ -314,11 +314,11 @@ func (x *FlatRun) GetSearcherMetricValue() float64 { return 0 } -func (x *FlatRun) GetExternalRunId() int32 { +func (x *FlatRun) GetExternalRunId() string { if x != nil && x.ExternalRunId != nil { return *x.ExternalRunId } - return 0 + return "" } func (x *FlatRun) GetHyperparameters() *_struct.Struct { @@ -492,7 +492,7 @@ var file_determined_run_v1_run_proto_rawDesc = []byte{ 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x13, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x0f, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x5f, 0x72, 0x75, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, + 0x5f, 0x72, 0x75, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0d, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x75, 0x6e, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x46, 0x0a, 0x0f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, diff --git a/proto/src/determined/run/v1/run.proto b/proto/src/determined/run/v1/run.proto index cb4329b4d40..1823931fc04 100644 --- a/proto/src/determined/run/v1/run.proto +++ b/proto/src/determined/run/v1/run.proto @@ -89,7 +89,7 @@ message FlatRun { // Signed searcher metrics value. optional double searcher_metric_value = 8; // The id of external run - optional int32 external_run_id = 9; + optional string external_run_id = 9; // Trial hyperparameters. optional google.protobuf.Struct hyperparameters = 10; // summary metrics. diff --git a/webui/react/src/services/api-ts-sdk/api.ts b/webui/react/src/services/api-ts-sdk/api.ts index 9e78ef4a122..277d3f43ea8 100644 --- a/webui/react/src/services/api-ts-sdk/api.ts +++ b/webui/react/src/services/api-ts-sdk/api.ts @@ -3501,10 +3501,10 @@ export interface V1FlatRun { searcherMetricValue?: number; /** * The id of external run - * @type {number} + * @type {string} * @memberof V1FlatRun */ - externalRunId?: number; + externalRunId?: string; /** * Trial hyperparameters. * @type {any} From c9e0d2ba34d18ef011e5edfce00de7d876040eaa Mon Sep 17 00:00:00 2001 From: AmanuelAaron Date: Mon, 29 Jul 2024 13:47:01 -0400 Subject: [PATCH 2/3] update flatrun type --- webui/react/src/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webui/react/src/types.ts b/webui/react/src/types.ts index e0bd114ce62..dd3796d4481 100644 --- a/webui/react/src/types.ts +++ b/webui/react/src/types.ts @@ -1279,7 +1279,7 @@ export interface FlatRun { checkpointSize: number; checkpointCount: number; searcherMetricValue?: number; - externalRunId?: number; + externalRunId?: string; hyperparameters?: TrialHyperparameters; summaryMetrics?: SummaryMetrics; userId?: number; From 01b79e91d4ef600001a504f223be830c83592aa6 Mon Sep 17 00:00:00 2001 From: AmanuelAaron Date: Mon, 29 Jul 2024 14:24:57 -0400 Subject: [PATCH 3/3] lint --- proto/buf.image.bin | Bin 631621 -> 631624 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/proto/buf.image.bin b/proto/buf.image.bin index b1b679005701a09a55fa932dfa2d80421ba60cc3..dd28f8476011939e2db3ed20121215531f8d8471 100644 GIT binary patch delta 3010 zcmYM$S!`5Q7{GDwozvU717XVW9l)|!N+~-UDh3Uq0gYnxQJ>&JR1)J0h`jl5iB`ah z7zpicSz9eG6vJxAr4TAmK&y~qC=pZCigw?amTs|r-#H&&ANp|q`O@?2xwmKLQf=;) z+T5)LPJvqxDNtw9I@=sS+0~YIX1tRdRt%&qn=vsqK9;5&H|iuJYZJ2`tRlF|nX|or zAPs-KWdA_=)qH0td475H`G|8d8Cww@x8FG)PHu>9a`MCN4bev;k7Q?tf4&@@6kGiE zhV`3Yd*dl*LGnUFv?s%D*Wp{o)APf!T-Q(j*Bl-1IPJ-Ct} z%-m5>$Hak!9Ng9$M>{%BqT}1}ozQCaS)=0=#Fwz6ogAk@eJu_w z*1^>}%v=?yZ^VIx9Ng9zM+Z8p(Qz?cSK>bxRF642$WcA!=y1?+cFfU1j&q>Sivx>w zaJ3FIR|D#TIIxg|Tefj@qT@0;u7x?J{;c3Kc$xh7caq~WOnXAs=(qy$g?t{JE5*EI!;^O@62oIX$k!ogxWTrJ1U4T2gL4i@5Yn_)QjkTZ(MvOQdPz@HwB zf;WL3_sB5{@tLwl$0*Eyk{$QRu~n=0^n;5Yi*<0d4l`Gv)i#{77d;koaI?pfLPw!i z?jAjMEMAbJtG-Z+DMhA2Ev6KmO`#T3icBABwM$G`tcj~NnYoX(+ASt5Wa2j8oJ}8H z^+nn}7#=?8&kKsQJfl8x6lr-zedH+8@{Ib(QLI&|IIvg;SL-ly`?NYB4lLy0mSr6M z$SBiM_X{1#jAyM1yASyg^wZIlX>TGwo_->g=|qmKkyNH1UCocHpGf6eRR{@-C2_SR zGj~L*&xM4ANZjl#cb|@?QoEG1df^Io43HzK z)pz2+VjWzq!_0lJ)md?1AqTf-jAIZTHR!k+zF6iz9n_4yDud*x8GBU*=~by2dsPO> z@q<>E#DT>+xLSvqtJUg?IIxg|o4xgi&{2nu8(~H{-uiXg1OEGm$Wf>D0$HP@PA_|b z&tr%jKWlYO99XP_t96*U>sr-|0}DC0+1qv)9XHW&Cp=S*x9v?WpFYFnxT)pSXPC~T zLCdGlFgb2%bz2-*tb?m{n7QAzY7_?+a&X&Vp34Y2n$Xb}uKmP+J!sPMt#O1LO4>QRAERLZ4_DFzxb#ZXauzu((b*V=or>O&v)pVjW~?3vD-OV!yI zsg7CVAX&9C`c%X@pN!>3CzLqH!YOspjZSX3tu8tzGBYtfy!~u+a_Z7I z^Ve^B`PF1~U9>CRZPDQy$5ZpdvTWB+I!)1uj?xwdKR8wB@lBY)wwW+W~G-_}m`{yV1G0`J)cX)$$bY`cQ3-D+s9nOqVi{a5!_4gl^^q{J5QE!8hS7|S5L~w` zoUqr=2}1B@@V?FD2w~<*S)*eg#Fwz6nHG*626_@f>!vkmFNOUx)*Xb#S!~GxsH^qvF6q4sPp> zqZJ($==dglEA(FsD!`k?`?iv!0%qsR8XYGfzKk8MeB9JS`SL-ly?`X9Z=j@Xn3pu#iv*|@fp;qp0 z{r|J+rL!s2V(KMRp%zmwolT(@Q!km`(`u)fuvimUYcg{mXthgBSjfa}kvW^b1fq(x zyI)79XJoF>ATI~}T7VF|_U1qLW zs}gZxAs4qylabU3y zuGV4Zj%f9nIIxg|n|yeM