diff --git a/crates/re_types_builder/src/codegen/python.rs b/crates/re_types_builder/src/codegen/python.rs index 27957e35b0fb..f8178f6c7ba3 100644 --- a/crates/re_types_builder/src/codegen/python.rs +++ b/crates/re_types_builder/src/codegen/python.rs @@ -789,9 +789,9 @@ fn code_for_union( }; let inner_type = if field_types.len() > 1 { - format!("Union[{}]", field_types.iter().join(", ")) + field_types.iter().join(" | ") } else { - field_types.iter().next().unwrap().to_string() + field_types.first().unwrap().to_string() }; // components and datatypes have converters only if manually provided @@ -1060,44 +1060,39 @@ fn quote_native_types_method_from_obj(objects: &Objects, obj: &Object) -> String fn quote_aliases_from_object(obj: &Object) -> String { assert_ne!(obj.kind, ObjectKind::Archetype); - let aliases = obj.try_get_attr::(ATTR_PYTHON_ALIASES); - let array_aliases = obj - .try_get_attr::(ATTR_PYTHON_ARRAY_ALIASES) - .unwrap_or_default(); + let aliases = obj.get_attr_list(ATTR_PYTHON_ALIASES); + let array_aliases = obj.get_attr_list(ATTR_PYTHON_ARRAY_ALIASES); let name = &obj.name; let mut code = String::new(); code.push_unindented_text( - &if let Some(aliases) = aliases { + &if aliases.is_empty() { + format!("{name}Like = {name}") + } else { format!( r#" if TYPE_CHECKING: - {name}Like = Union[ - {name}, - {aliases} - ] + {name}Like = {name} | {} else: {name}Like = Any "#, + aliases.iter().join(" | ") ) - } else { - format!("{name}Like = {name}") }, 1, ); code.push_unindented_text( - format!( - r#" - {name}ArrayLike = Union[ - {name}, - Sequence[{name}Like], - {array_aliases} - ] - "#, - ), + if array_aliases.is_empty() { + format!("{name}ArrayLike = {name} | Sequence[{name}Like]") + } else { + format!( + "{name}ArrayLike = {name} | Sequence[{name}Like] | {}", + array_aliases.iter().join(" | ") + ) + }, 0, ); @@ -1108,34 +1103,33 @@ fn quote_aliases_from_object(obj: &Object) -> String { /// included. fn quote_union_aliases_from_object<'a>( obj: &Object, - mut field_types: impl Iterator, + field_types: impl Iterator, ) -> String { assert_ne!(obj.kind, ObjectKind::Archetype); - let aliases = obj.try_get_attr::(ATTR_PYTHON_ALIASES); - let array_aliases = obj - .try_get_attr::(ATTR_PYTHON_ARRAY_ALIASES) - .unwrap_or_default(); + let field_types = field_types.collect_vec(); + + let aliases = obj.get_attr_list(ATTR_PYTHON_ALIASES); + let array_aliases = obj.get_attr_list(ATTR_PYTHON_ARRAY_ALIASES); let name = &obj.name; - let union_fields = field_types.join(","); - let aliases = if let Some(aliases) = aliases { - aliases - } else { - String::new() - }; + let like = std::iter::once(name) + .chain(field_types.iter().copied()) + .chain(aliases.iter()) + .join(" | "); + + let array_like = std::iter::once(name) + .chain(field_types) + .chain(std::iter::once(&format!("Sequence[{name}Like]"))) + .chain(array_aliases.iter()) + .join(" | "); unindent::unindent(&format!( r#" if TYPE_CHECKING: - {name}Like = Union[ - {name},{union_fields},{aliases} - ] - {name}ArrayLike = Union[ - {name},{union_fields}, - Sequence[{name}Like],{array_aliases} - ] + {name}Like = {like} + {name}ArrayLike = {array_like} else: {name}Like = Any {name}ArrayLike = Any diff --git a/crates/re_types_builder/src/objects.rs b/crates/re_types_builder/src/objects.rs index 97c858a9926e..60a5d525e0a5 100644 --- a/crates/re_types_builder/src/objects.rs +++ b/crates/re_types_builder/src/objects.rs @@ -612,6 +612,15 @@ impl Object { self.attrs.try_get(self.fqname.as_str(), name) } + pub fn get_attr_list(&self, name: &str) -> Vec { + split_list( + &self + .attrs + .try_get::(self.fqname.as_str(), name) + .unwrap_or_default(), + ) + } + pub fn is_attr_set(&self, name: impl AsRef) -> bool { self.attrs.has(name) } @@ -1333,3 +1342,77 @@ fn filepath_from_declaration_file( .canonicalize_utf8() .expect("Failed to canonicalize declaration path") } + +fn split_list(str: &str) -> Vec { + let mut bow = 0; + let mut angles = 0; + let mut curly = 0; + let mut square = 0; + + let mut results = Vec::new(); + let mut current = String::new(); + + for c in str.chars() { + match c { + '<' => angles += 1, + '>' => angles -= 1, + + '(' => bow += 1, + ')' => bow -= 1, + + '{' => curly += 1, + '}' => curly -= 1, + + '[' => square += 1, + ']' => square -= 1, + + ',' if angles == 0 && bow == 0 && curly == 0 && square == 0 => { + results.push(current.trim().to_owned()); + current = String::new(); + continue; // skip the comma + } + _ => {} + } + current.push(c); + } + + current = current.trim().to_owned(); + if !current.is_empty() { + results.push(current); + } + results +} + +#[test] +fn test_split_list() { + assert_eq!(split_list(""), Vec::::new()); + assert_eq!(split_list(" hello "), vec!["hello".to_owned()]); + assert_eq!( + split_list("hello, there"), + vec!["hello".to_owned(), "there".to_owned()] + ); + + // Python: + assert_eq!( + split_list("int, Tuple[int, str], Tuple[int, str, datatypes.Rgba32Like]"), + vec![ + "int".to_owned(), + "Tuple[int, str]".to_owned(), + "Tuple[int, str, datatypes.Rgba32Like]".to_owned(), + ] + ); + assert_eq!( + split_list("int, Sequence[Union[int, float]], npt.NDArray[Union[np.uint8, np.float32, np.float64]]"), + vec![ + "int".to_owned(), + "Sequence[Union[int, float]]".to_owned(), + "npt.NDArray[Union[np.uint8, np.float32, np.float64]]".to_owned(), + ] + ); + + // Rust: + assert_eq!( + split_list("HashMap, bool"), + vec!["HashMap".to_owned(), "bool".to_owned()] + ); +} diff --git a/crates/re_types_core/src/components/clear_is_recursive.rs b/crates/re_types_core/src/components/clear_is_recursive.rs index f22b3ed3218b..4f18a216d059 100644 --- a/crates/re_types_core/src/components/clear_is_recursive.rs +++ b/crates/re_types_core/src/components/clear_is_recursive.rs @@ -21,7 +21,7 @@ use crate::SerializationResult; use crate::{ComponentBatch, MaybeOwnedComponentBatch}; use crate::{DeserializationError, DeserializationResult}; -/// **Component**: Configures how a clear operation should behave - recursive or not. +/// **Component**: Configures how a clear operation should behave - recursive or not? #[derive(Clone, Debug, Copy, PartialEq, Eq)] pub struct ClearIsRecursive( /// If true, also clears all recursive children entities. diff --git a/rerun_cpp/src/rerun/archetypes/segmentation_image.hpp b/rerun_cpp/src/rerun/archetypes/segmentation_image.hpp index 4513e669b0cb..848c2126b7be 100644 --- a/rerun_cpp/src/rerun/archetypes/segmentation_image.hpp +++ b/rerun_cpp/src/rerun/archetypes/segmentation_image.hpp @@ -18,7 +18,7 @@ namespace rerun { namespace archetypes { - /// **Archetype**: An image made up of integer class-ids. + /// **Archetype**: An image made up of integer class-ids /// /// The shape of the `TensorData` must be mappable to an `HxW` tensor. /// Each pixel corresponds to a depth value in units specified by meter. diff --git a/rerun_cpp/src/rerun/components/clear_is_recursive.hpp b/rerun_cpp/src/rerun/components/clear_is_recursive.hpp index 42ae6555a20a..5714596a87ac 100644 --- a/rerun_cpp/src/rerun/components/clear_is_recursive.hpp +++ b/rerun_cpp/src/rerun/components/clear_is_recursive.hpp @@ -17,7 +17,7 @@ namespace arrow { namespace rerun { namespace components { - /// **Component**: Configures how a clear operation should behave - recursive or not. + /// **Component**: Configures how a clear operation should behave - recursive or not? struct ClearIsRecursive { /// If true, also clears all recursive children entities. bool recursive; diff --git a/rerun_cpp/src/rerun/components/text.hpp b/rerun_cpp/src/rerun/components/text.hpp index ce7757d99eee..01f7d87a274c 100644 --- a/rerun_cpp/src/rerun/components/text.hpp +++ b/rerun_cpp/src/rerun/components/text.hpp @@ -20,7 +20,7 @@ namespace arrow { namespace rerun { namespace components { - /// **Component**: A string of text, e.g. for labels and text documents. + /// **Component**: A string of text, e.g. for labels and text documents struct Text { rerun::datatypes::Utf8 value; diff --git a/rerun_py/rerun_sdk/rerun/blueprint/auto_space_views.py b/rerun_py/rerun_sdk/rerun/blueprint/auto_space_views.py index c2529872ce8b..cace85395f26 100644 --- a/rerun_py/rerun_sdk/rerun/blueprint/auto_space_views.py +++ b/rerun_py/rerun_sdk/rerun/blueprint/auto_space_views.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence from attrs import define, field @@ -38,10 +38,7 @@ def __init__(self: Any, enabled: AutoSpaceViewsLike): AutoSpaceViewsLike = AutoSpaceViews -AutoSpaceViewsArrayLike = Union[ - AutoSpaceViews, - Sequence[AutoSpaceViewsLike], -] +AutoSpaceViewsArrayLike = AutoSpaceViews | Sequence[AutoSpaceViewsLike] class AutoSpaceViewsType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/blueprint/panel_view.py b/rerun_py/rerun_sdk/rerun/blueprint/panel_view.py index efaed31438d7..3d6391db4a68 100644 --- a/rerun_py/rerun_sdk/rerun/blueprint/panel_view.py +++ b/rerun_py/rerun_sdk/rerun/blueprint/panel_view.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence from attrs import define, field @@ -32,10 +32,7 @@ def __init__(self: Any, is_expanded: PanelViewLike): PanelViewLike = PanelView -PanelViewArrayLike = Union[ - PanelView, - Sequence[PanelViewLike], -] +PanelViewArrayLike = PanelView | Sequence[PanelViewLike] class PanelViewType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/blueprint/space_view_component.py b/rerun_py/rerun_sdk/rerun/blueprint/space_view_component.py index 3290cc13c532..b33abd9f3695 100644 --- a/rerun_py/rerun_sdk/rerun/blueprint/space_view_component.py +++ b/rerun_py/rerun_sdk/rerun/blueprint/space_view_component.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -47,10 +47,7 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: SpaceViewComponentLike = SpaceViewComponent -SpaceViewComponentArrayLike = Union[ - SpaceViewComponent, - Sequence[SpaceViewComponentLike], -] +SpaceViewComponentArrayLike = SpaceViewComponent | Sequence[SpaceViewComponentLike] class SpaceViewComponentType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/blueprint/space_view_maximized.py b/rerun_py/rerun_sdk/rerun/blueprint/space_view_maximized.py index 9c37ae078c58..a65d26de7008 100644 --- a/rerun_py/rerun_sdk/rerun/blueprint/space_view_maximized.py +++ b/rerun_py/rerun_sdk/rerun/blueprint/space_view_maximized.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -47,10 +47,7 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: SpaceViewMaximizedLike = SpaceViewMaximized -SpaceViewMaximizedArrayLike = Union[ - SpaceViewMaximized, - Sequence[SpaceViewMaximizedLike], -] +SpaceViewMaximizedArrayLike = SpaceViewMaximized | Sequence[SpaceViewMaximizedLike] class SpaceViewMaximizedType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/blueprint/viewport_layout.py b/rerun_py/rerun_sdk/rerun/blueprint/viewport_layout.py index 1318326d6dde..8c774379ba56 100644 --- a/rerun_py/rerun_sdk/rerun/blueprint/viewport_layout.py +++ b/rerun_py/rerun_sdk/rerun/blueprint/viewport_layout.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -67,10 +67,7 @@ def __init__(self: Any, space_view_keys: npt.ArrayLike, tree: npt.ArrayLike, aut ViewportLayoutLike = ViewportLayout -ViewportLayoutArrayLike = Union[ - ViewportLayout, - Sequence[ViewportLayoutLike], -] +ViewportLayoutArrayLike = ViewportLayout | Sequence[ViewportLayoutLike] class ViewportLayoutType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/annotation_context.py b/rerun_py/rerun_sdk/rerun/components/annotation_context.py index a464b76038fa..4264e2f8625e 100644 --- a/rerun_py/rerun_sdk/rerun/components/annotation_context.py +++ b/rerun_py/rerun_sdk/rerun/components/annotation_context.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import pyarrow as pa from attrs import define, field @@ -57,16 +57,13 @@ def __init__(self: Any, class_map: AnnotationContextLike): if TYPE_CHECKING: - AnnotationContextLike = Union[ - AnnotationContext, datatypes.ClassDescriptionArrayLike, Sequence[datatypes.ClassDescriptionMapElemLike] - ] + AnnotationContextLike = ( + AnnotationContext | datatypes.ClassDescriptionArrayLike | Sequence[datatypes.ClassDescriptionMapElemLike] + ) else: AnnotationContextLike = Any -AnnotationContextArrayLike = Union[ - AnnotationContext, - Sequence[AnnotationContextLike], -] +AnnotationContextArrayLike = AnnotationContext | Sequence[AnnotationContextLike] class AnnotationContextType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/blob.py b/rerun_py/rerun_sdk/rerun/components/blob.py index 24429e755f91..916765f2f22f 100644 --- a/rerun_py/rerun_sdk/rerun/components/blob.py +++ b/rerun_py/rerun_sdk/rerun/components/blob.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -39,11 +39,11 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - BlobLike = Union[Blob, bytes, npt.NDArray[np.uint8]] + BlobLike = Blob | bytes | npt.NDArray[np.uint8] else: BlobLike = Any -BlobArrayLike = Union[Blob, Sequence[BlobLike], bytes, npt.NDArray[np.uint8]] +BlobArrayLike = Blob | Sequence[BlobLike] | bytes | npt.NDArray[np.uint8] class BlobType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/clear_is_recursive.py b/rerun_py/rerun_sdk/rerun/components/clear_is_recursive.py index 9ca096e23eef..64558d31c0e2 100644 --- a/rerun_py/rerun_sdk/rerun/components/clear_is_recursive.py +++ b/rerun_py/rerun_sdk/rerun/components/clear_is_recursive.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -26,7 +26,7 @@ @define(init=False) class ClearIsRecursive(ClearIsRecursiveExt): - """**Component**: Configures how a clear operation should behave - recursive or not.""" + """**Component**: Configures how a clear operation should behave - recursive or not?.""" def __init__(self: Any, recursive: ClearIsRecursiveLike): """ @@ -48,11 +48,11 @@ def __init__(self: Any, recursive: ClearIsRecursiveLike): if TYPE_CHECKING: - ClearIsRecursiveLike = Union[ClearIsRecursive, bool] + ClearIsRecursiveLike = ClearIsRecursive | bool else: ClearIsRecursiveLike = Any -ClearIsRecursiveArrayLike = Union[ClearIsRecursive, Sequence[ClearIsRecursiveLike], bool, npt.NDArray[np.bool_]] +ClearIsRecursiveArrayLike = ClearIsRecursive | Sequence[ClearIsRecursiveLike] | bool | npt.NDArray[np.bool_] class ClearIsRecursiveType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/depth_meter.py b/rerun_py/rerun_sdk/rerun/components/depth_meter.py index 5790b36dd1c5..0e9496287195 100644 --- a/rerun_py/rerun_sdk/rerun/components/depth_meter.py +++ b/rerun_py/rerun_sdk/rerun/components/depth_meter.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -39,11 +39,11 @@ def __float__(self) -> float: if TYPE_CHECKING: - DepthMeterLike = Union[DepthMeter, float] + DepthMeterLike = DepthMeter | float else: DepthMeterLike = Any -DepthMeterArrayLike = Union[DepthMeter, Sequence[DepthMeterLike], float, npt.NDArray[np.float32]] +DepthMeterArrayLike = DepthMeter | Sequence[DepthMeterLike] | float | npt.NDArray[np.float32] class DepthMeterType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/disconnected_space.py b/rerun_py/rerun_sdk/rerun/components/disconnected_space.py index a2ab1520b1ce..7b752977f097 100644 --- a/rerun_py/rerun_sdk/rerun/components/disconnected_space.py +++ b/rerun_py/rerun_sdk/rerun/components/disconnected_space.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -43,11 +43,11 @@ class DisconnectedSpace(DisconnectedSpaceExt): if TYPE_CHECKING: - DisconnectedSpaceLike = Union[DisconnectedSpace, bool] + DisconnectedSpaceLike = DisconnectedSpace | bool else: DisconnectedSpaceLike = Any -DisconnectedSpaceArrayLike = Union[DisconnectedSpace, Sequence[DisconnectedSpaceLike], bool, npt.NDArray[np.bool_]] +DisconnectedSpaceArrayLike = DisconnectedSpace | Sequence[DisconnectedSpaceLike] | bool | npt.NDArray[np.bool_] class DisconnectedSpaceType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/draw_order.py b/rerun_py/rerun_sdk/rerun/components/draw_order.py index 94afba3e6db8..b6bafbf5f29b 100644 --- a/rerun_py/rerun_sdk/rerun/components/draw_order.py +++ b/rerun_py/rerun_sdk/rerun/components/draw_order.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -47,11 +47,11 @@ def __float__(self) -> float: if TYPE_CHECKING: - DrawOrderLike = Union[DrawOrder, float] + DrawOrderLike = DrawOrder | float else: DrawOrderLike = Any -DrawOrderArrayLike = Union[DrawOrder, Sequence[DrawOrderLike], float, npt.NDArray[np.float32]] +DrawOrderArrayLike = DrawOrder | Sequence[DrawOrderLike] | float | npt.NDArray[np.float32] class DrawOrderType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/instance_key.py b/rerun_py/rerun_sdk/rerun/components/instance_key.py index dc77c6192180..08685fa08c82 100644 --- a/rerun_py/rerun_sdk/rerun/components/instance_key.py +++ b/rerun_py/rerun_sdk/rerun/components/instance_key.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -39,11 +39,11 @@ def __int__(self) -> int: if TYPE_CHECKING: - InstanceKeyLike = Union[InstanceKey, int] + InstanceKeyLike = InstanceKey | int else: InstanceKeyLike = Any -InstanceKeyArrayLike = Union[InstanceKey, Sequence[InstanceKeyLike], int, npt.NDArray[np.uint64]] +InstanceKeyArrayLike = InstanceKey | Sequence[InstanceKeyLike] | int | npt.NDArray[np.uint64] class InstanceKeyType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/line_strip2d.py b/rerun_py/rerun_sdk/rerun/components/line_strip2d.py index 890305408587..5186055c1ea2 100644 --- a/rerun_py/rerun_sdk/rerun/components/line_strip2d.py +++ b/rerun_py/rerun_sdk/rerun/components/line_strip2d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -46,11 +46,11 @@ def __init__(self: Any, points: LineStrip2DLike): if TYPE_CHECKING: - LineStrip2DLike = Union[LineStrip2D, datatypes.Vec2DArrayLike, npt.NDArray[np.float32]] + LineStrip2DLike = LineStrip2D | datatypes.Vec2DArrayLike | npt.NDArray[np.float32] else: LineStrip2DLike = Any -LineStrip2DArrayLike = Union[LineStrip2D, Sequence[LineStrip2DLike], npt.NDArray[np.float32]] +LineStrip2DArrayLike = LineStrip2D | Sequence[LineStrip2DLike] | npt.NDArray[np.float32] class LineStrip2DType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/line_strip3d.py b/rerun_py/rerun_sdk/rerun/components/line_strip3d.py index 463a85bc6325..90c48f33d744 100644 --- a/rerun_py/rerun_sdk/rerun/components/line_strip3d.py +++ b/rerun_py/rerun_sdk/rerun/components/line_strip3d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -46,11 +46,11 @@ def __init__(self: Any, points: LineStrip3DLike): if TYPE_CHECKING: - LineStrip3DLike = Union[LineStrip3D, datatypes.Vec3DArrayLike, npt.NDArray[np.float32]] + LineStrip3DLike = LineStrip3D | datatypes.Vec3DArrayLike | npt.NDArray[np.float32] else: LineStrip3DLike = Any -LineStrip3DArrayLike = Union[LineStrip3D, Sequence[LineStrip3DLike], npt.NDArray[np.float32]] +LineStrip3DArrayLike = LineStrip3D | Sequence[LineStrip3DLike] | npt.NDArray[np.float32] class LineStrip3DType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/radius.py b/rerun_py/rerun_sdk/rerun/components/radius.py index bb6da280bc9e..44f8873b59ab 100644 --- a/rerun_py/rerun_sdk/rerun/components/radius.py +++ b/rerun_py/rerun_sdk/rerun/components/radius.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -39,11 +39,11 @@ def __float__(self) -> float: if TYPE_CHECKING: - RadiusLike = Union[Radius, float] + RadiusLike = Radius | float else: RadiusLike = Any -RadiusArrayLike = Union[Radius, Sequence[RadiusLike], float, npt.ArrayLike] +RadiusArrayLike = Radius | Sequence[RadiusLike] | float | npt.ArrayLike class RadiusType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/scalar.py b/rerun_py/rerun_sdk/rerun/components/scalar.py index b46f396d7bee..7a9d64b807aa 100644 --- a/rerun_py/rerun_sdk/rerun/components/scalar.py +++ b/rerun_py/rerun_sdk/rerun/components/scalar.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -43,11 +43,11 @@ def __float__(self) -> float: if TYPE_CHECKING: - ScalarLike = Union[Scalar, float] + ScalarLike = Scalar | float else: ScalarLike = Any -ScalarArrayLike = Union[Scalar, Sequence[ScalarLike], float, npt.NDArray[np.float64]] +ScalarArrayLike = Scalar | Sequence[ScalarLike] | float | npt.NDArray[np.float64] class ScalarType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/scalar_scattering.py b/rerun_py/rerun_sdk/rerun/components/scalar_scattering.py index 3d05b70643c9..a2a2d21de2b9 100644 --- a/rerun_py/rerun_sdk/rerun/components/scalar_scattering.py +++ b/rerun_py/rerun_sdk/rerun/components/scalar_scattering.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -38,11 +38,11 @@ def __init__(self: Any, scattered: ScalarScatteringLike): if TYPE_CHECKING: - ScalarScatteringLike = Union[ScalarScattering, bool] + ScalarScatteringLike = ScalarScattering | bool else: ScalarScatteringLike = Any -ScalarScatteringArrayLike = Union[ScalarScattering, Sequence[ScalarScatteringLike], bool, npt.NDArray[np.bool_]] +ScalarScatteringArrayLike = ScalarScattering | Sequence[ScalarScatteringLike] | bool | npt.NDArray[np.bool_] class ScalarScatteringType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/components/view_coordinates.py b/rerun_py/rerun_sdk/rerun/components/view_coordinates.py index e1270822e9de..3854ab0c0287 100644 --- a/rerun_py/rerun_sdk/rerun/components/view_coordinates.py +++ b/rerun_py/rerun_sdk/rerun/components/view_coordinates.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -71,11 +71,11 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - ViewCoordinatesLike = Union[ViewCoordinates, npt.ArrayLike] + ViewCoordinatesLike = ViewCoordinates | npt.ArrayLike else: ViewCoordinatesLike = Any -ViewCoordinatesArrayLike = Union[ViewCoordinates, Sequence[ViewCoordinatesLike], npt.ArrayLike] +ViewCoordinatesArrayLike = ViewCoordinates | Sequence[ViewCoordinatesLike] | npt.ArrayLike class ViewCoordinatesType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/angle.py b/rerun_py/rerun_sdk/rerun/datatypes/angle.py index d9bbd1bb301d..c43aec532ef4 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/angle.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/angle.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Literal, Sequence, Union +from typing import TYPE_CHECKING, Any, Literal, Sequence import pyarrow as pa from attrs import define, field @@ -35,15 +35,8 @@ class Angle(AngleExt): if TYPE_CHECKING: - AngleLike = Union[ - Angle, - float, - ] - AngleArrayLike = Union[ - Angle, - float, - Sequence[AngleLike], - ] + AngleLike = Angle | float + AngleArrayLike = Angle | float | Sequence[AngleLike] else: AngleLike = Any AngleArrayLike = Any diff --git a/rerun_py/rerun_sdk/rerun/datatypes/annotation_info.py b/rerun_py/rerun_sdk/rerun/datatypes/annotation_info.py index fa23948aea2f..4f5e946248e5 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/annotation_info.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/annotation_info.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Tuple, Union +from typing import TYPE_CHECKING, Any, Sequence, Tuple import pyarrow as pa from attrs import define, field @@ -92,14 +92,11 @@ def __init__( if TYPE_CHECKING: - AnnotationInfoLike = Union[AnnotationInfo, int, Tuple[int, str], Tuple[int, str, datatypes.Rgba32Like]] + AnnotationInfoLike = AnnotationInfo | int | Tuple[int, str] | Tuple[int, str, datatypes.Rgba32Like] else: AnnotationInfoLike = Any -AnnotationInfoArrayLike = Union[ - AnnotationInfo, - Sequence[AnnotationInfoLike], -] +AnnotationInfoArrayLike = AnnotationInfo | Sequence[AnnotationInfoLike] class AnnotationInfoType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/class_description.py b/rerun_py/rerun_sdk/rerun/datatypes/class_description.py index 93d09b845883..cedd11306f33 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/class_description.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/class_description.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import pyarrow as pa from attrs import define, field @@ -71,14 +71,11 @@ class ClassDescription(ClassDescriptionExt): if TYPE_CHECKING: - ClassDescriptionLike = Union[ClassDescription, datatypes.AnnotationInfoLike] + ClassDescriptionLike = ClassDescription | datatypes.AnnotationInfoLike else: ClassDescriptionLike = Any -ClassDescriptionArrayLike = Union[ - ClassDescription, - Sequence[ClassDescriptionLike], -] +ClassDescriptionArrayLike = ClassDescription | Sequence[ClassDescriptionLike] class ClassDescriptionType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/class_description_map_elem.py b/rerun_py/rerun_sdk/rerun/datatypes/class_description_map_elem.py index 6899ccdad8e7..6b2605054175 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/class_description_map_elem.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/class_description_map_elem.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import pyarrow as pa from attrs import define, field @@ -69,14 +69,11 @@ def __init__(self: Any, class_id: datatypes.ClassIdLike, class_description: data if TYPE_CHECKING: - ClassDescriptionMapElemLike = Union[ClassDescriptionMapElem, datatypes.ClassDescriptionLike] + ClassDescriptionMapElemLike = ClassDescriptionMapElem | datatypes.ClassDescriptionLike else: ClassDescriptionMapElemLike = Any -ClassDescriptionMapElemArrayLike = Union[ - ClassDescriptionMapElem, - Sequence[ClassDescriptionMapElemLike], -] +ClassDescriptionMapElemArrayLike = ClassDescriptionMapElem | Sequence[ClassDescriptionMapElemLike] class ClassDescriptionMapElemType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/class_id.py b/rerun_py/rerun_sdk/rerun/datatypes/class_id.py index 3151fd6b4e3f..14b008cca8e6 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/class_id.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/class_id.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -39,11 +39,11 @@ def __int__(self) -> int: if TYPE_CHECKING: - ClassIdLike = Union[ClassId, int] + ClassIdLike = ClassId | int else: ClassIdLike = Any -ClassIdArrayLike = Union[ClassId, Sequence[ClassIdLike], int, npt.ArrayLike] +ClassIdArrayLike = ClassId | Sequence[ClassIdLike] | int | npt.ArrayLike class ClassIdType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/float32.py b/rerun_py/rerun_sdk/rerun/datatypes/float32.py index 767a44b56be5..fd640fb72b60 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/float32.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/float32.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -38,10 +38,7 @@ def __float__(self) -> float: Float32Like = Float32 -Float32ArrayLike = Union[ - Float32, - Sequence[Float32Like], -] +Float32ArrayLike = Float32 | Sequence[Float32Like] class Float32Type(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/keypoint_id.py b/rerun_py/rerun_sdk/rerun/datatypes/keypoint_id.py index f425119db6a6..ce4e95cbd37b 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/keypoint_id.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/keypoint_id.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -46,11 +46,11 @@ def __int__(self) -> int: if TYPE_CHECKING: - KeypointIdLike = Union[KeypointId, int] + KeypointIdLike = KeypointId | int else: KeypointIdLike = Any -KeypointIdArrayLike = Union[KeypointId, Sequence[KeypointIdLike], int, npt.ArrayLike] +KeypointIdArrayLike = KeypointId | Sequence[KeypointIdLike] | int | npt.ArrayLike class KeypointIdType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/keypoint_pair.py b/rerun_py/rerun_sdk/rerun/datatypes/keypoint_pair.py index 9bb7c7de502b..8ab8b4d78c5a 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/keypoint_pair.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/keypoint_pair.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import pyarrow as pa from attrs import define, field @@ -62,14 +62,11 @@ def __init__(self: Any, keypoint0: datatypes.KeypointIdLike, keypoint1: datatype if TYPE_CHECKING: - KeypointPairLike = Union[KeypointPair, Sequence[datatypes.KeypointIdLike]] + KeypointPairLike = KeypointPair | Sequence[datatypes.KeypointIdLike] else: KeypointPairLike = Any -KeypointPairArrayLike = Union[ - KeypointPair, - Sequence[KeypointPairLike], -] +KeypointPairArrayLike = KeypointPair | Sequence[KeypointPairLike] class KeypointPairType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/mat3x3.py b/rerun_py/rerun_sdk/rerun/datatypes/mat3x3.py index 309ade65c025..e768da8b9284 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/mat3x3.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/mat3x3.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -71,14 +71,11 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - Mat3x3Like = Union[Mat3x3, npt.ArrayLike] + Mat3x3Like = Mat3x3 | npt.ArrayLike else: Mat3x3Like = Any -Mat3x3ArrayLike = Union[ - Mat3x3, - Sequence[Mat3x3Like], -] +Mat3x3ArrayLike = Mat3x3 | Sequence[Mat3x3Like] class Mat3x3Type(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/mat4x4.py b/rerun_py/rerun_sdk/rerun/datatypes/mat4x4.py index 68b3397147d5..25f48252906d 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/mat4x4.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/mat4x4.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -73,14 +73,11 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - Mat4x4Like = Union[Mat4x4, npt.ArrayLike] + Mat4x4Like = Mat4x4 | npt.ArrayLike else: Mat4x4Like = Any -Mat4x4ArrayLike = Union[ - Mat4x4, - Sequence[Mat4x4Like], -] +Mat4x4ArrayLike = Mat4x4 | Sequence[Mat4x4Like] class Mat4x4Type(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/material.py b/rerun_py/rerun_sdk/rerun/datatypes/material.py index d25fe6342347..522599c49588 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/material.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/material.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -54,10 +54,7 @@ def __init__(self: Any, albedo_factor: datatypes.Rgba32Like | None = None): MaterialLike = Material -MaterialArrayLike = Union[ - Material, - Sequence[MaterialLike], -] +MaterialArrayLike = Material | Sequence[MaterialLike] class MaterialType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/mesh_properties.py b/rerun_py/rerun_sdk/rerun/datatypes/mesh_properties.py index 97439d0321a2..dbdbd2d52b62 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/mesh_properties.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/mesh_properties.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -59,10 +59,7 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: MeshPropertiesLike = MeshProperties -MeshPropertiesArrayLike = Union[ - MeshProperties, - Sequence[MeshPropertiesLike], -] +MeshPropertiesArrayLike = MeshProperties | Sequence[MeshPropertiesLike] class MeshPropertiesType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/quaternion.py b/rerun_py/rerun_sdk/rerun/datatypes/quaternion.py index 075197483858..d062fd5d48c2 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/quaternion.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/quaternion.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -40,10 +40,7 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: QuaternionLike = Quaternion -QuaternionArrayLike = Union[ - Quaternion, - Sequence[QuaternionLike], -] +QuaternionArrayLike = Quaternion | Sequence[QuaternionLike] class QuaternionType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/rgba32.py b/rerun_py/rerun_sdk/rerun/datatypes/rgba32.py index 00920c088612..70a26d925318 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/rgba32.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/rgba32.py @@ -50,11 +50,11 @@ def __int__(self) -> int: if TYPE_CHECKING: - Rgba32Like = Union[Rgba32, int, Sequence[Union[int, float]], npt.NDArray[Union[np.uint8, np.float32, np.float64]]] + Rgba32Like = Rgba32 | int | Sequence[Union[int, float]] | npt.NDArray[Union[np.uint8, np.float32, np.float64]] else: Rgba32Like = Any -Rgba32ArrayLike = Union[Rgba32, Sequence[Rgba32Like], int, npt.ArrayLike] +Rgba32ArrayLike = Rgba32 | Sequence[Rgba32Like] | int | npt.ArrayLike class Rgba32Type(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/rotation3d.py b/rerun_py/rerun_sdk/rerun/datatypes/rotation3d.py index 616b9aba15d0..3c54164174c8 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/rotation3d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/rotation3d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, SupportsFloat, Union +from typing import TYPE_CHECKING, Any, Sequence, SupportsFloat import pyarrow as pa from attrs import define, field @@ -34,13 +34,8 @@ class Rotation3D(Rotation3DExt): if TYPE_CHECKING: - Rotation3DLike = Union[Rotation3D, datatypes.Quaternion, datatypes.RotationAxisAngle, Sequence[SupportsFloat]] - Rotation3DArrayLike = Union[ - Rotation3D, - datatypes.Quaternion, - datatypes.RotationAxisAngle, - Sequence[Rotation3DLike], - ] + Rotation3DLike = Rotation3D | datatypes.Quaternion | datatypes.RotationAxisAngle | Sequence[SupportsFloat] + Rotation3DArrayLike = Rotation3D | datatypes.Quaternion | datatypes.RotationAxisAngle | Sequence[Rotation3DLike] else: Rotation3DLike = Any Rotation3DArrayLike = Any diff --git a/rerun_py/rerun_sdk/rerun/datatypes/rotation_axis_angle.py b/rerun_py/rerun_sdk/rerun/datatypes/rotation_axis_angle.py index 9b431991f13d..ca1050ed28b9 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/rotation_axis_angle.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/rotation_axis_angle.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Sequence, Union +from typing import Sequence import pyarrow as pa from attrs import define, field @@ -54,10 +54,7 @@ class RotationAxisAngle(RotationAxisAngleExt): RotationAxisAngleLike = RotationAxisAngle -RotationAxisAngleArrayLike = Union[ - RotationAxisAngle, - Sequence[RotationAxisAngleLike], -] +RotationAxisAngleArrayLike = RotationAxisAngle | Sequence[RotationAxisAngleLike] class RotationAxisAngleType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/scale3d.py b/rerun_py/rerun_sdk/rerun/datatypes/scale3d.py index c913d7f0f896..cce47f0adbe3 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/scale3d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/scale3d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import pyarrow as pa from attrs import define, field @@ -47,13 +47,8 @@ class Scale3D(Scale3DExt): if TYPE_CHECKING: - Scale3DLike = Union[Scale3D, datatypes.Vec3D, float, datatypes.Vec3DLike] - Scale3DArrayLike = Union[ - Scale3D, - datatypes.Vec3D, - float, - Sequence[Scale3DLike], - ] + Scale3DLike = Scale3D | datatypes.Vec3D | float | datatypes.Vec3DLike + Scale3DArrayLike = Scale3D | datatypes.Vec3D | float | Sequence[Scale3DLike] else: Scale3DLike = Any Scale3DArrayLike = Any diff --git a/rerun_py/rerun_sdk/rerun/datatypes/tensor_buffer.py b/rerun_py/rerun_sdk/rerun/datatypes/tensor_buffer.py index 2746bc468324..e82e113cbcb7 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/tensor_buffer.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/tensor_buffer.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Literal, Sequence, Union +from typing import TYPE_CHECKING, Any, Literal, Sequence import numpy as np import numpy.typing as npt @@ -63,35 +63,35 @@ class TensorBuffer(TensorBufferExt): if TYPE_CHECKING: - TensorBufferLike = Union[ - TensorBuffer, - npt.NDArray[np.float16], - npt.NDArray[np.float32], - npt.NDArray[np.float64], - npt.NDArray[np.int16], - npt.NDArray[np.int32], - npt.NDArray[np.int64], - npt.NDArray[np.int8], - npt.NDArray[np.uint16], - npt.NDArray[np.uint32], - npt.NDArray[np.uint64], - npt.NDArray[np.uint8], - ] - TensorBufferArrayLike = Union[ - TensorBuffer, - npt.NDArray[np.float16], - npt.NDArray[np.float32], - npt.NDArray[np.float64], - npt.NDArray[np.int16], - npt.NDArray[np.int32], - npt.NDArray[np.int64], - npt.NDArray[np.int8], - npt.NDArray[np.uint16], - npt.NDArray[np.uint32], - npt.NDArray[np.uint64], - npt.NDArray[np.uint8], - Sequence[TensorBufferLike], - ] + TensorBufferLike = ( + TensorBuffer + | npt.NDArray[np.float16] + | npt.NDArray[np.float32] + | npt.NDArray[np.float64] + | npt.NDArray[np.int16] + | npt.NDArray[np.int32] + | npt.NDArray[np.int64] + | npt.NDArray[np.int8] + | npt.NDArray[np.uint16] + | npt.NDArray[np.uint32] + | npt.NDArray[np.uint64] + | npt.NDArray[np.uint8] + ) + TensorBufferArrayLike = ( + TensorBuffer + | npt.NDArray[np.float16] + | npt.NDArray[np.float32] + | npt.NDArray[np.float64] + | npt.NDArray[np.int16] + | npt.NDArray[np.int32] + | npt.NDArray[np.int64] + | npt.NDArray[np.int8] + | npt.NDArray[np.uint16] + | npt.NDArray[np.uint32] + | npt.NDArray[np.uint64] + | npt.NDArray[np.uint8] + | Sequence[TensorBufferLike] + ) else: TensorBufferLike = Any TensorBufferArrayLike = Any diff --git a/rerun_py/rerun_sdk/rerun/datatypes/tensor_data.py b/rerun_py/rerun_sdk/rerun/datatypes/tensor_data.py index dae3c8e326a9..453c1e6267ed 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/tensor_data.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/tensor_data.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy.typing as npt import pyarrow as pa @@ -45,11 +45,11 @@ class TensorData(TensorDataExt): if TYPE_CHECKING: - TensorDataLike = Union[TensorData, npt.ArrayLike] + TensorDataLike = TensorData | npt.ArrayLike else: TensorDataLike = Any -TensorDataArrayLike = Union[TensorData, Sequence[TensorDataLike], npt.ArrayLike] +TensorDataArrayLike = TensorData | Sequence[TensorDataLike] | npt.ArrayLike class TensorDataType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/tensor_dimension.py b/rerun_py/rerun_sdk/rerun/datatypes/tensor_dimension.py index 431acb92c280..e5743ffe20f8 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/tensor_dimension.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/tensor_dimension.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -55,10 +55,7 @@ def __init__(self: Any, size: int, name: str | None = None): TensorDimensionLike = TensorDimension -TensorDimensionArrayLike = Union[ - TensorDimension, - Sequence[TensorDimensionLike], -] +TensorDimensionArrayLike = TensorDimension | Sequence[TensorDimensionLike] class TensorDimensionType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/transform3d.py b/rerun_py/rerun_sdk/rerun/datatypes/transform3d.py index de7b19767b24..fcdec8fbd709 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/transform3d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/transform3d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import pyarrow as pa from attrs import define, field @@ -32,17 +32,10 @@ class Transform3D(Transform3DExt): if TYPE_CHECKING: - Transform3DLike = Union[ - Transform3D, - datatypes.TranslationAndMat3x3, - datatypes.TranslationRotationScale3D, - ] - Transform3DArrayLike = Union[ - Transform3D, - datatypes.TranslationAndMat3x3, - datatypes.TranslationRotationScale3D, - Sequence[Transform3DLike], - ] + Transform3DLike = Transform3D | datatypes.TranslationAndMat3x3 | datatypes.TranslationRotationScale3D + Transform3DArrayLike = ( + Transform3D | datatypes.TranslationAndMat3x3 | datatypes.TranslationRotationScale3D | Sequence[Transform3DLike] + ) else: Transform3DLike = Any Transform3DArrayLike = Any diff --git a/rerun_py/rerun_sdk/rerun/datatypes/translation_and_mat3x3.py b/rerun_py/rerun_sdk/rerun/datatypes/translation_and_mat3x3.py index ed6d4da44c4f..81160a36496b 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/translation_and_mat3x3.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/translation_and_mat3x3.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Sequence, Union +from typing import Sequence import pyarrow as pa from attrs import define, field @@ -79,10 +79,7 @@ class TranslationAndMat3x3(TranslationAndMat3x3Ext): TranslationAndMat3x3Like = TranslationAndMat3x3 -TranslationAndMat3x3ArrayLike = Union[ - TranslationAndMat3x3, - Sequence[TranslationAndMat3x3Like], -] +TranslationAndMat3x3ArrayLike = TranslationAndMat3x3 | Sequence[TranslationAndMat3x3Like] class TranslationAndMat3x3Type(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/translation_rotation_scale3d.py b/rerun_py/rerun_sdk/rerun/datatypes/translation_rotation_scale3d.py index 983eb5486fa4..92e553a4072a 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/translation_rotation_scale3d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/translation_rotation_scale3d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Sequence, Union +from typing import Sequence import pyarrow as pa from attrs import define, field @@ -83,10 +83,7 @@ class TranslationRotationScale3D(TranslationRotationScale3DExt): TranslationRotationScale3DLike = TranslationRotationScale3D -TranslationRotationScale3DArrayLike = Union[ - TranslationRotationScale3D, - Sequence[TranslationRotationScale3DLike], -] +TranslationRotationScale3DArrayLike = TranslationRotationScale3D | Sequence[TranslationRotationScale3DLike] class TranslationRotationScale3DType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/uint32.py b/rerun_py/rerun_sdk/rerun/datatypes/uint32.py index 478a66c2ec2a..132c4f9b2606 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/uint32.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/uint32.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -38,10 +38,7 @@ def __int__(self) -> int: UInt32Like = UInt32 -UInt32ArrayLike = Union[ - UInt32, - Sequence[UInt32Like], -] +UInt32ArrayLike = UInt32 | Sequence[UInt32Like] class UInt32Type(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/utf8.py b/rerun_py/rerun_sdk/rerun/datatypes/utf8.py index 88d08a992cba..9130b5a61b65 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/utf8.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/utf8.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import pyarrow as pa from attrs import define, field @@ -33,11 +33,11 @@ def __str__(self) -> str: if TYPE_CHECKING: - Utf8Like = Union[Utf8, str] + Utf8Like = Utf8 | str else: Utf8Like = Any -Utf8ArrayLike = Union[Utf8, Sequence[Utf8Like], str, Sequence[str]] +Utf8ArrayLike = Utf8 | Sequence[Utf8Like] | str | Sequence[str] class Utf8Type(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/uvec2d.py b/rerun_py/rerun_sdk/rerun/datatypes/uvec2d.py index e1270bd38f55..4f209e4083e2 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/uvec2d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/uvec2d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -38,13 +38,13 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - UVec2DLike = Union[UVec2D, npt.NDArray[Any], npt.ArrayLike, Sequence[int]] + UVec2DLike = UVec2D | npt.NDArray[Any] | npt.ArrayLike | Sequence[int] else: UVec2DLike = Any -UVec2DArrayLike = Union[ - UVec2D, Sequence[UVec2DLike], npt.NDArray[Any], npt.ArrayLike, Sequence[Sequence[int]], Sequence[int] -] +UVec2DArrayLike = ( + UVec2D | Sequence[UVec2DLike] | npt.NDArray[Any] | npt.ArrayLike | Sequence[Sequence[int]] | Sequence[int] +) class UVec2DType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/uvec3d.py b/rerun_py/rerun_sdk/rerun/datatypes/uvec3d.py index af9fcab87062..e5e06fc75532 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/uvec3d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/uvec3d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -38,13 +38,13 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - UVec3DLike = Union[UVec3D, npt.NDArray[Any], npt.ArrayLike, Sequence[int]] + UVec3DLike = UVec3D | npt.NDArray[Any] | npt.ArrayLike | Sequence[int] else: UVec3DLike = Any -UVec3DArrayLike = Union[ - UVec3D, Sequence[UVec3DLike], npt.NDArray[Any], npt.ArrayLike, Sequence[Sequence[int]], Sequence[int] -] +UVec3DArrayLike = ( + UVec3D | Sequence[UVec3DLike] | npt.NDArray[Any] | npt.ArrayLike | Sequence[Sequence[int]] | Sequence[int] +) class UVec3DType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/uvec4d.py b/rerun_py/rerun_sdk/rerun/datatypes/uvec4d.py index 64e8860ce172..5d99552d1ca6 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/uvec4d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/uvec4d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -38,13 +38,13 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - UVec4DLike = Union[UVec4D, npt.NDArray[Any], npt.ArrayLike, Sequence[int]] + UVec4DLike = UVec4D | npt.NDArray[Any] | npt.ArrayLike | Sequence[int] else: UVec4DLike = Any -UVec4DArrayLike = Union[ - UVec4D, Sequence[UVec4DLike], npt.NDArray[Any], npt.ArrayLike, Sequence[Sequence[int]], Sequence[int] -] +UVec4DArrayLike = ( + UVec4D | Sequence[UVec4DLike] | npt.NDArray[Any] | npt.ArrayLike | Sequence[Sequence[int]] | Sequence[int] +) class UVec4DType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/vec2d.py b/rerun_py/rerun_sdk/rerun/datatypes/vec2d.py index 0160c09fd5e0..d439ba4e9ebe 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/vec2d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/vec2d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -39,13 +39,13 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - Vec2DLike = Union[Vec2D, npt.NDArray[Any], npt.ArrayLike, Sequence[float]] + Vec2DLike = Vec2D | npt.NDArray[Any] | npt.ArrayLike | Sequence[float] else: Vec2DLike = Any -Vec2DArrayLike = Union[ - Vec2D, Sequence[Vec2DLike], npt.NDArray[Any], npt.ArrayLike, Sequence[Sequence[float]], Sequence[float] -] +Vec2DArrayLike = ( + Vec2D | Sequence[Vec2DLike] | npt.NDArray[Any] | npt.ArrayLike | Sequence[Sequence[float]] | Sequence[float] +) class Vec2DType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/vec3d.py b/rerun_py/rerun_sdk/rerun/datatypes/vec3d.py index 77f4d760af1e..42454b9cf69c 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/vec3d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/vec3d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -39,13 +39,13 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - Vec3DLike = Union[Vec3D, npt.NDArray[Any], npt.ArrayLike, Sequence[float]] + Vec3DLike = Vec3D | npt.NDArray[Any] | npt.ArrayLike | Sequence[float] else: Vec3DLike = Any -Vec3DArrayLike = Union[ - Vec3D, Sequence[Vec3DLike], npt.NDArray[Any], npt.ArrayLike, Sequence[Sequence[float]], Sequence[float] -] +Vec3DArrayLike = ( + Vec3D | Sequence[Vec3DLike] | npt.NDArray[Any] | npt.ArrayLike | Sequence[Sequence[float]] | Sequence[float] +) class Vec3DType(BaseExtensionType): diff --git a/rerun_py/rerun_sdk/rerun/datatypes/vec4d.py b/rerun_py/rerun_sdk/rerun/datatypes/vec4d.py index d68b6dcd19a4..8f60085f23fa 100644 --- a/rerun_py/rerun_sdk/rerun/datatypes/vec4d.py +++ b/rerun_py/rerun_sdk/rerun/datatypes/vec4d.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Sequence, Union +from typing import TYPE_CHECKING, Any, Sequence import numpy as np import numpy.typing as npt @@ -39,13 +39,13 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: if TYPE_CHECKING: - Vec4DLike = Union[Vec4D, npt.NDArray[Any], npt.ArrayLike, Sequence[float]] + Vec4DLike = Vec4D | npt.NDArray[Any] | npt.ArrayLike | Sequence[float] else: Vec4DLike = Any -Vec4DArrayLike = Union[ - Vec4D, Sequence[Vec4DLike], npt.NDArray[Any], npt.ArrayLike, Sequence[Sequence[float]], Sequence[float] -] +Vec4DArrayLike = ( + Vec4D | Sequence[Vec4DLike] | npt.NDArray[Any] | npt.ArrayLike | Sequence[Sequence[float]] | Sequence[float] +) class Vec4DType(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer10.py b/rerun_py/tests/test_types/components/affix_fuzzer10.py index 657bfe836d7c..75e1fd88f566 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer10.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer10.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -29,10 +29,7 @@ def __init__(self: Any, single_string_optional: str | None = None): AffixFuzzer10Like = AffixFuzzer10 -AffixFuzzer10ArrayLike = Union[ - AffixFuzzer10, - Sequence[AffixFuzzer10Like], -] +AffixFuzzer10ArrayLike = AffixFuzzer10 | Sequence[AffixFuzzer10Like] class AffixFuzzer10Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer11.py b/rerun_py/tests/test_types/components/affix_fuzzer11.py index d3dd67ba7a74..c22258198aba 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer11.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer11.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -35,10 +35,7 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: AffixFuzzer11Like = AffixFuzzer11 -AffixFuzzer11ArrayLike = Union[ - AffixFuzzer11, - Sequence[AffixFuzzer11Like], -] +AffixFuzzer11ArrayLike = AffixFuzzer11 | Sequence[AffixFuzzer11Like] class AffixFuzzer11Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer12.py b/rerun_py/tests/test_types/components/affix_fuzzer12.py index 31776b9be5e8..94055aec3a9f 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer12.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer12.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -26,10 +26,7 @@ def __init__(self: Any, many_strings_required: AffixFuzzer12Like): AffixFuzzer12Like = AffixFuzzer12 -AffixFuzzer12ArrayLike = Union[ - AffixFuzzer12, - Sequence[AffixFuzzer12Like], -] +AffixFuzzer12ArrayLike = AffixFuzzer12 | Sequence[AffixFuzzer12Like] class AffixFuzzer12Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer13.py b/rerun_py/tests/test_types/components/affix_fuzzer13.py index 50a0aacc5a71..d4eff0806e27 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer13.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer13.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -26,10 +26,7 @@ def __init__(self: Any, many_strings_optional: list[str] | None = None): AffixFuzzer13Like = AffixFuzzer13 -AffixFuzzer13ArrayLike = Union[ - AffixFuzzer13, - Sequence[AffixFuzzer13Like], -] +AffixFuzzer13ArrayLike = AffixFuzzer13 | Sequence[AffixFuzzer13Like] class AffixFuzzer13Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer16.py b/rerun_py/tests/test_types/components/affix_fuzzer16.py index 4f7ca96ff7b5..4b67b0ed1d08 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer16.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer16.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -28,10 +28,7 @@ def __init__(self: Any, many_required_unions: AffixFuzzer16Like): AffixFuzzer16Like = AffixFuzzer16 -AffixFuzzer16ArrayLike = Union[ - AffixFuzzer16, - Sequence[AffixFuzzer16Like], -] +AffixFuzzer16ArrayLike = AffixFuzzer16 | Sequence[AffixFuzzer16Like] class AffixFuzzer16Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer17.py b/rerun_py/tests/test_types/components/affix_fuzzer17.py index d0a2b6b7920a..714391ca1299 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer17.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer17.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -28,10 +28,7 @@ def __init__(self: Any, many_optional_unions: datatypes.AffixFuzzer3ArrayLike | AffixFuzzer17Like = AffixFuzzer17 -AffixFuzzer17ArrayLike = Union[ - AffixFuzzer17, - Sequence[AffixFuzzer17Like], -] +AffixFuzzer17ArrayLike = AffixFuzzer17 | Sequence[AffixFuzzer17Like] class AffixFuzzer17Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer18.py b/rerun_py/tests/test_types/components/affix_fuzzer18.py index 7749a74623c1..44396b34d3b7 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer18.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer18.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -28,10 +28,7 @@ def __init__(self: Any, many_optional_unions: datatypes.AffixFuzzer4ArrayLike | AffixFuzzer18Like = AffixFuzzer18 -AffixFuzzer18ArrayLike = Union[ - AffixFuzzer18, - Sequence[AffixFuzzer18Like], -] +AffixFuzzer18ArrayLike = AffixFuzzer18 | Sequence[AffixFuzzer18Like] class AffixFuzzer18Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer7.py b/rerun_py/tests/test_types/components/affix_fuzzer7.py index f845d2c0c291..bf908d4921c1 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer7.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer7.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -28,10 +28,7 @@ def __init__(self: Any, many_optional: datatypes.AffixFuzzer1ArrayLike | None = AffixFuzzer7Like = AffixFuzzer7 -AffixFuzzer7ArrayLike = Union[ - AffixFuzzer7, - Sequence[AffixFuzzer7Like], -] +AffixFuzzer7ArrayLike = AffixFuzzer7 | Sequence[AffixFuzzer7Like] class AffixFuzzer7Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer8.py b/rerun_py/tests/test_types/components/affix_fuzzer8.py index 67cb7a95df56..5428c6183cd0 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer8.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer8.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -35,10 +35,7 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: AffixFuzzer8Like = AffixFuzzer8 -AffixFuzzer8ArrayLike = Union[ - AffixFuzzer8, - Sequence[AffixFuzzer8Like], -] +AffixFuzzer8ArrayLike = AffixFuzzer8 | Sequence[AffixFuzzer8Like] class AffixFuzzer8Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/components/affix_fuzzer9.py b/rerun_py/tests/test_types/components/affix_fuzzer9.py index abcdf0f9683e..67cce0bc373a 100644 --- a/rerun_py/tests/test_types/components/affix_fuzzer9.py +++ b/rerun_py/tests/test_types/components/affix_fuzzer9.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -29,10 +29,7 @@ def __str__(self) -> str: AffixFuzzer9Like = AffixFuzzer9 -AffixFuzzer9ArrayLike = Union[ - AffixFuzzer9, - Sequence[AffixFuzzer9Like], -] +AffixFuzzer9ArrayLike = AffixFuzzer9 | Sequence[AffixFuzzer9Like] class AffixFuzzer9Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/datatypes/affix_fuzzer1.py b/rerun_py/tests/test_types/datatypes/affix_fuzzer1.py index 6dc70aff02b2..bb8eae15da10 100644 --- a/rerun_py/tests/test_types/datatypes/affix_fuzzer1.py +++ b/rerun_py/tests/test_types/datatypes/affix_fuzzer1.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -76,10 +76,7 @@ def __init__( AffixFuzzer1Like = AffixFuzzer1 -AffixFuzzer1ArrayLike = Union[ - AffixFuzzer1, - Sequence[AffixFuzzer1Like], -] +AffixFuzzer1ArrayLike = AffixFuzzer1 | Sequence[AffixFuzzer1Like] class AffixFuzzer1Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/datatypes/affix_fuzzer2.py b/rerun_py/tests/test_types/datatypes/affix_fuzzer2.py index ee2aa56208c2..7746e48a8ba1 100644 --- a/rerun_py/tests/test_types/datatypes/affix_fuzzer2.py +++ b/rerun_py/tests/test_types/datatypes/affix_fuzzer2.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -35,10 +35,7 @@ def __array__(self, dtype: npt.DTypeLike = None) -> npt.NDArray[Any]: AffixFuzzer2Like = AffixFuzzer2 -AffixFuzzer2ArrayLike = Union[ - AffixFuzzer2, - Sequence[AffixFuzzer2Like], -] +AffixFuzzer2ArrayLike = AffixFuzzer2 | Sequence[AffixFuzzer2Like] class AffixFuzzer2Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/datatypes/affix_fuzzer20.py b/rerun_py/tests/test_types/datatypes/affix_fuzzer20.py index 303bdc3a1565..7116f38674a9 100644 --- a/rerun_py/tests/test_types/datatypes/affix_fuzzer20.py +++ b/rerun_py/tests/test_types/datatypes/affix_fuzzer20.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -45,10 +45,7 @@ def __init__(self: Any, p: datatypes.PrimitiveComponentLike, s: datatypes.String AffixFuzzer20Like = AffixFuzzer20 -AffixFuzzer20ArrayLike = Union[ - AffixFuzzer20, - Sequence[AffixFuzzer20Like], -] +AffixFuzzer20ArrayLike = AffixFuzzer20 | Sequence[AffixFuzzer20Like] class AffixFuzzer20Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/datatypes/affix_fuzzer21.py b/rerun_py/tests/test_types/datatypes/affix_fuzzer21.py index 7092e7d465da..5a152cc625bb 100644 --- a/rerun_py/tests/test_types/datatypes/affix_fuzzer21.py +++ b/rerun_py/tests/test_types/datatypes/affix_fuzzer21.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -32,10 +32,7 @@ def __init__(self: Any, single_half: float, many_halves: npt.ArrayLike): AffixFuzzer21Like = AffixFuzzer21 -AffixFuzzer21ArrayLike = Union[ - AffixFuzzer21, - Sequence[AffixFuzzer21Like], -] +AffixFuzzer21ArrayLike = AffixFuzzer21 | Sequence[AffixFuzzer21Like] class AffixFuzzer21Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/datatypes/affix_fuzzer3.py b/rerun_py/tests/test_types/datatypes/affix_fuzzer3.py index fc098692a9d0..e45c9b5f11d9 100644 --- a/rerun_py/tests/test_types/datatypes/affix_fuzzer3.py +++ b/rerun_py/tests/test_types/datatypes/affix_fuzzer3.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Literal, Sequence, Union +from typing import TYPE_CHECKING, Any, Literal, Sequence import numpy as np import numpy.typing as npt @@ -37,19 +37,10 @@ class AffixFuzzer3: if TYPE_CHECKING: - AffixFuzzer3Like = Union[ - AffixFuzzer3, - float, - list[datatypes.AffixFuzzer1], - npt.NDArray[np.float32], - ] - AffixFuzzer3ArrayLike = Union[ - AffixFuzzer3, - float, - list[datatypes.AffixFuzzer1], - npt.NDArray[np.float32], - Sequence[AffixFuzzer3Like], - ] + AffixFuzzer3Like = AffixFuzzer3 | float | list[datatypes.AffixFuzzer1] | npt.NDArray[np.float32] + AffixFuzzer3ArrayLike = ( + AffixFuzzer3 | float | list[datatypes.AffixFuzzer1] | npt.NDArray[np.float32] | Sequence[AffixFuzzer3Like] + ) else: AffixFuzzer3Like = Any AffixFuzzer3ArrayLike = Any diff --git a/rerun_py/tests/test_types/datatypes/affix_fuzzer4.py b/rerun_py/tests/test_types/datatypes/affix_fuzzer4.py index dd1e58dc4166..a3ed9d97e10b 100644 --- a/rerun_py/tests/test_types/datatypes/affix_fuzzer4.py +++ b/rerun_py/tests/test_types/datatypes/affix_fuzzer4.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any, Literal, Sequence, Union +from typing import TYPE_CHECKING, Any, Literal, Sequence import pyarrow as pa from attrs import define, field @@ -33,17 +33,10 @@ class AffixFuzzer4: if TYPE_CHECKING: - AffixFuzzer4Like = Union[ - AffixFuzzer4, - datatypes.AffixFuzzer3, - list[datatypes.AffixFuzzer3], - ] - AffixFuzzer4ArrayLike = Union[ - AffixFuzzer4, - datatypes.AffixFuzzer3, - list[datatypes.AffixFuzzer3], - Sequence[AffixFuzzer4Like], - ] + AffixFuzzer4Like = AffixFuzzer4 | datatypes.AffixFuzzer3 | list[datatypes.AffixFuzzer3] + AffixFuzzer4ArrayLike = ( + AffixFuzzer4 | datatypes.AffixFuzzer3 | list[datatypes.AffixFuzzer3] | Sequence[AffixFuzzer4Like] + ) else: AffixFuzzer4Like = Any AffixFuzzer4ArrayLike = Any diff --git a/rerun_py/tests/test_types/datatypes/affix_fuzzer5.py b/rerun_py/tests/test_types/datatypes/affix_fuzzer5.py index 8fe701bb4068..a2c3bc1169ce 100644 --- a/rerun_py/tests/test_types/datatypes/affix_fuzzer5.py +++ b/rerun_py/tests/test_types/datatypes/affix_fuzzer5.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -41,10 +41,7 @@ def __init__(self: Any, single_optional_union: datatypes.AffixFuzzer4Like | None AffixFuzzer5Like = AffixFuzzer5 -AffixFuzzer5ArrayLike = Union[ - AffixFuzzer5, - Sequence[AffixFuzzer5Like], -] +AffixFuzzer5ArrayLike = AffixFuzzer5 | Sequence[AffixFuzzer5Like] class AffixFuzzer5Type(BaseExtensionType): diff --git a/rerun_py/tests/test_types/datatypes/flattened_scalar.py b/rerun_py/tests/test_types/datatypes/flattened_scalar.py index 224443b6e496..87cd5deaeace 100644 --- a/rerun_py/tests/test_types/datatypes/flattened_scalar.py +++ b/rerun_py/tests/test_types/datatypes/flattened_scalar.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -41,10 +41,7 @@ def __float__(self) -> float: FlattenedScalarLike = FlattenedScalar -FlattenedScalarArrayLike = Union[ - FlattenedScalar, - Sequence[FlattenedScalarLike], -] +FlattenedScalarArrayLike = FlattenedScalar | Sequence[FlattenedScalarLike] class FlattenedScalarType(BaseExtensionType): diff --git a/rerun_py/tests/test_types/datatypes/primitive_component.py b/rerun_py/tests/test_types/datatypes/primitive_component.py index d680cb9cfe94..ce4abd5dc918 100644 --- a/rerun_py/tests/test_types/datatypes/primitive_component.py +++ b/rerun_py/tests/test_types/datatypes/primitive_component.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import numpy as np import numpy.typing as npt @@ -41,10 +41,7 @@ def __int__(self) -> int: PrimitiveComponentLike = PrimitiveComponent -PrimitiveComponentArrayLike = Union[ - PrimitiveComponent, - Sequence[PrimitiveComponentLike], -] +PrimitiveComponentArrayLike = PrimitiveComponent | Sequence[PrimitiveComponentLike] class PrimitiveComponentType(BaseExtensionType): diff --git a/rerun_py/tests/test_types/datatypes/string_component.py b/rerun_py/tests/test_types/datatypes/string_component.py index fd267d7ab1c3..62b03552ff45 100644 --- a/rerun_py/tests/test_types/datatypes/string_component.py +++ b/rerun_py/tests/test_types/datatypes/string_component.py @@ -5,7 +5,7 @@ from __future__ import annotations -from typing import Any, Sequence, Union +from typing import Any, Sequence import pyarrow as pa from attrs import define, field @@ -35,10 +35,7 @@ def __str__(self) -> str: StringComponentLike = StringComponent -StringComponentArrayLike = Union[ - StringComponent, - Sequence[StringComponentLike], -] +StringComponentArrayLike = StringComponent | Sequence[StringComponentLike] class StringComponentType(BaseExtensionType):