Consolidate type_utils in a way that can be reused in substitution results that need to be coerced to a specific type by ivanpauno · Pull Request #438 · ros2/launch

ivanpauno · 2020-07-13T13:39:39Z

This try to consolidate the launch.frontend.type_utils module, in a way it's usable from custom actions/descriptions that requires an user to specify the type.

To consolidate the coercion rules allowed I've dropped support of Union[...] and non uniform lists, we really don't need that.

I have to consolidate documentation (partially outdated), type annotations and add more test cases.

This could also be used in the future in places like:

launch/launch/launch/actions/timer_action.py

Line 59 in 24ae132

period: Union[float, SomeSubstitutionsType],

so we always use the same rules to convert result of substitutions to specific types.

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

hidmic

First pass, sorry for the long delay @ivanpauno !

launch/launch/frontend/parser.py

launch/launch/utilities/type_utils.py

launch/test/launch/utilities/test_type_utils.py

launch/launch/frontend/parser.py

launch/launch/utilities/type_utils.py

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

… is_instance_of Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

… is_instance_of, coerce_to_type, coerce_list Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

ivanpauno · 2020-07-22T20:37:29Z

@hidmic I'm still iterating on documentation and tests, but I've at least covered all the functions in launch.utilities.type_utils.
Can you take another look?

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

ivanpauno · 2020-07-23T20:54:29Z

launch.frontend.type_utils

There's still a module called in that way, though I've moved most of the methods.
Also, a lots of the methods have been modified and renamed.

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

… substitution and a list of substitutions Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

launch/launch/utilities/type_utils.py

launch/test/launch/utilities/test_type_utils.py

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

ivanpauno · 2020-07-29T18:23:49Z

Linux
Linux-aarch64
macOS
Windows

dirk-thomas · 2020-07-30T16:39:59Z

It seems that this change resulted in a regression across all platforms: see e.g. https://ci.ros2.org/view/nightly/job/nightly_linux_debug/1641/testReport/test_launch_ros.test.test_launch_ros.frontend/test_node_frontend/test_launch_remapping_xml/

@ivanpauno Please address asap.

