Skip to content

Add content-filtered-topic interfaces (backport #1506)#1521

Merged
ahcorde merged 3 commits intojazzyfrom
mergify/bp/jazzy/pr-1506
Dec 1, 2025
Merged

Add content-filtered-topic interfaces (backport #1506)#1521
ahcorde merged 3 commits intojazzyfrom
mergify/bp/jazzy/pr-1506

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Oct 10, 2025

Description

Add ContentFilteredTopic interface

Fixes #1504

Is this user-facing behavior change?

No

Did you use Generative AI?

No

This is an automatic backport of pull request #1506 done by Mergify.

@Barry-Xu-2018 @mergify
Add content-filtered-topic interfaces (#1506)
c73ecca 
Signed-off-by: Barry Xu <Barry.Xu@sony.com>
(cherry picked from commit 8d42eaa)

# Conflicts:
#	rclpy/rclpy/impl/_rclpy_pybind11.pyi
#	rclpy/rclpy/node.py
#	rclpy/rclpy/subscription.py
#	rclpy/src/rclpy/subscription.cpp
#	rclpy/src/rclpy/subscription.hpp
#	rclpy/test/test_subscription.py
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Oct 10, 2025

Cherry-pick of 8d42eaa has failed:

On branch mergify/bp/jazzy/pr-1506
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 8d42eaa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   rclpy/rclpy/subscription_content_filter_options.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   rclpy/rclpy/impl/_rclpy_pybind11.pyi
	both modified:   rclpy/rclpy/node.py
	both modified:   rclpy/rclpy/subscription.py
	both modified:   rclpy/src/rclpy/subscription.cpp
	both modified:   rclpy/src/rclpy/subscription.hpp
	both modified:   rclpy/test/test_subscription.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Oct 10, 2025
@mergify mergify bot mentioned this pull request Oct 10, 2025
Merged
@Barry-Xu-2018
Copy link
Copy Markdown
Contributor

Barry-Xu-2018 commented Oct 10, 2025

I will handle build issue.

@Barry-Xu-2018 Barry-Xu-2018 mentioned this pull request Oct 11, 2025
Merged
@Barry-Xu-2018
Resolve merge conflicts (#1523)
ee5dd42 
Signed-off-by: Barry Xu <Barry.Xu@sony.com>
@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Oct 12, 2025

Pulls: #1521
Gist: https://gist.githubusercontent.com/fujitatomoya/6bdb45a035b6790f2e3a29777b3d09ec/raw/be17410bada7a60ddcc34189ef53e66d0c50142b/ros2.repos
BUILD args: --packages-above-and-dependencies rclpy
TEST args: --packages-above rclpy
ROS Distro: jazzy
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/17278

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Oct 12, 2025

@Barry-Xu-2018 can you check https://ci.ros2.org/job/ci_windows/25713/ are unrelated warnings to this PR just in case. (i believe those are not related.)

@Barry-Xu-2018
Copy link
Copy Markdown
Contributor

Barry-Xu-2018 commented Oct 13, 2025

@fujitatomoya

can you check https://ci.ros2.org/job/ci_windows/25713/ are unrelated warnings to this PR just in case. (i believe those are not related.)

Yes. The failed tests are unrelated to this PR.
Besides, I try to rerun Windows CI

  • Windows Build Status

@ahcorde ahcorde requested a review from fujitatomoya October 13, 2025 07:18
fujitatomoya
fujitatomoya reviewed Oct 13, 2025
View reviewed changes
Copy link
Copy Markdown
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Barry-Xu-2018 i am not inclined to take this backport... what do you think?

rclpy/rclpy/impl/_rclpy_pybind11.pyi Outdated
@@ -0,0 +1,1281 @@
# Copyright 2024 Open Source Robotics Foundation, Inc.
Copy link
Copy Markdown
Collaborator

@fujitatomoya fujitatomoya Oct 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this whole file is added in this PR, but originally this is not the content filtering API enhancement. I am not really comfortable with adding this entire file because of this backport.

  1. probably it would be better to discuss on adding this pybind11 file aside from cft backport.
  2. then we can come back on this PR to backport cft feature.

i think that would be the right procedure to have the consensus with PMC? what do you think?

Copy link
Copy Markdown
Member

@christophebedard christophebedard Oct 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This .pyi file is just for stubs/type information for the Python bindings (e.g., for static type checking). I would just delete this file and keep the rest.

@ahcorde
Added review feedback
d80d78e 
Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
@ahcorde
Copy link
Copy Markdown
Contributor

ahcorde commented Nov 28, 2025

Pulls: #1521
Gist: https://gist.githubusercontent.com/ahcorde/88e5cced8f73a960e500aeec8b97f134/raw/be17410bada7a60ddcc34189ef53e66d0c50142b/ros2.repos
BUILD args: --packages-above-and-dependencies rclpy
TEST args: --packages-above rclpy
ROS Distro: jazzy
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/17650

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@ahcorde ahcorde merged commit 7343db5 into jazzy Dec 1, 2025
3 checks passed
@peci1 peci1 mentioned this pull request Dec 1, 2025
Open
jplapp pushed a commit to pixel-robotics/rclpy that referenced this pull request Dec 12, 2025
@mergify @Barry-Xu-2018
@ahcorde @jplapp
Add content-filtered-topic interfaces (backport ros2#1506) (ros2#1521)
246d41a 
* Add content-filtered-topic interfaces (ros2#1506)

Signed-off-by: Barry Xu <Barry.Xu@sony.com>
(cherry picked from commit 8d42eaa)

Signed-off-by: Barry Xu <Barry.Xu@sony.com>
Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
Co-authored-by: Barry Xu <barry.xu@sony.com>
Co-authored-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@christophebedard christophebedard christophebedard left review comments

@fujitatomoya fujitatomoya fujitatomoya left review comments

@ahcorde ahcorde ahcorde approved these changes

Assignees

@Barry-Xu-2018 Barry-Xu-2018

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Barry-Xu-2018 @fujitatomoya @ahcorde @christophebedard