test and fix setting timeline/time from python

Author: IsseW

crates/viewer/re_viewer/src/app_blueprint.rs

@@ -4,9 +4,12 @@ use re_chunk::{Chunk, RowId};
 use re_chunk_store::LatestAtQuery;
 use re_entity_db::EntityDb;
 use re_log_types::EntityPath;
-use re_types::blueprint::{
-    archetypes::{PanelBlueprint, TimePanelBlueprint},
-    components::PanelState,
+use re_types::{
+    AsComponents,
+    blueprint::{
+        archetypes::{PanelBlueprint, TimePanelBlueprint},
+        components::PanelState,
+    },
 };
 use re_viewer_context::{
     CommandSender, SystemCommand, SystemCommandSender as _, TIME_PANEL_PATH,
@@ -234,12 +237,14 @@ impl AppBlueprint<'_> {
 
             let timepoint = blueprint_timepoint_for_writes(blueprint_db);
 
+            let component_update: &dyn AsComponents = if panel_name == TIME_PANEL_PATH {
+                &TimePanelBlueprint::update_fields().with_state(value)
+            } else {
+                &PanelBlueprint::update_fields().with_state(value)
+            };
+
             let chunk = Chunk::builder(entity_path)
-                .with_archetype(
-                    RowId::new(),
-                    timepoint,
-                    &PanelBlueprint::update_fields().with_state(value),
-                )
+                .with_archetype(RowId::new(), timepoint, component_update)
                 .build()
                 // All builtin types, no reason for this to ever fail.
                 .expect("Failed to build chunk.");

examples/python/blueprint/blueprint.py

@@ -39,20 +39,26 @@ def main() -> None:
             ),
             rrb.BlueprintPanel(state="collapsed"),
             rrb.SelectionPanel(state="collapsed"),
-            rrb.TimePanel(state="collapsed"),
+            rrb.TimePanel(state="collapsed", timeline="custom", sequence_cursor=15),
             auto_views=args.auto_views,
         )
 
     rr.init("rerun_example_blueprint", spawn=True, default_blueprint=blueprint)
 
+    rr.set_time("custom", sequence=0)
+
     img = np.zeros([128, 128, 3], dtype="uint8")
     for i in range(8):
         img[(i * 16) + 4 : (i * 16) + 12, :] = (0, 0, 200)
     rr.log("image", rr.Image(img))
+
+    rr.set_time("custom", sequence=10)
     rr.log(
         "rect/0",
         rr.Boxes2D(mins=[16, 16], sizes=[64, 64], labels="Rect0", colors=(255, 0, 0)),
     )
+
+    rr.set_time("custom", sequence=20)
     rr.log(
         "rect/1",
         rr.Boxes2D(mins=[48, 48], sizes=[64, 64], labels="Rect1", colors=(0, 255, 0)),

rerun_py/rerun_sdk/rerun/_baseclasses.py

@@ -8,7 +8,6 @@
 import numpy.typing as npt
 import pyarrow as pa
 from attrs import define, fields
-
 from rerun_bindings import ComponentDescriptor
 
 from .error_utils import catch_and_log_exceptions

rerun_py/rerun_sdk/rerun/_properties.py

@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING
 
 import rerun_bindings as bindings
+
 from rerun._log import log
 from rerun.error_utils import catch_and_log_exceptions
 

rerun_py/rerun_sdk/rerun/_send_columns.py

@@ -4,9 +4,8 @@
 
 import numpy as np
 import pyarrow as pa
-from typing_extensions import deprecated  # type: ignore[misc, unused-ignore]
-
 import rerun_bindings as bindings
+from typing_extensions import deprecated  # type: ignore[misc, unused-ignore]
 
 from ._baseclasses import Archetype, ComponentColumn, ComponentDescriptor
 from .error_utils import catch_and_log_exceptions

rerun_py/rerun_sdk/rerun/archetypes/asset_video_ext.py

@@ -5,9 +5,8 @@
 
 import numpy as np
 import numpy.typing as npt
-from typing_extensions import deprecated
-
 import rerun_bindings as bindings
+from typing_extensions import deprecated
 
 from ..error_utils import catch_and_log_exceptions
 

rerun_py/rerun_sdk/rerun/blueprint/api.py

@@ -10,6 +10,7 @@
 from .._spawn import _spawn_viewer
 from ..datatypes import BoolLike, EntityPathLike, Float32ArrayLike, Utf8ArrayLike, Utf8Like
 from ..recording_stream import RecordingStream
+from ..time import to_nanos, to_nanos_since_epoch
 from .archetypes import (
     ContainerBlueprint,
     PanelBlueprint,
@@ -19,9 +20,12 @@
     ViewportBlueprint,
 )
 from .components import PanelState, PanelStateLike
-from .time import to_nanos, to_nanos_since_epoch
 
 if TYPE_CHECKING:
+    from datetime import datetime, timedelta
+
+    import numpy as np
+
     from ..memory import MemoryRecording
     from .components.container_kind import ContainerKindLike
 
@@ -430,15 +434,15 @@ class TimePanel(Panel):
     """The state of the time panel."""
 
     def __init__(
-            self,
-            *,
-            expanded: bool | None = None,
-            state: PanelStateLike | None = None,
-            timeline: Utf8Like | None = None,
-            sequence_cursor: int | None = None,
-            duration_cursor: int | float | timedelta | np.timedelta64 | None = None,
-            timestamp_cursor: int | float | datetime | np.datetime64 | None = None,
-        ) -> None:
+        self,
+        *,
+        expanded: bool | None = None,
+        state: PanelStateLike | None = None,
+        timeline: Utf8Like | None = None,
+        sequence_cursor: int | None = None,
+        duration_cursor: int | float | timedelta | np.timedelta64 | None = None,
+        timestamp_cursor: int | float | datetime | np.datetime64 | None = None,
+    ) -> None:
         """
         Construct a new time panel.
 
@@ -454,32 +458,47 @@ def __init__(
         timeline:
             What timeline the timepanel should display.
 
+        sequence_cursor:
+            The time cursor for a sequence timeline.
+
+        duration_cursor:
+            The time cursor for a duration timeline.
+
+        timestamp_cursor:
+            The time cursor for a timestamp timeline.
+
         """
