re_grpc_types -> re_protos

ARCHITECTURE.md

@@ -88,11 +88,11 @@ Of course, this will only take us so far. In the future we plan on caching queri
 Here is an overview of the crates included in the project:
 
 <picture>
-  <img src="https://static.rerun.io/crates/91c15c92ad604a46c0b45d6282d00d1995d6a79f/full.png" alt="">
-  <source media="(max-width: 480px)" srcset="https://static.rerun.io/crates/91c15c92ad604a46c0b45d6282d00d1995d6a79f/480w.png">
-  <source media="(max-width: 768px)" srcset="https://static.rerun.io/crates/91c15c92ad604a46c0b45d6282d00d1995d6a79f/768w.png">
-  <source media="(max-width: 1024px)" srcset="https://static.rerun.io/crates/91c15c92ad604a46c0b45d6282d00d1995d6a79f/1024w.png">
-  <source media="(max-width: 1200px)" srcset="https://static.rerun.io/crates/91c15c92ad604a46c0b45d6282d00d1995d6a79f/1200w.png">
+  <img src="https://static.rerun.io/crates/35c2f18eb941ec321c6d19f5a763f0ac542ca2ed/full.png" alt="">
+  <source media="(max-width: 480px)" srcset="https://static.rerun.io/crates/35c2f18eb941ec321c6d19f5a763f0ac542ca2ed/480w.png">
+  <source media="(max-width: 768px)" srcset="https://static.rerun.io/crates/35c2f18eb941ec321c6d19f5a763f0ac542ca2ed/768w.png">
+  <source media="(max-width: 1024px)" srcset="https://static.rerun.io/crates/35c2f18eb941ec321c6d19f5a763f0ac542ca2ed/1024w.png">
+  <source media="(max-width: 1200px)" srcset="https://static.rerun.io/crates/35c2f18eb941ec321c6d19f5a763f0ac542ca2ed/1200w.png">
 </picture>
 
 
@@ -163,8 +163,8 @@ Update instructions:
 |-----------------------|--------------------------------------------------------------------------|
 | re_dataframe          | The Rerun public data APIs.                                              |
 | re_entity_db          | In-memory storage of Rerun entities                                      |
-| re_grpc_types         | Rerun remote store gRPC API types                                        |
 | re_log_encoding       | Helpers for encoding and transporting Rerun log messages                 |
+| re_protos             | Rerun remote store gRPC API types                                        |
 | re_query              | Querying data in the re_chunk_store                                      |
 | re_types              | The built-in Rerun data types, component types, and archetypes.          |
 | re_types_blueprint    | The core traits and types that power Rerun's Blueprint sub-system.       |
@@ -200,7 +200,7 @@ Update instructions:
 | re_build_info                 | Information about the build. Use together with re_build_tools    |
 | re_build_tools                | build.rs helpers for generating build info                       |
 | re_dev_tools                  | Various tools for Rerun development. Each tool has a subcommand. |
-| re_grpc_types_builder         | Generates code for Rerun remote store gRPC API                   |
+| re_protos_builder             | Generates code for Rerun remote store gRPC API                   |
 | re_types_builder              | Generates code for Rerun's SDKs from flatbuffers definitions.    |
 
 

Cargo.lock

