Skip to content

Commit 05a7d83

Browse files
authored
Bump neptune-api to latest neptune@main (#97)
1 parent 812100a commit 05a7d83

File tree

25 files changed

+1649
-48
lines changed

25 files changed

+1649
-48
lines changed
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
syntax = "proto3";
2+
3+
package neptune.api.v1.model;
4+
5+
option java_multiple_files = true;
6+
option java_package = "ml.neptune.leaderboard.api.model.proto.generated";
7+
8+
message ProtoGetTimeseriesBucketsRequest {
9+
repeated ProtoCustomExpression expressions = 1;
10+
ProtoView view = 2;
11+
}
12+
13+
// Custom metric configuration
14+
message ProtoCustomExpression {
15+
string requestId = 1; // needs to be unique in the whole ProtoGetTimeseriesBucketsRequest
16+
string runId = 2;
17+
string customYFormula = 3;
18+
optional bool includePreview = 4;
19+
ProtoLineage lineage = 5;
20+
LineageEntityType entityType = 6;
21+
}
22+
23+
// View configuration
24+
message ProtoView {
25+
optional double from = 1;
26+
optional double to = 2;
27+
optional ProtoPointFilters pointFilters = 3;
28+
int32 maxBuckets = 4;
29+
ProtoScale xScale = 5;
30+
ProtoScale yScale = 6;
31+
ProtoXAxis xAxis = 7;
32+
}
33+
34+
// Point filters
35+
message ProtoPointFilters {
36+
optional ProtoOpenRange stepRange = 1;
37+
}
38+
39+
message ProtoOpenRange {
40+
optional double from = 1;
41+
optional double to = 2;
42+
}
43+
44+
message ProtoXAxis {
45+
oneof value {
46+
XSteps steps = 1;
47+
XEpochMillis epochMillis = 2;
48+
XRelativeTime relativeTime =3;
49+
XCustom custom = 4;
50+
}
51+
}
52+
message XSteps {}
53+
message XEpochMillis {}
54+
message XRelativeTime {}
55+
message XCustom {
56+
string expression = 1;
57+
}
58+
59+
enum ProtoScale {
60+
linear = 0;
61+
log = 1;
62+
}
63+
64+
// Enum for lineage types
65+
enum ProtoLineage {
66+
FULL = 0;
67+
ONLY_OWNED = 1;
68+
}
69+
70+
enum LineageEntityType {
71+
EXPERIMENT = 0;
72+
RUN = 1;
73+
}

codegen/proto/neptune_pb/api/v1/model/series_values.proto

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,31 @@ message ProtoFileRef {
7777
int64 sizeBytes = 2;
7878
string mimeType = 3;
7979
}
80+
81+
message ProtoTimeseriesBucketsDTO {
82+
repeated TimeseriesBuckets entries = 1;
83+
}
84+
message TimeseriesBuckets {
85+
string requestId = 1;
86+
repeated TimeseriesBucket bucket = 2;
87+
}
88+
89+
message TimeseriesBucket {
90+
int64 index = 1;
91+
double fromX = 2;
92+
double toX = 3;
93+
optional FinitePoint first = 4;
94+
optional FinitePoint last = 5;
95+
optional double localMin = 6;
96+
optional double localMax = 7;
97+
int64 finitePointCount = 8;
98+
int64 nanCount = 9;
99+
int64 positiveInfCount = 10;
100+
int64 negativeInfCount = 11;
101+
optional double localSum = 12;
102+
}
103+
104+
message FinitePoint {
105+
double x = 1;
106+
double y = 2;
107+
}

codegen/proto/neptune_pb/ingest/v1/pub/client.proto

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ option java_package = "ml.neptune.client.api.models";
77
option java_outer_classname = "ClientIngestProto";
88

99
import "neptune_pb/ingest/v1/pub/request_status.proto";
10+
import "neptune_pb/ingest/v1/ingest.proto";
1011

1112

1213
message RequestId {
@@ -38,3 +39,22 @@ message BulkStatusCheck {
3839
string project = 2;
3940
repeated RequestId ids = 1; // wire-compatibility with RequestIdList
4041
}
42+
43+
message BulkCheckDetail {
44+
string project = 1;
45+
repeated RequestId ids = 2;
46+
optional string next_cursor = 3;
47+
optional int32 limit = 4;
48+
}
49+
50+
message IngestResultDetail {
51+
RequestId request_id = 1;
52+
string path = 2;
53+
IngestCode ingest_code = 3;
54+
string error_detail = 4;
55+
}
56+
57+
message BulkIngestResultDetail {
58+
repeated IngestResultDetail details = 1;
59+
string next_cursor = 2;
60+
}

codegen/proto/neptune_pb/ingest/v1/pub/request_status.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import "neptune_pb/ingest/v1/ingest.proto";
1111

1212
message RequestStatus {
1313
repeated CodeByCount code_by_count = 1;
14+
optional string shared_error_message = 2; // in case error spans all operations of request
15+
1416

1517
// in case all operations are successful {"OK": 1}, otherwise errors are reported
1618
message CodeByCount {

codegen/redocly.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ apis:
2020
queryAttributeDefinitionsWithinProject,
2121
queryAttributesWithinProjectProto,
2222
searchLeaderboardEntriesProto,
23+
getTimeseriesBucketsProto,
2324
]
2425
storage:
2526
root: tmp/storage.json

codegen/swagger/retrieval.json

Lines changed: 126 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,13 @@
649649
"required" : false,
650650
"type" : "string",
651651
"enum" : [ "FULL", "NONE" ]
652+
}, {
653+
"name" : "lineageEntityType",
654+
"in" : "query",
655+
"description" : "lineageEntityType",
656+
"required" : false,
657+
"type" : "string",
658+
"enum" : [ "RUN", "EXPERIMENT" ]
652659
}, {
653660
"name" : "skipToStep",
654661
"in" : "query",
@@ -3241,6 +3248,13 @@
32413248
"required" : false,
32423249
"type" : "string",
32433250
"enum" : [ "FULL", "NONE" ]
3251+
}, {
3252+
"name" : "lineageEntityType",
3253+
"in" : "query",
3254+
"description" : "lineageEntityType",
3255+
"required" : false,
3256+
"type" : "string",
3257+
"enum" : [ "RUN", "EXPERIMENT" ]
32443258
}, {
32453259
"name" : "skipToStep",
32463260
"in" : "query",
@@ -3338,6 +3352,62 @@
33383352
"deprecated" : false
33393353
}
33403354
},
3355+
"/api/leaderboard/v1/proto/attributes/timeseries/buckets" : {
3356+
"post" : {
3357+
"summary" : "Get bucketed timeseries data",
3358+
"operationId" : "getTimeseriesBucketsProto",
3359+
"consumes" : [ "application/json", "application/x-protobuf" ],
3360+
"produces" : [ "application/json", "application/x-protobuf" ],
3361+
"parameters" : [ {
3362+
"name" : "X-Neptune-Client-Metadata",
3363+
"in" : "header",
3364+
"description" : "Custom metadata header for Neptune client information (max 200 characters)",
3365+
"required" : false,
3366+
"type" : "string"
3367+
}, {
3368+
"in" : "body",
3369+
"name" : "request",
3370+
"description" : "request",
3371+
"required" : true,
3372+
"schema" : {
3373+
"$ref" : "#/definitions/ProtoGetTimeseriesBucketsRequest"
3374+
}
3375+
} ],
3376+
"responses" : {
3377+
"200" : {
3378+
"description" : "OK",
3379+
"schema" : {
3380+
"$ref" : "#/definitions/ProtoTimeseriesBucketsDTO"
3381+
}
3382+
},
3383+
"400" : {
3384+
"description" : "Bad Request"
3385+
},
3386+
"401" : {
3387+
"description" : "Unauthorized"
3388+
},
3389+
"403" : {
3390+
"description" : "Forbidden"
3391+
},
3392+
"404" : {
3393+
"description" : "Not Found"
3394+
},
3395+
"408" : {
3396+
"description" : "Request Timeout"
3397+
},
3398+
"409" : {
3399+
"description" : "Conflict"
3400+
},
3401+
"422" : {
3402+
"description" : "Unprocessable Entity"
3403+
},
3404+
"429" : {
3405+
"description" : "Too Many Requests"
3406+
}
3407+
},
3408+
"deprecated" : false
3409+
}
3410+
},
33413411
"/api/leaderboard/v1/proto/leaderboard/attributes/query" : {
33423412
"post" : {
33433413
"summary" : "Queries attributes",
@@ -5322,6 +5392,10 @@
53225392
"DashboardConfigDTO" : {
53235393
"type" : "object",
53245394
"properties" : {
5395+
"defaultStep" : {
5396+
"type" : "number",
5397+
"format" : "double"
5398+
},
53255399
"metricsStepsRange" : {
53265400
"$ref" : "#/definitions/OpenRangeDTO"
53275401
},
@@ -5344,6 +5418,9 @@
53445418
"type" : "string",
53455419
"enum" : [ "causal", "centered", "ema", "gaussian" ]
53465420
},
5421+
"snapToClosestLoggedStep" : {
5422+
"type" : "boolean"
5423+
},
53475424
"xaxisMetric" : {
53485425
"$ref" : "#/definitions/AttributeDefinitionDTO"
53495426
},
@@ -7077,6 +7154,10 @@
70777154
"type" : "object",
70787155
"title" : "ProtoFloatSeriesValuesResponseDTO"
70797156
},
7157+
"ProtoGetTimeseriesBucketsRequest" : {
7158+
"type" : "object",
7159+
"title" : "ProtoGetTimeseriesBucketsRequest"
7160+
},
70807161
"ProtoLeaderboardEntriesSearchResultDTO" : {
70817162
"type" : "object",
70827163
"title" : "ProtoLeaderboardEntriesSearchResultDTO"
@@ -7089,6 +7170,10 @@
70897170
"type" : "object",
70907171
"title" : "ProtoSeriesValuesResponseDTO"
70917172
},
7173+
"ProtoTimeseriesBucketsDTO" : {
7174+
"type" : "object",
7175+
"title" : "ProtoTimeseriesBucketsDTO"
7176+
},
70927177
"QueryAttributeDefinitionsBodyDTO" : {
70937178
"type" : "object",
70947179
"properties" : {
@@ -7450,6 +7535,21 @@
74507535
},
74517536
"title" : "QueryLeaderboardParamsSortingParamsDTO"
74527537
},
7538+
"RangeDTO" : {
7539+
"type" : "object",
7540+
"required" : [ "from", "to" ],
7541+
"properties" : {
7542+
"from" : {
7543+
"type" : "number",
7544+
"format" : "double"
7545+
},
7546+
"to" : {
7547+
"type" : "number",
7548+
"format" : "double"
7549+
}
7550+
},
7551+
"title" : "RangeDTO"
7552+
},
74537553
"RelativeTimestamp" : {
74547554
"type" : "object",
74557555
"title" : "RelativeTimestamp"
@@ -8117,6 +8217,12 @@
81178217
"items" : {
81188218
"$ref" : "#/definitions/Point"
81198219
}
8220+
},
8221+
"xrange" : {
8222+
"$ref" : "#/definitions/RangeDTO"
8223+
},
8224+
"yrange" : {
8225+
"$ref" : "#/definitions/RangeDTO"
81208226
}
81218227
},
81228228
"title" : "SingleCustomTimeSeriesView"
@@ -8187,13 +8293,19 @@
81878293
"items" : {
81888294
"$ref" : "#/definitions/Point"
81898295
}
8296+
},
8297+
"xrange" : {
8298+
"$ref" : "#/definitions/RangeDTO"
8299+
},
8300+
"yrange" : {
8301+
"$ref" : "#/definitions/RangeDTO"
81908302
}
81918303
},
81928304
"title" : "SingleTimeSeriesView"
81938305
},
81948306
"SingleTimeSeriesViewBucket" : {
81958307
"type" : "object",
8196-
"required" : [ "bucketNo", "count", "maxY", "minY", "sum" ],
8308+
"required" : [ "bucketNo", "count", "maxY", "minY", "nanCount", "negativeInfCount", "positiveInfCount", "sum" ],
81978309
"properties" : {
81988310
"bucketNo" : {
81998311
"type" : "integer",
@@ -8211,6 +8323,18 @@
82118323
"type" : "number",
82128324
"format" : "double"
82138325
},
8326+
"nanCount" : {
8327+
"type" : "integer",
8328+
"format" : "int64"
8329+
},
8330+
"negativeInfCount" : {
8331+
"type" : "integer",
8332+
"format" : "int64"
8333+
},
8334+
"positiveInfCount" : {
8335+
"type" : "integer",
8336+
"format" : "int64"
8337+
},
82148338
"sum" : {
82158339
"type" : "number",
82168340
"format" : "double"
@@ -8812,7 +8936,7 @@
88128936
},
88138937
"type" : {
88148938
"type" : "string",
8815-
"enum" : [ "chart", "valueList", "file", "fileSet", "image", "imageComparison", "interactiveTable", "gallery", "notebook", "scatterPlot", "singleValue", "table", "textNode", "section", "histogram", "fileSeries" ]
8939+
"enum" : [ "chart", "valueList", "file", "fileSet", "image", "imageComparison", "interactiveTable", "gallery", "notebook", "scatterPlot", "singleValue", "table", "textNode", "section", "dynamicSection", "histogram", "fileSeries" ]
88168940
}
88178941
},
88188942
"title" : "WidgetDTO"

0 commit comments

Comments
 (0)