-
Notifications
You must be signed in to change notification settings - Fork 339
Add EntitySemantics system that enables setting categories and tags #3005
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
cf9f0ba
Add EntitySemantics system that enables setting categories and tags
azeey e164853
Add description field
azeey eb8880b
Convert type for tags to std::vector to match ROS definition
azeey 7142159
Merge remote-tracking branch 'origin/main' into entity_metadata
azeey 282cd95
Undo unintended change
azeey 175b916
Fix serialization
azeey c31da6a
Rename SemanticTag to SemanticTags
azeey a25a730
Fix linter issues
azeey 69782b3
Merge remote-tracking branch 'origin/main' into entity_metadata
azeey a883b75
Address reviewer comments
azeey fec4f3c
Expose APIs for clearing the ECMs internal state tracking addition an…
azeey 9f47add
Merge branch 'main' into entity_metadata
azeey 87b65cc
Merge branch 'main' into entity_metadata
azeey 6cc2ac6
Fix windows warning
azeey 9097a00
Add bazel rule for plugin
azeey bccf3d3
Fix naemspace issue on windows
azeey 8fcbd8b
Fix cpplint
azeey 8aaa203
Merge branch 'main' into entity_metadata
azeey File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Copyright (C) 2025 Open Source Robotics Foundation | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
#ifndef GZ_SIM_COMPONENTS_SEMANTIC_CATEGORY_HH_ | ||
#define GZ_SIM_COMPONENTS_SEMANTIC_CATEGORY_HH_ | ||
|
||
#include "gz/sim/components/Component.hh" | ||
#include "gz/sim/components/Factory.hh" | ||
#include "gz/sim/config.hh" | ||
|
||
namespace gz | ||
{ | ||
namespace sim | ||
{ | ||
// Inline bracket to help doxygen filtering. | ||
inline namespace GZ_SIM_VERSION_NAMESPACE { | ||
namespace components | ||
{ | ||
/// \brief A component that holds the semantic category of an entity. This is | ||
/// meant to be used by systems such as EntitySemantics to assign categories to | ||
/// entities. | ||
/// See | ||
/// https://github.com/ros-simulation/simulation_interfaces/blob/1.0.0/msg/EntityCategory.msg | ||
using SemanticCategory = Component<uint8_t, class SemanticCategoryTag>; | ||
GZ_SIM_REGISTER_COMPONENT("gz_sim_components.SemanticCategory", | ||
SemanticCategory) | ||
} // namespace components | ||
} // namespace GZ_SIM_VERSION_NAMESPACE | ||
} // namespace sim | ||
} // namespace gz | ||
#endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
* Copyright (C) 2025 Open Source Robotics Foundation | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
#ifndef GZ_SIM_COMPONENTS_SEMANTIC_DESCRIPTION_HH_ | ||
#define GZ_SIM_COMPONENTS_SEMANTIC_DESCRIPTION_HH_ | ||
|
||
#include <string> | ||
|
||
#include "gz/sim/components/Component.hh" | ||
#include "gz/sim/components/Factory.hh" | ||
#include "gz/sim/config.hh" | ||
|
||
namespace gz | ||
{ | ||
namespace sim | ||
{ | ||
// Inline bracket to help doxygen filtering. | ||
inline namespace GZ_SIM_VERSION_NAMESPACE { | ||
namespace components | ||
{ | ||
/// \brief A component that holds the semantic description of an entity. This is | ||
/// meant to be used by systems such as EntitySemantics to assign descriptions | ||
/// to entities. See | ||
/// https://github.com/ros-simulation/simulation_interfaces/blob/1.0.0/msg/EntityInfo.msg | ||
using SemanticDescription = | ||
Component<std::string, class SemanticDescriptionTag>; | ||
GZ_SIM_REGISTER_COMPONENT("gz_sim_components.SemanticDescription", | ||
SemanticDescription) | ||
} // namespace components | ||
} // namespace GZ_SIM_VERSION_NAMESPACE | ||
} // namespace sim | ||
} // namespace gz | ||
#endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
/* | ||
* Copyright (C) 2025 Open Source Robotics Foundation | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
#ifndef GZ_SIM_COMPONENTS_SEMANTIC_TAG_HH_ | ||
#define GZ_SIM_COMPONENTS_SEMANTIC_TAG_HH_ | ||
|
||
#include <gz/msgs/stringmsg_v.pb.h> | ||
|
||
#include <set> | ||
#include <string> | ||
|
||
#include "gz/sim/components/Component.hh" | ||
#include "gz/sim/components/Factory.hh" | ||
#include "gz/sim/config.hh" | ||
|
||
namespace gz | ||
{ | ||
namespace sim | ||
{ | ||
// Inline bracket to help doxygen filtering. | ||
inline namespace GZ_SIM_VERSION_NAMESPACE | ||
{ | ||
namespace serializers | ||
{ | ||
class SemanticTagSerializer | ||
{ | ||
public: | ||
static std::ostream &Serialize(std::ostream &_out, | ||
azeey marked this conversation as resolved.
Show resolved
Hide resolved
|
||
const std::set<std::string> &_tags) | ||
{ | ||
msgs::StringMsg_V msg; | ||
for (const auto &tag : _tags) | ||
{ | ||
msg.add_data(tag); | ||
} | ||
msg.SerializeToOstream(&_out); | ||
return _out; | ||
} | ||
|
||
public: | ||
static std::istream &Deserialize(std::istream &_in, | ||
azeey marked this conversation as resolved.
Show resolved
Hide resolved
|
||
std::set<std::string> &_tags) | ||
{ | ||
msgs::StringMsg_V msg; | ||
msg.ParsePartialFromIstream(&_in); | ||
for (const auto &item : msg.data()) | ||
{ | ||
_tags.insert(item); | ||
} | ||
return _in; | ||
} | ||
}; | ||
} // namespace serializers | ||
// | ||
namespace components | ||
{ | ||
|
||
/// \brief A component that holds the semantic tag of an entity. This is | ||
/// meant to be used by systems such as EntitySemantics to assign tags to | ||
/// entities. See | ||
/// https://github.com/ros-simulation/simulation_interfaces/blob/1.0.0/msg/TagsFilter.msg | ||
using SemanticTag = Component<std::set<std::string>, class SemanticTagTag, | ||
serializers::SemanticTagSerializer>; | ||
GZ_SIM_REGISTER_COMPONENT("gz_sim_components.SemanticTag", SemanticTag) | ||
} // namespace components | ||
} // namespace GZ_SIM_VERSION_NAMESPACE | ||
} // namespace sim | ||
} // namespace gz | ||
#endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
gz_add_system(entity-semantics | ||
SOURCES | ||
EntitySemantics.cc | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,172 @@ | ||
/* | ||
* Copyright (C) 2025 Open Source Robotics Foundation | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
|
||
#include "EntitySemantics.hh" | ||
|
||
#include <algorithm> | ||
#include <array> | ||
#include <cctype> | ||
#include <cstdint> | ||
#include <gz/common/Profiler.hh> | ||
#include <gz/plugin/Register.hh> | ||
#include <gz/transport/Node.hh> | ||
#include <map> | ||
#include <optional> | ||
#include <set> | ||
#include <string> | ||
azeey marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
#include "gz/sim/components/Model.hh" | ||
#include "gz/sim/components/Name.hh" | ||
#include "gz/sim/components/SemanticCategory.hh" | ||
#include "gz/sim/components/SemanticDescription.hh" | ||
#include "gz/sim/components/SemanticTag.hh" | ||
|
||
using namespace gz; | ||
using namespace sim; | ||
using namespace systems; | ||
|
||
namespace | ||
{ | ||
|
||
// clang-format off | ||
std::array kCategoryStrToInt = { | ||
std::pair{"object", 0u}, | ||
azeey marked this conversation as resolved.
Show resolved
Hide resolved
|
||
std::pair{"robot", 1u}, | ||
std::pair{"human", 2u}, | ||
std::pair{"dynamic_object", 4u}, | ||
std::pair{"static_object", 5u}, | ||
}; | ||
// clang-format on | ||
|
||
std::optional<uint8_t> ConvertCategoryStrToInt(const std::string &_category) | ||
{ | ||
auto it = | ||
std::find_if(kCategoryStrToInt.begin(), kCategoryStrToInt.end(), | ||
[&](const auto &_item) { return _category == _item.first; }); | ||
|
||
if (it != kCategoryStrToInt.end()) | ||
{ | ||
return it->second; | ||
} | ||
return std::nullopt; | ||
} | ||
} // namespace | ||
|
||
////////////////////////////////////////////////// | ||
void EntitySemantics::PreUpdate(const UpdateInfo &, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. windows CI picked up a warning here:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hopefully fixed by 6cc2ac6 |
||
EntityComponentManager &_ecm) | ||
{ | ||
GZ_PROFILE("EntitySemantics::PreUpdate"); | ||
|
||
// Store entities temporarily since it's not safe to add components in an | ||
// `EachNew` loop. | ||
std::map<Entity, uint8_t> entitiesToCategorize; | ||
std::map<Entity, std::string> entitiesToDescribe; | ||
std::map<Entity, std::set<std::string>> entitiesToTag; | ||
_ecm.EachNew<components::Name, components::ModelSdf>( | ||
[&](const Entity &_entity, const components::Name *_name, | ||
const components::ModelSdf *_modelSdf) | ||
{ | ||
auto elem = _modelSdf->Data().Element(); | ||
auto semanticsElem = elem->FindElement("gz:semantics"); | ||
if (semanticsElem) | ||
{ | ||
auto categoryElem = semanticsElem->FindElement("category"); | ||
if (categoryElem) | ||
{ | ||
auto categoryStr = categoryElem->Get<std::string>(); | ||
auto category = | ||
ConvertCategoryStrToInt(common::lowercase(categoryStr)); | ||
if (category) | ||
{ | ||
entitiesToCategorize.emplace(_entity, *category); | ||
} | ||
else | ||
{ | ||
gzerr << "Invalid category specified [" << categoryStr | ||
<< "] in model [" << _name->Data() << "]\n"; | ||
} | ||
|
||
if (categoryElem->GetNextElement("category")) | ||
{ | ||
// TODO(azeey) Include file and line number in error message. | ||
gzerr << "There should be only one <category> element for an " | ||
"entity in model [" | ||
<< _name->Data() << "]\n"; | ||
} | ||
} | ||
|
||
auto descriptionElem = semanticsElem->FindElement("description"); | ||
if (descriptionElem) | ||
{ | ||
auto description = descriptionElem->Get<std::string>(); | ||
if (!description.empty()) | ||
{ | ||
entitiesToDescribe.emplace(_entity, description); | ||
} | ||
else | ||
{ | ||
gzerr << "<description> cannot be an empty string" | ||
<< "] in model [" << _name->Data() << "]\n"; | ||
} | ||
|
||
if (descriptionElem->GetNextElement("description")) | ||
{ | ||
// TODO(azeey) Include file and line number in error message. | ||
gzerr << "There should be only one <description> element for an " | ||
"entity in model [" | ||
<< _name->Data() << "]\n"; | ||
} | ||
} | ||
|
||
for (auto tagElem = semanticsElem->FindElement("tag"); tagElem; | ||
tagElem = tagElem->GetNextElement("tag")) | ||
{ | ||
auto tagStr = tagElem->Get<std::string>(); | ||
if (tagStr.empty()) | ||
{ | ||
gzerr << "<tag> cannot be an empty string in model [" | ||
<< _name->Data() << "]\n"; | ||
} | ||
else | ||
{ | ||
entitiesToTag[_entity].insert(tagStr); | ||
} | ||
} | ||
} | ||
return true; | ||
}); | ||
|
||
for (const auto &[entity, category] : entitiesToCategorize) | ||
{ | ||
_ecm.SetComponentData<components::SemanticCategory>(entity, category); | ||
} | ||
|
||
for (const auto &[entity, description] : entitiesToDescribe) | ||
{ | ||
_ecm.SetComponentData<components::SemanticDescription>(entity, description); | ||
} | ||
|
||
for (const auto &[entity, tags] : entitiesToTag) | ||
{ | ||
_ecm.SetComponentData<components::SemanticTag>(entity, tags); | ||
} | ||
} | ||
|
||
GZ_ADD_PLUGIN(EntitySemantics, System, EntitySemantics::ISystemPreUpdate) | ||
|
||
GZ_ADD_PLUGIN_ALIAS(EntitySemantics, "gz::sim::systems::EntitySemantics") |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.