diff --git a/cpp/KeywordTagging/plugin-files/descriptor/descriptor.json b/cpp/KeywordTagging/plugin-files/descriptor/descriptor.json index b1e9367f..b6bffad8 100644 --- a/cpp/KeywordTagging/plugin-files/descriptor/descriptor.json +++ b/cpp/KeywordTagging/plugin-files/descriptor/descriptor.json @@ -64,7 +64,7 @@ "value": "REGION" }, { - "name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK", + "name": "IS_ANNOTATOR", "value": "TRUE" } ] @@ -79,7 +79,7 @@ "value": "REGION" }, { - "name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK", + "name": "IS_ANNOTATOR", "value": "TRUE" }, { diff --git a/cpp/OcvDnnDetection/OcvDnnDetection.cpp b/cpp/OcvDnnDetection/OcvDnnDetection.cpp index 3946438f..c9083425 100644 --- a/cpp/OcvDnnDetection/OcvDnnDetection.cpp +++ b/cpp/OcvDnnDetection/OcvDnnDetection.cpp @@ -190,8 +190,8 @@ std::vector OcvDnnDetection::GetDetections(const MPFVideoJob &job std::vector tracks = getDetections(job, feedForwardTracker); - bool output_merge_with_previous_task = - DetectionComponentUtils::GetProperty(job.job_properties, "OUTPUT_MERGE_WITH_PREVIOUS_TASK", false); + bool is_annotator = + DetectionComponentUtils::GetProperty(job.job_properties, "IS_ANNOTATOR", false); for (MPFVideoTrack &track : tracks) { // Update track props with feed-forward props @@ -200,7 +200,7 @@ std::vector OcvDnnDetection::GetDetections(const MPFVideoJob &job track_props.insert(feed_forward_track_prop); } // Determine if we should copy feed-forward confidence - if (output_merge_with_previous_task) { + if (is_annotator) { track.confidence = job.feed_forward_track.confidence; } // Update location props with corresponding feed-forward props @@ -214,7 +214,7 @@ std::vector OcvDnnDetection::GetDetections(const MPFVideoJob &job loc_props.insert(feed_forward_prop); } // Determine if we should copy feed-forward confidence - if (output_merge_with_previous_task) { + if (is_annotator) { pair.second.confidence = feed_forward_loc_iter->second.confidence; } } @@ -290,8 +290,8 @@ std::vector OcvDnnDetection::GetDetections(const MPFImageJob & } if (job.has_feed_forward_location) { - bool output_merge_with_previous_task = - DetectionComponentUtils::GetProperty(job.job_properties, "OUTPUT_MERGE_WITH_PREVIOUS_TASK", false); + bool is_annotator = + DetectionComponentUtils::GetProperty(job.job_properties, "IS_ANNOTATOR", false); // Update location props with feed-forward props const Properties &feed_forward_props = job.feed_forward_location.detection_properties; @@ -301,7 +301,7 @@ std::vector OcvDnnDetection::GetDetections(const MPFImageJob & props.insert(feed_forward_prop); } // Determine if we should copy feed-forward confidence - if (output_merge_with_previous_task) { + if (is_annotator) { location.confidence = job.feed_forward_location.confidence; } } diff --git a/python/ArgosTranslation/plugin-files/descriptor/descriptor.json b/python/ArgosTranslation/plugin-files/descriptor/descriptor.json index 0ed200bb..0ecc79ad 100644 --- a/python/ArgosTranslation/plugin-files/descriptor/descriptor.json +++ b/python/ArgosTranslation/plugin-files/descriptor/descriptor.json @@ -64,7 +64,7 @@ "value": "REGION" }, { - "name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK", + "name": "IS_ANNOTATOR", "value": "TRUE" } ] @@ -79,7 +79,7 @@ "value": "REGION" }, { - "name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK", + "name": "IS_ANNOTATOR", "value": "FALSE" } ] diff --git a/python/AzureTranslation/plugin-files/descriptor/descriptor.json b/python/AzureTranslation/plugin-files/descriptor/descriptor.json index a04762bb..7a7e195d 100644 --- a/python/AzureTranslation/plugin-files/descriptor/descriptor.json +++ b/python/AzureTranslation/plugin-files/descriptor/descriptor.json @@ -131,7 +131,7 @@ "value": "REGION" }, { - "name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK", + "name": "IS_ANNOTATOR", "value": "TRUE" } ] diff --git a/python/FastTextLanguageDetection/plugin-files/descriptor/descriptor.json b/python/FastTextLanguageDetection/plugin-files/descriptor/descriptor.json index 2d3ee8d5..aa31a013 100644 --- a/python/FastTextLanguageDetection/plugin-files/descriptor/descriptor.json +++ b/python/FastTextLanguageDetection/plugin-files/descriptor/descriptor.json @@ -59,7 +59,7 @@ "value": "REGION" }, { - "name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK", + "name": "IS_ANNOTATOR", "value": "TRUE" } ] diff --git a/python/NlpTextCorrection/plugin-files/descriptor/descriptor.json b/python/NlpTextCorrection/plugin-files/descriptor/descriptor.json index 89b7c10a..4bdcef44 100644 --- a/python/NlpTextCorrection/plugin-files/descriptor/descriptor.json +++ b/python/NlpTextCorrection/plugin-files/descriptor/descriptor.json @@ -52,7 +52,7 @@ "value": "REGION" }, { - "name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK", + "name": "IS_ANNOTATOR", "value": "TRUE" } ] diff --git a/python/TransformerTagging/plugin-files/descriptor/descriptor.json b/python/TransformerTagging/plugin-files/descriptor/descriptor.json index 8aa136ee..340f39d6 100644 --- a/python/TransformerTagging/plugin-files/descriptor/descriptor.json +++ b/python/TransformerTagging/plugin-files/descriptor/descriptor.json @@ -70,7 +70,7 @@ "value": "REGION" }, { - "name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK", + "name": "IS_ANNOTATOR", "value": "TRUE" } ]