Honor scoped specs and gate Granite tests

Author: 0xShug0

CMakeLists.txt

@@ -1817,31 +1817,6 @@ add_executable(miocodec_wavlm_parity EXCLUDE_FROM_ALL
 
 target_link_libraries(miocodec_wavlm_parity PRIVATE engine_runtime ggml)
 
-add_executable(test_granite5asr_golden_transcription
-    tests/granite5asr/test_granite5asr_golden_transcription.cpp
-)
-target_compile_definitions(test_granite5asr_golden_transcription PRIVATE
-    ENGINE_REPO_ROOT="${CMAKE_CURRENT_SOURCE_DIR}"
-)
-target_link_libraries(test_granite5asr_golden_transcription PRIVATE engine_runtime ggml)
-target_include_directories(test_granite5asr_golden_transcription PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-if (ENGINE_ENABLE_OPENMP)
-    target_link_libraries(test_granite5asr_golden_transcription PRIVATE OpenMP::OpenMP_CXX)
-endif()
-
-add_executable(granite5asr_warm_bench
-    tests/granite5asr/granite5asr_warm_bench.cpp
-)
-target_compile_definitions(granite5asr_warm_bench PRIVATE
-    ENGINE_REPO_ROOT="${CMAKE_CURRENT_SOURCE_DIR}"
-)
-target_link_libraries(granite5asr_warm_bench PRIVATE engine_runtime ggml)
-target_include_directories(granite5asr_warm_bench PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-if (ENGINE_ENABLE_OPENMP)
-    target_link_libraries(granite5asr_warm_bench PRIVATE OpenMP::OpenMP_CXX)
-endif()
-
-
 # F5/Habibi tests: parity harnesses + e2e sample generator. Only when the
 # f5_tts model is linked (they call model-internal symbols) AND test hooks
 # are explicitly enabled — F5_MEL_TEST must never leak into production
@@ -1861,6 +1836,18 @@ if (f5_tts IN_LIST AUDIOCPP_LINKED_MODELS AND ENGINE_F5_TEST_HOOKS)
 endif()
 
 if (ENGINE_BUILD_TESTS)
+    add_executable(test_granite5asr_golden_transcription
+        tests/granite5asr/test_granite5asr_golden_transcription.cpp
+    )
+    target_compile_definitions(test_granite5asr_golden_transcription PRIVATE
+        ENGINE_REPO_ROOT="${CMAKE_CURRENT_SOURCE_DIR}"
+    )
+    target_link_libraries(test_granite5asr_golden_transcription PRIVATE engine_runtime ggml)
+    target_include_directories(test_granite5asr_golden_transcription PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+    if (ENGINE_ENABLE_OPENMP)
+        target_link_libraries(test_granite5asr_golden_transcription PRIVATE OpenMP::OpenMP_CXX)
+    endif()
+
     add_executable(torch_bin_parity
         tests/vibevoice/torch_bin_parity.cpp
     )
@@ -1972,6 +1959,9 @@ if (ENGINE_BUILD_WARMBENCH)
     add_engine_warmbench(controlfoley_warm_bench tests/controlfoley/controlfoley_warm_bench.cpp)
     add_engine_warmbench(fun_asr_nano_warm_bench tests/fun_asr_nano/fun_asr_nano_warm_bench.cpp)
     add_engine_warmbench(granite5asr_warm_bench tests/granite5asr/granite5asr_warm_bench.cpp)
+    target_compile_definitions(granite5asr_warm_bench PRIVATE
+        ENGINE_REPO_ROOT="${CMAKE_CURRENT_SOURCE_DIR}"
+    )
     add_engine_warmbench(higgs_audio_stt_warm_bench tests/higgs_audio_stt/higgs_audio_stt_warm_bench.cpp)
     add_engine_warmbench(higgs_audio_tts_warm_bench tests/higgs_audio_tts/higgs_audio_tts_warm_bench.cpp)
     add_engine_warmbench(hviske_asr_warm_bench tests/hviske_asr/hviske_asr_warm_bench.cpp)

app/server/runtime.cpp

@@ -13,6 +13,7 @@
 #include "engine/framework/debug/trace.h"
 #include "engine/framework/io/json.h"
 #include "engine/framework/model_spec/metadata.h"
+#include "engine/framework/model_spec/package.h"
 #include "engine/framework/runtime/errors.h"
 #include "engine/framework/runtime/registry.h"
 
@@ -85,8 +86,28 @@ std::optional<int> parse_busy_timeout_override(const Value & body) {
     return requested;
 }
 
-bool model_accepts_request_option(std::string_view family, std::string_view option) {
-    const auto contract = engine::model_spec::model_contract(family);
+bool is_missing_model_contract_error(std::string_view message) {
+    return message.find("model contract spec not found for family '") != std::string_view::npos ||
+           message.find("does not embed an audio.cpp model spec") != std::string_view::npos ||
+           message.find("embeds a legacy model spec") != std::string_view::npos;
+}
+
+bool model_accepts_request_option(
+    std::string_view family,
+    std::string_view option,
+    const std::optional<std::filesystem::path> & model_spec_override,
+    const std::filesystem::path & model_path) {
+    std::optional<engine::model_spec::ModelContract> contract;
+    {
+        engine::model_spec::ScopedSpecOverride scoped(model_spec_override, model_path);
+        try {
+            contract = engine::model_spec::model_contract(family);
+        } catch (const std::runtime_error & ex) {
+            if (!is_missing_model_contract_error(ex.what())) {
+                throw;
+            }
+        }
+    }
     if (!contract.has_value()) {
         return true;
     }
@@ -1848,8 +1869,15 @@ engine::runtime::TaskRequest ServerState::build_speech_request(const LoadedModel
 
     bool voice_field_is_preset = false;
     const auto * preset = select_voice_preset(model, body, voice_field_is_preset);
+    const auto effective_model_spec_override = model.config.model_spec_override.has_value()
+        ? model.config.model_spec_override
+        : config_.model_spec_override;
     const bool can_inject_reference_text =
-        model_accepts_request_option(model.config.family, "reference_text");
+        model_accepts_request_option(
+            model.config.family,
+            "reference_text",
+            effective_model_spec_override,
+            model.config.path);
 
     engine::runtime::VoiceCondition voice;
     bool has_voice = false;