more annotations, convert all examples to use new defaults/overrides

Author: Wumpf

crates/build/re_types_builder/src/codegen/python/views.rs

@@ -59,7 +59,7 @@ fn init_method(reporter: &Reporter, objects: &Objects, obj: &Object) -> String {
     name: Utf8Like | None = None,
     visible: datatypes.BoolLike | None = None,
     defaults: list[AsComponents | Iterable[DescribedComponentBatch]] = None,
-    overrides: dict[EntityPathLike, list[AsComponents | Iterable[DescribedComponentBatch]]] = None,
+    overrides: dict[EntityPathLike, AsComponents | Iterable[AsComponents | Iterable[DescribedComponentBatch]]] = None,
     "#
     .to_owned();
 

examples/python/blueprint/blueprint.py

@@ -33,8 +33,8 @@ def main() -> None:
                     name="Rect 1",
                     origin="/",
                     contents=["/**"],
-                    defaults=[rr.components.Radius(2)],  # Default all rectangles to have a radius of 2
-                    overrides={"rect/0": [rr.components.Radius(1)]},  # Override the radius of rect/0 to be 1
+                    defaults=[rr.Boxes2D.from_fields(radii=1)],  # Default all rectangles to have a radius of 1
+                    overrides={"rect/0": rr.Boxes2D.from_fields(radii=2)},  # Override the radius of rect/0 to be 2
                 ),
             ),
             rrb.BlueprintPanel(state="collapsed"),

examples/python/dna/dna.py

@@ -78,6 +78,7 @@ def main() -> None:
                 origin="/",
                 overrides={
                     "helix/structure/scaffolding/beads": [
+                        # TODO: visible time range override is.. special.
                         rrb.VisibleTimeRange(
                             "stable_time",
                             start=rrb.TimeRangeBoundary.cursor_relative(seconds=-0.3),

examples/python/graphs/graphs.py

@@ -165,14 +165,14 @@ def log_blueprint() -> None:
                     force_link=ForceLink(enabled=False),
                     force_many_body=ForceManyBody(enabled=False),
                     force_collision_radius=ForceCollisionRadius(enabled=True),
-                    defaults=[ShowLabels(False)],
+                    defaults=[rr.GraphNodes.from_fields(show_labels=False)],
                 ),
                 rrb.GraphView(
                     origin="lattice",
                     name="Lattice",
                     force_link=ForceLink(distance=60),
                     force_many_body=ForceManyBody(strength=-60),
-                    defaults=[ShowLabels(False), Radius(10)],
+                    defaults=[rr.GraphNodes.from_fields(show_labels=False, radii=10)],
                 ),
                 rrb.Horizontal(
                     rrb.GraphView(

examples/python/nuscenes_dataset/nuscenes_dataset/__main__.py

@@ -318,8 +318,7 @@ def main() -> None:
             name=sensor_name,
             origin=f"world/ego_vehicle/{sensor_name}",
             contents=["$origin/**", "world/anns"],
-            # TODO(#6670): Can't specify rr.components.FillMode.MajorWireframe right now, need to use batch type instead.
-            overrides={"world/anns": [rr.components.FillModeBatch("majorwireframe")]},
+            overrides={"world/anns": rr.Boxes3D.from_fields(fill_mode="majorwireframe")},
         )
         for sensor_name in nuscene_sensor_names(nusc, args.scene_name)
     ]
@@ -330,9 +329,8 @@ def main() -> None:
                     name="3D",
                     origin="world",
                     # Set the image plane distance to 5m for all camera visualizations.
-                    defaults=[rr.components.ImagePlaneDistance(5.0)],
-                    # TODO(#6670): Can't specify rr.components.FillMode.MajorWireframe right now, need to use batch type instead.
-                    overrides={"world/anns": [rr.components.FillModeBatch("solid")]},
+                    defaults=[rr.Pinhole.from_fields(image_plane_distance=5.0)],
+                    overrides={"world/anns": rr.Boxes3D.from_fields(fill_mode="solid")},
                 ),
                 rrb.Vertical(
                     rrb.TextDocumentView(origin="description", name="Description"),

examples/python/plots/plots.py

@@ -154,6 +154,7 @@ def main() -> None:
                 rrb.TimeSeriesView(
                     name="Spiral",
                     origin="/spiral",
+                    # TODO: type annotation issue
                     overrides={"spiral": rr.SeriesLine.from_fields(name=["0.01t cos(0.01t)", "0.01t sin(0.01t)"])},
                 ),
                 row_shares=[2, 1],

examples/python/rgbd/rgbd.py

@@ -190,7 +190,7 @@ def main() -> None:
                 rrb.Spatial2DView(
                     name="RGB & Depth",
                     origin="world/camera/image",
-                    overrides={"world/camera/image/rgb": [rr.components.Opacity(0.5)]},
+                    overrides={"world/camera/image/rgb": rr.Image.from_fields(opacity=0.5)},
                 ),
                 rrb.Tabs(
                     rrb.Spatial2DView(name="RGB", origin="world/camera/image", contents="world/camera/image/rgb"),

rerun_py/rerun_sdk/rerun/blueprint/api.py

@@ -43,10 +43,17 @@ def __init__(
         contents: ViewContentsLike,
         name: Utf8Like | None,
         visible: BoolLike | None = None,
+<<<<<<< HEAD
         properties: dict[str, AsComponents] | None = None,
         defaults: list[AsComponents | Iterable[DescribedComponentBatch]] | None = None,
         overrides: dict[EntityPathLike, list[AsComponents | Iterable[DescribedComponentBatch]]] | None = None,
     ) -> None:
+=======
+        properties: dict[str, AsComponents] = {},
+        defaults: list[AsComponents | Iterable[DescribedComponentBatch]] = [],
+        overrides: dict[EntityPathLike, AsComponents | Iterable[AsComponents | Iterable[DescribedComponentBatch]]] = {},
+    ):
+>>>>>>> 2e8b494065 (more annotations, convert all examples to use new defaults/overrides)
         """
         Construct a blueprint for a new view.
 

rerun_py/rerun_sdk/rerun/blueprint/components/visualizer_overrides_ext.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from typing import cast
 
 from ..._baseclasses import DescribedComponentBatch
 
@@ -16,4 +17,6 @@ def as_component_batches(self) -> list[DescribedComponentBatch]:
 
         TODO(#8129): In the future visualizer overrides should be handled with tagging overrides instead.
         """
-        return [DescribedComponentBatch(self, self.component_descriptor())]
+        from ...blueprint.components.visualizer_overrides import VisualizerOverrides
+        batch = cast(VisualizerOverrides, self)
+        return [DescribedComponentBatch(batch, batch.component_descriptor())]