…sults that need to be coerced to a specific type (#438) Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Part of backporting #438 to Foxy. Signed-off-by: Jacob Perron <jacob@openrobotics.org>

…sults that need to be coerced to a specific type (#438) Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Part of backporting #438 to Foxy. Signed-off-by: Jacob Perron <jacob@openrobotics.org>

ivanpauno added 6 commits July 2, 2020 13:37

Consolidate with new rules to convert parameters in launch_ros

567ae79

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Reorganize modules and import tests from launch_ros PR

6f6faf9

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Fixes after reorganization

83af8f6

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Add functions to handle typed substitutions, correct typing type aliases

3e7a122

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Add way to allow embedded strings substitutions in type_utils

e6977a5

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Fixes for allowing string embedded substitutions

55547fb

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

ivanpauno added the enhancement New feature or request label Jul 13, 2020

ivanpauno requested a review from hidmic July 13, 2020 13:39

ivanpauno self-assigned this Jul 13, 2020

ivanpauno mentioned this pull request Jul 13, 2020

Fix problems when parsing a Command Substitution as a parameter value ros2/launch_ros#137

Merged

hidmic reviewed Jul 20, 2020

View reviewed changes

ivanpauno and others added 17 commits July 20, 2020 14:50

Fix typo

7cdcdf9

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>

Fix typo

48afacd

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>

Fix typo

1b22646

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>

Fix typo

a318750

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>

Address peer review comments

df07ebd

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Nicer utility function names

c691361

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Improve docs and add tests for is_typing_list and is_valid_scalar_type

c9b7e8e

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Improve docblock of is_instance_of_valid_type and extract_type

cd5753d

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Add test cases for extract_type

af643c4

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Test cases, doc improvements and fixes for is_instance_of_valid_type,…

b058195

… is_instance_of Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Test cases, doc improvements and fixes for is_instance_of_valid_type,…

a66b04e

… is_instance_of, coerce_to_type, coerce_list Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Add tests for coerce_list

de3589d

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Improve get_typed_value docblock and add test cases

3af001a

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Document and test is_substitution

a697e10

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Document and test normalize_typed_substitution

4279df1

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Document and add tests for perform_typed_substitution

a12e624

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Document and test is_normalized_substitution

aef8120

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

ivanpauno requested a review from hidmic July 22, 2020 20:36

ivanpauno and others added 4 commits July 23, 2020 17:24

nit

057069a

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>

nit

be8f964

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>

Use 'list_of' prefix in list type identifiers

0e97e74

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Delete redundant assertion

c2dacfc

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Address peer review comments

cd3fafe

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

ivanpauno requested a review from hidmic July 23, 2020 20:59

ivanpauno added 2 commits July 24, 2020 18:17

Beautify code

ab35da7

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Add comment clarifying the difference between a single non-normalized…

b4afa17

… substitution and a list of substitutions Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

hidmic approved these changes Jul 28, 2020

View reviewed changes

ivanpauno added 3 commits July 29, 2020 11:38

Use keyed arguments in tests to make calls more readable

150deca

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Make can_be_str argument keyword only

99cc84c

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Clarify compatibility comments

9ab3835

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

ivanpauno requested a review from hidmic July 29, 2020 15:32

hidmic approved these changes Jul 29, 2020

View reviewed changes

Fix up can_be_str usage in launch_xml and launch_yaml

742c37d

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

ivanpauno changed the title ~~Fix parameter bad interaction frontend~~ Consolidate type_utils in a way that can be reused for substitutions that need to be converted to a specific type Jul 29, 2020

ivanpauno changed the title ~~Consolidate type_utils in a way that can be reused for substitutions that need to be converted to a specific type~~ Consolidate type_utils in a way that can be reused in substitution results that need to be coerced to a specific type Jul 29, 2020

ivanpauno merged commit 2159a5a into master Jul 29, 2020

delete-merged-branch bot deleted the ivanpauno/fix-parameter-bad-interaction-frontend branch July 29, 2020 20:21

This was referenced Jul 30, 2020

Handle empty strings in type coercion. #443

Merged

Drop double single-quoted params. ros2/launch_ros#164

Merged

jacobperron pushed a commit that referenced this pull request Sep 10, 2021

Consolidate type_utils in a way that can be reused in substitution re…

175c466

…sults that need to be coerced to a specific type (#438) Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

jacobperron added a commit that referenced this pull request Sep 10, 2021

Add back removed functions to keep backwards compatibility

52ef127

Part of backporting #438 to Foxy. Signed-off-by: Jacob Perron <jacob@openrobotics.org>

jacobperron mentioned this pull request Sep 10, 2021

[foxy] Backport parser fixes and type_utils refactor #530

Merged

jacobperron added a commit that referenced this pull request Sep 10, 2021

Add back removed functions to keep backwards compatibility

7ce628f

Part of backporting #438 to Foxy. Signed-off-by: Jacob Perron <jacob@openrobotics.org>

jacobperron pushed a commit that referenced this pull request Nov 11, 2021

Consolidate type_utils in a way that can be reused in substitution re…

e341023

…sults that need to be coerced to a specific type (#438) Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

jacobperron added a commit that referenced this pull request Nov 11, 2021

Add back removed functions to keep backwards compatibility

ebfc8fb

Part of backporting #438 to Foxy. Signed-off-by: Jacob Perron <jacob@openrobotics.org>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidate type_utils in a way that can be reused in substitution results that need to be coerced to a specific type#438

Consolidate type_utils in a way that can be reused in substitution results that need to be coerced to a specific type#438
ivanpauno merged 44 commits intomasterfrom
ivanpauno/fix-parameter-bad-interaction-frontend

ivanpauno commented Jul 13, 2020

Uh oh!

hidmic left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ivanpauno commented Jul 22, 2020

Uh oh!

ivanpauno commented Jul 23, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ivanpauno commented Jul 29, 2020

Uh oh!

dirk-thomas commented Jul 30, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

ivanpauno commented Jul 13, 2020

Uh oh!

hidmic left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ivanpauno commented Jul 22, 2020

Uh oh!

ivanpauno commented Jul 23, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ivanpauno commented Jul 29, 2020

Uh oh!

dirk-thomas commented Jul 30, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants