Support printer specific filament profiles in the OrcaFilamentLibrary (#15101)

* Support printer specific filament profiles in the Orca Filament Library

scripts/orca_extra_profile_check.py

@@ -46,12 +46,16 @@ def no_duplicates_object_pairs_hook(pairs):
     return seen
 
 # NOTE: currently Orca expects compatible_printers to be a defined in every instantiation profile, inheritation is not supported in Profile page
-def check_filament_compatible_printers(vendor_folder):
+def check_filament_compatible_printers(vendor, vendor_folder):
     """
     Checks JSON files in the vendor folder for missing or empty 'compatible_printers'
     when 'instantiation' is flagged as true.
 
+    In the OrcaFilamentLibrary 'compatible_printers' is optional: a profile without it is generic and
+    offered on every printer, while a profile that lists printers supersedes the generic one there.
+
     Parameters:
+        vendor (str): The vendor name the folder belongs to.
         vendor_folder (str or Path): The directory to search for JSON profile files.
 
     Returns:
@@ -115,7 +119,7 @@ def check_filament_compatible_printers(vendor_folder):
 
     for profile in profiles.values():
         instantiation = str(profile['content'].get("instantiation", "")).lower() == "true"
-        if instantiation:
+        if instantiation and vendor != 'OrcaFilamentLibrary':
             try:
                 compatible_printers = get_property(profile, "compatible_printers")
                 if not compatible_printers or (isinstance(compatible_printers, list) and not compatible_printers):
@@ -571,7 +575,7 @@ def main():
         vendor_path = profiles_dir / vendor_name
 
         if args.check_filaments or not (args.check_materials and not args.check_filaments):
-            errors_found += check_filament_compatible_printers(vendor_path / "filament")
+            errors_found += check_filament_compatible_printers(vendor_name, vendor_path / "filament")
 
         if args.check_materials:
             new_errors, new_warnings = check_machine_default_materials(profiles_dir, vendor_name)

src/libslic3r/Preset.cpp

@@ -3784,12 +3784,14 @@ void PresetCollection::update_library_profile_excluded_from()
     }
 
     // Check all presets that has the same alias as the filament presets with empty compatible_printers in Orca Filament Library.
+    // A printer specific profile supersedes the generic one, no matter whether it lives in a vendor bundle or in the
+    // library itself.
     for (const Preset& preset : m_presets) {
-        if (preset.vendor == nullptr || preset.vendor->name == PresetBundle::ORCA_FILAMENT_LIBRARY)
+        if (preset.vendor == nullptr)
             continue;
 
         const auto* compatible_printers = dynamic_cast<const ConfigOptionStrings*>(preset.config.option("compatible_printers"));
-        // All profiles in concrete vendor profile shouldn't have empty compatible_printers, but here we check it for safety.
+        // Profiles with empty compatible_printers are the generic ones, they never supersede anything.
         if (compatible_printers == nullptr || compatible_printers->values.empty())
             continue;
         auto itr = excluded_froms.find(preset.alias);

tests/libslic3r/test_preset_bundle_loading.cpp

@@ -488,3 +488,69 @@ TEST_CASE("Plugin capability override keys are scoped per preset type", "[Preset
         }
 }
 
+namespace {
+
+// A standalone filament collection that exposes the protected library masking builder, so the Orca
+// Filament Library scenario can be set up without the full system-profile load pipeline.
+struct LibraryFilamentTestCollection : public PresetCollection
+{
+    LibraryFilamentTestCollection()
+        : PresetCollection(Preset::TYPE_FILAMENT, Preset::filament_options(),
+                           static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults()))
+    {}
+    using PresetCollection::update_library_profile_excluded_from;
+};
+
+} // namespace
+
+// Orca: a filament in the Orca Filament Library that names its compatible printers has to hide the generic
+// library filament sharing its alias, the same way a vendor owned filament does. Otherwise both are compatible
+// with that printer and the plater combo box lists the shared alias twice.
+TEST_CASE("A printer specific filament supersedes the generic library filament with the same alias", "[Preset][Bundle]")
+{
+    LibraryFilamentTestCollection filaments;
+    PresetCollection              printers(Preset::TYPE_PRINTER, Preset::printer_options(),
+                                           static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults()));
+    // The masking keys off the vendor name, which VendorProfile's constructor does not derive from the id.
+    VendorProfile                 library(PresetBundle::ORCA_FILAMENT_LIBRARY);
+    VendorProfile                 vendor("Vendor");
+    library.name = PresetBundle::ORCA_FILAMENT_LIBRARY;
+    vendor.name  = "Vendor";
+
+    auto add_filament = [&filaments](const VendorProfile &owner, const std::string &name, std::vector<std::string> compatible_printers) {
+        Preset &preset = add_inmemory_preset(filaments, name);
+        preset.alias   = "Generic ABS";
+        preset.vendor  = &owner;
+        preset.config.option<ConfigOptionStrings>("compatible_printers", true)->values = std::move(compatible_printers);
+    };
+
+    add_filament(library, "Generic ABS @System", {});
+    add_filament(library, "Generic ABS @Printer A", { "Printer A" });
+    add_filament(vendor,  "Generic ABS @Printer B", { "Printer B" });
+
+    filaments.update_library_profile_excluded_from();
+
+    const Preset *generic = filaments.find_preset("Generic ABS @System");
+    REQUIRE(generic != nullptr);
+    CHECK(generic->m_excluded_from.count("Printer A") == 1);
+    CHECK(generic->m_excluded_from.count("Printer B") == 1);
+    CHECK(generic->m_excluded_from.size() == 2);
+
+    // A printer specific profile names printers, so it is never the one being hidden - not even by itself.
+    const Preset *specific = filaments.find_preset("Generic ABS @Printer A");
+    REQUIRE(specific != nullptr);
+    CHECK(specific->m_excluded_from.empty());
+
+    // ...and the generic profile really drops out of the compatible set on the printer it is hidden from.
+    add_inmemory_preset(printers, "Printer A");
+    add_inmemory_preset(printers, "Printer C");
+    const Preset *printer_a = printers.find_preset("Printer A");
+    const Preset *printer_c = printers.find_preset("Printer C");
+    REQUIRE(printer_a != nullptr);
+    REQUIRE(printer_c != nullptr);
+
+    const PresetWithVendorProfile generic_lib(*generic, &library);
+    CHECK_FALSE(is_compatible_with_printer(generic_lib, PresetWithVendorProfile(*printer_a, nullptr)));
+    CHECK(is_compatible_with_printer(generic_lib, PresetWithVendorProfile(*printer_c, nullptr)));
+}
+