From ace793e59ad6a69fd79cd776460308e17d49541f Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 6 Nov 2024 11:51:04 +0100 Subject: [PATCH] Rename `re_remote_store_types` to `re_grpc_types` --- ARCHITECTURE.md | 6 ++-- Cargo.lock | 30 +++++++++---------- Cargo.toml | 2 +- .../src/bin/build_re_remote_store_types.rs | 4 +-- .../re_remote_store_types_builder/src/lib.rs | 2 +- crates/store/re_grpc_client/Cargo.toml | 2 +- crates/store/re_grpc_client/src/lib.rs | 8 ++--- .../.gitattributes | 0 .../Cargo.toml | 2 +- .../README.md | 6 ++-- .../proto/rerun/v0/common.proto | 0 .../proto/rerun/v0/remote_store.proto | 0 .../src/codec.rs | 0 .../src/lib.rs | 0 .../src/v0/rerun.remote_store.v0.rs | 0 rerun_py/Cargo.toml | 4 +-- rerun_py/src/remote.rs | 4 +-- scripts/lint.py | 2 +- 18 files changed, 36 insertions(+), 36 deletions(-) rename crates/store/{re_remote_store_types => re_grpc_types}/.gitattributes (100%) rename crates/store/{re_remote_store_types => re_grpc_types}/Cargo.toml (96%) rename crates/store/{re_remote_store_types => re_grpc_types}/README.md (59%) rename crates/store/{re_remote_store_types => re_grpc_types}/proto/rerun/v0/common.proto (100%) rename crates/store/{re_remote_store_types => re_grpc_types}/proto/rerun/v0/remote_store.proto (100%) rename crates/store/{re_remote_store_types => re_grpc_types}/src/codec.rs (100%) rename crates/store/{re_remote_store_types => re_grpc_types}/src/lib.rs (100%) rename crates/store/{re_remote_store_types => re_grpc_types}/src/v0/rerun.remote_store.v0.rs (100%) diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 5e580875c94a..c80334fe2e72 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -161,13 +161,13 @@ Update instructions: | Crate | Description | |-----------------------|--------------------------------------------------------------------------| +| 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_query | Querying data in the re_chunk_store | -| re_dataframe | The Rerun public data APIs. | -| re_remote_store_types | Rerun remote store gRPC API types | | 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. | -| re_log_encoding | Helpers for encoding and transporting Rerun log messages | ### Low-level store diff --git a/Cargo.lock b/Cargo.lock index d3f86c129e5c..a9aac47e7acf 100644 --- a/Cargo.lock +++ b/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_remote_store_types", "re_smart_channel", "thiserror", "tokio", @@ -5696,6 +5696,19 @@ 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_int_histogram" version = "0.20.0-alpha.1+dev" @@ -5884,19 +5897,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "re_remote_store_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_remote_store_types_builder" 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_remote_store_types", "re_sdk", "re_video", "re_web_viewer_server", diff --git a/Cargo.toml b/Cargo.toml index 1f49588dc627..8fa2e3237329 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ re_log_encoding = { path = "crates/store/re_log_encoding", version = "=0.20.0-al 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 } re_grpc_client = { path = "crates/store/re_grpc_client", version = "=0.20.0-alpha.1", default-features = false } -re_remote_store_types = { path = "crates/store/re_remote_store_types", 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_sdk_comms = { path = "crates/store/re_sdk_comms", version = "=0.20.0-alpha.1", default-features = false } re_types = { path = "crates/store/re_types", version = "=0.20.0-alpha.1", default-features = false } re_types_blueprint = { path = "crates/store/re_types_blueprint", version = "=0.20.0-alpha.1", default-features = false } diff --git a/crates/build/re_remote_store_types_builder/src/bin/build_re_remote_store_types.rs b/crates/build/re_remote_store_types_builder/src/bin/build_re_remote_store_types.rs index 3f6d884da31b..91e0255df6a3 100644 --- a/crates/build/re_remote_store_types_builder/src/bin/build_re_remote_store_types.rs +++ b/crates/build/re_remote_store_types_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_remote_store_types/proto"; +const PROTOBUF_DEFINITIONS_DIR_PATH: &str = "crates/store/re_grpc_types/proto"; const PROTOBUF_REMOTE_STORE_V0_RELATIVE_PATH: &str = "rerun/v0/remote_store.proto"; -const RUST_V0_OUTPUT_DIR_PATH: &str = "crates/store/re_remote_store_types/src/v0"; +const RUST_V0_OUTPUT_DIR_PATH: &str = "crates/store/re_grpc_types/src/v0"; fn main() { re_log::setup_logging(); diff --git a/crates/build/re_remote_store_types_builder/src/lib.rs b/crates/build/re_remote_store_types_builder/src/lib.rs index 0714356c64c6..e1efe6a137ec 100644 --- a/crates/build/re_remote_store_types_builder/src/lib.rs +++ b/crates/build/re_remote_store_types_builder/src/lib.rs @@ -1,5 +1,5 @@ //! This crate contains logic for generating remote store gRPC API types as defined in -//! `re_remote_store_types` proto files. We are currently generating both client and server +//! `re_grpc_types` proto files. We are currently generating both client and server //! definitions in the same file. //! diff --git a/crates/store/re_grpc_client/Cargo.toml b/crates/store/re_grpc_client/Cargo.toml index 3a41fcb4fd75..b9eccc6f8297 100644 --- a/crates/store/re_grpc_client/Cargo.toml +++ b/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_remote_store_types.workspace = true +re_grpc_types.workspace = true re_smart_channel.workspace = true thiserror.workspace = true diff --git a/crates/store/re_grpc_client/src/lib.rs b/crates/store/re_grpc_client/src/lib.rs index 08e938661666..9f98b0a59b9e 100644 --- a/crates/store/re_grpc_client/src/lib.rs +++ b/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_log_types::{ - ApplicationId, LogMsg, SetStoreInfo, StoreId, StoreInfo, StoreKind, StoreSource, Time, -}; -use re_remote_store_types::{ +use re_grpc_types::{ codec::{decode, CodecError}, v0::{ storage_node_client::StorageNodeClient, EncoderVersion, FetchRecordingRequest, RecordingId, }, }; +use re_log_types::{ + ApplicationId, LogMsg, SetStoreInfo, StoreId, StoreInfo, StoreKind, StoreSource, Time, +}; // ---------------------------------------------------------------------------- diff --git a/crates/store/re_remote_store_types/.gitattributes b/crates/store/re_grpc_types/.gitattributes similarity index 100% rename from crates/store/re_remote_store_types/.gitattributes rename to crates/store/re_grpc_types/.gitattributes diff --git a/crates/store/re_remote_store_types/Cargo.toml b/crates/store/re_grpc_types/Cargo.toml similarity index 96% rename from crates/store/re_remote_store_types/Cargo.toml rename to crates/store/re_grpc_types/Cargo.toml index 972d543fd1a4..8978cae6a85a 100644 --- a/crates/store/re_remote_store_types/Cargo.toml +++ b/crates/store/re_grpc_types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "re_remote_store_types" +name = "re_grpc_types" authors.workspace = true edition.workspace = true homepage.workspace = true diff --git a/crates/store/re_remote_store_types/README.md b/crates/store/re_grpc_types/README.md similarity index 59% rename from crates/store/re_remote_store_types/README.md rename to crates/store/re_grpc_types/README.md index 67bdf092bfe6..d40620fa8b7f 100644 --- a/crates/store/re_remote_store_types/README.md +++ b/crates/store/re_grpc_types/README.md @@ -1,9 +1,9 @@ -# re_remote_store_types +# re_grpc_types Part of the [`rerun`](https://github.com/rerun-io/rerun) family of crates. -[![Latest version](https://img.shields.io/crates/v/re_remote_store_types.svg)](https://crates.io/crates/re_remote_store_types?speculative-link) -[![Documentation](https://docs.rs/re_remote_store_types/badge.svg)](https://docs.rs/re_remote_store_types?speculative-link) +[![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) ![MIT](https://img.shields.io/badge/license-MIT-blue.svg) ![Apache](https://img.shields.io/badge/license-Apache-blue.svg) diff --git a/crates/store/re_remote_store_types/proto/rerun/v0/common.proto b/crates/store/re_grpc_types/proto/rerun/v0/common.proto similarity index 100% rename from crates/store/re_remote_store_types/proto/rerun/v0/common.proto rename to crates/store/re_grpc_types/proto/rerun/v0/common.proto diff --git a/crates/store/re_remote_store_types/proto/rerun/v0/remote_store.proto b/crates/store/re_grpc_types/proto/rerun/v0/remote_store.proto similarity index 100% rename from crates/store/re_remote_store_types/proto/rerun/v0/remote_store.proto rename to crates/store/re_grpc_types/proto/rerun/v0/remote_store.proto diff --git a/crates/store/re_remote_store_types/src/codec.rs b/crates/store/re_grpc_types/src/codec.rs similarity index 100% rename from crates/store/re_remote_store_types/src/codec.rs rename to crates/store/re_grpc_types/src/codec.rs diff --git a/crates/store/re_remote_store_types/src/lib.rs b/crates/store/re_grpc_types/src/lib.rs similarity index 100% rename from crates/store/re_remote_store_types/src/lib.rs rename to crates/store/re_grpc_types/src/lib.rs diff --git a/crates/store/re_remote_store_types/src/v0/rerun.remote_store.v0.rs b/crates/store/re_grpc_types/src/v0/rerun.remote_store.v0.rs similarity index 100% rename from crates/store/re_remote_store_types/src/v0/rerun.remote_store.v0.rs rename to crates/store/re_grpc_types/src/v0/rerun.remote_store.v0.rs diff --git a/rerun_py/Cargo.toml b/rerun_py/Cargo.toml index 5abdadb343cc..775fd35caa9d 100644 --- a/rerun_py/Cargo.toml +++ b/rerun_py/Cargo.toml @@ -37,7 +37,7 @@ nasm = ["re_video/nasm"] remote = [ "dep:object_store", - "dep:re_remote_store_types", + "dep:re_grpc_types", "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_remote_store_types = { workspace = true, optional = true } +re_grpc_types = { 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 } diff --git a/rerun_py/src/remote.rs b/rerun_py/src/remote.rs index 7ce74085f446..291224aad99f 100644 --- a/rerun_py/src/remote.rs +++ b/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_remote_store_types::v0::{ +use re_grpc_types::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_remote_store_types::v0::RecordingInfo, + info: re_grpc_types::v0::RecordingInfo, } #[pymethods] diff --git a/scripts/lint.py b/scripts/lint.py index a870aee89d94..179df6082a84 100755 --- a/scripts/lint.py +++ b/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_remote_store_types/src/v0/rerun.remote_store.v0.rs", # auto-generated + "./crates/store/re_grpc_types/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