Skip to content

Commit

Permalink
Rename re_remote_store_types to re_grpc_types
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed Nov 6, 2024
1 parent 6efe36c commit ace793e
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 36 deletions.
6 changes: 3 additions & 3 deletions ARCHITECTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion crates/build/re_remote_store_types_builder/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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.
//!
Expand Down
2 changes: 1 addition & 1 deletion crates/store/re_grpc_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions crates/store/re_grpc_client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

// ----------------------------------------------------------------------------

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "re_remote_store_types"
name = "re_grpc_types"
authors.workspace = true
edition.workspace = true
homepage.workspace = true
Expand Down
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions rerun_py/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions rerun_py/src/remote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion scripts/lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ace793e

Please sign in to comment.