Expand model package with authoring tools and schema versioning

cmake/onnxruntime_session.cmake

@@ -13,10 +13,8 @@ file(GLOB onnxruntime_session_srcs CONFIGURE_DEPENDS
 
 # Standalone model package library (parsing/inspection with no ORT dependency).
 # Compiled as a static library and linked into onnxruntime_session.
-# NOTE: ORT intentionally uses the library's internal C++ types directly (model_package::ParsePackage,
-# model_package_internal.h) rather than going through its public C API (ModelPackage_*). This avoids
-# double-wrapping (ORT C API -> standalone C API -> C++ internals). The public C API exists for
-# external consumers (GenAI, FL) who link against the standalone library independently.
+# ORT uses the standalone library's public C API (model_package.h) and translates
+# the C handles into ORT-internal C++ types inside core/session/model_package/.
 set(MODEL_PACKAGE_LIB_DIR "${REPO_ROOT}/model_package")
 if(NOT onnxruntime_MINIMAL_BUILD)
   set(MODEL_PACKAGE_BUILD_SHARED OFF CACHE BOOL "" FORCE)
@@ -59,7 +57,7 @@ onnxruntime_add_include_to_target(onnxruntime_session onnxruntime_common onnxrun
 target_link_libraries(onnxruntime_session PRIVATE onnxruntime_lora)
 if(TARGET model_package)
   target_link_libraries(onnxruntime_session PRIVATE model_package)
-  target_include_directories(onnxruntime_session PRIVATE ${MODEL_PACKAGE_LIB_DIR}/include ${MODEL_PACKAGE_LIB_DIR}/src)
+  target_include_directories(onnxruntime_session PRIVATE ${MODEL_PACKAGE_LIB_DIR}/include)
 endif()
 if(onnxruntime_ENABLE_INSTRUMENT)
   target_compile_definitions(onnxruntime_session PUBLIC ONNXRUNTIME_ENABLE_INSTRUMENT)

include/onnxruntime/core/session/onnxruntime_experimental_c_api.inc

@@ -66,6 +66,7 @@ ORT_EXPERIMENTAL_API(28, OrtStatusPtr, OrtApi_ExperimentalApiTest, _Out_ int64_t
 //    - OrtModelPackageApi_ModelPackage_GetVariantCount
 //    - OrtModelPackageApi_ModelPackage_GetVariantNames
 //    - OrtModelPackageApi_ModelPackage_GetVariantEpName
+//    - OrtModelPackageApi_ModelPackage_ResolveStringRef
 // 4) Select a component and resolve variant:
 //    - OrtModelPackageApi_SelectComponent
 // 5) Query selected variant info (optional):
@@ -212,6 +213,33 @@ ORT_EXPERIMENTAL_API(28, OrtStatusPtr, OrtModelPackageApi_ModelPackage_GetVarian
                      _In_ const char* variant_name,
                      _Outptr_result_maybenull_ const char** out_ep)
 
+/** \brief Resolve a path reference declared inside the package against the model_package rules.
+ *
+ * Handles the path forms a package may use:
+ *   - "sha256:<hex>" or "sha256:<hex>/<tail>": a content-addressed shared asset. Resolves to
+ *     the asset's on-disk directory (honoring manifest shared_assets overrides), optionally
+ *     joined with the confined tail. Errors if the asset is not declared/discovered.
+ *   - any other value: a relative path resolved against `base_dir` (or the package root when
+ *     `base_dir` is NULL), with portable-layout confinement (no absolute paths, no "..").
+ *
+ * When `must_exist` is non-zero the resolved path must exist on disk. `out_path` is owned by
+ * `ctx` and remains valid until the next call to this function on the same context.
+ *
+ * \param[in] ctx The package context returned by OrtModelPackageApi_CreateModelPackageContext.
+ * \param[in] base_dir Base directory for relative inputs. May be NULL to use the package root.
+ * \param[in] input The path reference to resolve.
+ * \param[in] must_exist Non-zero to require that the resolved path exists on disk.
+ * \param[out] out_path Receives the resolved path string.
+ *
+ * \snippet{doc} snippets.dox OrtStatus Return Value
+ */
+ORT_EXPERIMENTAL_API(28, OrtStatusPtr, OrtModelPackageApi_ModelPackage_ResolveStringRef,
+                     _In_ const OrtModelPackageContext* ctx,
+                     _In_opt_ const char* base_dir,
+                     _In_ const char* input,
+                     _In_ int must_exist,
+                     _Outptr_ const char** out_path)
+
 /** \brief Select a component model and return an opaque component instance.
  *
  * The variant selection is also performed during this call based on the component

model_package/CMakeLists.txt

@@ -52,8 +52,13 @@ endif()
 # ─────────────────────────────────────────────────────────────────────────────
 
 set(MODEL_PACKAGE_SOURCES
-  src/api.cc
-  src/parser.cc
+  src/asset_hasher.cc
+  src/authoring.cc
+  src/commit_prune_validate.cc
+  src/manifest_parser.cc
+  src/model_package_impl.cc
+  src/path_resolver.cc
+  src/sha256.cc
 )
 
 if(MODEL_PACKAGE_BUILD_SHARED)
@@ -91,6 +96,45 @@ install(TARGETS model_package
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
-install(FILES include/model_package_api.h
+install(FILES include/model_package_api.h include/model_package.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
+
+# ─────────────────────────────────────────────────────────────────────────────
+# Tests
+# ─────────────────────────────────────────────────────────────────────────────
+
+if(MODEL_PACKAGE_BUILD_TESTS)
+  enable_testing()
+  add_executable(test_inspection tests/test_inspection.cc)
+  target_link_libraries(test_inspection PRIVATE model_package nlohmann_json::nlohmann_json)
+  target_include_directories(test_inspection PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+  )
+  add_test(NAME inspection COMMAND test_inspection)
+
+  add_executable(test_asset_hashing tests/test_asset_hashing.cc)
+  target_link_libraries(test_asset_hashing PRIVATE model_package nlohmann_json::nlohmann_json)
+  target_include_directories(test_asset_hashing PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+  )
+  add_test(NAME asset_hashing COMMAND test_asset_hashing)
+
+  add_executable(test_authoring tests/test_authoring.cc)
+  target_link_libraries(test_authoring PRIVATE model_package nlohmann_json::nlohmann_json)
+  target_include_directories(test_authoring PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+  )
+  add_test(NAME authoring COMMAND test_authoring)
+
+  add_executable(test_commit tests/test_commit.cc)
+  target_link_libraries(test_commit PRIVATE model_package nlohmann_json::nlohmann_json)
+  target_include_directories(test_commit PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+  )
+  add_test(NAME commit COMMAND test_commit)
+endif()