FesapiHelpers now also support UUID only methods

F2I-Consulting · Oct 7, 2024 · c52aab2 · c52aab2
1 parent 66bbb79
commit c52aab2
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 4 deletions.
diff --git a/cmake/swigEtp1_2Include.i.in b/cmake/swigEtp1_2Include.i.in
@@ -2162,12 +2162,31 @@ namespace ETP_NS
 		*/
 		Energistics::Etp::v12::Datatypes::Object::Resource buildEtpResourceFromEnergisticsObject(COMMON_NS::AbstractObject const* obj, bool countRels = true);
 
+		/**
+		* Build and return an ETP resource from an Energistics object defined by an UUID in a DataObjectRepository.
+		* @param repo		The repository where the required UUID is defined
+		* @param uuid		The UUID describing the Energistics object
+		* @param countRels	Indicate if the returned resource contain the count of source or target relationships.
+		* @return			The ETP resource built from the Energistics object
+		*/
+		Energistics::Etp::v12::Datatypes::Object::Resource buildEtpResourceFromEnergisticsObject(
+			COMMON_NS::DataObjectRepository const* repo, const std::string& uuid, bool countRels = true);
+
 		/**
 		* Build and return an ETP data object from an Energistics object.
 		* @param obj	The input Energistics obj
 		* @return		The ETP data object built from the Energistics object
 		*/
 		Energistics::Etp::v12::Datatypes::Object::DataObject buildEtpDataObjectFromEnergisticsObject(COMMON_NS::AbstractObject * obj, bool includeSerialization = true);
+
+		/**
+		* Build and return an ETP data object from an Energistics object defined by an UUID in a DataObjectRepository.
+		* @param repo		The repository where the required UUID is defined
+		* @param uuid		The UUID describing the Energistics object
+		* @return		The ETP data object built from the Energistics object
+		*/
+		Energistics::Etp::v12::Datatypes::Object::DataObject buildEtpDataObjectFromEnergisticsObject(
+			COMMON_NS::DataObjectRepository const* repo, const std::string& uuid, bool includeSerialization = true);
 	}
 #endif
 }

diff --git a/python/example/PutHorizon.ipynb b/python/example/PutHorizon.ipynb
@@ -261,12 +261,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "repo.setUriSource(dataspace.uri)\n",
     "dataobjects = fetpapi.MapStringDataObject()\n",
     "allUuids = repo.getUuids()\n",
     "for i, uuid in enumerate(allUuids):\n",
-    "    dataObj = repo.getDataObjectByUuid(uuid)\n",
-    "    dataObj.setUriSource(dataspace.uri)\n",
-    "    dataobjects[str(i)] = fetpapi.buildEtpDataObjectFromEnergisticsObject(dataObj)\n",
+    "    dataobjects[str(i)] = fetpapi.buildEtpDataObjectFromEnergisticsObject(repo, uuid)\n",
     "client_session.putDataObjects(dataobjects)\n",
     "# Finally commit the tansaction now that we have put everything we wanted\n",
     "client_session.commitTransaction()"
@@ -293,7 +292,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },

diff --git a/src/etp/fesapi/FesapiHelpers.cpp b/src/etp/fesapi/FesapiHelpers.cpp
@@ -48,6 +48,11 @@ Energistics::Etp::v12::Datatypes::Object::Resource ETP_NS::FesapiHelpers::buildE
 	return result;
 }
 
+Energistics::Etp::v12::Datatypes::Object::Resource ETP_NS::FesapiHelpers::buildEtpResourceFromEnergisticsObject(
+	COMMON_NS::DataObjectRepository const* repo, const std::string& uuid, bool countRels) {
+	return buildEtpResourceFromEnergisticsObject(repo->getDataObjectByUuid(uuid), countRels);
+}
+
 Energistics::Etp::v12::Datatypes::Object::DataObject ETP_NS::FesapiHelpers::buildEtpDataObjectFromEnergisticsObject(COMMON_NS::AbstractObject * obj, bool includeSerialization)
 {
 	Energistics::Etp::v12::Datatypes::Object::DataObject result;
@@ -68,3 +73,8 @@ Energistics::Etp::v12::Datatypes::Object::DataObject ETP_NS::FesapiHelpers::buil
 
 	return result;
 }
+
+Energistics::Etp::v12::Datatypes::Object::DataObject ETP_NS::FesapiHelpers::buildEtpDataObjectFromEnergisticsObject(
+	COMMON_NS::DataObjectRepository const* repo, const std::string& uuid, bool includeSerialization) {
+	return buildEtpDataObjectFromEnergisticsObject(repo->getDataObjectByUuid(uuid), includeSerialization);
+}
diff --git a/src/etp/fesapi/FesapiHelpers.h b/src/etp/fesapi/FesapiHelpers.h
@@ -46,11 +46,30 @@ namespace ETP_NS
 		*/
 		FETPAPI_DLL_IMPORT_OR_EXPORT Energistics::Etp::v12::Datatypes::Object::Resource buildEtpResourceFromEnergisticsObject(COMMON_NS::AbstractObject const* obj, bool countRels = true);
 
+		/**
+		* Build and return an ETP resource from an Energistics object defined by an UUID in a DataObjectRepository.
+		* @param repo		The repository where the required UUID is defined
+		* @param uuid		The UUID describing the Energistics object
+		* @param countRels	Indicate if the returned resource contain the count of source or target relationships.
+		* @return			The ETP resource built from the Energistics object
+		*/
+		FETPAPI_DLL_IMPORT_OR_EXPORT Energistics::Etp::v12::Datatypes::Object::Resource buildEtpResourceFromEnergisticsObject(
+			COMMON_NS::DataObjectRepository const* repo, const std::string& uuid, bool countRels = true);
+
 		/**
 		* Build and return an ETP data object from an Energistics object.
 		* @param obj	The input Energistics obj
 		* @return		The ETP data object built from the Energistics object
 		*/
 		FETPAPI_DLL_IMPORT_OR_EXPORT Energistics::Etp::v12::Datatypes::Object::DataObject buildEtpDataObjectFromEnergisticsObject(COMMON_NS::AbstractObject * obj, bool includeSerialization = true);
+
+		/**
+		* Build and return an ETP data object from an Energistics object defined by an UUID in a DataObjectRepository.
+		* @param repo	The repository where the required UUID is defined
+		* @param uuid	The UUID describing the Energistics object
+		* @return		The ETP data object built from the Energistics object
+		*/
+		FETPAPI_DLL_IMPORT_OR_EXPORT Energistics::Etp::v12::Datatypes::Object::DataObject buildEtpDataObjectFromEnergisticsObject(
+			COMMON_NS::DataObjectRepository const* repo, const std::string& uuid, bool includeSerialization = true);
 	}
 }