Skip to content

Add support for IS_ANNOTATORS and SUPPRESS_TRACKS Properties #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add support for IS_ANNOTATORS and SUPPRESS_TRACKS Properties #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dc3004
removed the OUTPUT_MERGE_WITH_PREVIOUS_TASK property, add the IS_ANNO…
jtat1062 Jul 30, 2025
7f26d2c
Merge branch 'develop' into feat/annotators-2
brosenberg42 Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cpp/KeywordTagging/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"value": "REGION"
},
{
"name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK",
"name": "IS_ANNOTATOR",
"value": "TRUE"
}
]
Expand All @@ -79,7 +79,7 @@
"value": "REGION"
},
{
"name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK",
"name": "IS_ANNOTATOR",
"value": "TRUE"
},
{
Expand Down
14 changes: 7 additions & 7 deletions cpp/OcvDnnDetection/OcvDnnDetection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ std::vector<MPFVideoTrack> OcvDnnDetection::GetDetections(const MPFVideoJob &job

std::vector<MPFVideoTrack> 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
Expand All @@ -200,7 +200,7 @@ std::vector<MPFVideoTrack> 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
Expand All @@ -214,7 +214,7 @@ std::vector<MPFVideoTrack> 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;
}
}
Expand Down Expand Up @@ -290,8 +290,8 @@ std::vector<MPFImageLocation> 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;
Expand All @@ -301,7 +301,7 @@ std::vector<MPFImageLocation> 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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions python/ArgosTranslation/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"value": "REGION"
},
{
"name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK",
"name": "IS_ANNOTATOR",
"value": "TRUE"
}
]
Expand All @@ -79,7 +79,7 @@
"value": "REGION"
},
{
"name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK",
"name": "IS_ANNOTATOR",
"value": "FALSE"
}
]
Expand Down
2 changes: 1 addition & 1 deletion python/AzureTranslation/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"value": "REGION"
},
{
"name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK",
"name": "IS_ANNOTATOR",
"value": "TRUE"
}
]
Expand Down
2 changes: 1 addition & 1 deletion python/FastTextLanguageDetection/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"value": "REGION"
},
{
"name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK",
"name": "IS_ANNOTATOR",
"value": "TRUE"
}
]
Expand Down
2 changes: 1 addition & 1 deletion python/NlpTextCorrection/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"value": "REGION"
},
{
"name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK",
"name": "IS_ANNOTATOR",
"value": "TRUE"
}
]
Expand Down
2 changes: 1 addition & 1 deletion python/TransformerTagging/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"value": "REGION"
},
{
"name": "OUTPUT_MERGE_WITH_PREVIOUS_TASK",
"name": "IS_ANNOTATOR",
"value": "TRUE"
}
]
Expand Down