diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt index 711d467446f4b..1dfc254529e9a 100644 --- a/crates/re_types/source_hash.txt +++ b/crates/re_types/source_hash.txt @@ -1,4 +1,4 @@ # This is a sha256 hash for all direct and indirect dependencies of this crate's build script. # It can be safely removed at anytime to force the build script to run again. # Check out build.rs to see how it's computed. -ba3dbc22cd914eac35c130d4bac2754a325ca5cd6e5154cd1511963b2bdc0769 +c19f042ca7d4df439ce98030fdd82f4c8be1fec2f1046a525c48f4a91d5dc0e6 \ No newline at end of file diff --git a/crates/re_types/src/components/class_id.rs b/crates/re_types/src/components/class_id.rs index c55b7cf654802..e5c03e11b5d7f 100644 --- a/crates/re_types/src/components/class_id.rs +++ b/crates/re_types/src/components/class_id.rs @@ -8,7 +8,7 @@ pub struct ClassId(pub u16); impl crate::Component for ClassId { fn name() -> crate::ComponentName { - crate::ComponentName::Borrowed("rerun.components.ClassId") + crate::ComponentName::Borrowed("rerun.class_id") } #[allow(clippy::wildcard_imports)] diff --git a/crates/re_types/src/components/color.rs b/crates/re_types/src/components/color.rs index 6041c8c58f4b7..1de749cdb19a0 100644 --- a/crates/re_types/src/components/color.rs +++ b/crates/re_types/src/components/color.rs @@ -18,7 +18,7 @@ pub struct Color(pub u32); impl crate::Component for Color { fn name() -> crate::ComponentName { - crate::ComponentName::Borrowed("rerun.components.Color") + crate::ComponentName::Borrowed("rerun.colorrgba") } #[allow(clippy::wildcard_imports)] diff --git a/crates/re_types/src/components/draw_order.rs b/crates/re_types/src/components/draw_order.rs index 92aea359ddfd4..1ed1c97acedf6 100644 --- a/crates/re_types/src/components/draw_order.rs +++ b/crates/re_types/src/components/draw_order.rs @@ -13,7 +13,7 @@ pub struct DrawOrder(pub f32); impl crate::Component for DrawOrder { fn name() -> crate::ComponentName { - crate::ComponentName::Borrowed("rerun.components.DrawOrder") + crate::ComponentName::Borrowed("rerun.draw_order") } #[allow(clippy::wildcard_imports)] diff --git a/crates/re_types/src/components/instance_key.rs b/crates/re_types/src/components/instance_key.rs index 05259100c73be..229858d46cca4 100644 --- a/crates/re_types/src/components/instance_key.rs +++ b/crates/re_types/src/components/instance_key.rs @@ -6,7 +6,7 @@ pub struct InstanceKey(pub u64); impl crate::Component for InstanceKey { fn name() -> crate::ComponentName { - crate::ComponentName::Borrowed("rerun.components.InstanceKey") + crate::ComponentName::Borrowed("rerun.instance_key") } #[allow(clippy::wildcard_imports)] diff --git a/crates/re_types/src/components/keypoint_id.rs b/crates/re_types/src/components/keypoint_id.rs index 757cf35486ae7..dc052c879909f 100644 --- a/crates/re_types/src/components/keypoint_id.rs +++ b/crates/re_types/src/components/keypoint_id.rs @@ -10,7 +10,7 @@ pub struct KeypointId(pub u16); impl crate::Component for KeypointId { fn name() -> crate::ComponentName { - crate::ComponentName::Borrowed("rerun.components.KeypointId") + crate::ComponentName::Borrowed("rerun.keypoint_id") } #[allow(clippy::wildcard_imports)] diff --git a/crates/re_types/src/components/label.rs b/crates/re_types/src/components/label.rs index d66f624bf0ab1..782e45f321963 100644 --- a/crates/re_types/src/components/label.rs +++ b/crates/re_types/src/components/label.rs @@ -7,7 +7,7 @@ pub struct Label(pub String); impl crate::Component for Label { fn name() -> crate::ComponentName { - crate::ComponentName::Borrowed("rerun.components.Label") + crate::ComponentName::Borrowed("rerun.label") } #[allow(clippy::wildcard_imports)] diff --git a/crates/re_types/src/components/point2d.rs b/crates/re_types/src/components/point2d.rs index a5c740e105856..98f057872886e 100644 --- a/crates/re_types/src/components/point2d.rs +++ b/crates/re_types/src/components/point2d.rs @@ -9,7 +9,7 @@ pub struct Point2D { impl crate::Component for Point2D { fn name() -> crate::ComponentName { - crate::ComponentName::Borrowed("rerun.components.Point2D") + crate::ComponentName::Borrowed("rerun.point2d") } #[allow(clippy::wildcard_imports)] diff --git a/crates/re_types/src/components/radius.rs b/crates/re_types/src/components/radius.rs index 9a9e5855fe1d1..02fffa83b5874 100644 --- a/crates/re_types/src/components/radius.rs +++ b/crates/re_types/src/components/radius.rs @@ -6,7 +6,7 @@ pub struct Radius(pub f32); impl crate::Component for Radius { fn name() -> crate::ComponentName { - crate::ComponentName::Borrowed("rerun.components.Radius") + crate::ComponentName::Borrowed("rerun.radius") } #[allow(clippy::wildcard_imports)] diff --git a/rerun_py/rerun_sdk/rerun/_rerun2/components/class_id.py b/rerun_py/rerun_sdk/rerun/_rerun2/components/class_id.py index 24cc9625acc9d..c61b49ca56b8c 100644 --- a/rerun_py/rerun_sdk/rerun/_rerun2/components/class_id.py +++ b/rerun_py/rerun_sdk/rerun/_rerun2/components/class_id.py @@ -41,7 +41,7 @@ def __array__(self) -> npt.ArrayLike: class ClassIdType(pa.ExtensionType): # type: ignore[misc] def __init__(self: type[pa.ExtensionType]) -> None: - pa.ExtensionType.__init__(self, pa.uint16(), "rerun.components.ClassId") + pa.ExtensionType.__init__(self, pa.uint16(), "rerun.class_id") def __arrow_ext_serialize__(self: type[pa.ExtensionType]) -> bytes: # since we don't have a parameterized type, we don't need extra metadata to be deserialized @@ -58,7 +58,8 @@ def __arrow_ext_class__(self: type[pa.ExtensionType]) -> type[pa.ExtensionArray] return ClassIdArray -pa.register_extension_type(ClassIdType()) +# TODO(cmc): bring back registration to pyarrow once legacy types are gone +# pa.register_extension_type(ClassIdType()) class ClassIdArray(pa.ExtensionArray, ClassIdArrayExt): # type: ignore[misc] diff --git a/rerun_py/rerun_sdk/rerun/_rerun2/components/color.py b/rerun_py/rerun_sdk/rerun/_rerun2/components/color.py index c7fb9a0686f7a..dca8ab2678453 100644 --- a/rerun_py/rerun_sdk/rerun/_rerun2/components/color.py +++ b/rerun_py/rerun_sdk/rerun/_rerun2/components/color.py @@ -50,7 +50,7 @@ def __array__(self) -> npt.ArrayLike: class ColorType(pa.ExtensionType): # type: ignore[misc] def __init__(self: type[pa.ExtensionType]) -> None: - pa.ExtensionType.__init__(self, pa.uint32(), "rerun.components.Color") + pa.ExtensionType.__init__(self, pa.uint32(), "rerun.colorrgba") def __arrow_ext_serialize__(self: type[pa.ExtensionType]) -> bytes: # since we don't have a parameterized type, we don't need extra metadata to be deserialized @@ -67,7 +67,8 @@ def __arrow_ext_class__(self: type[pa.ExtensionType]) -> type[pa.ExtensionArray] return ColorArray -pa.register_extension_type(ColorType()) +# TODO(cmc): bring back registration to pyarrow once legacy types are gone +# pa.register_extension_type(ColorType()) class ColorArray(pa.ExtensionArray, ColorArrayExt): # type: ignore[misc] diff --git a/rerun_py/rerun_sdk/rerun/_rerun2/components/draw_order.py b/rerun_py/rerun_sdk/rerun/_rerun2/components/draw_order.py index 7f94db01de4cc..dd4c9314b7fc8 100644 --- a/rerun_py/rerun_sdk/rerun/_rerun2/components/draw_order.py +++ b/rerun_py/rerun_sdk/rerun/_rerun2/components/draw_order.py @@ -42,7 +42,7 @@ def __array__(self) -> npt.ArrayLike: class DrawOrderType(pa.ExtensionType): # type: ignore[misc] def __init__(self: type[pa.ExtensionType]) -> None: - pa.ExtensionType.__init__(self, pa.float32(), "rerun.components.DrawOrder") + pa.ExtensionType.__init__(self, pa.float32(), "rerun.draw_order") def __arrow_ext_serialize__(self: type[pa.ExtensionType]) -> bytes: # since we don't have a parameterized type, we don't need extra metadata to be deserialized @@ -59,7 +59,8 @@ def __arrow_ext_class__(self: type[pa.ExtensionType]) -> type[pa.ExtensionArray] return DrawOrderArray -pa.register_extension_type(DrawOrderType()) +# TODO(cmc): bring back registration to pyarrow once legacy types are gone +# pa.register_extension_type(DrawOrderType()) class DrawOrderArray(pa.ExtensionArray, DrawOrderArrayExt): # type: ignore[misc] diff --git a/rerun_py/rerun_sdk/rerun/_rerun2/components/instance_key.py b/rerun_py/rerun_sdk/rerun/_rerun2/components/instance_key.py index 01040b7bbb9ce..f4733520cf7ab 100644 --- a/rerun_py/rerun_sdk/rerun/_rerun2/components/instance_key.py +++ b/rerun_py/rerun_sdk/rerun/_rerun2/components/instance_key.py @@ -34,7 +34,7 @@ def __array__(self) -> npt.ArrayLike: class InstanceKeyType(pa.ExtensionType): # type: ignore[misc] def __init__(self: type[pa.ExtensionType]) -> None: - pa.ExtensionType.__init__(self, pa.uint64(), "rerun.components.InstanceKey") + pa.ExtensionType.__init__(self, pa.uint64(), "rerun.instance_key") def __arrow_ext_serialize__(self: type[pa.ExtensionType]) -> bytes: # since we don't have a parameterized type, we don't need extra metadata to be deserialized @@ -51,7 +51,8 @@ def __arrow_ext_class__(self: type[pa.ExtensionType]) -> type[pa.ExtensionArray] return InstanceKeyArray -pa.register_extension_type(InstanceKeyType()) +# TODO(cmc): bring back registration to pyarrow once legacy types are gone +# pa.register_extension_type(InstanceKeyType()) class InstanceKeyArray(pa.ExtensionArray, InstanceKeyArrayExt): # type: ignore[misc] diff --git a/rerun_py/rerun_sdk/rerun/_rerun2/components/keypoint_id.py b/rerun_py/rerun_sdk/rerun/_rerun2/components/keypoint_id.py index 6c1d52c9abce3..9e406e06abfa5 100644 --- a/rerun_py/rerun_sdk/rerun/_rerun2/components/keypoint_id.py +++ b/rerun_py/rerun_sdk/rerun/_rerun2/components/keypoint_id.py @@ -43,7 +43,7 @@ def __array__(self) -> npt.ArrayLike: class KeypointIdType(pa.ExtensionType): # type: ignore[misc] def __init__(self: type[pa.ExtensionType]) -> None: - pa.ExtensionType.__init__(self, pa.uint16(), "rerun.components.KeypointId") + pa.ExtensionType.__init__(self, pa.uint16(), "rerun.keypoint_id") def __arrow_ext_serialize__(self: type[pa.ExtensionType]) -> bytes: # since we don't have a parameterized type, we don't need extra metadata to be deserialized @@ -60,7 +60,8 @@ def __arrow_ext_class__(self: type[pa.ExtensionType]) -> type[pa.ExtensionArray] return KeypointIdArray -pa.register_extension_type(KeypointIdType()) +# TODO(cmc): bring back registration to pyarrow once legacy types are gone +# pa.register_extension_type(KeypointIdType()) class KeypointIdArray(pa.ExtensionArray, KeypointIdArrayExt): # type: ignore[misc] diff --git a/rerun_py/rerun_sdk/rerun/_rerun2/components/label.py b/rerun_py/rerun_sdk/rerun/_rerun2/components/label.py index 51aa945cf9d8f..a48e2a92f9718 100644 --- a/rerun_py/rerun_sdk/rerun/_rerun2/components/label.py +++ b/rerun_py/rerun_sdk/rerun/_rerun2/components/label.py @@ -35,7 +35,7 @@ def __str__(self) -> str: class LabelType(pa.ExtensionType): # type: ignore[misc] def __init__(self: type[pa.ExtensionType]) -> None: - pa.ExtensionType.__init__(self, pa.utf8(), "rerun.components.Label") + pa.ExtensionType.__init__(self, pa.utf8(), "rerun.label") def __arrow_ext_serialize__(self: type[pa.ExtensionType]) -> bytes: # since we don't have a parameterized type, we don't need extra metadata to be deserialized @@ -52,7 +52,8 @@ def __arrow_ext_class__(self: type[pa.ExtensionType]) -> type[pa.ExtensionArray] return LabelArray -pa.register_extension_type(LabelType()) +# TODO(cmc): bring back registration to pyarrow once legacy types are gone +# pa.register_extension_type(LabelType()) class LabelArray(pa.ExtensionArray, LabelArrayExt): # type: ignore[misc] diff --git a/rerun_py/rerun_sdk/rerun/_rerun2/components/point2d.py b/rerun_py/rerun_sdk/rerun/_rerun2/components/point2d.py index bfb7575a2328b..3096ec2d1c5ed 100644 --- a/rerun_py/rerun_sdk/rerun/_rerun2/components/point2d.py +++ b/rerun_py/rerun_sdk/rerun/_rerun2/components/point2d.py @@ -35,7 +35,7 @@ def __init__(self: type[pa.ExtensionType]) -> None: pa.ExtensionType.__init__( self, pa.struct([pa.field("x", pa.float32(), True, {}), pa.field("y", pa.float32(), True, {})]), - "rerun.components.Point2D", + "rerun.point2d", ) def __arrow_ext_serialize__(self: type[pa.ExtensionType]) -> bytes: @@ -53,7 +53,8 @@ def __arrow_ext_class__(self: type[pa.ExtensionType]) -> type[pa.ExtensionArray] return Point2DArray -pa.register_extension_type(Point2DType()) +# TODO(cmc): bring back registration to pyarrow once legacy types are gone +# pa.register_extension_type(Point2DType()) class Point2DArray(pa.ExtensionArray, Point2DArrayExt): # type: ignore[misc] diff --git a/rerun_py/rerun_sdk/rerun/_rerun2/components/radius.py b/rerun_py/rerun_sdk/rerun/_rerun2/components/radius.py index 62546605e5da6..7508475d1ad99 100644 --- a/rerun_py/rerun_sdk/rerun/_rerun2/components/radius.py +++ b/rerun_py/rerun_sdk/rerun/_rerun2/components/radius.py @@ -34,7 +34,7 @@ def __array__(self) -> npt.ArrayLike: class RadiusType(pa.ExtensionType): # type: ignore[misc] def __init__(self: type[pa.ExtensionType]) -> None: - pa.ExtensionType.__init__(self, pa.float32(), "rerun.components.Radius") + pa.ExtensionType.__init__(self, pa.float32(), "rerun.radius") def __arrow_ext_serialize__(self: type[pa.ExtensionType]) -> bytes: # since we don't have a parameterized type, we don't need extra metadata to be deserialized @@ -51,7 +51,8 @@ def __arrow_ext_class__(self: type[pa.ExtensionType]) -> type[pa.ExtensionArray] return RadiusArray -pa.register_extension_type(RadiusType()) +# TODO(cmc): bring back registration to pyarrow once legacy types are gone +# pa.register_extension_type(RadiusType()) class RadiusArray(pa.ExtensionArray, RadiusArrayExt): # type: ignore[misc] diff --git a/rerun_py/rerun_sdk/rerun/_rerun2/datatypes/vec2d.py b/rerun_py/rerun_sdk/rerun/_rerun2/datatypes/vec2d.py index 0383fd6e3f33f..bc6320a233bb0 100644 --- a/rerun_py/rerun_sdk/rerun/_rerun2/datatypes/vec2d.py +++ b/rerun_py/rerun_sdk/rerun/_rerun2/datatypes/vec2d.py @@ -53,7 +53,8 @@ def __arrow_ext_class__(self: type[pa.ExtensionType]) -> type[pa.ExtensionArray] return Vec2DArray -pa.register_extension_type(Vec2DType()) +# TODO(cmc): bring back registration to pyarrow once legacy types are gone +# pa.register_extension_type(Vec2DType()) class Vec2DArray(pa.ExtensionArray, Vec2DArrayExt): # type: ignore[misc]