-        if sum(x is not None for x in (sequence, duration, timestamp)) > 1:
+        if sum(x is not None for x in (sequence_cursor, duration_cursor, timestamp_cursor)) > 1:
             raise ValueError(
-                f"At most one of `sequence`, `duration`, and `timestamp` must be set",
+                "At most one of `sequence`, `duration`, and `timestamp` must be set",
             )
 
         super().__init__(blueprint_path="time_panel", expanded=expanded, state=state)
         self.timeline = timeline
 
         if sequence_cursor is not None:
-            self.time = sequence
+            self.time = sequence_cursor
         elif duration_cursor is not None:
-            self.time = to_nanos(duration)
+            self.time = to_nanos(duration_cursor)
         elif timestamp_cursor is not None:
-            self.time = to_nanos_since_epoch(timestamp)
+            self.time = to_nanos_since_epoch(timestamp_cursor)
 
     def _log_to_stream(self, stream: RecordingStream) -> None:
         """Internal method to convert to an archetype and log to the stream."""
         arch = TimePanelBlueprint(
             state=self.state,
             timeline=self.timeline,
-            time = self.time,
         )
 
         stream.log(self.blueprint_path(), arch)  # type: ignore[attr-defined]
 
+        if self.time is not None:
+            static_arch = TimePanelBlueprint(
+                time=self.time
+            )
+
+            stream.log(self.blueprint_path(), static_arch, static=True)
+
 
 ContainerLike = Union[Container, View]
 """

rerun_py/rerun_sdk/rerun/dataframe.py

@@ -4,7 +4,6 @@
 from typing import TYPE_CHECKING, Any
 
 import pyarrow as pa
-
 from rerun_bindings import (
     ComponentColumnDescriptor as ComponentColumnDescriptor,
     ComponentColumnSelector as ComponentColumnSelector,

rerun_py/rerun_sdk/rerun/sinks.py

@@ -3,15 +3,15 @@
 import logging
 from typing import TYPE_CHECKING, Union
 
-from typing_extensions import deprecated
-
 import rerun_bindings as bindings
-from rerun.blueprint.api import BlueprintLike, create_in_memory_blueprint
-from rerun.recording_stream import RecordingStream, get_application_id
 from rerun_bindings import (
     FileSink,
     GrpcSink,
 )
+from typing_extensions import deprecated
+
+from rerun.blueprint.api import BlueprintLike, create_in_memory_blueprint
+from rerun.recording_stream import RecordingStream, get_application_id
 
 from ._spawn import _spawn_viewer
 

rerun_py/tests/unit/test_annotation_context.py

@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING
 
 import pytest
+import rerun as rr
 from rerun.components import AnnotationContext, AnnotationContextLike
 from rerun.datatypes import (
     AnnotationInfo,
@@ -16,8 +17,6 @@
     Utf8,
 )
 
-import rerun as rr
-
 if TYPE_CHECKING:
     from collections.abc import Sequence