@@ -5684,9 +5684,9 @@ version = "0.20.0-alpha.1+dev"
 dependencies = [
  "re_chunk",
  "re_error",
- "re_grpc_types",
  "re_log",
  "re_log_types",
+ "re_protos",
  "re_smart_channel",
  "thiserror",
  "tokio",
@@ -5696,28 +5696,6 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "re_grpc_types"
-version = "0.20.0-alpha.1+dev"
-dependencies = [
- "prost",
- "re_arrow2",
- "re_dataframe",
- "re_log_types",
- "thiserror",
- "tonic",
- "tonic-web-wasm-client",
-]
-
-[[package]]
-name = "re_grpc_types_builder"
-version = "0.20.0-alpha.1+dev"
-dependencies = [
- "camino",
- "re_log",
- "tonic-build",
-]
-
 [[package]]
 name = "re_int_histogram"
 version = "0.20.0-alpha.1+dev"
@@ -5852,6 +5830,28 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "re_protos"
+version = "0.20.0-alpha.1+dev"
+dependencies = [
+ "prost",
+ "re_arrow2",
+ "re_dataframe",
+ "re_log_types",
+ "thiserror",
+ "tonic",
+ "tonic-web-wasm-client",
+]
+
+[[package]]
+name = "re_protos_builder"
+version = "0.20.0-alpha.1+dev"
+dependencies = [
+ "camino",
+ "re_log",
+ "tonic-build",
+]
+
 [[package]]
 name = "re_query"
 version = "0.20.0-alpha.1+dev"
@@ -6986,10 +6986,10 @@ dependencies = [
  "re_chunk",
  "re_chunk_store",
  "re_dataframe",
- "re_grpc_types",
  "re_log",
  "re_log_types",
  "re_memory",
+ "re_protos",
  "re_sdk",
  "re_video",
  "re_web_viewer_server",

Cargo.toml

@@ -37,7 +37,7 @@ version = "0.20.0-alpha.1+dev"
 re_build_info = { path = "crates/build/re_build_info", version = "=0.20.0-alpha.1", default-features = false }
 re_build_tools = { path = "crates/build/re_build_tools", version = "=0.20.0-alpha.1", default-features = false }
 re_dev_tools = { path = "crates/build/re_dev_tools", version = "=0.20.0-alpha.1", default-features = false }
-re_grpc_types_builder = { path = "crates/build/re_grpc_types_builder", version = "=0.20.0-alpha.1", default-features = false }
+re_protos_builder = { path = "crates/build/re_protos_builder", version = "=0.20.0-alpha.1", default-features = false }
 re_types_builder = { path = "crates/build/re_types_builder", version = "=0.20.0-alpha.1", default-features = false }
 
 # crates/store:
@@ -49,7 +49,7 @@ re_dataframe = { path = "crates/store/re_dataframe", version = "=0.20.0-alpha.1"
 re_entity_db = { path = "crates/store/re_entity_db", version = "=0.20.0-alpha.1", default-features = false }
 re_format_arrow = { path = "crates/store/re_format_arrow", version = "=0.20.0-alpha.1", default-features = false }
 re_grpc_client = { path = "crates/store/re_grpc_client", version = "=0.20.0-alpha.1", default-features = false }
-re_grpc_types = { path = "crates/store/re_grpc_types", version = "=0.20.0-alpha.1", default-features = false }
+re_protos = { path = "crates/store/re_protos", version = "=0.20.0-alpha.1", default-features = false }
 re_log_encoding = { path = "crates/store/re_log_encoding", version = "=0.20.0-alpha.1", default-features = false }
 re_log_types = { path = "crates/store/re_log_types", version = "=0.20.0-alpha.1", default-features = false }
 re_query = { path = "crates/store/re_query", version = "=0.20.0-alpha.1", default-features = false }

crates/build/re_grpc_types_builder/Cargo.toml → crates/build/re_protos_builder/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "re_grpc_types_builder"
+name = "re_protos_builder"
 authors.workspace = true
 edition.workspace = true
 homepage.workspace = true

crates/build/re_grpc_types_builder/README.md → crates/build/re_protos_builder/README.md

@@ -1,9 +1,9 @@
-# re_grpc_types_builder
+# re_protos_builder
 
 Part of the [`rerun`](https://github.com/rerun-io/rerun) family of crates.
 
-[![Latest version](https://img.shields.io/crates/v/re_grpc_types_builder.svg)](https://crates.io/crates/re_grpc_types_builder?speculative-link)
-[![Documentation](https://docs.rs/re_grpc_types_builder/badge.svg)](https://docs.rs/re_grpc_types_builder?speculative-link)
+[![Latest version](https://img.shields.io/crates/v/re_protos_builder.svg)](https://crates.io/crates/re_protos_builder?speculative-link)
+[![Documentation](https://docs.rs/re_protos_builder/badge.svg)](https://docs.rs/re_protos_builder?speculative-link)
 ![MIT](https://img.shields.io/badge/license-MIT-blue.svg)
 ![Apache](https://img.shields.io/badge/license-Apache-blue.svg)
 

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

@@ -7,9 +7,9 @@
 
 use camino::Utf8Path;
 
-const PROTOBUF_DEFINITIONS_DIR_PATH: &str = "crates/store/re_grpc_types/proto";
+const PROTOBUF_DEFINITIONS_DIR_PATH: &str = "crates/store/re_protos/proto";
 const PROTOBUF_REMOTE_STORE_V0_RELATIVE_PATH: &str = "rerun/v0/remote_store.proto";
-const RUST_V0_OUTPUT_DIR_PATH: &str = "crates/store/re_grpc_types/src/v0";
+const RUST_V0_OUTPUT_DIR_PATH: &str = "crates/store/re_protos/src/v0";
 
 fn main() {
     re_log::setup_logging();
@@ -35,7 +35,7 @@ fn main() {
         "Running codegen for storage node types",
     );
 
-    re_grpc_types_builder::generate_rust_code(
+    re_protos_builder::generate_rust_code(
         definitions_dir_path,
         &[PROTOBUF_REMOTE_STORE_V0_RELATIVE_PATH],
         rust_generated_output_dir_path,

crates/build/re_grpc_types_builder/src/lib.rs → crates/build/re_protos_builder/src/lib.rs

@@ -1,5 +1,5 @@
 //! This crate contains logic for generating remote store gRPC API types as defined in
-//! `re_grpc_types` proto files. We are currently generating both client and server
+//! `re_protos` proto files. We are currently generating both client and server
 //! definitions in the same file.
 //!
 

crates/store/re_grpc_client/Cargo.toml

@@ -24,7 +24,7 @@ re_chunk.workspace = true
 re_error.workspace = true
 re_log_types.workspace = true
 re_log.workspace = true
-re_grpc_types.workspace = true
+re_protos.workspace = true
 re_smart_channel.workspace = true
 
 thiserror.workspace = true

crates/store/re_grpc_client/src/lib.rs

@@ -9,15 +9,15 @@ pub use address::{Address, InvalidAddressError};
 use std::{error::Error, str::FromStr};
 
 use re_chunk::Chunk;
-use re_grpc_types::{
+use re_log_types::{
+    ApplicationId, LogMsg, SetStoreInfo, StoreId, StoreInfo, StoreKind, StoreSource, Time,
+};
+use re_protos::{
     codec::{decode, CodecError},
     v0::{
         storage_node_client::StorageNodeClient, EncoderVersion, FetchRecordingRequest, RecordingId,
     },
 };
-use re_log_types::{
-    ApplicationId, LogMsg, SetStoreInfo, StoreId, StoreInfo, StoreKind, StoreSource, Time,
-};
 
 // ----------------------------------------------------------------------------
 

crates/store/re_grpc_types/Cargo.toml → crates/store/re_protos/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "re_grpc_types"
+name = "re_protos"
 authors.workspace = true
 edition.workspace = true
 homepage.workspace = true

crates/store/re_grpc_types/README.md → crates/store/re_protos/README.md

@@ -1,9 +1,9 @@
-# re_grpc_types
+# re_protos
 
 Part of the [`rerun`](https://github.com/rerun-io/rerun) family of crates.
 
-[![Latest version](https://img.shields.io/crates/v/re_grpc_types.svg)](https://crates.io/crates/re_grpc_types?speculative-link)
-[![Documentation](https://docs.rs/re_grpc_types/badge.svg)](https://docs.rs/re_grpc_types?speculative-link)
+[![Latest version](https://img.shields.io/crates/v/re_protos.svg)](https://crates.io/crates/re_protos?speculative-link)
+[![Documentation](https://docs.rs/re_protos/badge.svg)](https://docs.rs/re_protos?speculative-link)
 ![MIT](https://img.shields.io/badge/license-MIT-blue.svg)
 ![Apache](https://img.shields.io/badge/license-Apache-blue.svg)
 

crates/store/re_grpc_types/src/lib.rs → crates/store/re_protos/src/lib.rs

@@ -1,5 +1,5 @@
 //! This crate contains generated types for the remote store gRPC service API.
-//! Generation is done using the `re_grpc_types_builder` crate.
+//! Generation is done using the `re_protos_builder` crate.
 //!
 //! We want clear separation between 'internal' types and gRPC types and don't want
 //! to use gRPC types in the rerun viewer codebase. That's why we implement all the

pixi.toml

@@ -126,7 +126,7 @@ check-env = "python scripts/check_env.py"
 codegen = "cargo --quiet run --package re_types_builder -- "
 
 # Run the codegen for remote store types.
-codegen-rstore = "cargo --quiet run --package re_grpc_types_builder && pixi run -e cpp format"
+codegen-rstore = "cargo --quiet run --package re_protos_builder && pixi run -e cpp format"
 
 # Generate the Rerun CLI manual.
 

rerun_py/Cargo.toml

@@ -37,7 +37,7 @@ nasm = ["re_video/nasm"]
 
 remote = [
   "dep:object_store",
-  "dep:re_grpc_types",
+  "dep:re_protos",
   "dep:re_ws_comms",
   "dep:tokio",
   "dep:tonic",
@@ -85,7 +85,7 @@ uuid.workspace = true
 
 # Deps for remote feature
 object_store = { workspace = true, optional = true, features = ["aws"] }
-re_grpc_types = { workspace = true, optional = true }
+re_protos = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 # Not used yet, but we will need it when we start streaming data
 #tokio-stream = { workspace = true, optional = true }

rerun_py/src/remote.rs

@@ -3,7 +3,7 @@ use arrow::{array::ArrayData, pyarrow::PyArrowType};
 // False positive due to #[pyfunction] macro
 use pyo3::{exceptions::PyRuntimeError, prelude::*, types::PyDict, Bound, PyResult};
 use re_chunk::TransportChunk;
-use re_grpc_types::v0::{
+use re_protos::v0::{
     storage_node_client::StorageNodeClient, EncoderVersion, ListRecordingsRequest,
     RecordingMetadata, RecordingType, RegisterRecordingRequest,
 };
@@ -189,7 +189,7 @@ impl MetadataLike {
 /// The info for a recording stored in the archive.
 #[pyclass(name = "RecordingInfo")]
 pub struct PyRecordingInfo {
-    info: re_grpc_types::v0::RecordingInfo,
+    info: re_protos::v0::RecordingInfo,
 }
 
 #[pymethods]

scripts/lint.py

@@ -1204,7 +1204,7 @@ def main() -> None:
         "./.pytest_cache",
         "./CODE_STYLE.md",
         "./crates/build/re_types_builder/src/reflection.rs",  # auto-generated
-        "./crates/store/re_grpc_types/src/v0/rerun.remote_store.v0.rs",  # auto-generated
+        "./crates/store/re_protos/src/v0/rerun.remote_store.v0.rs",  # auto-generated
         "./docs/content/concepts/app-model.md",  # this really needs custom letter casing
         "./docs/content/reference/cli.md",  # auto-generated
         "./docs/snippets/all/tutorials/custom-application-id.cpp",  # nuh-uh, I don't want rerun_example_ here