MVP Blueprint APIs for layout and contents

crates/re_sdk/src/recording_stream.rs

@@ -1522,7 +1522,11 @@ impl RecordingStream {
     /// terms of data durability and ordering.
     /// See [`Self::set_sink`] for more information.
     pub fn connect(&self) {
-        self.connect_opts(crate::default_server_addr(), crate::default_flush_timeout());
+        self.connect_opts(
+            crate::default_server_addr(),
+            crate::default_flush_timeout(),
+            None,
+        );
     }
 
     /// Swaps the underlying sink for a [`crate::log_sink::TcpSink`] sink pre-configured to use
@@ -1539,13 +1543,23 @@ impl RecordingStream {
         &self,
         addr: std::net::SocketAddr,
         flush_timeout: Option<std::time::Duration>,
+        blueprint: Option<Vec<LogMsg>>,
     ) {
         if forced_sink_path().is_some() {
             re_log::debug!("Ignored setting new TcpSink since _RERUN_FORCE_SINK is set");
             return;
         }
 
-        self.set_sink(Box::new(crate::log_sink::TcpSink::new(addr, flush_timeout)));
+        let sink = crate::log_sink::TcpSink::new(addr, flush_timeout);
+
+        // If a blueprint was provided, send it first.
+        if let Some(blueprint) = blueprint {
+            for msg in blueprint {
+                sink.send(msg);
+            }
+        }
+
+        self.set_sink(Box::new(sink));
     }
 
     /// Spawns a new Rerun Viewer process from an executable available in PATH, then swaps the
@@ -1598,7 +1612,7 @@ impl RecordingStream {
 
         spawn(opts)?;
 
-        self.connect_opts(opts.connect_addr(), flush_timeout);
+        self.connect_opts(opts.connect_addr(), flush_timeout, None);
 
         Ok(())
     }

crates/re_types/definitions/rerun/blueprint/archetypes/viewport_blueprint.fbs

@@ -15,10 +15,9 @@ table ViewportBlueprint (
 ) {
     // --- Required ---
 
-    /// All of the space-views that belong to the viewport.
-    space_views: [rerun.blueprint.components.IncludedSpaceView] ("attr.rerun.component_required", order: 1000);
-
     // --- Optional ---
+    /// All of the space-views that belong to the viewport.
+    space_views: [rerun.blueprint.components.IncludedSpaceView] ("attr.rerun.component_optional", nullable, order: 1000);
 
     /// The layout of the space-views
     root_container: rerun.blueprint.components.RootContainer ("attr.rerun.component_optional", nullable, order: 2500);

crates/re_viewport/src/viewport_blueprint.rs

@@ -98,8 +98,11 @@ impl ViewportBlueprint {
             }
         };
 
-        let space_view_ids: Vec<SpaceViewId> =
-            space_views.into_iter().map(|id| id.0.into()).collect();
+        let space_view_ids: Vec<SpaceViewId> = space_views
+            .unwrap_or(vec![])
+            .iter()
+            .map(|id| id.0.into())
+            .collect();
 
         let space_views: BTreeMap<SpaceViewId, SpaceViewBlueprint> = space_view_ids
             .into_iter()

crates/rerun_c/src/lib.rs

@@ -408,7 +408,7 @@ fn rr_recording_stream_connect_impl(
     } else {
         None
     };
-    stream.connect_opts(tcp_addr, flush_timeout);
+    stream.connect_opts(tcp_addr, flush_timeout, None);
 
     Ok(())
 }

examples/python/blueprint/main.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 """Example of using the blueprint APIs to configure Rerun."""
+# TODO(jleibs): Update this example to use the new APIs
 from __future__ import annotations
 
 import argparse
@@ -26,15 +27,11 @@ def main() -> None:
         rr.init(
             "Blueprint demo",
             init_logging=False,
-            exp_init_blueprint=not args.skip_blueprint,
-            exp_add_to_app_default_blueprint=args.no_append_default,
             spawn=True,
         )
     else:
         rr.init(
             "Blueprint demo",
-            exp_init_blueprint=not args.skip_blueprint,
-            exp_add_to_app_default_blueprint=args.no_append_default,
             spawn=True,
         )
 

rerun_py/rerun_sdk/rerun/__init__.py

@@ -142,6 +142,7 @@
     ViewCoordinates,
 )
 from .archetypes.boxes2d_ext import Box2DFormat
+from .blueprint.api import BlueprintLike
 from .components import (
     Material,
     MediaType,
@@ -230,6 +231,7 @@ def _init_recording_stream() -> None:
             set_time_nanos,
             disable_timeline,
             reset_time,
+            log,
         ]
         + [fn for name, fn in getmembers(sys.modules[__name__], isfunction) if name.startswith("log_")]
     )
@@ -247,8 +249,7 @@ def init(
     init_logging: bool = True,
     default_enabled: bool = True,
     strict: bool = False,
-    exp_init_blueprint: bool = False,
-    exp_add_to_app_default_blueprint: bool = True,
+    blueprint: BlueprintLike | None = None,
 ) -> None:
     """
     Initialize the Rerun SDK with a user-chosen application id (name).
@@ -316,10 +317,8 @@ def init(
     strict
         If `True`, an exceptions is raised on use error (wrong parameter types, etc.).
         If `False`, errors are logged as warnings instead.
-    exp_init_blueprint
-        (Experimental) Should we initialize the blueprint for this application?
-    exp_add_to_app_default_blueprint
-        (Experimental) Should the blueprint append to the existing app-default blueprint instead of creating a new one.
+    blueprint
+        A blueprint to use for this application. If not provided, a new one will be created.
 
     """
 
@@ -346,21 +345,11 @@ def init(
             spawn=False,
             default_enabled=default_enabled,
         )
-    if exp_init_blueprint:
-        experimental.new_blueprint(
-            application_id=application_id,
-            blueprint_id=recording_id,
-            make_default=True,
-            make_thread_default=False,
-            spawn=False,
-            add_to_app_default_blueprint=exp_add_to_app_default_blueprint,
-            default_enabled=default_enabled,
-        )
 
     if spawn:
         from rerun.sinks import spawn as _spawn
 
-        _spawn()
+        _spawn(blueprint=blueprint)
 
 
 # TODO(#3793): defaulting recording_id to authkey should be opt-in

rerun_py/rerun_sdk/rerun/_log.py

@@ -218,6 +218,9 @@ def log_components(
         if None, use the global default from `rerun.strict_mode()`
 
     """
+    # Convert to a native recording
+    recording = RecordingStream.to_native(recording)
+
     instanced: dict[str, pa.Array] = {}
     splats: dict[str, pa.Array] = {}