Merge branch 'main' into grtlr/remove-temp

Cargo.lock

@@ -5316,9 +5316,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.13.3"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
+checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -5347,9 +5347,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.13.3"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
+checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -5360,9 +5360,9 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.13.3"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670"
+checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
 dependencies = [
  "prost",
 ]
@@ -6354,6 +6354,7 @@ version = "0.23.0-alpha.1+dev"
 dependencies = [
  "arrow",
  "prost",
+ "prost-types",
  "re_build_info",
  "re_byte_size",
  "re_log_types",

Cargo.toml

@@ -249,6 +249,7 @@ proc-macro2 = { version = "1.0", default-features = false }
 profiling = { version = "1.0.12", default-features = false }
 prost = "0.13.3"
 prost-build = "0.13.3"
+prost-types = "0.13.3"
 puffin = "0.19.1"
 puffin_http = "0.16"
 pyo3 = "0.22.5"

crates/build/re_protos_builder/src/bin/build_re_remote_store_types.rs

@@ -28,7 +28,7 @@ fn main() {
 
     let definitions_dir_path = workspace_dir.join(PROTOS_DIR);
     let rust_generated_output_dir_path = workspace_dir.join(OUTPUT_V0_RUST_DIR);
-    let proto_paths = std::fs::read_dir(definitions_dir_path.join(INPUT_V0_DIR))
+    let mut proto_paths = std::fs::read_dir(definitions_dir_path.join(INPUT_V0_DIR))
         .unwrap()
         .map(|v| {
             v.unwrap()
@@ -38,6 +38,7 @@ fn main() {
                 .to_owned()
         })
         .collect::<Vec<_>>();
+    proto_paths.sort();
 
     re_log::info!(
         definitions=?definitions_dir_path,

crates/store/re_protos/Cargo.toml

@@ -22,6 +22,7 @@ re_tuid.workspace = true
 # External
 arrow.workspace = true
 prost.workspace = true
+prost-types.workspace = true
 thiserror.workspace = true
 
 # Native dependencies:

crates/store/re_protos/proto/rerun/v0/collection.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+package rerun.remote_store.v0;
+
+import "google/protobuf/timestamp.proto";
+
+// A collection in the catalog
+message Collection {
+    string id = 1;
+    string name = 2;
+    repeated string index_ids = 3;
+    google.protobuf.Timestamp created_at = 4;
+    google.protobuf.Timestamp updated_at = 5;
+}

crates/store/re_protos/proto/rerun/v0/collection_ops.proto

@@ -0,0 +1,28 @@
+syntax = "proto3";
+
+package rerun.remote_store.v0;
+
+import "rerun/v0/collection.proto";
+
+message CollectionFilter {
+    optional string id = 1;
+    optional string name = 2;
+}
+
+message FindCollectionRequest {
+    CollectionFilter filter = 1;
+}
+
+// Returns matching collection, if there is exactly one match
+message FindCollectionResponse {
+    Collection collection = 1;
+}
+
+message FindCollectionsRequest {
+    CollectionFilter filter = 1;
+}
+
+// Contains zero or more matching collections
+message FindCollectionsResponse {
+    repeated Collection collection = 1;
+}

crates/store/re_protos/proto/rerun/v0/remote_store.proto

@@ -2,9 +2,15 @@ syntax = "proto3";
 
 package rerun.remote_store.v0;
 
+import "rerun/v0/collection_ops.proto";
 import "rerun/v0/common.proto";
 
 service StorageNode {
+    // Collection APIs
+
+    rpc FindCollection(FindCollectionRequest) returns (FindCollectionResponse);
+    rpc FindCollections(FindCollectionsRequest) returns (FindCollectionsResponse);
+
     // Data APIs
 
     rpc Query(QueryRequest) returns (stream DataframePart) {}