Merge branch 'main' into emilk/native-av1-decode

Cargo.lock

@@ -5367,7 +5367,7 @@ dependencies = [
 [[package]]
 name = "re_mp4"
 version = "0.1.0"
-source = "git+https://github.com/rerun-io/re_mp4?rev=3236c76f9228cf6ab0b2bfb1b8f9ffcde975ea05#3236c76f9228cf6ab0b2bfb1b8f9ffcde975ea05"
+source = "git+https://github.com/rerun-io/re_mp4?rev=4705e85f62ddb47c32d9c091d8f0662068211bc8#4705e85f62ddb47c32d9c091d8f0662068211bc8"
 dependencies = [
  "byteorder",
  "bytes",
@@ -5627,7 +5627,7 @@ dependencies = [
  "itertools 0.13.0",
  "re_chunk_store",
  "re_data_ui",
- "re_dataframe",
+ "re_dataframe2",
  "re_entity_db",
  "re_format",
  "re_log",

Cargo.toml

@@ -554,7 +554,7 @@ missing_errors_doc = "allow"
 
 # commit on `rerun-io/mp4` `master` branch: https://github.com/rerun-io/re_mp4/tree/master
 # https://github.com/rerun-io/mp4/commit/3236c76f9228cf6ab0b2bfb1b8f9ffcde975ea05
-re_mp4 = { git = "https://github.com/rerun-io/re_mp4", rev = "3236c76f9228cf6ab0b2bfb1b8f9ffcde975ea05" }
+re_mp4 = { git = "https://github.com/rerun-io/re_mp4", rev = "4705e85f62ddb47c32d9c091d8f0662068211bc8" }
 
 # commit on `rerun-io/re_arrow2` `main` branch
 # https://github.com/rerun-io/re_arrow2/commit/e4717d6debc6d4474ec10db8f629f823f57bad07

crates/build/re_types_builder/src/codegen/rust/api.rs

@@ -975,6 +975,7 @@ fn quote_trait_impls_for_datatype_or_component(
                 // re_tracing::profile_function!();
 
                 #![allow(clippy::wildcard_imports)]
+                #![allow(clippy::manual_is_variant_and)]
                 use arrow2::{datatypes::*, array::*};
                 use ::re_types_core::{Loggable as _, ResultExt as _};
 

crates/store/re_types/definitions/rerun/blueprint/archetypes/dataframe_query.fbs

@@ -1,63 +1,12 @@
 namespace rerun.blueprint.archetypes;
 
 
-// Rationale behind the present data modelling:
-// - Avoid using `union` at all cost.
-// - An explicit "mode" enum maps well with a UI toggle and API parameter, and enabled a hard disambiguation when
-//   settings are present for both the latest-at and range modes.
-// - Timestamps are hard-invalidated by a change of timeline. So we keep them on a per-timeline basis.
-
-// TODO(#7067): add visible components (maybe in another archetype?)
-// TODO(#7072): add (optional) PoV components
-// Note: component list should be modelled as:
-//     component PovComponents {
-//        datatype ComponentNames {
-//            value: [string];
-//        }
-//     }
-//
-// Motivation:
-// - Chances are high that the user prefers to have their pov components _not_ invalidated by a changeof timeline.
-// - That is even though a component might _technically_ be soft-invalidated by a change of timeline (e.g. if it was
-//   not logged on that particular timeline). But we have to deal regardless with potentially invalid component, so this
-//   doesn't change the story much.
-
-// --
-
 /// The query for the dataframe view.
-//TODO(ab): replace by DataframeQueryV2 when ready
 table DataframeQuery (
     "attr.rerun.scope": "blueprint"
 ) {
     // --- Optional ---
 
-    /// The timeline for this query.
-    ///
-    /// If unset, use the time panel's timeline and a latest-at query, ignoring all other components of this archetype.
-    timeline: rerun.blueprint.components.TimelineName ("attr.rerun.component_optional", nullable, order: 100);
-
-    /// Kind of query: latest-at or range.
-    kind: rerun.blueprint.components.QueryKind ("attr.rerun.component_optional", nullable,order: 200);
-
-    /// Configuration for latest-at queries.
-    ///
-    /// Note: configuration as saved on a per-timeline basis.
-    latest_at_queries: rerun.blueprint.components.LatestAtQueries ("attr.rerun.component_optional", nullable,order: 400);
-
-    /// Configuration for the time range queries.
-    ///
-    /// Note: configuration as saved on a per-timeline basis.
-    time_range_queries: rerun.blueprint.components.TimeRangeQueries ("attr.rerun.component_optional", nullable,order: 500);
-}
-
-
-
-/// The query for the dataframe view.
-table DataframeQueryV2 (
-    "attr.rerun.scope": "blueprint"
-) {
-    // --- Optional ---
-
     /// The timeline for this query.
     ///
     /// If unset, the timeline currently active on the time panel is used.

crates/store/re_types/definitions/rerun/blueprint/datatypes/component_column_selector.fbs

@@ -5,6 +5,7 @@ namespace rerun.blueprint.datatypes;
 //TODO(ab, jleibs): this probably needs reunification with whatever structure the data out API uses.
 // Has to be a table because flatbuffer doesn't support strings in structs.
 table ComponentColumnSelector (
+  "attr.python.aliases": "str",
   "attr.rust.derive": "Default, PartialEq, Eq, Hash",
   "attr.rerun.scope": "blueprint"
 ) {

crates/store/re_types/definitions/rerun/blueprint/datatypes/filter_by_event.fbs

@@ -4,8 +4,9 @@ namespace rerun.blueprint.datatypes;
 /// Configuration for the filter by event feature of the dataframe view.
 // Has to be a table because flatbuffer doesn't support strings in structs.
 table FilterByEvent (
-  "attr.rust.derive": "Default, PartialEq, Eq",
-  "attr.rerun.scope": "blueprint"
+    "attr.python.aliases": "blueprint_datatypes.ComponentColumnSelectorLike",
+    "attr.rust.derive": "Default, PartialEq, Eq",
+    "attr.rerun.scope": "blueprint"
 ) {
     /// Whether the filter by event feature is active.
     active: rerun.datatypes.Bool (order: 100);

crates/store/re_types/definitions/rerun/blueprint/datatypes/selected_columns.fbs

@@ -4,6 +4,7 @@ namespace rerun.blueprint.datatypes;
 /// List of selected columns in a dataframe.
 // Has to be a table because flatbuffer doesn't support strings in structs.
 table SelectedColumns (
+  "attr.python.aliases": "Sequence[Union[blueprint_datatypes.ComponentColumnSelectorLike, datatypes.Utf8Like]]",
   "attr.rust.derive": "Default, PartialEq, Eq",
   "attr.rerun.scope": "blueprint"
 ) {

crates/store/re_types/definitions/rerun/blueprint/views/dataframe.fbs

@@ -7,8 +7,9 @@ namespace rerun.blueprint.views;
 /// \example views/dataframe title="Use a blueprint to customize a DataframeView."
 //TODO(#6896): add a thumbnail when the example becomes interesting
 table DataframeView (
-    "attr.rerun.view_identifier": "Dataframe"
+    "attr.rerun.view_identifier": "Dataframe",
+    "attr.docs.unreleased"
 ) {
     /// Query of the dataframe.
-    query: rerun.blueprint.archetypes.DataframeQueryV2 (order: 1000);
+    query: rerun.blueprint.archetypes.DataframeQuery (order: 1000);
 }