diff --git a/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp b/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp index 1119465a14585990e083facb42e45aca521b4448..a02a8f8afbab9ba819762df47d25387678317efa 100644 --- a/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp +++ b/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp @@ -256,4 +256,9 @@ namespace armarx { profileCoreSegment.addProfile(profile); } + + std::optional<std::vector<skills::manager::arondto::FluxioProfile>> SkillsMemory::loadProfiles() + { + return profileCoreSegment.getProfiles(); + } } // namespace armarx diff --git a/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.h b/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.h index 1155b05d8cc8737a64855c9cb5c9b3ddf9d3d552..8f117a5cbd4e9771becb9b9dd7fd80aab91d0c41 100644 --- a/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.h +++ b/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.h @@ -118,6 +118,7 @@ namespace armarx std::optional<std::vector<skills::manager::arondto::FluxioSkill>> loadCompositeSkillsOfProvider(const std::string& providerId) override; void addProfile(const skills::manager::arondto::FluxioProfile& profile) override; + std::optional<std::vector<skills::manager::arondto::FluxioProfile>> loadProfiles() override; protected: /// @see armarx::ManagedIceObject::onInitComponent() diff --git a/source/RobotAPI/libraries/armem_skills/server/segment/ProfileLibrarySegment.cpp b/source/RobotAPI/libraries/armem_skills/server/segment/ProfileLibrarySegment.cpp index 0d3d49d1fff53e91a90082d252ba4aa831d3a4fa..075e0f192070c8d5c5475babcfce8a3e2b5c6a7a 100644 --- a/source/RobotAPI/libraries/armem_skills/server/segment/ProfileLibrarySegment.cpp +++ b/source/RobotAPI/libraries/armem_skills/server/segment/ProfileLibrarySegment.cpp @@ -1,9 +1,11 @@ #include "ProfileLibrarySegment.h" +#include <vector> #include <SimoxUtility/algorithm/string.h> #include <ArmarXCore/core/time/ice_conversions.h> +#include "RobotAPI/libraries/armem/client/query/Builder.h" #include "RobotAPI/libraries/armem/core/Commit.h" #include "RobotAPI/libraries/armem/core/MemoryID.h" #include <RobotAPI/libraries/armem/server/MemoryToIceAdapter.h> @@ -52,4 +54,31 @@ namespace armarx::skills::segment // Commit data to memory and notify iceMemory.commit(commit); } + + std::optional<std::vector<skills::manager::arondto::FluxioProfile>> ProfileLibraryCoreSegment::getProfiles() const { + std::vector<skills::manager::arondto::FluxioProfile> ret; + armarx::armem::client::query::Builder qb; + qb.allLatestInCoreSegment(id()); + armem::client::QueryResult qresult = iceMemory.query(qb.buildQueryInput()); + if (!qresult.success) + { + ARMARX_WARNING << "Query failed: " << qresult.errorMessage; + return std::nullopt; + } + + const armem::wm::Memory& data = qresult.memory; + + data.forEachInstance( + [&ret](const armem::wm::EntityInstance& instance) + { + auto profile = instance.dataAs<skills::manager::arondto::FluxioProfile>(); + if (profile.deleted) + { + return; + } + ret.push_back(profile); + }); + + return ret; + } } // namespace armarx::skills::segment diff --git a/source/RobotAPI/libraries/armem_skills/server/segment/ProfileLibrarySegment.h b/source/RobotAPI/libraries/armem_skills/server/segment/ProfileLibrarySegment.h index 61c5a9fc1e34c5d42eac798ef813e8a2aa1321e1..2032163c5f10d5d02ee8d10fb2607e91d3bcabea 100644 --- a/source/RobotAPI/libraries/armem_skills/server/segment/ProfileLibrarySegment.h +++ b/source/RobotAPI/libraries/armem_skills/server/segment/ProfileLibrarySegment.h @@ -1,6 +1,8 @@ #pragma once // Base Class +#include <optional> +#include <vector> #include <RobotAPI/libraries/armem/server/segment/SpecializedSegment.h> // ArmarX @@ -29,5 +31,6 @@ namespace armarx::skills::segment void init(); void addProfile(const skills::manager::arondto::FluxioProfile& profile); + std::optional<std::vector<skills::manager::arondto::FluxioProfile>> getProfiles() const; }; } // namespace armarx::skills::segment diff --git a/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.cpp b/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.cpp index 39b5d2d716fe1295f9893a7098a1ee3970372909..31b002a434c773248f74e06a6913efa783c6ee99 100644 --- a/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.cpp +++ b/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.cpp @@ -771,4 +771,11 @@ namespace armarx { // Implemented in derived class } + + std::optional<std::vector<skills::manager::arondto::FluxioProfile>> + SkillManagerComponentPluginUser::loadProfiles() + { + // Implemented in derived class + return {}; + } } // namespace armarx diff --git a/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.h b/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.h index 89d1480298e10864ed48dd588ec24baa7457c128..1eb873f366af6b557bd436623e88bc62a71697fa 100644 --- a/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.h +++ b/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.h @@ -156,6 +156,7 @@ namespace armarx virtual std::optional<std::vector<skills::manager::arondto::FluxioSkill>> loadCompositeSkillsOfProvider(const std::string& providerId); virtual void addProfile(const skills::manager::arondto::FluxioProfile& profile); + virtual std::optional<std::vector<skills::manager::arondto::FluxioProfile>> loadProfiles(); private: armarx::plugins::SkillManagerComponentPlugin* plugin = nullptr;