Remove deprecated methods from AnyValues (#11390)

Co-authored-by: Andreas Reich <[email protected]>

Author: Weijun-H

crates/store/re_types/src/any_values.rs

@@ -1,8 +1,6 @@
 //! Utilities to log arbitrary data to Rerun.
 
-use crate::{
-    ArchetypeName, Component, SerializedComponentBatch, dynamic_archetype::DynamicArchetype,
-};
+use crate::{Component, SerializedComponentBatch, dynamic_archetype::DynamicArchetype};
 use re_types_core::{AsComponents, ComponentType, Loggable};
 
 /// A helper for logging arbitrary data to Rerun.
@@ -20,19 +18,6 @@ impl Default for AnyValues {
 }
 
 impl AnyValues {
-    //TODO(#10908): Prune this method in 0.26.0
-    /// Assigns an (archetype) name to this set of any values.
-    #[deprecated(
-        since = "0.25.0",
-        note = "Use of archetype leads to ambiguity whether provided field names should be prefixed to be unique. Refer to dynamic_archetype instead for an unambiguous usage."
-    )]
-    #[inline]
-    pub fn new(archetype_name: impl Into<ArchetypeName>) -> Self {
-        Self {
-            builder: DynamicArchetype::new(archetype_name),
-        }
-    }
-
     /// Adds a component generated from arbitrary data to this collection.
     ///
     /// In many cases, it might be more convenient to use [`Self::with_component`] to log an existing Rerun component instead.
@@ -47,18 +32,6 @@ impl AnyValues {
         }
     }
 
-    //TODO(#10908): Prune this method in 0.26.0
-    /// Adds a field of arbitrary data to this collection.
-    ///
-    /// In many cases, it might be more convenient to use [`Self::with_component`] to log an existing Rerun component instead.
-    #[deprecated(since = "0.25.0", note = "Use with_component_from_data instead.")]
-    #[inline]
-    pub fn with_field(self, field: impl AsRef<str>, array: arrow::array::ArrayRef) -> Self {
-        Self {
-            builder: self.builder.with_component_from_data(field, array),
-        }
-    }
-
     /// Adds an existing Rerun [`Component`] to this collection.
     #[inline]
     pub fn with_component<C: Component>(
@@ -87,25 +60,6 @@ impl AnyValues {
                 .with_component_override(field, component_type, loggable),
         }
     }
-
-    //TODO(#10908): Prune this method in 0.26.0
-    /// Adds an existing Rerun [`Component`] to this collection.
-    ///
-    /// This method can be used to override the component type.
-    #[deprecated(since = "0.25.0", note = "Use with_component_override instead.")]
-    #[inline]
-    pub fn with_loggable<L: Loggable>(
-        self,
-        field: impl AsRef<str>,
-        component_type: impl Into<ComponentType>,
-        loggable: impl IntoIterator<Item = impl Into<L>>,
-    ) -> Self {
-        Self {
-            builder: self
-                .builder
-                .with_component_override(field, component_type, loggable),
-        }
-    }
 }
 
 impl AsComponents for AnyValues {

rerun_py/rerun_sdk/rerun/any_value.py

@@ -1,12 +1,9 @@
 from __future__ import annotations
 
-import warnings
 from typing import Any
 
 from typing_extensions import deprecated
 
-from rerun._baseclasses import ComponentDescriptor
-
 from ._baseclasses import ComponentColumn, ComponentColumnList, DescribedComponentBatch
 from ._log import AsComponents
 from .dynamic_archetype import DynamicArchetype
@@ -83,26 +80,12 @@ def __init__(self, drop_untyped_nones: bool = True, **kwargs: Any) -> None:
     @deprecated(
         "`rr.AnyValues.with_field` is deprecated, use `rr.AnyValues.with_component_from_data` instead.",
     )
-    def with_field(
-        self, descriptor: str | ComponentDescriptor, value: Any, *, drop_untyped_nones: bool = True
-    ) -> AnyValues:
+    def with_field(self, descriptor: str, value: Any, *, drop_untyped_nones: bool = True) -> AnyValues:
         return self.with_component_from_data(descriptor, value, drop_untyped_nones=drop_untyped_nones)
 
-    def with_component_from_data(
-        self, descriptor: str | ComponentDescriptor, value: Any, *, drop_untyped_nones: bool = True
-    ) -> AnyValues:
+    def with_component_from_data(self, descriptor: str, value: Any, *, drop_untyped_nones: bool = True) -> AnyValues:
         """Adds an `AnyValueBatch` to this `AnyValues` bundle."""
-        # TODO(#10908): Prune this type in 0.26
-        if isinstance(descriptor, ComponentDescriptor):
-            warnings.warn(
-                "`rr.AnyValues.with_field` using a component descriptor is deprecated, "
-                "use DynamicArchetype if trying to specify archetype grouping of values.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            self._builder._with_descriptor_internal(descriptor, value, drop_untyped_nones=drop_untyped_nones)
-        else:
-            self._builder.with_component_from_data(descriptor, value, drop_untyped_nones=drop_untyped_nones)
+        self._builder.with_component_from_data(descriptor, value, drop_untyped_nones=drop_untyped_nones)
         return self
 
     @deprecated(
@@ -183,4 +166,4 @@ def columns(cls, drop_untyped_nones: bool = True, **kwargs: Any) -> ComponentCol
 
     @property
     def component_batches(self) -> list[DescribedComponentBatch]:
-        return self._builder.component_batches
+        return self._builder.as_component_batches()

rerun_py/rerun_sdk/rerun/dynamic_archetype.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import warnings
 from typing import TYPE_CHECKING, Any
 
 from rerun._baseclasses import ComponentDescriptor
@@ -226,13 +225,3 @@ def columns(
         return ComponentColumnList([
             ComponentColumn(batch.component_descriptor(), batch) for batch in inst._component_batches
         ])
-
-    @property
-    def component_batches(self) -> list[DescribedComponentBatch]:
-        # TODO(#10908): Prune this type in 0.26
-        warnings.warn(
-            "Accessing `component_batches` directly is deprecated, access via `as_component_batches` instead.",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        return self._component_batches

rerun_py/tests/unit/test_any_values.py

@@ -193,10 +193,6 @@ def test_any_values_numpy() -> None:
 
 def test_any_values_with_field() -> None:
     rr.set_strict_mode(False)
-    with pytest.warns(DeprecationWarning, match="`rr.AnyValues.with_field` using a component descriptor is deprecated"):
-        values = rr.AnyValues().with_component_from_data(
-            descriptor=rr.ComponentDescriptor("value"),
-            value=np.array([5], dtype=np.int64),
-        )
+    values = rr.AnyValues().with_component_from_data(descriptor="value", value=np.array([5], dtype=np.int64))
     assert values.as_component_batches()[0].component_descriptor() == rr.ComponentDescriptor("value")
     assert values.as_component_batches()[0].as_arrow_array().to_numpy() == np.array([5], dtype=np.int64)