Make Graph_GetModelPath return an OrtStatus*

Author: adrianlizarraga

include/onnxruntime/core/session/onnxruntime_c_api.h

@@ -5560,17 +5560,19 @@ struct OrtApi {
    */
   ORT_API2_STATUS(Graph_GetName, _In_ const OrtGraph* graph, _Outptr_ const char** graph_name);
 
-  /** \brief Returns the file path to the ONNX model from which an OrtGraph is constructed.
+  /** \brief Get the filepath to the ONNX model from which an OrtGraph is constructed.
    *
-   * \note Returns an empty file path if the model path is unknown, such as when the model is loaded from bytes
+   * \note The model's filepath is empty if the filepath is unknown, such as when the model is loaded from bytes
    * via CreateSessionFromArray.
    *
    * \param[in] graph The OrtGraph instance.
-   * \return The model path, which is an empty path string if unknown.
+   * \param[out] model_path Output parameter set to the model's filepath, which is an empty path string if unknown.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
    *
    * \since Version 1.23.
    */
-  ORT_API_T(const ORTCHAR_T*, Graph_GetModelPath, _In_ const OrtGraph* graph);
+  ORT_API2_STATUS(Graph_GetModelPath, _In_ const OrtGraph* graph, _Outptr_ const ORTCHAR_T** model_path);
 
   /** \brief Returns the ONNX IR version.
    *

onnxruntime/core/graph/model_editor_api_types.h

@@ -173,7 +173,7 @@ struct ModelEditorGraph : public OrtGraph {
 
   const std::string& GetName() const override { return name; }
 
-  const ORTCHAR_T* GetModelPath() const override { return ORT_TSTR(""); }
+  const ORTCHAR_T* GetModelPath() const override { return model_path.c_str(); }
 
   int64_t GetOnnxIRVersion() const override {
     return ONNX_NAMESPACE::Version::IR_VERSION;
@@ -229,6 +229,7 @@ struct ModelEditorGraph : public OrtGraph {
   std::unordered_map<std::string, std::unique_ptr<OrtValue>> external_initializers;
   std::vector<std::unique_ptr<onnxruntime::ModelEditorNode>> nodes;
   std::string name = "ModelEditorGraph";
+  std::filesystem::path model_path;
 };
 
 }  // namespace onnxruntime

onnxruntime/core/session/onnxruntime_c_api.cc

@@ -2579,8 +2579,15 @@ ORT_API_STATUS_IMPL(OrtApis::Graph_GetName, _In_ const OrtGraph* graph, _Outptr_
   API_IMPL_END
 }
 
-ORT_API(const ORTCHAR_T*, OrtApis::Graph_GetModelPath, _In_ const OrtGraph* graph) {
-  return graph->GetModelPath();
+ORT_API_STATUS_IMPL(OrtApis::Graph_GetModelPath, _In_ const OrtGraph* graph, _Outptr_ const ORTCHAR_T** model_path) {
+  API_IMPL_BEGIN
+  if (model_path == nullptr) {
+    return OrtApis::CreateStatus(ORT_INVALID_ARGUMENT, "'model_path' argument is NULL");
+  }
+
+  *model_path = graph->GetModelPath();
+  return nullptr;
+  API_IMPL_END
 }
 
 ORT_API_STATUS_IMPL(OrtApis::Graph_GetOnnxIRVersion, _In_ const OrtGraph* graph, _Out_ int64_t* ir_version) {

onnxruntime/core/session/ort_apis.h

@@ -630,7 +630,7 @@ ORT_API_STATUS_IMPL(ValueInfo_IsFromOuterScope, _In_ const OrtValueInfo* value_i
 
 // OrtGraph
 ORT_API_STATUS_IMPL(Graph_GetName, _In_ const OrtGraph* graph, _Outptr_ const char** graph_name);
-ORT_API(const ORTCHAR_T*, Graph_GetModelPath, _In_ const OrtGraph* graph);
+ORT_API_STATUS_IMPL(Graph_GetModelPath, _In_ const OrtGraph* graph, _Outptr_ const ORTCHAR_T** model_path);
 ORT_API_STATUS_IMPL(Graph_GetOnnxIRVersion, _In_ const OrtGraph* graph, _Out_ int64_t* onnx_ir_version);
 ORT_API_STATUS_IMPL(Graph_GetNumOperatorSets, _In_ const OrtGraph* graph, _Out_ size_t* num_operator_sets);
 ORT_API_STATUS_IMPL(Graph_GetOperatorSets, _In_ const OrtGraph* graph,

onnxruntime/test/ep_graph/test_ep_graph.cc

@@ -537,7 +537,8 @@ static void CheckGraphCApi(const GraphViewer& graph_viewer, const OrtGraph& api_
 
   // Check the path to model.
   const std::filesystem::path& model_path = graph_viewer.ModelPath();
-  const ORTCHAR_T* api_model_path = ort_api.Graph_GetModelPath(&api_graph);
+  const ORTCHAR_T* api_model_path = nullptr;
+  ASSERT_ORTSTATUS_OK(ort_api.Graph_GetModelPath(&api_graph, &api_model_path));
   ASSERT_EQ(PathString(api_model_path), PathString(model_path.c_str()));
 
   // Check graph inputs.