Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uuid & IncludedSpaceView types are now serializable in python #5372

Merged
merged 9 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/re_types/definitions/rerun/blueprint.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include "./blueprint/components/entity_properties_component.fbs";
include "./blueprint/components/grid_columns.fbs";
include "./blueprint/components/included_contents.fbs";
include "./blueprint/components/included_queries.fbs";
include "./blueprint/components/included_space_views.fbs";
include "./blueprint/components/included_space_view.fbs";
include "./blueprint/components/panel_view.fbs";
include "./blueprint/components/query_expressions.fbs";
include "./blueprint/components/root_container.fbs";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ table ViewportBlueprint (
// --- Required ---

/// All of the space-views that belong to the viewport.
space_views: rerun.blueprint.components.IncludedSpaceViews ("attr.rerun.component_required", order: 1000);
space_views: [rerun.blueprint.components.IncludedSpaceView] ("attr.rerun.component_required", order: 1000);

// --- Optional ---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ namespace rerun.blueprint.components;
/// The id of a `SpaceView`.
///
/// Unstable. Used for the ongoing blueprint experimentations.
table IncludedSpaceViews (
table IncludedSpaceView (
"attr.rerun.scope": "blueprint",
"attr.python.aliases": "npt.NDArray[np.uint8], npt.ArrayLike, Sequence[int], bytes",
"attr.rust.derive": "Default",
"attr.rust.override_crate": "re_viewport",
"attr.rust.repr": "transparent"
) {
space_view_ids: [rerun.datatypes.Uuid] (order: 100);
space_view_ids: rerun.datatypes.Uuid (order: 100);
}
5 changes: 2 additions & 3 deletions crates/re_types/definitions/rerun/datatypes/uuid.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ namespace rerun.datatypes;

/// A 16-byte uuid.
struct Uuid (
// TODO(jleibs): Figure out why we can't make this transparent.
// The deserializer barfs on list of fixed-sized-list.
//"attr.arrow.transparent",
"attr.arrow.transparent",
"attr.python.aliases": "npt.NDArray[np.uint8], npt.ArrayLike, Sequence[int], bytes",
"attr.rust.derive": "Default, Copy, PartialEq, Eq",
"attr.rust.repr": "transparent"
) {
Expand Down
115 changes: 110 additions & 5 deletions crates/re_types/src/blueprint/components/included_queries.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading